ufs-community · jkbk2004 · Jun 23, 2023 · Jun 1, 2023 · Jun 5, 2023 · Jun 14, 2023
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -29,6 +29,13 @@ Provide a detailed description of what this PR does. What bug does it fix, or wh
 - [ ] stochastic_physics
 - [ ] none
 
+### Library Updates/Changes
+<!-- Library updates take time. If this PR needs updates to libraries, please make sure to accomplish the following tasks -->
+- [ ] Not Needed
+- [ ] Create separate issue in [JCSDA/spack-stack](https://github.com/JCSDA/spack-stack) asking for update to library. Include library name, library version.
+- [ ] Add issue link from JCSDA/spack-stack following this item
+<!-- for example: "- JCSDA/spack-stack/issue/1757" -->
+
 ### Combined with PR's (If Applicable):
 
 ## Commit Queue Checklist:

diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20230616
+export BL_DATE=20230621
 
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -1000,6 +1000,7 @@ export mesh_file=cfsr_mesh.nc
 export MESH_ATM=DATM_INPUT/${mesh_file}
 export atm_datamode=${DATM_SRC}
 export stream_files=DATM_INPUT/${FILENAME_BASE}201110.nc
+export STREAM_OFFSET=0
 
 # MOM6 defaults; 1 degree
 export MOM_INPUT=MOM_input_template_100

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_cheyenne.log b/tests/logs/RegressionTests_cheyenne.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/parm/datm.streams.IN b/tests/parm/datm.streams.IN
@@ -4,7 +4,7 @@ mapalgo01:                 bilinear
 tInterpAlgo01:             linear
 readMode01:                single
 dtlimit01:                 1.0
-stream_offset01:           0
+stream_offset01:           @[STREAM_OFFSET]
 yearFirst01:               @[SYEAR]
 yearLast01:                @[SYEAR]
 yearAlign01:               @[SYEAR]

diff --git a/tests/parm/nems.configure.datm_cdeps.IN b/tests/parm/nems.configure.datm_cdeps.IN
@@ -91,8 +91,8 @@ DRIVER_attributes::
 ::
 
 MED_attributes::
-      Verbosity = 5
-      dbug_flag = 5
+      Verbosity = 0
+      dbug_flag = 0
       ATM_model = @[atm_model]
       ICE_model = @[ice_model]
       OCN_model = @[ocn_model]

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -607,11 +607,6 @@ if [[ $ECFLOW == true ]]; then
     MAX_BUILDS=1
   fi
 
-  if [[ $MACHINE_ID = hera ]] && [[ ! $HOSTNAME = hecflow* ]]; then
-    echo "ERROR: To use ECFlow on Hera we must be logged into 'hecflow01' login node."
-    exit 1
-  fi
-
   ECFLOW_RUN=${PATHRT}/ecflow_run
   ECFLOW_SUITE=regtest_$$
   rm -rf ${ECFLOW_RUN}
@@ -647,13 +642,6 @@ EOF
     die "ecFlow is not supported on this machine $MACHINE_ID"
   fi
 
-else
-
-  if [[ $MACHINE_ID = hera ]] && [[ $HOSTNAME = hecflow* ]]; then
-    echo "ERROR: To run without using ECFlow on Hera, please do not use ecflow node."
-    exit 1
-  fi
-
 fi
 
 ##

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -626,9 +626,6 @@ EOF
 
 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="${ECF_HOST:-$HOSTNAME}"
 
   set +e
@@ -646,9 +643,9 @@ ecflow_run() {
       fi
       MYCOMM="bash -l -c \"module load ecflow && ecflow_start.sh -p ${ECF_PORT} \""
       ssh $ECF_HOST "${MYCOMM}"
-    elif [[ ${MACHINE_ID} == jet ]]; then
+    elif [[ ${MACHINE_ID} == hera || ${MACHINE_ID} == jet ]]; then
       module load ecflow
-      echo "Using special Jet ECFLOW start procedure"
+      echo "On ${MACHINE_ID}, start ecFlow server on dedicated node ${ECF_HOST}"
       MYCOMM="bash -l -c \"module load ecflow && ${ECFLOW_START} -d ${RUNDIR_ROOT}/ecflow_server\""
       ssh $ECF_HOST "${MYCOMM}"
     else

diff --git a/tests/tests/datm_cdeps_bulk_gefs b/tests/tests/datm_cdeps_bulk_gefs
@@ -23,6 +23,7 @@ export FILENAME_BASE='gefs.'
 export mesh_file="gefs_mesh.nc"
 export MESH_ATM="DATM_INPUT/${mesh_file}"
 export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
+export STREAM_OFFSET=-21600
 
 export RESTART_N=12
 export flux_scheme='-1'

diff --git a/tests/tests/datm_cdeps_control_gefs b/tests/tests/datm_cdeps_control_gefs
@@ -24,6 +24,7 @@ export FILENAME_BASE='gefs.'
 export mesh_file="gefs_mesh.nc"
 export MESH_ATM="DATM_INPUT/${mesh_file}"
 export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
+export STREAM_OFFSET=-21600
 export RESTART_N=12
 export eps_imesh='2.5e-1'
 export TOPOEDITS=ufs.topo_edits_011818.nc

diff --git a/tests/tests/datm_cdeps_iau_gefs b/tests/tests/datm_cdeps_iau_gefs
@@ -25,6 +25,7 @@ export FILENAME_BASE='gefs.'
 export mesh_file="gefs_mesh.nc"
 export MESH_ATM="DATM_INPUT/${mesh_file}"
 export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
+export STREAM_OFFSET=-21600
 export RESTART_N=12
 export eps_imesh='2.5e-1'
 export TOPOEDITS=ufs.topo_edits_011818.nc

diff --git a/tests/tests/datm_cdeps_mx025_gefs b/tests/tests/datm_cdeps_mx025_gefs
@@ -31,6 +31,7 @@ export FILENAME_BASE='gefs.'
 export mesh_file="gefs_mesh.nc"
 export MESH_ATM="DATM_INPUT/${mesh_file}"
 export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
+export STREAM_OFFSET=-21600
 
 ATM_compute_tasks=${ATM_compute_tasks_cdeps_025}
 OCN_tasks=${OCN_tasks_cdeps_025}

diff --git a/tests/tests/datm_cdeps_stochy_gefs b/tests/tests/datm_cdeps_stochy_gefs
@@ -24,6 +24,7 @@ export FILENAME_BASE='gefs.'
 export mesh_file="gefs_mesh.nc"
 export MESH_ATM="DATM_INPUT/${mesh_file}"
 export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
+export STREAM_OFFSET=-21600
 export RESTART_N=12
 export eps_imesh='2.5e-1'
 export FV3_RUN=cpld_datm_cdeps.IN
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		export BL_DATE=20230616
		export BL_DATE=20230621