Revert "Merge branch 'jgfouca/cime/remove_zombie_files' into master (PR

#1855)" This reverts commit 28136d3, reversing changes made to 658107a.
ESMCI · Oct 19, 2017 · f497d1c · f497d1c
1 parent 86a026b
commit f497d1c
Show file tree

Hide file tree

Showing 33 changed files with 5,584 additions and 0 deletions.
diff --git a/scripts/Testing/Testcases/ICP_script b/scripts/Testing/Testcases/ICP_script
@@ -0,0 +1,108 @@
+
+#======================================================================
+# Test setup:
+#======================================================================
+
+cd $CASEROOT
+
+touch cice_perf.out
+
+./xmlchange --file env_run.xml   --id CONTINUE_RUN      --val FALSE
+./xmlchange --file env_run.xml   --id REST_OPTION       --val none
+./xmlchange --file env_build.xml --id CICE_AUTO_DECOMP  --val false
+
+cat >! user_nl_cice.mhT <<EOF
+maskhalo_bound = .true.
+maskhalo_dyn = .true.
+maskhalo_remap = .true.
+maskhalo_stress = .true.
+EOF
+
+cat >! user_nl_cice.mhF <<EOF
+maskhalo_bound = .false.
+maskhalo_dyn = .false.
+maskhalo_remap = .false.
+maskhalo_stress = .false.
+EOF
+
+#======================================================================
+# do an initial run test
+#======================================================================
+
+set cntmax = 1000
+set cnt = 0
+set found = 1
+
+echo " start..... " >> cice_perf.out
+while ($cnt < $cntmax && $found == 1)
+  @ cnt = $cnt + 1
+  set acnt = $cnt
+  if ($cnt < 1000) set acnt = "0${cnt}"
+  if ($cnt < 100 ) set acnt = "00${cnt}"
+  if ($cnt < 10  ) set acnt = "000${cnt}"
+
+  if (-e env_build.xml.${acnt}) then
+    cp -f env_build.xml.${acnt} env_build.xml
+    cp -f env_build.xml LockedFiles/env_build.xml
+    cp -f $EXEROOT/${CIME_MODEL}.exe.${acnt} $EXEROOT/${CIME_MODEL}.exe
+
+    foreach maskhalo (T F)
+      cd $CASEROOT
+      cp -f user_nl_cice.mh${maskhalo} user_nl_cice
+
+      ./case.run
+      if ($status != 0) then
+	  echo " ERROR: case.run failed" >>& $TESTSTATUS_LOG
+	  exit -1
+      endif
+
+      set ICE_GRID		= `./xmlquery ICE_GRID			--value`
+      set CICE_BLCKX		= `./xmlquery CICE_BLCKX		--value`
+      set CICE_BLCKY		= `./xmlquery CICE_BLCKY		--value`
+      set CICE_MXBLCKS	        = `./xmlquery CICE_MXBLCKS		--value`
+      set CICE_DECOMPTYPE	= `./xmlquery CICE_DECOMPTYPE		--value `
+      set CICE_DECOMPSETTING	= `./xmlquery CICE_DECOMPSETTING	--value `
+      set NTASKS_ICE		= `./xmlquery NTASKS_ICE		--value`
+      set NTHRDS_ICE		= `./xmlquery NTHRDS_ICE		--value`
+
+      set LID = `ls -1t $RUNDIR/cpl.log* | head -1 | sed 's/.*cpl.log.//' | sed 's/.gz//' `
+      @ ice_pes = ${NTASKS_ICE} * ${NTHRDS_ICE}
+      if ($LID != "") then
+         set ice_time = `grep -i "ice run time" timing/*$LID | cut -c 40-70`
+         echo "$LID $ICE_GRID ${ice_pes} $NTASKS_ICE $NTHRDS_ICE $CICE_BLCKX $CICE_BLCKY $CICE_MXBLCKS $CICE_DECOMPTYPE $CICE_DECOMPSETTING $maskhalo ${ice_time}" >> cice_perf.out
+         mv ${RUNDIR} ${RUNDIR}.${LID}
+      else
+         echo " error..... $ICE_GRID ${ice_pes} $NTASKS_ICE $NTHRDS_ICE $CICE_BLCKX $CICE_BLCKY $CICE_MXBLCKS $CICE_DECOMPTYPE $CICE_DECOMPSETTING $maskhalo " >> cice_perf.out
+         mv ${RUNDIR} ${RUNDIR}.error
+      endif
+    end # maskhalo
+  else
+    set found = 0
+  endif
+end  # while
+echo "  done..... " >> cice_perf.out
+
+set CplLogFile = `ls -1t $RUNDIR/cpl.log* | head -1`
+if ( $?CplLogFile ) then
+    if (-e $CplLogFile) then
+       set pass = `zgrep "SUCCESSFUL TERMINATION" $CplLogFile | wc -l`
+       if ($pass != 1) then
+           echo "ERROR: coupler log $CplLogFile indicates model run failed" >>& $TESTSTATUS_LOG
+ 	   exit -1
+       else
+           echo "Success: test log is $CplLogFile" >>& $TESTSTATUS_LOG
+       endif
+    endif
+else
+    echo "ERROR: no coupler log created, model run failed" >>& $TESTSTATUS_LOG
+    exit -1
+endif
+
+#======================================================================
+# Test status check:
+#======================================================================
+
+set CPLLOG = $CplLogFile
+
+echo "DONE ${CASEBASEID} : ($msg finished, successful coupler log) " >>& $TESTSTATUS_LOG
+echo "" >>& $TESTSTATUS_LOG
diff --git a/scripts/Testing/Testcases/LAR_script b/scripts/Testing/Testcases/LAR_script
@@ -0,0 +1,109 @@
+
+#======================================================================
+# (1) do an initial run test
+#======================================================================
+
+cd $CASEROOT
+
+set RUN_STARTDATE      = `./xmlquery RUN_STARTDATE --value`
+set DOUT_S_ROOT        = `./xmlquery DOUT_S_ROOT   --value`
+set DOUT_L_MSROOT      = `./xmlquery DOUT_L_MSROOT --value`
+
+echo "doing an initial test" >>& $TESTSTATUS_LOG
+
+set start_date = $RUN_STARTDATE
+set start_year = `echo $start_date | cut -f 1 -d "-"`
+set start_date = $start_year-11-01
+
+./xmlchange --file env_run.xml   --id START_DATE		--val $start_yearp2-01-01
+./xmlchange --file env_build.xml --id BUILD_COMPLETE	--val TRUE
+./xmlchange --file env_run.xml   --id CONTINUE_RUN	--val FALSE
+./xmlchange --file env_run.xml   --id REST_OPTION		--val none
+
+./case.run
+if ($status != 0) then
+    echo " ERROR: case.run failed" >>& $TESTSTATUS_LOG
+    exit -1
+endif
+
+set CplLogFile = `ls -1t $RUNDIR/cpl.log* | head -1`
+if ( $?CplLogFile ) then
+    if (-e $CplLogFile) then
+       set pass = `zgrep "SUCCESSFUL TERMINATION" $CplLogFile | wc -l`
+       if ($pass != 1) then
+           echo "ERROR: coupler log $CplLogFile indicates model run failed" >>& $TESTSTATUS_LOG
+ 	   exit -1
+       else
+           echo "Success: test log is $CplLogFile" >>& $TESTSTATUS_LOG
+       endif
+    endif
+else
+    echo "ERROR: no coupler log created, model run failed" >>& $TESTSTATUS_LOG
+    exit -1
+endif
+
+echo "running long-term archiver" >>& $TESTSTATUS_LOG
+
+./case.lt_archive
+
+#======================================================================
+# (2) do a restart run test
+#======================================================================
+
+echo "doing a continue run" >>& $TESTSTATUS_LOG
+
+./xmlchange --file env_run.xml --id CONTINUE_RUN --val TRUE
+
+./case.run
+if ($status != 0) then
+    echo " ERROR: case.run failed" >>& $TESTSTATUS_LOG
+    exit -1
+endif
+
+set CplLogFile = `ls -1t $RUNDIR/cpl.log* | head -1`
+if ( $?CplLogFile ) then
+    if (-e $CplLogFile) then
+       set pass = `zgrep "SUCCESSFUL TERMINATION" $CplLogFile | wc -l`
+       if ($pass != 1) then
+           echo "ERROR: coupler log $CplLogFile indicates model run failed" >>& $TESTSTATUS_LOG
+ 	   exit -1
+       else
+           echo "Success: test log is $CplLogFile" >>& $TESTSTATUS_LOG
+       endif
+    endif
+else
+    echo "ERROR: no coupler log created, model run failed" >>& $TESTSTATUS_LOG
+    exit -1
+endif
+
+echo "running long-term archiver" >>& $TESTSTATUS_LOG
+./case.lt_archive
+
+# TODO ??? What should be done here?
+
+#======================================================================
+# Check case validation first
+#======================================================================
+
+# What should be done here - this is the old code - but I am not sure what we should have to replace it?
+
+set pass = `$SCRIPTSROOT/Tools/ccsm_msls ${DOUT_L_MSROOT}/restart.tars | grep 0002-01-01 | wc -l`
+if ($pass == 0) then
+   echo "ERROR in ${0}:  0002-01-01 restart.tar not long-term archived" >>& $TESTSTATUS_LOG
+   set basestatus = "FAIL"
+endif
+
+set pass = `ls -1 ${DOUT_S_ROOT}/restart.tars | grep 0002-01-01 | wc -l`
+if ($pass == 1) then
+   echo "ERROR in ${0}:  0002-01-01 restart.tar not removed in short-term archive" >>& $TESTSTATUS_LOG
+   set basestatus = "FAIL"
+endif
+
+set pass = `$SCRIPTSROOT/Tools/ccsm_msls ${DOUT_L_MSROOT}/restart.tars | grep 0002-03-01 | wc -l`
+if ($pass == 0) then
+   echo "ERROR in ${0}:  0002-03-01 restart.tar not long-term archived" >>& $TESTSTATUS_LOG
+   set basestatus = "FAIL"
+endif
+
+echo "$basestatus ${CASEBASEID} ARCHIVE" >>&! $TESTSTATUS_OUT
+
diff --git a/scripts/Testing/Testcases/OCP_script b/scripts/Testing/Testcases/OCP_script
@@ -0,0 +1,89 @@
+
+#======================================================================
+# Test setup:
+#======================================================================
+
+cd $CASEROOT
+
+touch pop_perf.out
+
+./xmlchange --file env_run.xml   --id CONTINUE_RUN     --val FALSE
+./xmlchange --file env_run.xml   --id REST_OPTION      --val none
+./xmlchange --file env_build.xml --id POP_AUTO_DECOMP  --val false
+
+#======================================================================
+# do an initial run test
+#======================================================================
+
+  set cntmax = 1000
+  set cnt = 0
+  set found = 1
+
+  echo " start..... " >> pop_perf.out
+  while ($cnt < $cntmax && $found == 1)
+    @ cnt = $cnt + 1
+    set acnt = $cnt
+    if ($cnt < 1000) set acnt = "0${cnt}"
+    if ($cnt < 100 ) set acnt = "00${cnt}"
+    if ($cnt < 10  ) set acnt = "000${cnt}"
+
+    if (-e env_build.xml.${acnt}) then
+      cp -f env_build.xml.${acnt} env_build.xml
+      cp -f env_build.xml LockedFiles/env_build.xml
+      cp -f $EXEROOT/${CIME_MODEL}.exe.${acnt} $EXEROOT/${CIME_MODEL}.exe
+
+      ./case.run
+      if ($status != 0) then
+	  echo " ERROR: case.run failed" >>& $TESTSTATUS_LOG
+	  exit -1
+      endif
+
+      set OCN_GRID	 = `./xmlquery OCN_GRID	      --value`
+      set POP_BLCKX	 = `./xmlquery POP_BLCKX      --value`
+      set POP_BLCKY	 = `./xmlquery POP_BLCKY      --value`
+      set POP_MXBLCKS	 = `./xmlquery POP_MXBLCKS    --value`
+      set POP_DECOMPTYPE = `./xmlquery POP_DECOMPTYPE --value`
+      set NTASKS_OCN	 = `./xmlquery NTASKS_OCN     --value`
+      set NTHRDS_OCN	 = `./xmlquery NTHRDS_OCN     --value`
+
+      set LID = `ls -1t $RUNDIR/cpl.log* | head -1 | sed 's/.*cpl.log.//' | sed 's/.gz//' `
+      @ ocn_pes = ${NTASKS_OCN} * ${NTHRDS_OCN}
+      if ($LID != "") then
+         set ocn_time = `grep -i "ocn run time" timing/*$LID | cut -c 40-70`
+         echo "$LID $OCN_GRID ${ocn_pes} $NTASKS_OCN $NTHRDS_OCN $POP_BLCKX $POP_BLCKY $POP_MXBLCKS $POP_DECOMPTYPE ${ocn_time}" >> pop_perf.out
+         mv ${RUNDIR} ${RUNDIR}.${LID}
+      else
+         echo " error..... $OCN_GRID ${ocn_pes} $NTASKS_OCN $NTHRDS_OCN $POP_BLCKX $POP_BLCKY $POP_MXBLCKS $POP_DECOMPTYPE " >> pop_perf.out
+         mv ${RUNDIR} ${RUNDIR}.error
+      endif
+    else
+      set found = 0
+    endif
+  end  # while
+  echo "  done..... " >> pop_perf.out
+
+set CplLogFile = `ls -1t $RUNDIR/cpl.log* | head -1`
+if ( $?CplLogFile ) then
+    if (-e $CplLogFile) then
+       set pass = `zgrep "SUCCESSFUL TERMINATION" $CplLogFile | wc -l`
+       if ($pass != 1) then
+           echo "ERROR: coupler log $CplLogFile indicates model run failed" >>& $TESTSTATUS_LOG
+ 	   exit -1
+       else
+           echo "Success: test log is $CplLogFile" >>& $TESTSTATUS_LOG
+       endif
+    endif
+else
+    echo "ERROR: no coupler log created, model run failed" >>& $TESTSTATUS_LOG
+    exit -1
+endif
+
+#======================================================================
+# Test status check:
+#======================================================================
+
+set CPLLOG = $CplLogFile
+
+echo "DONE ${CASEBASEID} : ($msg finished, successful coupler log) " >>& $TESTSTATUS_LOG
+echo "" >>& $TESTSTATUS_LOG
+
diff --git a/scripts/Testing/Testcases/README b/scripts/Testing/Testcases/README
@@ -0,0 +1,39 @@
+
+NOTES: 
+Most of the tests have been moved to python in cime/utils/python/CIME/SystemTests
+See the README there for more info.
+
+The remaining tests are:
+
+======================================================================
+    Multi-Instance Tests (smoke)
+======================================================================
+
+NOC    multi-instance validation for single instance ocean (default length)
+       do an initial run test with NINST 2 (other than ocn), with mod to instance 1 (suffix: inst1_base, inst2_mod)
+       do an initial run test with NINST 2 (other than ocn), with mod to instance 2 (suffix: inst1_base, inst2_mod)
+       compare inst1_base with inst2_base 
+       compare inst1_mod  with inst2_mod  
+
+
+======================================================================
+    Performance Tests
+======================================================================
+
+ICP    cice performance test 
+OCP    pop performance test 
+
+======================================================================
+    Archiving Tests
+======================================================================
+
+LAR    long term archive test 
+
+======================================================================
+    Other
+======================================================================
+
+HOMME
+
+
+