ufs-community · DusanJovic-NOAA · Mar 26, 2022 · Mar 22, 2022 · Mar 24, 2022 · Mar 24, 2022
diff --git a/doc/UsersGuide/source/InputsOutputs.rst b/doc/UsersGuide/source/InputsOutputs.rst
@@ -22,8 +22,12 @@ The ufs-weather-model can be configured as one of several applications, from a s
      - UFSAtm coupled to GOCART
    * - S2S
      - Coupled UFSATM-MOM6-CICE6-CMEPS
+   * - S2SA
+     - Coupled UFSATM-MOM6-CICE6-GOCART-CMEPS
    * - S2SW
      - Coupled UFSATM-MOM6-CICE6-WW3-CMEPS
+   * - S2SWA
+     - Coupled UFSATM-MOM6-CICE6-WW3-GOCART-CMEPS
    * - NG-GODAS
      - Coupled CDEPS-DATM-MOM6-CICE6-CMEPS
    * - HAFS
@@ -1205,8 +1209,7 @@ shows the following parameters that can be set in *model_configure* at run-time.
    * - output_fh
      - history file output forecast hours or history file output frequency if the second elelment is -1
      - real
-     - -1 (negative: turn off the option, otherwise overwritten nfhout/nfhout_fh; 6 -1: output every 6 hoursr; 6 9: output history files at fh=6 and 9)
-     - -1 (negative: turn off the option, otherwise overwritten nfhout/nfhout_fh; 6 -1: output every 6 hoursr; 6 9: output history files at fh=6 and 9. Note: output_fh can only take 277 elements)
+     - -1 (negative: turn off the option, otherwise overwritten nfhout/nfhout_fh; 6 -1: output every 6 hoursr; 6 9: output history files at fh=6 and 9. Note: output_fh can only take 1032 characters)
 
 :numref:`Table %s <ModelConfigParamsNotChanged>` shows the following parameters in *model_configure* that
 are not usually changed.

diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
@@ -8,7 +8,7 @@ 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 fms/2021.03
+module load fms/2021.04
 
 module load bacio/2.4.1
 module load crtm/2.3.0

diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
@@ -8,7 +8,7 @@ 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 fms/2021.03
+module load fms/2021.04
 
 module load bacio/2.4.1
 module load crtm/2.3.0

diff --git a/modulefiles/ufs_hera.gnu b/modulefiles/ufs_hera.gnu
@@ -23,9 +23,6 @@ module load hpc-mpich/3.3.2
 
 module load ufs_common
 
-module unload fms
-module load fms/2021.03-avx
-
 setenv CC mpicc
 setenv CXX mpicxx
 setenv FC mpif90

diff --git a/modulefiles/ufs_hera.intel b/modulefiles/ufs_hera.intel
@@ -20,13 +20,9 @@ module load hpc/1.1.0
 
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
-#module swap impi/2021.3.0
 
 module load ufs_common
 
-module unload fms
-module load fms/2021.03-avx
-
 setenv CC mpiicc
 setenv CXX mpiicpc
 setenv FC mpiifort

diff --git a/modulefiles/ufs_hera.intel_debug b/modulefiles/ufs_hera.intel_debug
@@ -20,7 +20,6 @@ module load hpc/1.1.0
 
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
-#module swap impi/2021.3.0
 
 module load ufs_common_debug
 

diff --git a/modulefiles/ufs_wcoss_cray b/modulefiles/ufs_wcoss_cray
@@ -58,7 +58,7 @@ module load udreg
 module load ugni
 
 module load esmf/8.2.1b04
-module load fms/2021.03
+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
@@ -58,7 +58,7 @@ module load udreg
 module load ugni
 
 module load esmf/8.2.1b04-debug
-module load fms/2021.03
+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_jet.intel.log b/tests/RegressionTests_jet.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/fv3_conf/cpld_datm_cdeps.IN b/tests/fv3_conf/cpld_datm_cdeps.IN
@@ -22,6 +22,9 @@ if [ $WARM_START = .false. ]; then
  else
   cp    @[INPUTDATA_ROOT]/MOM6_IC/@[OCNRES]/2011100100/MOM6_IC_TS*.nc ./INPUT/MOM6_IC_TS.nc
   cp    @[INPUTDATA_ROOT]/CICE_IC/@[OCNRES]/cice_model_@[ICERES].cpc.res_2011100100.nc cice_model.res.nc
+  if [[ $MOM_IAU == 'True' ]];then
+     cp    @[INPUTDATA_ROOT]/MOM6_IC/@[OCNRES]/2011100100/mom6_increment.nc ./INPUT/mom6_increment.nc
+  fi
  fi
 else
 # warm start

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -180,6 +180,7 @@ COMPILE | -DAPP=NG-GODAS
 RUN     | datm_cdeps_control_cfsr                                                                                                 | - wcoss_cray                            | fv3 |
 RUN     | datm_cdeps_restart_cfsr                                                                                                 | - wcoss_cray                            |     | datm_cdeps_control_cfsr
 RUN     | datm_cdeps_control_gefs                                                                                                 | - wcoss_cray                            | fv3 |
+RUN     | datm_cdeps_iau_gefs                                                                                                     | - wcoss_cray                            | fv3 |
 RUN     | datm_cdeps_stochy_gefs                                                                                                  | - wcoss_cray                            | fv3 |
 
 RUN     | datm_cdeps_bulk_cfsr                                                                                                    | - wcoss_cray                            | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220322
+BL_DATE=20220325
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -56,7 +56,6 @@ export LIST_FILES="sfcf036.tile1.nc \
 
 export_fv3
 export_cpl
-export WLCLK=48
 
 export DAYS=1.5
 export FHMAX=36

diff --git a/tests/tests/datm_cdeps_iau_gefs b/tests/tests/datm_cdeps_iau_gefs
@@ -0,0 +1,30 @@
+#
+#  DATM_CDEPS_MOM6_CICE_CMEPS_GEFS test
+#
+
+export TEST_DESCR="DATM_CDEPS-MOM6-CICE-CMEPS_GEFS - iau"
+
+export CNTL_DIR="datm_cdeps_iau_gefs"
+
+export LIST_FILES="RESTART/MOM.res.nc \
+                   RESTART/iced.2011-10-02-00000.nc \
+                   RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc"
+
+export_datm_cdeps
+export atm_datamode="GEFS"
+
+# atm configure
+export MOM_IAU="True"
+export IATM=1536
+export JATM=768
+export ATM_NX_GLB=$IATM
+export ATM_NY_GLB=$JATM
+export ATMRES='1536x768'
+export DATM_SRC="GEFS"
+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 RESTART_N=12
+export eps_imesh='2.5e-1'
+export FV3_RUN=cpld_datm_cdeps.IN