Merge branch 'develop' into support/HAFS

climbfuji · Dec 2, 2019 · 6216665 · 6216665
2 parents af02f4e + dca7a75
commit 6216665
Show file tree

Hide file tree

Showing 35 changed files with 66,556 additions and 66,615 deletions.
diff --git a/FV3 b/FV3
diff --git a/compsets/hera.input b/compsets/hera.input
@@ -30,8 +30,8 @@ platform hera.intel {
     # INPUTS is the input directory, which should contain fix and parm
     # files, plus any restarts or other inputs.
 
-    BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
-    BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
+    BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
+    BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
     INPUTS="@[BASELINE]"
 
     default_resources={

diff --git a/compsets/wcoss.input b/compsets/wcoss.input
@@ -26,8 +26,8 @@ platform wcoss.phase2 {
     LONG_TEST_QUEUE='&LONGQ;'
     BUILD_QUEUE='&BUILDQ;'
     MACHINE_ID='wcoss.phase2'
-    BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
-    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
+    BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
+    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
 
     default_resources={
         TASKS=156
@@ -121,8 +121,8 @@ platform wcoss.phase1 {
     cores_per_node=16
     cpus_per_core=2
     MACHINE_ID='wcoss.phase1'
-    BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
-    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
+    BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
+    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
 
     # WCOSS Phase 2 has been slow of late.
     DEFAULT_TEST_WALLTIME=2700
@@ -206,8 +206,8 @@ platform wcoss_dell_p3 {
     LONG_TEST_QUEUE='&LONGQ;'
     BUILD_QUEUE='&BUILDQ;'
 
-    BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
-    BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
+    BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
+    BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
 
     default_resources={
         TASKS=156
@@ -304,8 +304,8 @@ platform wcoss.cray {
     BUILD_WALLTIME="3600"
     DEFAULT_TEST_WALLTIME=1800
 
-    BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
-    BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191109"
+    BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
+    BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191121"
 
     execution_time_modules=[[[
       module load alps

diff --git a/log/report-hera.intel-log/build_fv3.exe.log b/log/report-hera.intel-log/build_fv3.exe.log
diff --git a/log/report-hera.intel-log/build_fv3_32bit.exe.log b/log/report-hera.intel-log/build_fv3_32bit.exe.log
diff --git a/log/report-hera.intel-log/build_fv3_32bit_debug.exe.log b/log/report-hera.intel-log/build_fv3_32bit_debug.exe.log
diff --git a/log/report-hera.intel-log/build_fv3_appbuilder.exe.log b/log/report-hera.intel-log/build_fv3_appbuilder.exe.log
diff --git a/log/report-hera.intel-log/build_fv3_ccpp_control.exe.log b/log/report-hera.intel-log/build_fv3_ccpp_control.exe.log
diff --git a/log/report-hera.intel-log/build_fv3_ww3.exe.log b/log/report-hera.intel-log/build_fv3_ww3.exe.log
diff --git a/log/report-hera.intel-log/rtreport.txt b/log/report-hera.intel-log/rtreport.txt
diff --git a/log/report-wcoss.cray-log/build_fv3.exe.log b/log/report-wcoss.cray-log/build_fv3.exe.log
diff --git a/log/report-wcoss.cray-log/build_fv3_32bit.exe.log b/log/report-wcoss.cray-log/build_fv3_32bit.exe.log
diff --git a/log/report-wcoss.cray-log/build_fv3_appbuilder.exe.log b/log/report-wcoss.cray-log/build_fv3_appbuilder.exe.log
diff --git a/log/report-wcoss.cray-log/build_fv3_ww3.exe.log b/log/report-wcoss.cray-log/build_fv3_ww3.exe.log
diff --git a/log/report-wcoss.cray-log/rtreport.txt b/log/report-wcoss.cray-log/rtreport.txt
diff --git a/log/report-wcoss.phase1-log/build_fv3.exe.log b/log/report-wcoss.phase1-log/build_fv3.exe.log
diff --git a/log/report-wcoss.phase1-log/build_fv3_32bit.exe.log b/log/report-wcoss.phase1-log/build_fv3_32bit.exe.log
diff --git a/log/report-wcoss.phase1-log/build_fv3_appbuilder.exe.log b/log/report-wcoss.phase1-log/build_fv3_appbuilder.exe.log
diff --git a/log/report-wcoss.phase1-log/rtreport.txt b/log/report-wcoss.phase1-log/rtreport.txt
diff --git a/log/report-wcoss.phase2-log/build_fv3.exe.log b/log/report-wcoss.phase2-log/build_fv3.exe.log
diff --git a/log/report-wcoss.phase2-log/build_fv3_32bit.exe.log b/log/report-wcoss.phase2-log/build_fv3_32bit.exe.log
diff --git a/log/report-wcoss.phase2-log/build_fv3_appbuilder.exe.log b/log/report-wcoss.phase2-log/build_fv3_appbuilder.exe.log
diff --git a/log/report-wcoss.phase2-log/rtreport.txt b/log/report-wcoss.phase2-log/rtreport.txt
diff --git a/log/report-wcoss_dell_p3-log/build_fv3.exe.log b/log/report-wcoss_dell_p3-log/build_fv3.exe.log
diff --git a/log/report-wcoss_dell_p3-log/build_fv3_32bit.exe.log b/log/report-wcoss_dell_p3-log/build_fv3_32bit.exe.log
diff --git a/log/report-wcoss_dell_p3-log/build_fv3_appbuilder.exe.log b/log/report-wcoss_dell_p3-log/build_fv3_appbuilder.exe.log
diff --git a/log/report-wcoss_dell_p3-log/build_fv3_ww3.exe.log b/log/report-wcoss_dell_p3-log/build_fv3_ww3.exe.log
diff --git a/log/report-wcoss_dell_p3-log/rtreport.txt b/log/report-wcoss_dell_p3-log/rtreport.txt
diff --git a/tests/Compile_hera.intel.log b/tests/Compile_hera.intel.log
diff --git a/tests/Compile_wcoss_cray.log b/tests/Compile_wcoss_cray.log
diff --git a/tests/Compile_wcoss_dell_p3.log b/tests/Compile_wcoss_dell_p3.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.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
@@ -341,9 +341,9 @@ while getopts ":cfsl:mkreh" opt; do
 done
 
 if [[ $MACHINE_ID = cheyenne.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/trunk-20191109/${COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/trunk-20191121/${COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/trunk-20191109}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/trunk-20191121}
 fi
 
 shift $((OPTIND-1))