fv3atm cap cleanup (#954)

FV3 nuopc cap code cleanup. Remove used code/variables. Fix minor inconsistencies.
ufs-community · Dec 17, 2021 · c9b399c · c9b399c
1 parent bc6c5f6
commit c9b399c
Show file tree

Hide file tree

Showing 13 changed files with 1,992 additions and 1,767 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -9,7 +9,7 @@ die() { echo "$@" >&2; exit 1; }
 usage() {
   set +x
   echo
-  echo "Usage: $0 -c | -e | -h | -k | -l <file> | -m | -n <name> | -r "
+  echo "Usage: $0 -c | -e | -h | -k | -w  | -l <file> | -m | -n <name> | -r "
   echo
   echo "  -c  create new baseline results"
   echo "  -e  use ecFlow workflow manager"
@@ -19,6 +19,7 @@ usage() {
   echo "  -m  compare against new baseline results"
   echo "  -n  run single test <name>"
   echo "  -r  use Rocoto workflow manager"
+  echo "  -w  for weekly_test, skip comparing baseline results"
   echo
   set -x
   exit 1
@@ -407,10 +408,11 @@ ECFLOW=false
 KEEP_RUNDIR=false
 SINGLE_NAME=''
 TEST_35D=false
+export skip_check_results=false
 
 TESTS_FILE='rt.conf'
 
-while getopts ":cl:mn:kreh" opt; do
+while getopts ":cl:mn:wkreh" opt; do
   case $opt in
     c)
       CREATE_BASELINE=true
@@ -427,6 +429,9 @@ while getopts ":cl:mn:kreh" opt; do
       TESTS_FILE='rt.conf.single'
       rm -f $TESTS_FILE
       ;;
+    w)
+      export skip_check_results=true
+      ;;
     k)
       KEEP_RUNDIR=true
       ;;
@@ -482,7 +487,11 @@ if [[ $CREATE_BASELINE == true ]]; then
   mkdir -p "${NEW_BASELINE}"
 fi
 
-REGRESSIONTEST_LOG=${PATHRT}/RegressionTests_$MACHINE_ID.log
+if [[ $skip_check_results == true ]]; then
+  REGRESSIONTEST_LOG=${PATHRT}/RegressionTests_weekly_$MACHINE_ID.log
+else
+  REGRESSIONTEST_LOG=${PATHRT}/RegressionTests_$MACHINE_ID.log
+fi
 
 date > ${REGRESSIONTEST_LOG}
 echo "Start Regression test" >> ${REGRESSIONTEST_LOG}

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -202,7 +202,7 @@ submit_and_wait() {
 
   if [[ $test_status = 'FAIL' ]]; then
     if [[ ${OPNREQ_TEST} == false ]]; then
-      echo "${TEST_NAME} ${TEST_NR} failed" >> $PATHRT/fail_test_${TEST_NR}
+      echo "${TEST_NAME} ${TEST_NR}" >> $PATHRT/fail_test_${TEST_NR}
       echo "Test ${TEST_NR} ${TEST_NAME} FAIL" >> ${REGRESSIONTEST_LOG}
       echo;echo;echo                           >> ${REGRESSIONTEST_LOG}
       echo "Test ${TEST_NR} ${TEST_NAME} FAIL"
@@ -215,6 +215,12 @@ submit_and_wait() {
     fi
   fi
 
+  if [[ $test_status = 'PASS' || $test_status = 'DONE' ]]; then
+    echo "Test ${TEST_NR} ${TEST_NAME} RUN_SUCCESS" >> ${REGRESSIONTEST_LOG}
+    echo;echo;echo                           >> ${REGRESSIONTEST_LOG}
+    echo "Test ${TEST_NR} ${TEST_NAME} RUN_SUCCESS"
+  fi
+
   eval "$set_x"
 }
 

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -237,7 +237,9 @@ else
 
 fi
 
-check_results
+if [[ $skip_check_results = false ]]; then
+  check_results
+fi
 
 if [[ $SCHEDULER != 'none' ]]; then
   cat ${RUNDIR}/job_timestamp.txt >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
+14 −82		atmos_model.F90
+1 −336		cpl/module_cap_cpl.F90
+162 −3		cpl/module_cplfields.F90
+36 −24		fv3_cap.F90
+155 −269		module_fcst_grid_comp.F90
+1 −5		module_fv3_config.F90
+0 −170		time_utils.F90