ufs-community · MinsukJi-NOAA · Jun 6, 2022 · Jun 6, 2022 · Jun 6, 2022 · Jun 7, 2022
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/ci/Dockerfile b/tests/ci/Dockerfile
@@ -1,4 +1,4 @@
-From noaaemc/ubuntu-hpc:v1.10b
+From noaaemc/ubuntu-hpc:v1.11b
 
 ENV HOME=/home/builder
 COPY --chown=builder:builder . $HOME/ufs-weather-model

diff --git a/tests/ci/ci.sh b/tests/ci/ci.sh
@@ -81,7 +81,7 @@ elif [ $RUN == "true" ]; then
                 -e "RT_MACHINE=linux.gnu" -e "RT_COMPILER=gnu" \
                 -w "/home/builder/ufs-weather-model/tests" \
                 -v DataVolume:/home/builder/data/NEMSfv3gfs \
-                --shm-size=512m --name my-container noaaemc/ubuntu-hpc:v1.10b \
+                --shm-size=512m --name my-container noaaemc/ubuntu-hpc:v1.11b \
                 /bin/bash -c "./opnReqTest -n ${TEST_NAME} -c ${TEST_CASE} -x"
 
   cd $GITHUB_WORKSPACE

diff --git a/tests/ci/ci.test b/tests/ci/ci.test
@@ -2,5 +2,5 @@ control
 thr mpi dcp rst bit dbg
 regional_control
 thr dcp
-cpld_control_noaero_p8
+cpld_control_nowave_noaero_p8
 rst dbg
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -114,7 +114,9 @@ else
   ls -1 ./INPUT/${RFILE}>ice.restart_file
 
   # WAVE restart file
-  cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
+  if [[ $CPLWAV == .true. ]]; then
+    cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
+  fi
 fi
 
 #inline post

diff --git a/tests/opnReqTests/dbg.sh b/tests/opnReqTests/dbg.sh
@@ -14,6 +14,7 @@ if [[ $application == 'global' ]]; then
   else
     LIST_FILES="sfcf0$FHMAX_2D.nc sfcf0$FHMAX_2D.nc"
   fi
+  WRITE_DOPOST=.false.
 elif [[ $application == 'regional' ]]; then
   echo "Regional application not yet implemented for debug"
   exit 1

diff --git a/tests/opnReqTests/wrt_env.sh b/tests/opnReqTests/wrt_env.sh
@@ -27,4 +27,5 @@ export NFHOUT_HF=${NFHOUT_HF}
 export LIST_FILES="${LIST_FILES}"
 export OUTPUT_FH="${OUTPUT_FH}"
 export AOD_FRQ=${AOD_FRQ:-}
+export WRITE_DOPOST=${WRITE_DOPOST:-}
 EOF
diff --git a/tests/parm/nems.configure.cpld_noaero_nowave.IN b/tests/parm/nems.configure.cpld_noaero_nowave.IN
@@ -0,0 +1,112 @@
+#############################################
+####  NEMS Run-Time Configuration File  #####
+#############################################
+
+# ESMF #
+logKindFlag:            ESMF_LOGKIND_MULTI
+
+# EARTH #
+EARTH_component_list: MED ATM OCN ICE
+EARTH_attributes::
+  Verbosity = 0
+::
+
+# MED #
+MED_model:                      @[med_model]
+MED_petlist_bounds:             @[med_petlist_bounds]
+::
+
+# ATM #
+ATM_model:                      @[atm_model]
+ATM_petlist_bounds:             @[atm_petlist_bounds]
+ATM_attributes::
+  Verbosity = 0
+  DumpFields = false
+  ProfileMemory = false
+  OverwriteSlice = true
+::
+
+# OCN #
+OCN_model:                      @[ocn_model]
+OCN_petlist_bounds:             @[ocn_petlist_bounds]
+OCN_attributes::
+  Verbosity = 0
+  DumpFields = false
+  ProfileMemory = false
+  OverwriteSlice = true
+  mesh_ocn = @[MESHOCN_ICE]
+::
+
+# ICE #
+ICE_model:                      @[ice_model]
+ICE_petlist_bounds:             @[ice_petlist_bounds]
+ICE_attributes::
+  Verbosity = 0
+  DumpFields = false
+  ProfileMemory = false
+  OverwriteSlice = true
+  mesh_ice = @[MESHOCN_ICE]
+  stop_n = @[RESTART_N]
+  stop_option = nhours
+  stop_ymd = -999
+::
+
+# CMEPS warm run sequence
+runSeq::
+@@[coupling_interval_slow_sec]
+   MED med_phases_prep_ocn_avg
+   MED -> OCN :remapMethod=redist
+   OCN
+   @@[coupling_interval_fast_sec]
+     MED med_phases_prep_atm
+     MED med_phases_prep_ice
+     MED -> ATM :remapMethod=redist
+     MED -> ICE :remapMethod=redist
+     ATM
+     ICE
+     ATM -> MED :remapMethod=redist
+     MED med_phases_post_atm
+     ICE -> MED :remapMethod=redist
+     MED med_phases_post_ice
+     MED med_phases_prep_ocn_accum
+   @
+   OCN -> MED :remapMethod=redist
+   MED med_phases_post_ocn
+   MED med_phases_restart_write
+@
+::
+
+# CMEPS variables
+
+DRIVER_attributes::
+::
+
+MED_attributes::
+      ATM_model = @[atm_model]
+      ICE_model = @[ice_model]
+      OCN_model = @[ocn_model]
+      history_n = 1
+      history_option = nhours
+      history_ymd = -999
+      coupling_mode = @[CPLMODE]
+      history_tile_atm = @[ATMTILESIZE]
+::
+ALLCOMP_attributes::
+      ScalarFieldCount = 2
+      ScalarFieldIdxGridNX = 1
+      ScalarFieldIdxGridNY = 2
+      ScalarFieldName = cpl_scalars
+      start_type = @[RUNTYPE]
+      restart_dir = RESTART/
+      case_name = ufs.cpld
+      restart_n = @[RESTART_N]
+      restart_option = nhours
+      restart_ymd = -999
+      dbug_flag = @[cap_dbug_flag]
+      use_coldstart = @[use_coldstart]
+      use_mommesh = @[use_mommesh]
+      eps_imesh = @[eps_imesh]
+      stop_n = @[FHMAX]
+      stop_option = nhours
+      stop_ymd = -999
+::
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -16,9 +16,16 @@ RUN     | cpld_restart_c192_p8
 RUN     | cpld_bmark_p8                                                                                                           | - wcoss_cray  wcoss2.intel jet.intel    | fv3 |
 RUN     | cpld_restart_bmark_p8                                                                                                   | - wcoss_cray  wcoss2.intel jet.intel    |     | cpld_bmark_p8
 
+COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                         |                                         | fv3 |
+RUN     | cpld_control_noaero_p8                                                                                                  |                                         | fv3 |
+RUN     | cpld_control_nowave_noaero_p8                                                                                           |                                         | fv3 |
+
 COMPILE | -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                             | - wcoss_cray  wcoss2.intel              | fv3 |
 RUN     | cpld_debug_p8                                                                                                           | - wcoss_cray  wcoss2.intel              | fv3 |
 
+COMPILE | -DAPP=S2SW -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                              |                                         | fv3 |
+RUN     | cpld_debug_noaero_p8                                                                                                    |                                         | fv3 |
+
 # Waves and aerosol off for computing fluxes in mediator
 COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_sfcocn -DCMEPS_AOFLUX=ON                                                 | - wcoss_cray                            | fv3 |
 RUN     | cpld_control_noaero_p8_agrid                                                                                        | - wcoss_cray                            | fv3 |

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -62,6 +62,7 @@ RUN     | control_wam_debug
 
 COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                         |                | fv3         |
 RUN     | cpld_control_noaero_p8                                                                                                  |                | fv3         |
+RUN     | cpld_control_nowave_noaero_p8                                                                                           |                | fv3         |
 
 COMPILE | -DAPP=S2SW -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                              |                | fv3         |
 RUN     | cpld_debug_noaero_p8                                                                                                    |                | fv3         |

diff --git a/tests/tests/cpld_control_nowave_noaero_p8 b/tests/tests/cpld_control_nowave_noaero_p8
@@ -0,0 +1,105 @@
+#
+#  cpld_control C96 noaero P8 test
+#
+
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100"
+
+export CNTL_DIR="cpld_control_c96_noaero_p8"
+
+export LIST_FILES="sfcf021.tile1.nc \
+                   sfcf021.tile2.nc \
+                   sfcf021.tile3.nc \
+                   sfcf021.tile4.nc \
+                   sfcf021.tile5.nc \
+                   sfcf021.tile6.nc \
+                   atmf021.tile1.nc \
+                   atmf021.tile2.nc \
+                   atmf021.tile3.nc \
+                   atmf021.tile4.nc \
+                   atmf021.tile5.nc \
+                   atmf021.tile6.nc \
+                   sfcf024.tile1.nc \
+                   sfcf024.tile2.nc \
+                   sfcf024.tile3.nc \
+                   sfcf024.tile4.nc \
+                   sfcf024.tile5.nc \
+                   sfcf024.tile6.nc \
+                   atmf024.tile1.nc \
+                   atmf024.tile2.nc \
+                   atmf024.tile3.nc \
+                   atmf024.tile4.nc \
+                   atmf024.tile5.nc \
+                   atmf024.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc \
+                   RESTART/MOM.res.nc \
+                   RESTART/iced.2021-03-23-21600.nc \
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
+
+#TODO: add comparison of CA restart files?
+
+export_fv3
+export_cpl
+
+export RESTART_N=12
+export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH='0 21 24'
+
+export INPES=$INPES_cpl_dflt
+export JNPES=$JNPES_cpl_dflt
+export THRD=$THRD_cpl_dflt
+export WRTTASK_PER_GROUP=$WPG_cpl_dflt
+
+OCN_tasks=$OCN_tasks_cpl_dflt
+ICE_tasks=$ICE_tasks_cpl_dflt
+export WAV_tasks=0
+export TASKS=$(( INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks + WAV_tasks ))
+
+export NPROC_ICE=$ICE_tasks
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
+
+export CPLWAV=.false.
+export CPLWAV2ATM=.false.
+export MOM6_USE_WAVES=False
+export eps_imesh=2.5e-1
+
+export CPLCHM=.false.
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+
+export DIAG_TABLE=diag_table_template
+export NEMS_CONFIGURE=nems.configure.cpld_noaero_nowave.IN
+
+export FV3_RUN=cpld_control_run.IN