Reduce fhmax for cpld_c192_p7 test; update to ESMF 8.2.0 and MAPL 2.1…

…1.0 (#886) * reduce fhmax for coupled_control_c192_p7 test and associated restart test * update esmf to 8.2.0 and mapl to 2.11.0 Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
ufs-community · Nov 5, 2021 · 2a2ddad · 2a2ddad
1 parent f76123c
commit 2a2ddad
Show file tree

Hide file tree

Showing 19 changed files with 2,798 additions and 2,903 deletions.
diff --git a/HYCOM-interface/HYCOM b/HYCOM-interface/HYCOM
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
@@ -7,7 +7,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8_2_0_beta_snapshot_14
+module load esmf/8_2_0
 module load fms/2021.03
 
 module load bacio/2.4.1
@@ -19,6 +19,6 @@ module load sp/2.3.3
 module load w3nco/2.4.1
 module load upp/10.0.10
 
-#module load gftl-shared/v1.3.0
-#module load yafyaml/v0.5.1
-#module load mapl/v2.7.3-esmf820bs14
+module load gftl-shared/v1.3.3
+module load yafyaml/v0.5.1
+module load mapl/2.11.0-esmf-8_2_0
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
@@ -7,7 +7,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8_2_0_beta_snapshot_14-debug
+module load esmf/8_2_0-debug
 module load fms/2021.03
 
 module load bacio/2.4.1
@@ -19,6 +19,6 @@ module load sp/2.3.3
 module load w3nco/2.4.1
 module load upp/10.0.10
 
-#module load gftl-shared/v1.3.0
-#module load yafyaml/v0.5.1
-#module load mapl/v2.7.3-esmf820bs14
+module load gftl-shared/v1.3.3
+module load yafyaml/v0.5.1
+module load mapl/2.11.0-esmf-8_2_0
diff --git a/modulefiles/ufs_hera.intel b/modulefiles/ufs_hera.intel
@@ -25,9 +25,6 @@ module load ufs_common
 
 module unload fms
 module load fms/2021.03-avx
-module load gftl-shared/v1.3.0
-module load yafyaml/v0.5.1
-module load mapl/v2.7.3-esmf820bs14
 
 setenv CC mpiicc
 setenv CXX mpiicpc

diff --git a/modulefiles/ufs_hera.intel_debug b/modulefiles/ufs_hera.intel_debug
@@ -23,10 +23,6 @@ module load hpc-impi/2018.0.4
 
 module load ufs_common_debug
 
-module load gftl-shared/v1.3.0
-module load yafyaml/v0.5.1
-module load mapl/v2.7.3-esmf820bs14
-
 setenv CC mpiicc
 setenv CXX mpiicpc
 setenv FC mpiifort

diff --git a/modulefiles/ufs_wcoss_cray b/modulefiles/ufs_wcoss_cray
@@ -63,7 +63,7 @@ module load gni-headers
 module load udreg
 module load ugni
 
-module load esmf/820bs14
+module load esmf/820
 module load fms/2021.03
 
 module swap pmi pmi/5.0.11

diff --git a/modulefiles/ufs_wcoss_cray_debug b/modulefiles/ufs_wcoss_cray_debug
@@ -63,7 +63,7 @@ module load gni-headers
 module load udreg
 module load ugni
 
-module load esmf/820bs14-debug
+module load esmf/820-debug
 module load fms/2021.03
 
 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_orion.intel.log b/tests/RegressionTests_orion.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/rt.sh b/tests/rt.sh
@@ -460,7 +460,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20211101
+BL_DATE=20211104
 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_p7 b/tests/tests/cpld_control_c192_p7
@@ -5,18 +5,18 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 -
 
 export CNTL_DIR="cpld_control_c192_p7"
 
-export LIST_FILES="sfcf048.tile1.nc \
-                   sfcf048.tile2.nc \
-                   sfcf048.tile3.nc \
-                   sfcf048.tile4.nc \
-                   sfcf048.tile5.nc \
-                   sfcf048.tile6.nc \
-                   atmf048.tile1.nc \
-                   atmf048.tile2.nc \
-                   atmf048.tile3.nc \
-                   atmf048.tile4.nc \
-                   atmf048.tile5.nc \
-                   atmf048.tile6.nc \
+export LIST_FILES="sfcf036.tile1.nc \
+                   sfcf036.tile2.nc \
+                   sfcf036.tile3.nc \
+                   sfcf036.tile4.nc \
+                   sfcf036.tile5.nc \
+                   sfcf036.tile6.nc \
+                   atmf036.tile1.nc \
+                   atmf036.tile2.nc \
+                   atmf036.tile3.nc \
+                   atmf036.tile4.nc \
+                   atmf036.tile5.nc \
+                   atmf036.tile6.nc \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -50,14 +50,14 @@ export LIST_FILES="sfcf048.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2021-03-24-21600.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-24-21600.nc"
+                   RESTART/iced.2021-03-23-64800.nc \
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc"
 
 export_fv3
 export_cpl
 
-export DAYS=2
-export FHMAX=48
+export DAYS=1.5
+export FHMAX=36
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 

diff --git a/tests/tests/cpld_restart_c192_p7 b/tests/tests/cpld_restart_c192_p7
@@ -1,22 +1,22 @@
 #
 #  cpld_restart_c192_p7 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - 36h P7 restart test"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - 24h P7 restart test"
 
 export CNTL_DIR="cpld_control_c192_p7"
 
-export LIST_FILES="sfcf048.tile1.nc \
-                   sfcf048.tile2.nc \
-                   sfcf048.tile3.nc \
-                   sfcf048.tile4.nc \
-                   sfcf048.tile5.nc \
-                   sfcf048.tile6.nc \
-                   atmf048.tile1.nc \
-                   atmf048.tile2.nc \
-                   atmf048.tile3.nc \
-                   atmf048.tile4.nc \
-                   atmf048.tile5.nc \
-                   atmf048.tile6.nc \
+export LIST_FILES="sfcf036.tile1.nc \
+                   sfcf036.tile2.nc \
+                   sfcf036.tile3.nc \
+                   sfcf036.tile4.nc \
+                   sfcf036.tile5.nc \
+                   sfcf036.tile6.nc \
+                   atmf036.tile1.nc \
+                   atmf036.tile2.nc \
+                   atmf036.tile3.nc \
+                   atmf036.tile4.nc \
+                   atmf036.tile5.nc \
+                   atmf036.tile6.nc \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -50,14 +50,14 @@ export LIST_FILES="sfcf048.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2021-03-24-21600.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-24-21600.nc"
+                   RESTART/iced.2021-03-23-64800.nc \
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc"
 
 export_fv3
 export_cpl
 
-export DAYS=2
-export FHMAX=48
+export DAYS=1.5
+export FHMAX=36
 export FHROT=12
 export RESTART_N=$((FHMAX-$FHROT))