Skip to content

Commit

Permalink
Expanded unit testing, modernized ModRamFunctions, KpMax bugfix (#100)
Browse files Browse the repository at this point in the history 
* update to use F08 intrisic ERF; remove obsolete tests; add new tests

* ireverse index order so that Kpmax12/24 evaluate correctly

Index order needs to be forward (i.e., i-8:i-1) for correct evaluation.
Prior to this fix Kpmax12 and Kpmax24 evaluate identically to Kp

* Update regression tests after Kpmax12 fix

Expanded tests to do test 2 as well as test 3 (since test 2 is quick
and touches the restart code)
  • Loading branch information
@drsteve
drsteve authored Jun 17, 2022
1 parent bd2523a commit f71782a
Show file tree
Hide file tree
Showing 14 changed files with 41,671 additions and 41,829 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ramscb-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
export PERL5LIB=$PERL5LIB:`pwd`
./Config.pl -install -compiler=gfortran -mpi=openmpi -openmp -ncdf -gsl -O3
make
make testTravis
make testCI
- name: unit_tests
run: |
make unittest
4 changes: 3 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ help:
@echo ' HTML (Make HTML version of the documentation)'
@echo ' test (run all tests for RAM-SCB)'
@echo ' test_help (show all options for running the tests)'
@echo ' unittest (run unit test suite for RAM-SCB)'
@echo ' LIB (Component library libIM for SWMF)'

PDF:
Expand Down Expand Up @@ -130,7 +131,8 @@ test:
@(make test3)
@(make test4)

testTravis:
testCI:
@(make test2)
@(make test3)

test_help:
Expand Down
30 changes: 15 additions & 15 deletions output/test1/log.ref
View file
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.160738E+02 -0.101126E+02 0.918038E+01 0.126292E+02 0.293650E+01 0.403353E+01 0.477096E+00 0.678293E+00 0.204741E+00 0.132613E+01
0.120000E+03 2013 03 17 00 02 00 000 -0.160624E+02 -0.101126E+02 0.917334E+01 0.126169E+02 0.293371E+01 0.402923E+01 0.476739E+00 0.677713E+00 0.203268E+00 0.132423E+01
0.180000E+03 2013 03 17 00 03 00 000 -0.160514E+02 -0.101126E+02 0.916633E+01 0.126046E+02 0.293093E+01 0.402496E+01 0.476381E+00 0.677136E+00 0.202112E+00 0.132276E+01
0.240000E+03 2013 03 17 00 04 00 000 -0.160404E+02 -0.101126E+02 0.915935E+01 0.125925E+02 0.292815E+01 0.402072E+01 0.476025E+00 0.676564E+00 0.201083E+00 0.132147E+01
0.300000E+03 2013 03 17 00 05 00 000 -0.160295E+02 -0.102962E+02 0.915241E+01 0.125805E+02 0.292538E+01 0.401652E+01 0.475669E+00 0.675998E+00 0.200122E+00 0.132028E+01
0.360000E+03 2013 03 17 00 06 00 000 -0.160186E+02 -0.102962E+02 0.914550E+01 0.125688E+02 0.292262E+01 0.401236E+01 0.475315E+00 0.675438E+00 0.199219E+00 0.131916E+01
0.420000E+03 2013 03 17 00 07 00 000 -0.160078E+02 -0.102962E+02 0.913867E+01 0.125573E+02 0.291988E+01 0.400827E+01 0.474963E+00 0.674887E+00 0.198347E+00 0.131810E+01
0.480000E+03 2013 03 17 00 08 00 000 -0.159970E+02 -0.102962E+02 0.913194E+01 0.125461E+02 0.291716E+01 0.400425E+01 0.474614E+00 0.674347E+00 0.197558E+00 0.131714E+01
0.540000E+03 2013 03 17 00 09 00 000 -0.159863E+02 -0.102962E+02 0.912530E+01 0.125352E+02 0.291448E+01 0.400031E+01 0.474268E+00 0.673818E+00 0.196781E+00 0.131623E+01
0.600000E+03 2013 03 17 00 10 00 000 -0.159756E+02 -0.102519E+02 0.911876E+01 0.125245E+02 0.291182E+01 0.399646E+01 0.473927E+00 0.673300E+00 0.196016E+00 0.131535E+01
0.660000E+03 2013 03 17 00 11 00 000 -0.159648E+02 -0.102519E+02 0.911229E+01 0.125142E+02 0.290919E+01 0.399269E+01 0.473587E+00 0.672793E+00 0.195272E+00 0.131452E+01
0.720000E+03 2013 03 17 00 12 00 000 -0.159540E+02 -0.102519E+02 0.910592E+01 0.125041E+02 0.290659E+01 0.398903E+01 0.473252E+00 0.672299E+00 0.194537E+00 0.131371E+01
0.780000E+03 2013 03 17 00 13 00 000 -0.159433E+02 -0.102519E+02 0.909966E+01 0.124944E+02 0.290402E+01 0.398546E+01 0.472921E+00 0.671817E+00 0.193811E+00 0.131292E+01
0.840000E+03 2013 03 17 00 14 00 000 -0.159327E+02 -0.102519E+02 0.909350E+01 0.124850E+02 0.290149E+01 0.398201E+01 0.472594E+00 0.671348E+00 0.193093E+00 0.131214E+01
0.900000E+03 2013 03 17 00 15 00 000 -0.159221E+02 -0.102159E+02 0.908745E+01 0.124759E+02 0.289899E+01 0.397866E+01 0.472271E+00 0.670892E+00 0.192385E+00 0.131136E+01
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
Loading

0 comments on commit f71782a

Please sign in to comment.