Update s4 support (#31)

* update intel compiler to intel2022 * update libpng * update intel compiler on ufs_hera.intel_debug * remove I_MPI_DAPL_UD fot Intel 2022/2021 * update libraries g2 (3.4.5), Jasper (2.0.25), PIO (2.5.3), libpng (1.6.37) * updated gnu/cheyenne hpc-stack location * Update ufs_cheyenne.gnu_debug * Update ufs_cheyenne.intel * Update ufs_cheyenne.intel_debug * Updated S4 RT resource allotments ufs-community#1223 * Updated S4 compiler versions ufs-community#1223 * Corrected cpl_atmw_gdas test task count for S4 ufs-community#1235 ufs-community#1223 Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com> Co-authored-by: JONG KIM <jong.kim@noaa.gov> Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com>
DusanJovic-NOAA · Jun 3, 2022 · 3f4cb05 · 3f4cb05
1 parent 631d732
commit 3f4cb05
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/modulefiles/ufs_s4.intel b/modulefiles/ufs_s4.intel
@@ -9,8 +9,8 @@ module-whatis "loads UFS Model prerequisites for S4"
 module load license_intel/S4
 module use /data/prod/hpc-stack/modulefiles/stack
 module load hpc/1.1.0
-module load hpc-intel/18.0.4
-module load hpc-impi/18.0.4
+module load hpc-intel/2022.1
+module load hpc-impi/2022.1
 
 module load ufs_common
 

diff --git a/modulefiles/ufs_s4.intel_debug b/modulefiles/ufs_s4.intel_debug
@@ -10,8 +10,8 @@ module-whatis "loads UFS Model prerequisites for S4"
 module load license_intel/S4
 module use /data/prod/hpc-stack/modulefiles/stack
 module load hpc/1.1.0
-module load hpc-intel/18.0.4
-module load hpc-impi/18.0.4
+module load hpc-intel/2022.1
+module load hpc-impi/2022.1
 
 module load ufs_common_debug
 

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -168,18 +168,16 @@ elif [[ $MACHINE_ID = jet.* ]]; then
 
 elif [[ $MACHINE_ID = s4.* ]]; then
 
-  echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"
-  exit 1
+  TPN=32
 
-  TASKS_dflt=150 ; TPN_dflt=32 ; INPES_dflt=3 ; JNPES_dflt=8
-  TASKS_thrd=78  ; TPN_thrd=16 ; INPES_thrd=3 ; JNPES_thrd=4
-  TASKS_c384=336 ; TPN_c384=16 ; INPES_c384=6 ; JNPES_c384=8
-  TASKS_c768=928 ; TPN_c768=8  ; INPES_c768=8 ; JNPES_c768=16
-  TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
-  TASKS_strnest=96 ; TPN_strnest=12 ; INPES_strnest=2 ; JNPES_strnest=4
+  TASKS_dflt=150 ; INPES_dflt=3 ; JNPES_dflt=8
+  TASKS_thrd=78  ; INPES_thrd=3 ; JNPES_thrd=4
+  TASKS_c384=336 ; INPES_c384=6 ; JNPES_c384=8 ; THRD_c384=2
+  TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=1
 
-  TASKS_cpl_atmw_gdas=560; TPN_cpl_atmw_gdas=16; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
-  THRD_cpl_atmw_gdas=2; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"
+  TASKS_cpl_atmw_gdas=560; THRD_cpl_atmw_gdas=2
+  INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
+  WAV_tasks_atmw_gdas=248
 
 elif [[ $MACHINE_ID = gaea.* ]]; then