ufs-community · jkbk2004 · Oct 17, 2022 · Sep 18, 2022 · Sep 18, 2022 · Sep 19, 2022
diff --git a/.gitmodules b/.gitmodules
@@ -1,14 +1,14 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/SamuelTrahanNOAA/fv3atm
+  branch = bugfix/rrfs-debug-mode
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
   branch = dev/ufs-weather-model
 [submodule "stochastic_physics"]
   path = stochastic_physics
-  url = https://github.com/noaa-psd/stochastic_physics
+  url = https://github.com/NOAA-PSL/stochastic_physics
   branch = master
 [submodule "CMakeModules"]
   path = CMakeModules

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_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -370,6 +370,7 @@ export NSSL_INVERTCCN=.true.
 
 # Smoke
 export RRFS_SMOKE=.false.
+export RRFS_RESTART=NO
 export SEAS_OPT=2
 
 # GWD

diff --git a/tests/fv3_conf/rrfs_warm_run.IN b/tests/fv3_conf/rrfs_warm_run.IN
@@ -3,7 +3,31 @@ mkdir INPUT RESTART
 
 OPNREQ_TEST=${OPNREQ_TEST:-false}
 SUFFIX=${RT_SUFFIX}
-cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/
+
+if [[ "${RRFS_RESTART:-NO}" == YES ]] ; then
+    # cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
+    # rm -f INPUT/fv_core.res.*
+    # rm -f INPUT/fv_srf_wnd.res.*
+    # rm -f INPUT/fv_tracer.res.*
+    # rm -f INPUT/phy_data.*
+    # rm -f INPUT/sfc_data.*
+    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/grid_spec.nc INPUT/.
+    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/*_grid.tile*.nc INPUT/.
+    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/oro_data*.nc INPUT/.
+    for RFILE in ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
+      RFILE_OLD=$(basename $RFILE)
+      RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
+      cp $RFILE "INPUT/$RFILE_NEW"
+    done
+    for x in emi_data.nc SMOKE_GBBEPx_data.nc dust12m_data.nc gfs_ctrl.nc gfs_data.nc \
+        grid.tile7.halo4.nc ; do
+      cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/$x INPUT/.
+    done
+    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/gfs_bndy.* INPUT/.
+else
+  cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/
+fi
 
 for x in global_glacier.2x2.grb global_h2oprdlos.f77 global_maxice.2x2.grb \
          global_o3prdlos.f77 global_snoclim.1.875.grb global_zorclim.1x1.grb \

diff --git a/tests/parm/model_configure_rrfs_conus13km.IN b/tests/parm/model_configure_rrfs_conus13km.IN
@@ -5,6 +5,7 @@ start_hour:              @[SHOUR]
 start_minute:            0
 start_second:            0
 nhours_fcst:             @[FHMAX]
+fhrot:                   @[FHROT]
 
 dt_atmos:                @[DT_ATMOS]
 calendar:                'julian'

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -103,8 +103,19 @@ RUN     | rrfs_v1nssl
 RUN     | rrfs_v1nssl_nohailnoccn                                                                                                 |                                         | fv3 |
 
 RUN     | rrfs_conus13km_hrrr_warm                                                                                                |                                         | fv3 |
-RUN     | rrfs_conus13km_radar_tten_warm                                                                                          |                                         | fv3 |
 RUN     | rrfs_smoke_conus13km_hrrr_warm                                                                                          |                                         | fv3 |
+RUN     | rrfs_conus13km_radar_tten_warm                                                                                          |                                         | fv3 |
+
+# These do not match the control yet:
+# RUN     | rrfs_conus13km_hrrr_warm_decomp                                                                                         |                                         |     |
+# RUN     | rrfs_conus13km_radar_tten_warm_decomp                                                                                   |                                         |     |
+
+RUN     | rrfs_conus13km_hrrr_warm_2threads                                                                                       |                                         |     |
+RUN     | rrfs_conus13km_radar_tten_warm_2threads                                                                                 |                                         |     |
+
+# These do not match the control yet:
+# RUN     | rrfs_conus13km_hrrr_warm_restart                                                                                        |                                         |     | rrfs_conus13km_hrrr_warm
+# RUN     | rrfs_conus13km_radar_tten_warm_restart                                                                                  |                                         |     | rrfs_conus13km_radar_tten_warm
 
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp                        |                                         | fv3 |
 RUN     | control_csawmg                                                                                                          | - gaea.intel                            | fv3 |
@@ -121,6 +132,9 @@ RUN     | control_wam
 
 COMPILE | -DAPP=ATM -DDEBUG=ON -D32BIT=ON                                                                                         |                                         | fv3 |
 
+RUN     | rrfs_conus13km_hrrr_warm_debug                                                                                          |                                         | fv3 |
+RUN     | rrfs_conus13km_radar_tten_warm_debug                                                                                    |                                         | fv3 |
+
 RUN     | control_debug                                                                                                           |                                         | fv3 |
 RUN     | control_2threads_debug                                                                                                  |                                         |     |
 RUN     | control_CubedSphereGrid_debug                                                                                           |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20221007
+BL_DATE=20221012
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 
@@ -715,6 +715,8 @@ EOF
     (
       source ${PATHRT}/tests/$TEST_NAME
 
+      compute_petbounds_and_tasks
+
       TPN=$(( TPN / THRD ))
       NODES=$(( TASKS / TPN ))
       if (( NODES * TPN < TASKS )); then

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -25,9 +25,16 @@ RUN     | hrrr_control_2threads
 RUN     | hrrr_control_decomp                                                                                                     |                |             |
 RUN     | hrrr_control_restart                                                                                                    |                |             | hrrr_control
 RUN     | rrfs_v1beta                                                                                                             |                | fv3         |
-RUN     | rrfs_conus13km_hrrr_warm                                                                                                |                | fv3         |
-RUN     | rrfs_conus13km_radar_tten_warm                                                                                          |                | fv3         |
-RUN     | rrfs_smoke_conus13km_hrrr_warm                                                                                          |                | fv3         |
+
+RUN     | rrfs_conus13km_hrrr_warm                                                                                                |                                         | fv3 |
+RUN     | rrfs_smoke_conus13km_hrrr_warm                                                                                          |                                         | fv3 |
+
+RUN     | rrfs_conus13km_radar_tten_warm                                                                                          |                                         | fv3 |
+RUN     | rrfs_conus13km_radar_tten_warm_2threads                                                                                 |                                         |     |
+
+# These two are known to not match the control:
+#RUN     | rrfs_conus13km_radar_tten_warm_decomp                                                                                   |                                         |     |
+#RUN     | rrfs_conus13km_radar_tten_warm_restart                                                                                  |                                         |     | rrfs_conus13km_radar_tten_warm
 
 ##################################################################################################################################################################
 # CCPP DEBUG tests                                                                                                                                               #
@@ -48,6 +55,9 @@ RUN     | control_ras_debug
 RUN     | control_stochy_debug                                                                                                    |                | fv3         |
 RUN     | control_debug_p8                                                                                                        |                | fv3         |
 
+RUN     | rrfs_conus13km_hrrr_warm_debug                                                                                          |                | fv3         |
+RUN     | rrfs_conus13km_radar_tten_warm_debug                                                                                    |                | fv3         |
+
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON                                       |                | fv3         |
 RUN     | control_wam_debug                                                                                                       |                | fv3         |
 

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -15,6 +15,75 @@ qsub_id=0
 slurm_id=0
 bsub_id=0
 
+function compute_petbounds_and_tasks() {
+
+  # each test MUST define ${COMPONENT}_tasks variable for all components it is using
+  # and MUST NOT define those that it's not using or set the value to 0.
+
+  # ATM is a special case since it is running on the sum of compute and io tasks.
+  # CHM component and mediator are running on ATM compute tasks only.
+
+  if [[ $DATM_CDEPS = 'false' ]]; then
+    if [[ ${ATM_compute_tasks:-0} -eq 0 ]]; then
+      ATM_compute_tasks=$((INPES * JNPES * NTILES))
+    fi
+    if [[ $QUILTING = '.true.' ]]; then
+      ATM_io_tasks=$((WRITE_GROUP * WRTTASK_PER_GROUP))
+    fi
+  fi
+
+  local n=0
+  unset atm_petlist_bounds ocn_petlist_bounds ice_petlist_bounds wav_petlist_bounds chm_petlist_bounds med_petlist_bounds aqm_petlist_bounds
+
+  # ATM
+  ATM_io_tasks=${ATM_io_tasks:-0}
+  if [[ $((ATM_compute_tasks + ATM_io_tasks)) -gt 0 ]]; then
+     atm_petlist_bounds="${n} $((n + ATM_compute_tasks + ATM_io_tasks -1))"
+     n=$((n + ATM_compute_tasks + ATM_io_tasks))
+  fi
+
+  # OCN
+  if [[ ${OCN_tasks:-0} -gt 0 ]]; then
+     ocn_petlist_bounds="${n} $((n + OCN_tasks - 1))"
+     n=$((n + OCN_tasks))
+  fi
+
+  # ICE
+  if [[ ${ICE_tasks:-0} -gt 0 ]]; then
+     ice_petlist_bounds="${n} $((n + ICE_tasks - 1))"
+     n=$((n + ICE_tasks))
+  fi
+
+  # WAV
+  if [[ ${WAV_tasks:-0} -gt 0 ]]; then
+     wav_petlist_bounds="${n} $((n + WAV_tasks - 1))"
+     n=$((n + WAV_tasks))
+  fi
+
+  # CHM
+  chm_petlist_bounds="0 $((ATM_compute_tasks - 1))"
+
+  # MED
+  med_petlist_bounds="0 $((ATM_compute_tasks - 1))"
+
+  # AQM
+  aqm_petlist_bounds="0 $((ATM_compute_tasks - 1))"
+
+  UFS_tasks=${n}
+
+  echo "ATM_petlist_bounds: ${atm_petlist_bounds:-}"
+  echo "OCN_petlist_bounds: ${ocn_petlist_bounds:-}"
+  echo "ICE_petlist_bounds: ${ice_petlist_bounds:-}"
+  echo "WAV_petlist_bounds: ${wav_petlist_bounds:-}"
+  echo "CHM_petlist_bounds: ${chm_petlist_bounds:-}"
+  echo "MED_petlist_bounds: ${med_petlist_bounds:-}"
+  echo "AQM_petlist_bounds: ${aqm_petlist_bounds:-}"
+  echo "UFS_tasks         : ${UFS_tasks:-}"
+
+  # TASKS is now set to UFS_TASKS
+  export TASKS=$UFS_tasks
+}
+
 interrupt_job() {
   set -x
   if [[ $SCHEDULER = 'pbs' ]]; then

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -32,64 +32,6 @@ remove_fail_test() {
     fi
 }
 
-function compute_petbounds() {
-
-  # each test MUST define ${COMPONENT}_tasks variable for all components it is using
-  # and MUST NOT define those that it's not using or set the value to 0.
-
-  # ATM is a special case since it is running on the sum of compute and io tasks.
-  # CHM component and mediator are running on ATM compute tasks only.
-
-  local n=0
-  unset atm_petlist_bounds ocn_petlist_bounds ice_petlist_bounds wav_petlist_bounds chm_petlist_bounds med_petlist_bounds aqm_petlist_bounds
-
-  # ATM
-  ATM_io_tasks=${ATM_io_tasks:-0}
-  if [[ $((ATM_compute_tasks + ATM_io_tasks)) -gt 0 ]]; then
-     atm_petlist_bounds="${n} $((n + ATM_compute_tasks + ATM_io_tasks -1))"
-     n=$((n + ATM_compute_tasks + ATM_io_tasks))
-  fi
-
-  # OCN
-  if [[ ${OCN_tasks:-0} -gt 0 ]]; then
-     ocn_petlist_bounds="${n} $((n + OCN_tasks - 1))"
-     n=$((n + OCN_tasks))
-  fi
-
-  # ICE
-  if [[ ${ICE_tasks:-0} -gt 0 ]]; then
-     ice_petlist_bounds="${n} $((n + ICE_tasks - 1))"
-     n=$((n + ICE_tasks))
-  fi
-
-  # WAV
-  if [[ ${WAV_tasks:-0} -gt 0 ]]; then
-     wav_petlist_bounds="${n} $((n + WAV_tasks - 1))"
-     n=$((n + WAV_tasks))
-  fi
-
-  # CHM
-  chm_petlist_bounds="0 $((ATM_compute_tasks - 1))"
-
-  # MED
-  med_petlist_bounds="0 $((ATM_compute_tasks - 1))"
-
-  # AQM
-  aqm_petlist_bounds="0 $((ATM_compute_tasks - 1))"
-
-  UFS_tasks=${n}
-
-  echo "ATM_petlist_bounds: ${atm_petlist_bounds:-}"
-  echo "OCN_petlist_bounds: ${ocn_petlist_bounds:-}"
-  echo "ICE_petlist_bounds: ${ice_petlist_bounds:-}"
-  echo "WAV_petlist_bounds: ${wav_petlist_bounds:-}"
-  echo "CHM_petlist_bounds: ${chm_petlist_bounds:-}"
-  echo "MED_petlist_bounds: ${med_petlist_bounds:-}"
-  echo "AQM_petlist_bounds: ${aqm_petlist_bounds:-}"
-  echo "UFS_tasks         : ${UFS_tasks:-}"
-
-}
-
 if [[ $# != 5 ]]; then
   echo "Usage: $0 PATHRT RUNDIR_ROOT TEST_NAME TEST_NR COMPILE_NR"
   exit 1
@@ -174,22 +116,10 @@ fi
 
 atparse < ${PATHRT}/parm/${MODEL_CONFIGURE:-model_configure.IN} > model_configure
 
-if [[ $DATM_CDEPS = 'false' ]]; then
-  if [[ ${ATM_compute_tasks:-0} -eq 0 ]]; then
-    ATM_compute_tasks=$((INPES * JNPES * NTILES))
-  fi
-  if [[ $QUILTING = '.true.' ]]; then
-    ATM_io_tasks=$((WRITE_GROUP * WRTTASK_PER_GROUP))
-  fi
-fi
-
-compute_petbounds
+compute_petbounds_and_tasks
 
 atparse < ${PATHRT}/parm/${NEMS_CONFIGURE:-nems.configure} > nems.configure
 
-# TASKS is now set to UFS_TASKS
-export TASKS=$UFS_tasks
-
 if [[ "Q${INPUT_NEST02_NML:-}" != Q ]] ; then
     INPES_NEST=$INPES_NEST02; JNPES_NEST=$JNPES_NEST02
     NPX_NEST=$NPX_NEST02; NPY_NEST=$NPY_NEST02

diff --git a/tests/tests/rrfs_conus13km_hrrr_warm b/tests/tests/rrfs_conus13km_hrrr_warm
@@ -25,7 +25,7 @@ export SMONTH=5
 export SDAY=12
 export SHOUR=16
 export FHMAX=2
-export DT_ATMOS=60
+export DT_ATMOS=120
 export RESTART_INTERVAL=1
 export QUILTING=.true.
 export WRITE_GROUP=1
+4 −4		.gitmodules
+1 −1		atmos_cubed_sphere
+1 −1		ccpp/physics
-Original file line number
+Diff line change
@@ Expand Up / @@ -370,6 +370,7 @@ export NSSL_INVERTCCN=.true. @@
     # Smoke
     export RRFS_SMOKE=.false.
+    export RRFS_RESTART=NO
     export SEAS_OPT=2
     # GWD
@@ Expand Down @@