Update ESMF to version 8.3.0bs09 (#1146)

* Update ESMF to version 8.3.0b09 * Increase wall clock limit for tests/regional_3km to 15 min * Update AutoRT to use tfe01 ecflow node on Jet * Updated Cheyenne baseline epicufsrt path * Updated Cheyenne epicufsrt hpc-stack build Co-authored-by: JONG KIM <[email protected]> Co-authored-by: Brian Curtis <[email protected]>
ufs-community · Mar 31, 2022 · 6b1787f · 6b1787f
1 parent 995fed5
commit 6b1787f
Show file tree

Hide file tree

Showing 19 changed files with 2,724 additions and 2,730 deletions.
diff --git a/modulefiles/ufs_cheyenne.gnu b/modulefiles/ufs_cheyenne.gnu
@@ -16,7 +16,7 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/modulefiles/stack
 module load hpc/1.2.0
 module load hpc-gnu/10.1.0
 module load hpc-mpt/2.22

diff --git a/modulefiles/ufs_cheyenne.gnu_debug b/modulefiles/ufs_cheyenne.gnu_debug
@@ -16,7 +16,7 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/modulefiles/stack
 module load hpc/1.2.0
 module load hpc-gnu/10.1.0
 module load hpc-mpt/2.22

diff --git a/modulefiles/ufs_cheyenne.intel b/modulefiles/ufs_cheyenne.intel
@@ -16,7 +16,8 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/modulefiles/stack
+
 module load hpc/1.2.0
 module load hpc-intel/2021.2
 module load hpc-mpt/2.22

diff --git a/modulefiles/ufs_cheyenne.intel_debug b/modulefiles/ufs_cheyenne.intel_debug
@@ -16,7 +16,7 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/modulefiles/stack
 module load hpc/1.2.0
 module load hpc-intel/2021.2
 module load hpc-mpt/2.22

diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
@@ -7,7 +7,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8.2.1b04
+module load esmf/8.3.0b09
 module load fms/2021.04
 
 module load bacio/2.4.1
@@ -20,4 +20,4 @@ module load w3nco/2.4.1
 
 module load gftl-shared/v1.3.3
 module load yafyaml/v0.5.1
-module load mapl/2.11.0-esmf-8.2.1b04
+module load mapl/2.11.0-esmf-8.3.0b09
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
@@ -7,7 +7,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8.2.1b04-debug
+module load esmf/8.3.0b09-debug
 module load fms/2021.04
 
 module load bacio/2.4.1
@@ -20,4 +20,4 @@ module load w3nco/2.4.1
 
 module load gftl-shared/v1.3.3
 module load yafyaml/v0.5.1
-module load mapl/2.11.0-esmf-8.2.1b04
+module load mapl/2.11.0-esmf-8.3.0b09
diff --git a/modulefiles/ufs_wcoss_cray b/modulefiles/ufs_wcoss_cray
@@ -57,7 +57,7 @@ module load gni-headers
 module load udreg
 module load ugni
 
-module load esmf/8.2.1b04
+module load esmf/8.3.0b09
 module load fms/2021.04
 
 module swap pmi pmi/5.0.11

diff --git a/modulefiles/ufs_wcoss_cray_debug b/modulefiles/ufs_wcoss_cray_debug
@@ -57,7 +57,7 @@ module load gni-headers
 module load udreg
 module load ugni
 
-module load esmf/8.2.1b04-debug
+module load esmf/8.3.0b09-debug
 module load fms/2021.04
 
 module swap pmi pmi/5.0.11

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_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
@@ -301,8 +301,8 @@ elif [[ $MACHINE_ID = jet.* ]]; then
 
   export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH
   export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages
-  ECFLOW_START=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin/ecflow_start.sh
-  ECF_PORT=$(( $(id -u) + 1500 ))
+  module load ecflow
+  ECFLOW_START=/apps/ecflow/5.5.3/bin/ecflow_start.sh
 
   QUEUE=batch
   COMPILE_QUEUE=batch
@@ -355,7 +355,7 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   COMPILE_QUEUE=regular
   PARTITION=
   dprefix=/glade/scratch
-  DISKNM=/glade/p/ral/jntp/GMTB/ufs-weather-model/RT
+  DISKNM=/glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT
   STMP=$dprefix
   PTMP=$dprefix
   SCHEDULER=pbs
@@ -815,6 +815,12 @@ EOF
       export skip_check_results=${skip_check_results}
       export delete_rundir=${delete_rundir}
 EOF
+      if [[ $MACHINE_ID = jet.* ]]; then
+        cat << EOF >> ${RUNDIR_ROOT}/run_test_${TEST_NR}.env
+      export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH
+      export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages
+EOF
+      fi
 
       if [[ $ROCOTO == true ]]; then
         rocoto_create_run_task

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -286,7 +286,7 @@ check_results() {
           if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ wcoss_dell_p3 || ${MACHINE_ID} =~ wcoss_cray || ${MACHINE_ID} =~ cheyenne || ${MACHINE_ID} =~ gaea || ${MACHINE_ID} =~ jet || ${MACHINE_ID} =~ s4 ]] ; then
             printf ".......ALT CHECK.." >> ${REGRESSIONTEST_LOG}
             printf ".......ALT CHECK.."
-            ${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}/$i ${RUNDIR}/$i >/dev/null 2>&1 && d=$? || d=$?
+            ${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}/$i ${RUNDIR}/$i > compare_ncfile.log 2>&1 && d=$? || d=$?
             if [[ $d -eq 1 ]]; then
               echo "....ERROR" >> ${REGRESSIONTEST_LOG}
               echo "....ERROR"
@@ -534,7 +534,7 @@ ecflow_run() {
   # in rare instances when UID is greater then 58500 (like Ratko's UID on theia)
   [[ $ECF_PORT -gt 49151 ]] && ECF_PORT=12179
 
-  ECF_HOST=$( hostname )
+  ECF_HOST="${ECF_HOST:-$HOSTNAME}"
 
   set +e
   ecflow_client --ping --host=${ECF_HOST} --port=${ECF_PORT}
@@ -544,6 +544,11 @@ ecflow_run() {
     if [[ ${MACHINE_ID} == wcoss2 ]]; then
       # Annoying "Has NCO assigned port $ECF_PORT for use by this account? (yes/no) ".
       echo yes | ${ECFLOW_START} -p ${ECF_PORT} -d ${RUNDIR_ROOT}/ecflow_server
+    elif [[ ${MACHINE_ID} == jet.* ]]; then
+      module load ecflow
+      echo "Using special Jet ECFLOW start procedure"
+      MYCOMM="bash -l -c \"module load ecflow && ${ECFLOW_START} -d ${RUNDIR_ROOT}/ecflow_server\""
+      ssh $ECF_HOST "${MYCOMM}" 
     else
       ${ECFLOW_START} -p ${ECF_PORT} -d ${RUNDIR_ROOT}/ecflow_server
     fi

diff --git a/tests/tests/regional_3km b/tests/tests/regional_3km
@@ -35,7 +35,7 @@ export MODEL_CONFIGURE=model_configure_regional_3km.IN
 export DIAG_TABLE=diag_table_lam
 export FIELD_TABLE=field_table_regional
 
-export WLCLK=10
+export WLCLK=15
 export FHMAX=6
 export TASKS=120
 export INPES=10