Skip to content

Added species specific energy grids #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pheosics wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Added species specific energy grids #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 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
010e309
Updates for species outputs
Jun 20, 2025
016d4f1
Update for test3 and testEMIC
Jun 20, 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
38 changes: 33 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,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 +446,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 +512,5 @@ testSCE_check:
${TESTDIRC}/output_ram/pressure_d20130317_t001000.dat \
${IMDIR}/output/testSCE/pressure.ref \
>> testSCE.diff

@echo "Test Successful!"
Binary file modified input/initialization.nc
View file
Open in desktop
Binary file not shown.
32 changes: 16 additions & 16 deletions output/test1/log.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
RAM-SCB Log
time year mo dy hr mn sc msc dstRam dstBiot pparh pperh pparo ppero pparhe pperhe ppare ppere
0.600000E+02 2013 03 17 00 01 00 000 -0.160756E+02 -0.101126E+02 0.918038E+01 0.126292E+02 0.293650E+01 0.403353E+01 0.477096E+00 0.678293E+00 0.206100E+00 0.132783E+01
0.120000E+03 2013 03 17 00 02 00 000 -0.160646E+02 -0.101126E+02 0.917334E+01 0.126169E+02 0.293371E+01 0.402923E+01 0.476739E+00 0.677713E+00 0.204962E+00 0.132634E+01
0.180000E+03 2013 03 17 00 03 00 000 -0.160537E+02 -0.101126E+02 0.916633E+01 0.126046E+02 0.293093E+01 0.402496E+01 0.476381E+00 0.677136E+00 0.203979E+00 0.132508E+01
0.240000E+03 2013 03 17 00 04 00 000 -0.160429E+02 -0.101126E+02 0.915935E+01 0.125925E+02 0.292815E+01 0.402072E+01 0.476025E+00 0.676564E+00 0.203061E+00 0.132391E+01
0.300000E+03 2013 03 17 00 05 00 000 -0.160321E+02 -0.102989E+02 0.915241E+01 0.125805E+02 0.292538E+01 0.401652E+01 0.475669E+00 0.675998E+00 0.202179E+00 0.132281E+01
0.360000E+03 2013 03 17 00 06 00 000 -0.160213E+02 -0.102989E+02 0.914550E+01 0.125688E+02 0.292262E+01 0.401236E+01 0.475315E+00 0.675438E+00 0.201337E+00 0.132176E+01
0.420000E+03 2013 03 17 00 07 00 000 -0.160105E+02 -0.102989E+02 0.913867E+01 0.125573E+02 0.291988E+01 0.400827E+01 0.474963E+00 0.674887E+00 0.200513E+00 0.132074E+01
0.480000E+03 2013 03 17 00 08 00 000 -0.159997E+02 -0.102989E+02 0.913194E+01 0.125461E+02 0.291716E+01 0.400425E+01 0.474614E+00 0.674347E+00 0.199703E+00 0.131977E+01
0.540000E+03 2013 03 17 00 09 00 000 -0.159889E+02 -0.102989E+02 0.912530E+01 0.125352E+02 0.291448E+01 0.400031E+01 0.474268E+00 0.673818E+00 0.198905E+00 0.131883E+01
0.600000E+03 2013 03 17 00 10 00 000 -0.159782E+02 -0.102542E+02 0.911876E+01 0.125245E+02 0.291182E+01 0.399646E+01 0.473927E+00 0.673300E+00 0.198119E+00 0.131792E+01
0.660000E+03 2013 03 17 00 11 00 000 -0.159674E+02 -0.102542E+02 0.911229E+01 0.125142E+02 0.290919E+01 0.399269E+01 0.473587E+00 0.672793E+00 0.197354E+00 0.131707E+01
0.720000E+03 2013 03 17 00 12 00 000 -0.159566E+02 -0.102542E+02 0.910592E+01 0.125041E+02 0.290659E+01 0.398903E+01 0.473252E+00 0.672299E+00 0.196598E+00 0.131624E+01
0.780000E+03 2013 03 17 00 13 00 000 -0.159459E+02 -0.102542E+02 0.909966E+01 0.124944E+02 0.290402E+01 0.398546E+01 0.472921E+00 0.671817E+00 0.195852E+00 0.131542E+01
0.840000E+03 2013 03 17 00 14 00 000 -0.159352E+02 -0.102542E+02 0.909350E+01 0.124850E+02 0.290149E+01 0.398201E+01 0.472594E+00 0.671348E+00 0.195114E+00 0.131462E+01
0.900000E+03 2013 03 17 00 15 00 000 -0.159246E+02 -0.102176E+02 0.908745E+01 0.124759E+02 0.289899E+01 0.397866E+01 0.472271E+00 0.670892E+00 0.194385E+00 0.131382E+01
time year mo dy hr mn sc msc dstRam dstBiot ppar_H pper_H ppar_O pper_O pparHe pperHe ppar_e pper_e
0.600000E+02 2013 03 17 00 01 00 000 -0.161025E+02 0.820308E-16 0.918038E+01 0.126292E+02 0.293650E+01 0.403353E+01 0.477096E+00 0.678293E+00 0.224261E+00 0.141899E+01
0.120000E+03 2013 03 17 00 02 00 000 -0.160913E+02 0.820308E-16 0.917334E+01 0.126169E+02 0.293371E+01 0.402923E+01 0.476739E+00 0.677713E+00 0.223014E+00 0.141735E+01
0.180000E+03 2013 03 17 00 03 00 000 -0.160803E+02 0.820308E-16 0.916633E+01 0.126046E+02 0.293093E+01 0.402496E+01 0.476381E+00 0.677136E+00 0.221931E+00 0.141594E+01
0.240000E+03 2013 03 17 00 04 00 000 -0.160694E+02 0.820308E-16 0.915935E+01 0.125925E+02 0.292815E+01 0.402072E+01 0.476025E+00 0.676564E+00 0.220918E+00 0.141465E+01
0.300000E+03 2013 03 17 00 05 00 000 -0.160585E+02 -0.102996E+02 0.915241E+01 0.125805E+02 0.292538E+01 0.401652E+01 0.475669E+00 0.675998E+00 0.219945E+00 0.141342E+01
0.360000E+03 2013 03 17 00 06 00 000 -0.160475E+02 -0.102996E+02 0.914550E+01 0.125688E+02 0.292262E+01 0.401236E+01 0.475315E+00 0.675438E+00 0.219015E+00 0.141227E+01
0.420000E+03 2013 03 17 00 07 00 000 -0.160366E+02 -0.102996E+02 0.913867E+01 0.125573E+02 0.291988E+01 0.400827E+01 0.474963E+00 0.674887E+00 0.218105E+00 0.141116E+01
0.480000E+03 2013 03 17 00 08 00 000 -0.160257E+02 -0.102996E+02 0.913194E+01 0.125461E+02 0.291716E+01 0.400425E+01 0.474614E+00 0.674347E+00 0.217211E+00 0.141009E+01
0.540000E+03 2013 03 17 00 09 00 000 -0.160148E+02 -0.102996E+02 0.912530E+01 0.125352E+02 0.291448E+01 0.400031E+01 0.474268E+00 0.673818E+00 0.216332E+00 0.140906E+01
0.600000E+03 2013 03 17 00 10 00 000 -0.160039E+02 -0.102570E+02 0.911876E+01 0.125245E+02 0.291182E+01 0.399646E+01 0.473927E+00 0.673300E+00 0.215465E+00 0.140807E+01
0.660000E+03 2013 03 17 00 11 00 000 -0.159930E+02 -0.102570E+02 0.911229E+01 0.125142E+02 0.290919E+01 0.399269E+01 0.473587E+00 0.672793E+00 0.214621E+00 0.140711E+01
0.720000E+03 2013 03 17 00 12 00 000 -0.159821E+02 -0.102570E+02 0.910592E+01 0.125041E+02 0.290659E+01 0.398903E+01 0.473252E+00 0.672299E+00 0.213788E+00 0.140618E+01
0.780000E+03 2013 03 17 00 13 00 000 -0.159712E+02 -0.102570E+02 0.909966E+01 0.124944E+02 0.290402E+01 0.398546E+01 0.472921E+00 0.671817E+00 0.212965E+00 0.140528E+01
0.840000E+03 2013 03 17 00 14 00 000 -0.159604E+02 -0.102570E+02 0.909350E+01 0.124850E+02 0.290149E+01 0.398201E+01 0.472594E+00 0.671348E+00 0.212153E+00 0.140439E+01
0.900000E+03 2013 03 17 00 15 00 000 -0.159497E+02 -0.102221E+02 0.908745E+01 0.124759E+02 0.289899E+01 0.397866E+01 0.472271E+00 0.670892E+00 0.211351E+00 0.140351E+01
Loading
Loading