Skip to content
Open

WPI #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
66a608d
Added species specific energy grids
Jun 19, 2023
4914281
Update for species dependent energy grid
Jul 2, 2024
b71f851
Initialization commits for energy by species
Oct 15, 2024
9c1d407
Added energy and pitch angle interpolation
Nov 14, 2024
c90d1e0
Update to energy by species
Jan 27, 2025
fe664c8
Merge branch 'master' into energy_by_species
Pheosics Jan 27, 2025
49702af
Fixed issues with latest commits
Jan 27, 2025
4efdf0c
Merge branch 'energy_by_species' of github.com:Pheosics/RAM-SCB into …
Jan 27, 2025
33ff848
Updates to make energy by species work with SCE
Jan 27, 2025
240f5f3
Change paths for hiss and BAS chorus diffusion files to input_ram/PlH…
kyakymenko Jun 19, 2025
5b7154e
Create CODEOWNERS
kyakymenko Jun 20, 2025
764a69b
Merge pull request #1 from kyakymenko/change_path
kyakymenko Jun 20, 2025
939832f
Switched wapara_bas from reading old ASCII bav files to new netCDF fo…
kyakymenko Jul 7, 2025
b2f96c4
Made changes to account for new Kp bins
kyakymenko Jul 8, 2025
3ef2d67
Fixed netcdf bugs, changed Kp interpolation for chorus diffusion
kyakymenko Jul 9, 2025
2195c09
Fixed MLT grid boundary
kyakymenko Jul 10, 2025
f63e9bc
Fixed issues with reading bav netcdf files
kyakymenko Jul 13, 2025
ab570fc
Prevented NaNs in electron flux output by handling zero diffusion cases
kyakymenko Jul 13, 2025
a41e7d0
fix interpolation of d_mumu between ram grid points
Johannes243 Jul 14, 2025
c818b37
fix previous commit about interpolation between pa grid points
Johannes243 Jul 15, 2025
fadc18d
remove an old comment
Johannes243 Jul 15, 2025
d8d012c
(de)allocate new arrays and populate cdxxr during initialization
Johannes243 Jul 15, 2025
fe29a93
fix deallocation if not DoUseBASDiff, ignore highest BAS Kp bin, fix …
Johannes243 Jul 16, 2025
a76174b
Adding energy diffusion for electrons
Johannes243 Jul 17, 2025
f9701e7
correction to energy diffusion
Johannes243 Jul 19, 2025
c331b3b
Merge pull request #3 from kyakymenko/new_bav_files
kyakymenko Aug 8, 2025
1e862a6
Deleted CODEOWNERS file
Aug 8, 2025
e9b1520
Deallocate all arrays that might have been allocated in ModRamWPI
Aug 8, 2025
6d8c9f7
Fix mix-up with species indices and related energy interpolation issue
Aug 9, 2025
afc1478
Create BAS_bavDxx directory during rundir creation
kyakymenko Aug 9, 2025
ee3dd12
Update tests 1 through 4
kyakymenko Aug 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 34 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ rundir:
mv initialization.nc input_ram/; \
mv QinDenton_20130317_1min.txt input_scb/; \
mv NitrogenCrossSections.dat input_ram/; \
mkdir -p input_ram/BAS_bavDxx; \
cp -r ${IMDIR}/input/glow_data input_sce/;
@(if [ "$(STANDALONE)" != "NO" ]; then \
cd ${RUNDIR} ; \
Expand Down Expand Up @@ -236,14 +237,10 @@ test1_run:
cd ${TESTDIR1}; ${MPIRUN} ./ram_scb.exe | tee runlog

test1_check:
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
${TESTDIR1}/output_ram/log_d20130317_t000000.log \
${IMDIR}/output/test1/log.ref \
> test1.diff
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
${TESTDIR1}/output_ram/pressure_d20130317_t001500.dat \
${IMDIR}/output/test1/pressure.ref \
>> test1.diff
> test1.diff
ncdump -v "Flux_H","B_xyz" \
${TESTDIR1}/output_ram/sat1_d20130317_t000000.nc \
| sed -e '1,/data:/d' > \
Expand Down Expand Up @@ -450,7 +447,38 @@ testEMIC_check:
>> testEMIC.diff
@echo "Test Successful!"

testSpecies:
@echo "starting..." > testSpecies.diff
@echo "testSpecies_compile..." >> testSpecies.diff
make testSpecies_compile
@echo "testSpecies_rundir..." >> testSpecies.diff
make testSpecies_rundir PARAMFILE=PARAM.in.testSpecies
@echo "testSpecies_run..." >> testSpecies.diff
make testSpecies_run MPIRUN=
@echo "testSpecies_check..." >> testSpecies.diff
make testSpecies_check

testSpecies_compile:
make

testSpecies_rundir:
rm -rf ${TESTDIRC}
make rundir RUNDIR=${TESTDIRC} STANDALONE="YES"
cp Param/${PARAMFILE} ${TESTDIRC}/PARAM.in
cp input/sat*.dat ${TESTDIRC}/

testSpecies_run:
cd ${TESTDIRC}; ${MPIRUN} ./ram_scb.exe | tee runlog;

testSpecies_check:
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
${TESTDIRC}/output_ram/log_d20130317_t000000.log \
${IMDIR}/output/testSpecies/log.ref \
> testSpecies.diff
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
${TESTDIRC}/output_ram/pressure_d20130317_t001500.dat \
${IMDIR}/output/testSpecies/pressure.ref \
>> testSpecies.diff

#TEST SCE----------------------------------
testSCE:
Expand Down Expand Up @@ -485,4 +513,5 @@ testSCE_check:
${TESTDIRC}/output_ram/pressure_d20130317_t001000.dat \
${IMDIR}/output/testSCE/pressure.ref \
>> testSCE.diff

@echo "Test Successful!"
Loading
Loading