Update CDEPS component, add hailcast code in FV3/atmos_cubed_sphere a…

…nd reduce wall clock time used for the cpld_control_c192_p8 test on Jet (#1156) Co-authored-by: Yunheng Wang
ufs-community · Apr 29, 2022 · dedf86c · dedf86c
1 parent 9bf10ca
commit dedf86c
Show file tree

Hide file tree

Showing 14 changed files with 2,922 additions and 2,922 deletions.
diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS
diff --git a/FV3 b/FV3
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.3.0b09
-module load fms/2021.04
+module load fms/2022.01
 
 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.3.0b09-debug
-module load fms/2021.04
+module load fms/2022.01
 
 module load bacio/2.4.1
 module load crtm/2.3.0

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/default_vars.sh b/tests/default_vars.sh
@@ -380,19 +380,19 @@ elif [[ $MACHINE_ID = jet.* ]]; then
   CHM_cpl_bmrk="0 287"; OPB_cpl_bmrk="312 431"; IPB_cpl_bmrk="432 479"; WPB_cpl_bmrk="480 559"
   NPROC_ICE_cpl_bmrk=48
 
-  TASKS_cpl_bmrk_aero=1424; TPN_cpl_bmrk_aero=12; INPES_cpl_bmrk_aero=12; JNPES_cpl_bmrk_aero=16
-  THRD_cpl_bmrk_aero=3; WPG_cpl_bmrk_aero=24; MPB_cpl_bmrk_aero="0 287"; APB_cpl_bmrk_aero="0 1175"
-  CHM_cpl_bmrk_aero="0 1151"; OPB_cpl_bmrk_aero="1176 1275"; IPB_cpl_bmrk_aero="1276 1323"; WPB_cpl_bmrk_aero="1324  1423"
+  TASKS_cpl_bmrk_aero=1808; TPN_cpl_bmrk_aero=12; INPES_cpl_bmrk_aero=16; JNPES_cpl_bmrk_aero=16
+  THRD_cpl_bmrk_aero=3; WPG_cpl_bmrk_aero=24; MPB_cpl_bmrk_aero="0 287"; APB_cpl_bmrk_aero="0 1559"
+  CHM_cpl_bmrk_aero="0 1535"; OPB_cpl_bmrk_aero="1560 1659"; IPB_cpl_bmrk_aero="1660 1707"; WPB_cpl_bmrk_aero="1708  1807"
   NPROC_ICE_cpl_bmrk_aero=48
 
   TASKS_cpl_bmrk_mpi=600; TPN_cpl_bmrk_mpi=24; INPES_cpl_bmrk_mpi=6; JNPES_cpl_bmrk_mpi=8
   THRD_cpl_bmrk_mpi=1; WPG_cpl_bmrk_mpi=24; MPB_cpl_bmrk_mpi="0 287"; APB_cpl_bmrk_mpi="0 311"
   OPB_cpl_bmrk_mpi="312 431"; IPB_cpl_bmrk_mpi="432 479"; WPB_cpl_bmrk_mpi="480 599"
   NPROC_ICE_cpl_bmrk_mpi=48
 
-  TASKS_cpl_c192=564; TPN_cpl_c192=12; INPES_cpl_c192=8; JNPES_cpl_c192=8
-  THRD_cpl_c192=2; WPG_cpl_c192=12;  MPB_cpl_c192="0 287"; APB_cpl_c192="0 395"
-  CHM_cpl_c192="0 383"; OPB_cpl_c192="396 515"; IPB_cpl_c192="516 563"
+  TASKS_cpl_c192=1324; TPN_cpl_c192=12; INPES_cpl_c192=12; JNPES_cpl_c192=16
+  THRD_cpl_c192=2; WPG_cpl_c192=24;  MPB_cpl_c192="0 287"; APB_cpl_c192="0 1175"
+  CHM_cpl_c192="0 1151"; OPB_cpl_c192="1176 1275"; IPB_cpl_c192="1276 1323"
   NPROC_ICE_cpl_c192=48
 
   TASKS_cdeps_100=40; TPN_cdeps_100=24