update CMEPS to allow bilinear ATM<->WAV mapping for global coupled a…

…pplication; utilize custom restart names for WW3 (was #1684) (#1692) * set configuration variable true to use non-default restart file names in WW3 * change name of WW3 used for restart tests * change name of WW3 in hafs wav tests * update CMEPS
ufs-community · Apr 3, 2023 · 587ff4f · 587ff4f
1 parent 20e21f6
commit 587ff4f
Show file tree

Hide file tree

Showing 21 changed files with 6,042 additions and 5,374 deletions.
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
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/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -130,7 +130,8 @@ else
 
      # WAVE restart file
      if [[ $CPLWAV == .true. ]]; then
-       cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
+       RFILE=ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}
+       cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
      fi
 
   else

diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN
@@ -74,6 +74,7 @@ WAV_attributes::
   logfile = wav.log
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # CMEPS warm run sequence

diff --git a/tests/parm/nems.configure.cpld_esmfthreads.IN b/tests/parm/nems.configure.cpld_esmfthreads.IN
@@ -74,6 +74,7 @@ WAV_attributes::
   logfile = wav.log
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # CMEPS warm run sequence

diff --git a/tests/parm/nems.configure.cpld_noaero.IN b/tests/parm/nems.configure.cpld_noaero.IN
@@ -67,6 +67,7 @@ WAV_attributes::
   logfile = wav.log
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # CMEPS warm run sequence

diff --git a/tests/parm/nems.configure.cpld_noaero_outwav.IN b/tests/parm/nems.configure.cpld_noaero_outwav.IN
@@ -61,6 +61,7 @@ WAV_attributes::
   logfile = wav.log
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # CMEPS warm run sequence

diff --git a/tests/parm/nems.configure.hafs_atm_ocn_wav.IN b/tests/parm/nems.configure.hafs_atm_ocn_wav.IN
@@ -86,6 +86,7 @@ WAV_attributes::
   merge_import = .true.
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # Run Sequence #

diff --git a/tests/parm/nems.configure.hafs_atm_wav.IN b/tests/parm/nems.configure.hafs_atm_wav.IN
@@ -55,6 +55,7 @@ WAV_attributes::
   merge_import = .true.
   mesh_wav = @[MESH_WAV]
   multigrid = @[MULTIGRID]
+  user_sets_restname = true
 ::
 
 # Run Sequence #

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -82,10 +82,10 @@ RUN     | regional_control_qr
 RUN     | regional_restart_qr                                                                                                     |                                         |     | regional_control_qr
 RUN     | regional_decomp                                                                                                         |                                         |     |
 RUN     | regional_2threads                                                                                                       |                                         |     |
-RUN     | regional_noquilt                                                                                                        |                                         | fv3 |
+RUN     | regional_noquilt                                                                                                        | - jet.intel                             | fv3 |
 RUN     | regional_netcdf_parallel                                                                                                | - acorn.intel                           | fv3 |
 RUN     | regional_2dwrtdecomp                                                                                                    |                                         |     |
-RUN     | regional_wofs                                                                                                           |                                         | fv3 |
+RUN     | regional_wofs                                                                                                           | - jet.intel                             | fv3 |
 
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0 -D32BIT=ON -DREQUIRE_IFI=ON | + acorn.intel | fv3 |
 RUN     | regional_ifi_control                                                                                                    | + acorn.intel                           | fv3 |
@@ -229,7 +229,7 @@ RUN     | hafs_regional_storm_following_1nest_atm_ocn_wav
 COMPILE | -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON                        | - wcoss2.intel                          | fv3 |
 RUN     | hafs_regional_docn                                                                                                      | - wcoss2.intel                          | fv3 |
 RUN     | hafs_regional_docn_oisst                                                                                                | - wcoss2.intel                          | fv3 |
-RUN     | hafs_regional_datm_cdeps                                                                                                | - wcoss2.intel                          | fv3 |
+RUN     | hafs_regional_datm_cdeps                                                                                                | - wcoss2.intel -jet.intel               | fv3 |
 
 ###################################################################################################################################################################################
 # CDEPS Data Atmosphere tests                                                                                                                                                     #
@@ -295,9 +295,9 @@ RUN     | atmaero_control_p8_rad_micro
 ###################################################################################################################################################################################
 
 COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -D32BIT=ON                                                                    |                                           | fv3 |
-RUN     | regional_atmaq                                                                                                        |                                           | fv3 |
+RUN     | regional_atmaq                                                                                                        | - jet.intel                               | fv3 |
 COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON -D32BIT=ON                                                         |                                           | fv3 |
 RUN     | regional_atmaq_debug                                                                                                  | - jet.intel gaea.intel cheyenne.intel     | fv3 |
 
 COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON -D32BIT=ON                                                        |                                           | fv3 |
-RUN     | regional_atmaq_faster                                                                                                 |                                           | fv3 |
+RUN     | regional_atmaq_faster                                                                                                 | - jet.intel                               | fv3 |
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -446,7 +446,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
 fi
 
 
-BL_DATE=20230329
+BL_DATE=20230401
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/tests/hafs_regional_atm_ocn_wav b/tests/tests/hafs_regional_atm_ocn_wav
@@ -14,7 +14,7 @@ export LIST_FILES="atmf006.nc \
                    archs.2019_241_06.a \
                    out_grd.ww3 \
                    out_pnt.ww3 \
-                   20190829.060000.restart.ww3 \
+                   ufs.hafs.ww3.r.2019-08-29-21600 \
                    ufs.hafs.cpl.r.2019-08-29-21600.nc"
 
 export_fv3

diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav
@@ -12,7 +12,7 @@ export LIST_FILES="atmf006.nc \
                    sfcf006.nc \
                    out_grd.ww3 \
                    out_pnt.ww3 \
-                   20190829.060000.restart.ww3 \
+                   ufs.hafs.ww3.r.2019-08-29-21600 \
                    ufs.hafs.cpl.r.2019-08-29-21600.nc"
 
 export_fv3
-Original file line number
+Diff line change
@@ Expand Up @@
     fi
-    BL_DATE=20230329
+    BL_DATE=20230401
     RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
@@ Expand Down @@