From 1b5f3eea1490de3b557cadfeae2b75bdca6bfc08 Mon Sep 17 00:00:00 2001 From: Igor Sfiligoi Date: Wed, 2 Oct 2024 09:23:38 -0700 Subject: [PATCH] Add support for restart regression tests (#410) * Add restart regression tests to cgyro * Add restart spec files for the regression tests --------- Co-authored-by: Igor Sfiligoi --- cgyro/bin/cgyro | 13 ++- cgyro/tools/input/reg01/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg01/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg02/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg02/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg03/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg03/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg04/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg04/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg05/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg05/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg06/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg06/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg07/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg07/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg08/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg08/out.cgyro.prec.2 | 9 ++ cgyro/tools/input/reg09/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg09/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg10/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg10/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg11/out.cgyro.prec.1 | 16 +++ cgyro/tools/input/reg11/out.cgyro.prec.2 | 24 +++++ cgyro/tools/input/reg12/out.cgyro.prec.1 | 80 +++++++++++++++ cgyro/tools/input/reg12/out.cgyro.prec.2 | 120 +++++++++++++++++++++++ cgyro/tools/input/reg13/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg13/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg14/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg14/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg15/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg15/out.cgyro.prec.2 | 10 ++ cgyro/tools/input/reg16/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg16/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg17/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg17/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg18/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg18/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg19/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg19/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg20/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg20/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg21/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg21/out.cgyro.prec.2 | 12 +++ cgyro/tools/input/reg22/out.cgyro.prec.1 | 8 ++ cgyro/tools/input/reg22/out.cgyro.prec.2 | 12 +++ shared/bin/gacode_reg_do_restart | 101 +++++++++++++++++++ 46 files changed, 748 insertions(+), 1 deletion(-) create mode 100644 cgyro/tools/input/reg01/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg01/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg02/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg02/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg03/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg03/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg04/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg04/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg05/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg05/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg06/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg06/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg07/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg07/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg08/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg08/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg09/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg09/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg10/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg10/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg11/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg11/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg12/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg12/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg13/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg13/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg14/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg14/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg15/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg15/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg16/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg16/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg17/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg17/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg18/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg18/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg19/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg19/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg20/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg20/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg21/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg21/out.cgyro.prec.2 create mode 100644 cgyro/tools/input/reg22/out.cgyro.prec.1 create mode 100644 cgyro/tools/input/reg22/out.cgyro.prec.2 create mode 100755 shared/bin/gacode_reg_do_restart diff --git a/cgyro/bin/cgyro b/cgyro/bin/cgyro index 2d4652aa5..01ef54795 100755 --- a/cgyro/bin/cgyro +++ b/cgyro/bin/cgyro @@ -53,6 +53,9 @@ then echo " -rs " echo " Run specified regression case." echo + echo " -rt" + echo " Enable restart regression testing." + echo echo " -reset" echo " Reset regression data." echo @@ -104,6 +107,7 @@ MPINUMA=0 TEST_FLAG=0 GENERATE_FLAG=0 REGRESS_FLAG=0 +REGRESS_RESTART=0 MTEST_FLAG=0 CLEAN=0 COMPRESS_FLAG=0 @@ -142,6 +146,8 @@ while [ $# -gt 0 ] ; do -rs) REGRESS_FLAG=1 ; shift ; SCASE=$1 ;; + -rt) REGRESS_RESTART=1 ;; + -reset) RESET=1 ;; -m) MTEST_FLAG=1 ;; @@ -219,7 +225,12 @@ then exit 1 fi # NOMP=1 RESET=0 - gacode_reg_do $NPROC $NOMP $RESET cgyro 1e-6 $SCASE + if [ $REGRESS_RESTART -eq 0 ] + then + gacode_reg_do $NPROC $NOMP $RESET cgyro 1e-6 $SCASE + else + gacode_reg_do_restart $NPROC $NOMP $RESET cgyro 1e-6 $SCASE + fi exit 0 fi #============================================================ diff --git a/cgyro/tools/input/reg01/out.cgyro.prec.1 b/cgyro/tools/input/reg01/out.cgyro.prec.1 new file mode 100644 index 000000000..d0575a24a --- /dev/null +++ b/cgyro/tools/input/reg01/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +2.013013119164E+00 +2.486568726776E+00 +2.559561538001E+00 +2.473776730333E+00 +2.420263807834E+00 +2.396080604402E+00 +2.402558768716E+00 +2.425182399755E+00 diff --git a/cgyro/tools/input/reg01/out.cgyro.prec.2 b/cgyro/tools/input/reg01/out.cgyro.prec.2 new file mode 100644 index 000000000..f68737c0b --- /dev/null +++ b/cgyro/tools/input/reg01/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +2.013013119164E+00 +2.486568726776E+00 +2.559561538001E+00 +2.473776730333E+00 +2.420263807834E+00 +2.396080604402E+00 +2.402558768716E+00 +2.425182399755E+00 +2.454628140585E+00 +2.483013963694E+00 +2.505870980565E+00 +2.521047993198E+00 diff --git a/cgyro/tools/input/reg02/out.cgyro.prec.1 b/cgyro/tools/input/reg02/out.cgyro.prec.1 new file mode 100644 index 000000000..5b4dccf95 --- /dev/null +++ b/cgyro/tools/input/reg02/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.979346853662E+00 +2.508012799496E+00 +2.574077406326E+00 +2.504034806000E+00 +2.452071665652E+00 +2.433113352374E+00 +2.443397378591E+00 +2.469445542057E+00 diff --git a/cgyro/tools/input/reg02/out.cgyro.prec.2 b/cgyro/tools/input/reg02/out.cgyro.prec.2 new file mode 100644 index 000000000..24ae6f96a --- /dev/null +++ b/cgyro/tools/input/reg02/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.979346853662E+00 +2.508012799496E+00 +2.574077406326E+00 +2.504034806000E+00 +2.452071665652E+00 +2.433113352374E+00 +2.443397378591E+00 +2.469445542057E+00 +2.500154168710E+00 +2.527804972465E+00 +2.548148846507E+00 +2.559807893916E+00 diff --git a/cgyro/tools/input/reg03/out.cgyro.prec.1 b/cgyro/tools/input/reg03/out.cgyro.prec.1 new file mode 100644 index 000000000..947ab9d87 --- /dev/null +++ b/cgyro/tools/input/reg03/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +2.421669971683E+00 +2.307245962457E+00 +2.524153058625E+00 +2.561615140337E+00 +2.429605635528E+00 +2.403103209457E+00 +2.387877290711E+00 +2.366290588048E+00 diff --git a/cgyro/tools/input/reg03/out.cgyro.prec.2 b/cgyro/tools/input/reg03/out.cgyro.prec.2 new file mode 100644 index 000000000..d46bab095 --- /dev/null +++ b/cgyro/tools/input/reg03/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +2.421669971683E+00 +2.307245962457E+00 +2.524153058625E+00 +2.561615140337E+00 +2.429605635528E+00 +2.403103209457E+00 +2.387877290711E+00 +2.366290588048E+00 +2.362318747903E+00 +2.362541441803E+00 +2.362472161487E+00 +2.364531625492E+00 diff --git a/cgyro/tools/input/reg04/out.cgyro.prec.1 b/cgyro/tools/input/reg04/out.cgyro.prec.1 new file mode 100644 index 000000000..20c4d349b --- /dev/null +++ b/cgyro/tools/input/reg04/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +8.723019189894E-01 +3.922565014553E+00 +4.221614198458E+00 +4.491679856946E+00 +4.473821806778E+00 +4.470422978528E+00 +4.379870852232E+00 +4.317550367044E+00 diff --git a/cgyro/tools/input/reg04/out.cgyro.prec.2 b/cgyro/tools/input/reg04/out.cgyro.prec.2 new file mode 100644 index 000000000..f5d55e5e9 --- /dev/null +++ b/cgyro/tools/input/reg04/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +8.723019189894E-01 +3.922565014553E+00 +4.221614198458E+00 +4.491679856946E+00 +4.473821806778E+00 +4.470422978528E+00 +4.379870852232E+00 +4.317550367044E+00 +4.277701338439E+00 +4.245213280151E+00 +4.222512341360E+00 +4.207953623964E+00 diff --git a/cgyro/tools/input/reg05/out.cgyro.prec.1 b/cgyro/tools/input/reg05/out.cgyro.prec.1 new file mode 100644 index 000000000..f38b10f94 --- /dev/null +++ b/cgyro/tools/input/reg05/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.870402145742E-04 +3.458409451344E-04 +4.639347854870E-04 +5.427862510043E-04 +5.925446017430E-04 +6.265709885667E-04 +6.573655601493E-04 +6.950033032386E-04 diff --git a/cgyro/tools/input/reg05/out.cgyro.prec.2 b/cgyro/tools/input/reg05/out.cgyro.prec.2 new file mode 100644 index 000000000..9869dc227 --- /dev/null +++ b/cgyro/tools/input/reg05/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.870402145742E-04 +3.458409451344E-04 +4.639347854870E-04 +5.427862510043E-04 +5.925446017430E-04 +6.265709885667E-04 +6.573655601493E-04 +6.950033032386E-04 +7.477440506395E-04 +8.225500588855E-04 +9.259382570892E-04 +1.064422742241E-03 diff --git a/cgyro/tools/input/reg06/out.cgyro.prec.1 b/cgyro/tools/input/reg06/out.cgyro.prec.1 new file mode 100644 index 000000000..a35a0deee --- /dev/null +++ b/cgyro/tools/input/reg06/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.279651406955E-03 +2.399311429728E-03 +3.497741973365E-03 +5.037420719768E-03 +8.204438224472E-03 +1.398363333973E-02 +2.391820265253E-02 +4.150226324676E-02 diff --git a/cgyro/tools/input/reg06/out.cgyro.prec.2 b/cgyro/tools/input/reg06/out.cgyro.prec.2 new file mode 100644 index 000000000..565e83668 --- /dev/null +++ b/cgyro/tools/input/reg06/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.279651406955E-03 +2.399311429728E-03 +3.497741973365E-03 +5.037420719768E-03 +8.204438224472E-03 +1.398363333973E-02 +2.391820265253E-02 +4.150226324676E-02 +7.402538034069E-02 +1.442278751776E-01 +2.933799857723E-01 +6.059408567834E-01 diff --git a/cgyro/tools/input/reg07/out.cgyro.prec.1 b/cgyro/tools/input/reg07/out.cgyro.prec.1 new file mode 100644 index 000000000..1a5d58d49 --- /dev/null +++ b/cgyro/tools/input/reg07/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.874828574249E-04 +3.498799027781E-04 +4.781834107938E-04 +5.767228615583E-04 +6.563167839234E-04 +7.277945434430E-04 +7.984600858466E-04 +8.715835735689E-04 diff --git a/cgyro/tools/input/reg07/out.cgyro.prec.2 b/cgyro/tools/input/reg07/out.cgyro.prec.2 new file mode 100644 index 000000000..99ba3c0b3 --- /dev/null +++ b/cgyro/tools/input/reg07/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.874828574249E-04 +3.498799027781E-04 +4.781834107938E-04 +5.767228615583E-04 +6.563167839234E-04 +7.277945434430E-04 +7.984600858466E-04 +8.715835735689E-04 +9.474364432724E-04 +1.023881431146E-03 +1.097122731828E-03 +1.160698794088E-03 diff --git a/cgyro/tools/input/reg08/out.cgyro.prec.1 b/cgyro/tools/input/reg08/out.cgyro.prec.1 new file mode 100644 index 000000000..5dc5b47c6 --- /dev/null +++ b/cgyro/tools/input/reg08/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +2.370589712493E+00 +2.384271985470E+00 +2.561022875987E+00 +2.627239705581E+00 +2.573511547085E+00 +2.562847192966E+00 +2.563369314914E+00 +2.558757886050E+00 diff --git a/cgyro/tools/input/reg08/out.cgyro.prec.2 b/cgyro/tools/input/reg08/out.cgyro.prec.2 new file mode 100644 index 000000000..c078e5d45 --- /dev/null +++ b/cgyro/tools/input/reg08/out.cgyro.prec.2 @@ -0,0 +1,9 @@ +2.370589712493E+00 +2.384271985470E+00 +2.561022875987E+00 +2.627239705581E+00 +2.573511547085E+00 +2.562847192966E+00 +2.563369314914E+00 +2.558757886050E+00 +2.557567320249E+00 diff --git a/cgyro/tools/input/reg09/out.cgyro.prec.1 b/cgyro/tools/input/reg09/out.cgyro.prec.1 new file mode 100644 index 000000000..15541f60b --- /dev/null +++ b/cgyro/tools/input/reg09/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.279823859110E-03 +2.420361783525E-03 +3.548259949601E-03 +5.132832971564E-03 +8.403746796842E-03 +1.438153973583E-02 +2.470204676818E-02 +4.305302986243E-02 diff --git a/cgyro/tools/input/reg09/out.cgyro.prec.2 b/cgyro/tools/input/reg09/out.cgyro.prec.2 new file mode 100644 index 000000000..54715afda --- /dev/null +++ b/cgyro/tools/input/reg09/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.279823859110E-03 +2.420361783525E-03 +3.548259949601E-03 +5.132832971564E-03 +8.403746796842E-03 +1.438153973583E-02 +2.470204676818E-02 +4.305302986243E-02 +7.717675763479E-02 +1.513932781538E-01 +3.092477818032E-01 +6.410808829719E-01 diff --git a/cgyro/tools/input/reg10/out.cgyro.prec.1 b/cgyro/tools/input/reg10/out.cgyro.prec.1 new file mode 100644 index 000000000..51f0f60b6 --- /dev/null +++ b/cgyro/tools/input/reg10/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.101502827565E+00 +1.633603073065E+00 +2.047170567269E+00 +2.648606283857E+00 +3.255350458294E+00 +3.765533902115E+00 +4.025664356559E+00 +3.873436452363E+00 diff --git a/cgyro/tools/input/reg10/out.cgyro.prec.2 b/cgyro/tools/input/reg10/out.cgyro.prec.2 new file mode 100644 index 000000000..e724cfd6f --- /dev/null +++ b/cgyro/tools/input/reg10/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.101502827565E+00 +1.633603073065E+00 +2.047170567269E+00 +2.648606283857E+00 +3.255350458294E+00 +3.765533902115E+00 +4.025664356559E+00 +3.873436452363E+00 +3.318962359148E+00 +2.911720396277E+00 +2.777991128462E+00 +2.620672104498E+00 diff --git a/cgyro/tools/input/reg11/out.cgyro.prec.1 b/cgyro/tools/input/reg11/out.cgyro.prec.1 new file mode 100644 index 000000000..1c18db7f4 --- /dev/null +++ b/cgyro/tools/input/reg11/out.cgyro.prec.1 @@ -0,0 +1,16 @@ +1.316064580013E+00 +2.006581595910E+00 +2.390519084792E+00 +2.488440650372E+00 +2.485484898183E+00 +2.560143360494E+00 +2.527940553213E+00 +2.474071035919E+00 +2.449276535063E+00 +2.420591248181E+00 +2.405003080415E+00 +2.396328451931E+00 +2.399969896097E+00 +2.403241100832E+00 +2.412604984369E+00 +2.425444561401E+00 diff --git a/cgyro/tools/input/reg11/out.cgyro.prec.2 b/cgyro/tools/input/reg11/out.cgyro.prec.2 new file mode 100644 index 000000000..22b4d44b8 --- /dev/null +++ b/cgyro/tools/input/reg11/out.cgyro.prec.2 @@ -0,0 +1,24 @@ +1.316064580013E+00 +2.006581595910E+00 +2.390519084792E+00 +2.488440650372E+00 +2.485484898183E+00 +2.560143360494E+00 +2.527940553213E+00 +2.474071035919E+00 +2.449276535063E+00 +2.420591248181E+00 +2.405003080415E+00 +2.396328451931E+00 +2.399969896097E+00 +2.403241100832E+00 +2.412604984369E+00 +2.425444561401E+00 +2.439901682643E+00 +2.454904964522E+00 +2.469506936672E+00 +2.483304562283E+00 +2.495626713599E+00 +2.506172359164E+00 +2.514764664295E+00 +2.521354688032E+00 diff --git a/cgyro/tools/input/reg12/out.cgyro.prec.1 b/cgyro/tools/input/reg12/out.cgyro.prec.1 new file mode 100644 index 000000000..f865e054b --- /dev/null +++ b/cgyro/tools/input/reg12/out.cgyro.prec.1 @@ -0,0 +1,80 @@ +1.469587008039E-02 +1.616316399211E-02 +1.576713132328E-02 +1.406815395677E-02 +1.598907613720E-02 +1.306236101631E-02 +1.407190958068E-02 +1.324734001040E-02 +1.123779361754E-02 +1.267188218223E-02 +9.522388999330E-03 +1.010224578072E-02 +9.034629147033E-03 +6.755051470026E-03 +7.901719216590E-03 +4.635374062866E-03 +4.952495289324E-03 +3.827790975603E-03 +2.870504094896E-03 +3.694801233727E-03 +2.683363810892E-03 +9.730295113092E-04 +1.786865031049E-03 +3.924817885512E-03 +3.803663934235E-03 +5.823670260700E-03 +5.297033298298E-03 +6.171445246254E-03 +8.216028495594E-03 +6.758751794733E-03 +9.551305832791E-03 +8.697819977464E-03 +9.248181908804E-03 +1.085353854845E-02 +9.087899561158E-03 +1.139481266931E-02 +1.018128889053E-02 +1.029134693332E-02 +1.143886479425E-02 +9.304016475865E-03 +1.110130508852E-02 +9.531123869895E-03 +9.174545550241E-03 +9.922845893029E-03 +7.409942489134E-03 +8.786670944171E-03 +6.894327014956E-03 +6.165247667067E-03 +6.605211508900E-03 +3.975674660630E-03 +4.900345922473E-03 +2.777839287049E-03 +1.856124083042E-03 +2.732073170450E-03 +2.920938124637E-03 +2.278374606498E-03 +2.091922094769E-03 +3.036268469160E-03 +3.058210328050E-03 +5.671820545085E-03 +4.690900845186E-03 +6.755131057997E-03 +7.568729201781E-03 +7.243012070703E-03 +9.821284263012E-03 +8.676134244378E-03 +1.043761446767E-02 +1.099322526023E-02 +1.037109030928E-02 +1.258750429909E-02 +1.114296948562E-02 +1.249776278312E-02 +1.270137356942E-02 +1.168657704874E-02 +1.348855535296E-02 +1.166458123882E-02 +1.259077029727E-02 +1.239418883687E-02 +1.098296250218E-02 +1.236551614225E-02 diff --git a/cgyro/tools/input/reg12/out.cgyro.prec.2 b/cgyro/tools/input/reg12/out.cgyro.prec.2 new file mode 100644 index 000000000..78688b481 --- /dev/null +++ b/cgyro/tools/input/reg12/out.cgyro.prec.2 @@ -0,0 +1,120 @@ +1.469587008039E-02 +1.616316399211E-02 +1.576713132328E-02 +1.406815395677E-02 +1.598907613720E-02 +1.306236101631E-02 +1.407190958068E-02 +1.324734001040E-02 +1.123779361754E-02 +1.267188218223E-02 +9.522388999330E-03 +1.010224578072E-02 +9.034629147033E-03 +6.755051470026E-03 +7.901719216590E-03 +4.635374062866E-03 +4.952495289324E-03 +3.827790975603E-03 +2.870504094896E-03 +3.694801233727E-03 +2.683363810892E-03 +9.730295113092E-04 +1.786865031049E-03 +3.924817885512E-03 +3.803663934235E-03 +5.823670260700E-03 +5.297033298298E-03 +6.171445246254E-03 +8.216028495594E-03 +6.758751794733E-03 +9.551305832791E-03 +8.697819977464E-03 +9.248181908804E-03 +1.085353854845E-02 +9.087899561158E-03 +1.139481266931E-02 +1.018128889053E-02 +1.029134693332E-02 +1.143886479425E-02 +9.304016475865E-03 +1.110130508852E-02 +9.531123869895E-03 +9.174545550241E-03 +9.922845893029E-03 +7.409942489134E-03 +8.786670944171E-03 +6.894327014956E-03 +6.165247667067E-03 +6.605211508900E-03 +3.975674660630E-03 +4.900345922473E-03 +2.777839287049E-03 +1.856124083042E-03 +2.732073170450E-03 +2.920938124637E-03 +2.278374606498E-03 +2.091922094769E-03 +3.036268469160E-03 +3.058210328050E-03 +5.671820545085E-03 +4.690900845186E-03 +6.755131057997E-03 +7.568729201781E-03 +7.243012070703E-03 +9.821284263012E-03 +8.676134244378E-03 +1.043761446767E-02 +1.099322526023E-02 +1.037109030928E-02 +1.258750429909E-02 +1.114296948562E-02 +1.249776278312E-02 +1.270137356942E-02 +1.168657704874E-02 +1.348855535296E-02 +1.166458123882E-02 +1.259077029727E-02 +1.239418883687E-02 +1.098296250218E-02 +1.236551614225E-02 +1.017082662707E-02 +1.070727652307E-02 +1.013554097239E-02 +8.401619732007E-03 +9.415350346990E-03 +6.945563151329E-03 +7.176493900517E-03 +6.336900045998E-03 +4.402409654755E-03 +5.161929962168E-03 +2.637834952746E-03 +2.621227861726E-03 +1.690744274398E-03 +2.074439463353E-03 +2.424752267134E-03 +2.518644612225E-03 +2.219792082115E-03 +3.087705661502E-03 +4.991823486085E-03 +4.225034701534E-03 +6.605666568755E-03 +6.416673029313E-03 +7.069142188908E-03 +8.733396099246E-03 +7.722050623239E-03 +9.797393566994E-03 +9.315985477973E-03 +9.641610068991E-03 +1.094468984428E-02 +9.601130435057E-03 +1.127829301770E-02 +1.043070750466E-02 +1.037266794839E-02 +1.125985010521E-02 +9.558794572785E-03 +1.080784361463E-02 +9.595401414631E-03 +9.154318483470E-03 +9.649338599401E-03 +7.624831510270E-03 diff --git a/cgyro/tools/input/reg13/out.cgyro.prec.1 b/cgyro/tools/input/reg13/out.cgyro.prec.1 new file mode 100644 index 000000000..c71dd06d4 --- /dev/null +++ b/cgyro/tools/input/reg13/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +6.767515743951E-01 +1.263322568909E+00 +1.685807857268E+00 +1.943933408378E+00 +2.093200277349E+00 +2.183379312307E+00 +2.243317828175E+00 +2.286358717479E+00 diff --git a/cgyro/tools/input/reg13/out.cgyro.prec.2 b/cgyro/tools/input/reg13/out.cgyro.prec.2 new file mode 100644 index 000000000..8b3dd1838 --- /dev/null +++ b/cgyro/tools/input/reg13/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +6.767515743951E-01 +1.263322568909E+00 +1.685807857268E+00 +1.943933408378E+00 +2.093200277349E+00 +2.183379312307E+00 +2.243317828175E+00 +2.286358717479E+00 +2.317919142261E+00 +2.340500623703E+00 +2.355950106587E+00 +2.366068634753E+00 diff --git a/cgyro/tools/input/reg14/out.cgyro.prec.1 b/cgyro/tools/input/reg14/out.cgyro.prec.1 new file mode 100644 index 000000000..a50df502e --- /dev/null +++ b/cgyro/tools/input/reg14/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +2.365411622234E+00 +3.277402984939E+00 +3.868223262528E+00 +3.951681412406E+00 +3.905081944058E+00 +3.805996478587E+00 +3.707545902267E+00 +3.618691366958E+00 diff --git a/cgyro/tools/input/reg14/out.cgyro.prec.2 b/cgyro/tools/input/reg14/out.cgyro.prec.2 new file mode 100644 index 000000000..630fee91a --- /dev/null +++ b/cgyro/tools/input/reg14/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +2.365411622234E+00 +3.277402984939E+00 +3.868223262528E+00 +3.951681412406E+00 +3.905081944058E+00 +3.805996478587E+00 +3.707545902267E+00 +3.618691366958E+00 +3.543816588584E+00 +3.482591858460E+00 +3.432066570646E+00 +3.390494232292E+00 diff --git a/cgyro/tools/input/reg15/out.cgyro.prec.1 b/cgyro/tools/input/reg15/out.cgyro.prec.1 new file mode 100644 index 000000000..672ebccd1 --- /dev/null +++ b/cgyro/tools/input/reg15/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +2.861093129360E+00 +2.820221225163E+00 +3.082079734472E+00 +3.132106621646E+00 +3.007283944062E+00 +2.985059054356E+00 +2.972139913549E+00 +2.955887581563E+00 diff --git a/cgyro/tools/input/reg15/out.cgyro.prec.2 b/cgyro/tools/input/reg15/out.cgyro.prec.2 new file mode 100644 index 000000000..76aa812b1 --- /dev/null +++ b/cgyro/tools/input/reg15/out.cgyro.prec.2 @@ -0,0 +1,10 @@ +2.861093129360E+00 +2.820221225163E+00 +3.082079734472E+00 +3.132106621646E+00 +3.007283944062E+00 +2.985059054356E+00 +2.972139913549E+00 +2.955887581563E+00 +2.954470911640E+00 +2.955102809721E+00 diff --git a/cgyro/tools/input/reg16/out.cgyro.prec.1 b/cgyro/tools/input/reg16/out.cgyro.prec.1 new file mode 100644 index 000000000..9bc10dad7 --- /dev/null +++ b/cgyro/tools/input/reg16/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +4.761292029556E+00 +7.677423412451E+00 +8.011141935648E+00 +7.360476536186E+00 +6.725492691678E+00 +6.225709845962E+00 +5.834399915796E+00 +5.530517464311E+00 diff --git a/cgyro/tools/input/reg16/out.cgyro.prec.2 b/cgyro/tools/input/reg16/out.cgyro.prec.2 new file mode 100644 index 000000000..4a5d6a213 --- /dev/null +++ b/cgyro/tools/input/reg16/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +4.761292029556E+00 +7.677423412451E+00 +8.011141935648E+00 +7.360476536186E+00 +6.725492691678E+00 +6.225709845962E+00 +5.834399915796E+00 +5.530517464311E+00 +5.299281396483E+00 +5.127813528100E+00 +5.004794488682E+00 +4.920358898018E+00 diff --git a/cgyro/tools/input/reg17/out.cgyro.prec.1 b/cgyro/tools/input/reg17/out.cgyro.prec.1 new file mode 100644 index 000000000..1a5d58d49 --- /dev/null +++ b/cgyro/tools/input/reg17/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.874828574249E-04 +3.498799027781E-04 +4.781834107938E-04 +5.767228615583E-04 +6.563167839234E-04 +7.277945434430E-04 +7.984600858466E-04 +8.715835735689E-04 diff --git a/cgyro/tools/input/reg17/out.cgyro.prec.2 b/cgyro/tools/input/reg17/out.cgyro.prec.2 new file mode 100644 index 000000000..99ba3c0b3 --- /dev/null +++ b/cgyro/tools/input/reg17/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.874828574249E-04 +3.498799027781E-04 +4.781834107938E-04 +5.767228615583E-04 +6.563167839234E-04 +7.277945434430E-04 +7.984600858466E-04 +8.715835735689E-04 +9.474364432724E-04 +1.023881431146E-03 +1.097122731828E-03 +1.160698794088E-03 diff --git a/cgyro/tools/input/reg18/out.cgyro.prec.1 b/cgyro/tools/input/reg18/out.cgyro.prec.1 new file mode 100644 index 000000000..15541f60b --- /dev/null +++ b/cgyro/tools/input/reg18/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.279823859110E-03 +2.420361783525E-03 +3.548259949601E-03 +5.132832971564E-03 +8.403746796842E-03 +1.438153973583E-02 +2.470204676818E-02 +4.305302986243E-02 diff --git a/cgyro/tools/input/reg18/out.cgyro.prec.2 b/cgyro/tools/input/reg18/out.cgyro.prec.2 new file mode 100644 index 000000000..74d915ee2 --- /dev/null +++ b/cgyro/tools/input/reg18/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.279823859110E-03 +2.420361783525E-03 +3.548259949601E-03 +5.132832971564E-03 +8.403746796842E-03 +1.438153973583E-02 +2.470204676818E-02 +4.305302986243E-02 +7.717675763480E-02 +1.513932781538E-01 +3.092477818032E-01 +6.410808829719E-01 diff --git a/cgyro/tools/input/reg19/out.cgyro.prec.1 b/cgyro/tools/input/reg19/out.cgyro.prec.1 new file mode 100644 index 000000000..226b28e13 --- /dev/null +++ b/cgyro/tools/input/reg19/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +2.475782394120E-02 +4.549663932099E-02 +5.895058001338E-02 +6.560495382805E-02 +7.097486774048E-02 +8.257273488298E-02 +1.100906226727E-01 +1.793218026003E-01 diff --git a/cgyro/tools/input/reg19/out.cgyro.prec.2 b/cgyro/tools/input/reg19/out.cgyro.prec.2 new file mode 100644 index 000000000..ea8fef9a6 --- /dev/null +++ b/cgyro/tools/input/reg19/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +2.475782394120E-02 +4.549663932099E-02 +5.895058001338E-02 +6.560495382805E-02 +7.097486774048E-02 +8.257273488298E-02 +1.100906226727E-01 +1.793218026003E-01 +2.744165711851E-01 +3.681865382361E-01 +4.923965567733E-01 +6.565633621334E-01 diff --git a/cgyro/tools/input/reg20/out.cgyro.prec.1 b/cgyro/tools/input/reg20/out.cgyro.prec.1 new file mode 100644 index 000000000..5b919d497 --- /dev/null +++ b/cgyro/tools/input/reg20/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.280344256711E-03 +2.440825475070E-03 +3.582475718422E-03 +5.171078009873E-03 +8.445611022409E-03 +1.445249181210E-02 +2.482099717833E-02 +4.326264388383E-02 diff --git a/cgyro/tools/input/reg20/out.cgyro.prec.2 b/cgyro/tools/input/reg20/out.cgyro.prec.2 new file mode 100644 index 000000000..218086105 --- /dev/null +++ b/cgyro/tools/input/reg20/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.280344256711E-03 +2.440825475070E-03 +3.582475718422E-03 +5.171078009873E-03 +8.445611022409E-03 +1.445249181210E-02 +2.482099717833E-02 +4.326264388383E-02 +7.755587905658E-02 +1.524758060437E-01 +3.114501091091E-01 +6.455609432616E-01 diff --git a/cgyro/tools/input/reg21/out.cgyro.prec.1 b/cgyro/tools/input/reg21/out.cgyro.prec.1 new file mode 100644 index 000000000..8bb4be805 --- /dev/null +++ b/cgyro/tools/input/reg21/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.980979281808E+00 +2.509517596894E+00 +2.574336671720E+00 +2.503776663962E+00 +2.451533982140E+00 +2.432108723023E+00 +2.442239345311E+00 +2.468444985485E+00 diff --git a/cgyro/tools/input/reg21/out.cgyro.prec.2 b/cgyro/tools/input/reg21/out.cgyro.prec.2 new file mode 100644 index 000000000..428955e19 --- /dev/null +++ b/cgyro/tools/input/reg21/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.980979281808E+00 +2.509517596894E+00 +2.574336671720E+00 +2.503776663962E+00 +2.451533982140E+00 +2.432108723023E+00 +2.442239345311E+00 +2.468444985485E+00 +2.499403717828E+00 +2.527199800738E+00 +2.547538443893E+00 +2.559125387208E+00 diff --git a/cgyro/tools/input/reg22/out.cgyro.prec.1 b/cgyro/tools/input/reg22/out.cgyro.prec.1 new file mode 100644 index 000000000..ce21b39ce --- /dev/null +++ b/cgyro/tools/input/reg22/out.cgyro.prec.1 @@ -0,0 +1,8 @@ +1.972384968053E+00 +2.497025365253E+00 +2.563883017519E+00 +2.491855829059E+00 +2.438986491186E+00 +2.418416515286E+00 +2.427104214808E+00 +2.451743792267E+00 diff --git a/cgyro/tools/input/reg22/out.cgyro.prec.2 b/cgyro/tools/input/reg22/out.cgyro.prec.2 new file mode 100644 index 000000000..7a47adcaa --- /dev/null +++ b/cgyro/tools/input/reg22/out.cgyro.prec.2 @@ -0,0 +1,12 @@ +1.972384968053E+00 +2.497025365253E+00 +2.563883017519E+00 +2.491855829059E+00 +2.438986491186E+00 +2.418416515286E+00 +2.427104214808E+00 +2.451743792267E+00 +2.481368850914E+00 +2.508391257159E+00 +2.528587626845E+00 +2.540553013698E+00 diff --git a/shared/bin/gacode_reg_do_restart b/shared/bin/gacode_reg_do_restart new file mode 100755 index 000000000..a78df9943 --- /dev/null +++ b/shared/bin/gacode_reg_do_restart @@ -0,0 +1,101 @@ +#!/bin/bash +# +# SCRIPT: +# gacode_reg_do_restart +# +# PURPOSE: +# Run three times through full suite of regression tests defined for +# Check that both base, mid and final results are correct +# +# EXAMPLE: +# gacode_reg_do_restart 2 1 0 cgyro 1e-6 reg01 +#---------------------------------------------------- + +n=$# + +if [ $n -lt 5 ] +then + echo "Usage: gacode_reg_do " + exit 1 +fi + +# Define list of test directories: + +n_proc=${1} +n_omp=${2} +reset=${3} +code=${4} +tol=${5} +scase=${6} + +echo "REGRESSION TESTING: $code" + +testdir=$PWD/${code}_regression_test + +# Is data in GACODE + +if [ -d "$GACODE_ROOT/$code/tools/input" ] +then + compdir=$GACODE_ROOT/$code/tools/input +fi + +# Is data in GACODE_ADD +if [ -d "$GACODE_ADD_ROOT/$code/tools/input" ] +then + compdir=$GACODE_ADD_ROOT/$code/tools/input +fi + +precfile=out.$code.prec +infile=input.$code + +if [ "$scase" == "" ] +then + list=`cat $compdir/reg_list` +else + list=$scase +fi + +rm -rf $testdir ; mkdir $testdir +cd $testdir + +for sim in $list +do + $code -g $sim -p $testdir > out.$sim + rm -f $sim/$precfile + # patch input file to have frequent checkpointing + mv $sim/$infile $sim/$infile.org + grep -v RESTART_STEP $sim/$infile.org > $sim/$infile + echo "RESTART_STEP=1" >> $sim/$infile + # now run it 3 times + for ((i=0; $i<3; i=$i+1)) + do + if [ $i -ne 0 ] + then + cp $sim/$precfile $sim/$precfile.$oi + fi + if [ $n_omp -eq 1 ] && [ $n_proc -eq 1 ] ; then + $code -e $sim -p $testdir > out.$sim + else + $code -e $sim -n $n_proc -nomp $n_omp -p $testdir > out.$sim + fi + cp $sim/$precfile $sim/$precfile.$i + if [ $i -eq 0 ] + then + # reuse the non-checkpointed result from original regression test + myprecfile=$precfile + else + # use the additional iterations else + myprecfile=$precfile.$i + fi + gacode_reg $sim $compdir $myprecfile $tol + oi=$i + done + if [ $reset -eq 1 ] + then + # Overwrite regression data with current data + echo "$sim/$precfile -> $GACODE_ROOT/$code/tools/input/$sim" + cp $sim/$precfile.0 $compdir/$sim/$precfile + cp $sim/$precfile.1 $compdir/$sim/$precfile.1 + cp $sim/$precfile.2 $compdir/$sim/$precfile.2 + fi +done