From ae6d0ffc63d12f515880f2478491f4c797d0d9b3 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 15 Mar 2022 15:10:51 +0000 Subject: [PATCH 01/12] update intel compiler to intel2022 --- modulefiles/ufs_hera.intel | 11 +++++------ modulefiles/ufs_hera.intel_debug | 7 +++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modulefiles/ufs_hera.intel b/modulefiles/ufs_hera.intel index f20887c316..2dfddaaafa 100644 --- a/modulefiles/ufs_hera.intel +++ b/modulefiles/ufs_hera.intel @@ -18,18 +18,17 @@ module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack 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 hpc-intel/2022.1.2 +module load hpc-impi/2022.1.2 module load ufs_common -module unload fms -module load fms/2021.03-avx +#module unload fms +#module load fms/2021.03-avx setenv CC mpiicc setenv CXX mpiicpc setenv FC mpiifort setenv CMAKE_Platform hera.intel -setenv I_MPI_DAPL_UD 1 +#setenv I_MPI_DAPL_UD 1 diff --git a/modulefiles/ufs_hera.intel_debug b/modulefiles/ufs_hera.intel_debug index 8813814012..42274b6d2b 100644 --- a/modulefiles/ufs_hera.intel_debug +++ b/modulefiles/ufs_hera.intel_debug @@ -18,9 +18,8 @@ module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack 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 hpc-intel/2022.1.4 +module load hpc-impi/2022.1.4 module load ufs_common_debug @@ -29,4 +28,4 @@ setenv CXX mpiicpc setenv FC mpiifort setenv CMAKE_Platform hera.intel -setenv I_MPI_DAPL_UD 1 +#setenv I_MPI_DAPL_UD 1 From 600b784047be7cf5b95bb181724520d5c705d810 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Wed, 11 May 2022 12:30:00 +0000 Subject: [PATCH 02/12] update libpng --- modulefiles/ufs_common | 2 +- modulefiles/ufs_common_debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common index b601a612a8..271c041d26 100644 --- a/modulefiles/ufs_common +++ b/modulefiles/ufs_common @@ -2,7 +2,7 @@ module load jasper/2.0.22 module load zlib/1.2.11 -module load png/1.6.35 +module load libpng/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug index fa274306a8..342899079c 100644 --- a/modulefiles/ufs_common_debug +++ b/modulefiles/ufs_common_debug @@ -2,7 +2,7 @@ module load jasper/2.0.22 module load zlib/1.2.11 -module load png/1.6.35 +module load libpng/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 From 55c7745d29a5bb0781f6cd3a26fd9ba4444a2c8d Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Thu, 12 May 2022 12:40:50 +0000 Subject: [PATCH 03/12] update intel compiler on ufs_hera.intel_debug --- modulefiles/ufs_hera.intel_debug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/ufs_hera.intel_debug b/modulefiles/ufs_hera.intel_debug index 42274b6d2b..cfdb435d41 100644 --- a/modulefiles/ufs_hera.intel_debug +++ b/modulefiles/ufs_hera.intel_debug @@ -18,8 +18,8 @@ module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack module load hpc/1.1.0 -module load hpc-intel/2022.1.4 -module load hpc-impi/2022.1.4 +module load hpc-intel/2022.1.2 +module load hpc-impi/2022.1.2 module load ufs_common_debug From 52ab37f28269beb7853629aedf0e161783b9bed9 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Mon, 16 May 2022 13:54:47 +0000 Subject: [PATCH 04/12] remove I_MPI_DAPL_UD fot Intel 2022/2021 --- modulefiles/ufs_gaea.intel | 2 -- modulefiles/ufs_gaea.intel_debug | 2 -- modulefiles/ufs_hera.intel | 2 -- modulefiles/ufs_hera.intel_debug | 2 -- modulefiles/ufs_jet.intel | 2 -- modulefiles/ufs_jet.intel_debug | 2 -- modulefiles/ufs_orion.intel | 2 -- 7 files changed, 14 deletions(-) diff --git a/modulefiles/ufs_gaea.intel b/modulefiles/ufs_gaea.intel index f1a67d221f..69cd668cca 100644 --- a/modulefiles/ufs_gaea.intel +++ b/modulefiles/ufs_gaea.intel @@ -30,8 +30,6 @@ module load hpc-cray-mpich/7.7.11 module load ufs_common -#setenv I_MPI_DAPL_UD 1 - setenv CC cc setenv CXX CC setenv FC ftn diff --git a/modulefiles/ufs_gaea.intel_debug b/modulefiles/ufs_gaea.intel_debug index f3170b7198..a8ec5bfade 100644 --- a/modulefiles/ufs_gaea.intel_debug +++ b/modulefiles/ufs_gaea.intel_debug @@ -27,8 +27,6 @@ module load hpc-cray-mpich/7.7.11 module load ufs_common_debug -#setenv I_MPI_DAPL_UD 1 - setenv CC cc setenv CXX CC setenv FC ftn diff --git a/modulefiles/ufs_hera.intel b/modulefiles/ufs_hera.intel index 65d2296d30..3d15659d44 100644 --- a/modulefiles/ufs_hera.intel +++ b/modulefiles/ufs_hera.intel @@ -27,5 +27,3 @@ setenv CC mpiicc setenv CXX mpiicpc setenv FC mpiifort setenv CMAKE_Platform hera.intel - -#setenv I_MPI_DAPL_UD 1 diff --git a/modulefiles/ufs_hera.intel_debug b/modulefiles/ufs_hera.intel_debug index cfdb435d41..111a1ad112 100644 --- a/modulefiles/ufs_hera.intel_debug +++ b/modulefiles/ufs_hera.intel_debug @@ -27,5 +27,3 @@ setenv CC mpiicc setenv CXX mpiicpc setenv FC mpiifort setenv CMAKE_Platform hera.intel - -#setenv I_MPI_DAPL_UD 1 diff --git a/modulefiles/ufs_jet.intel b/modulefiles/ufs_jet.intel index 3e68dcbd91..009471befb 100644 --- a/modulefiles/ufs_jet.intel +++ b/modulefiles/ufs_jet.intel @@ -19,8 +19,6 @@ module load hpc-impi/2022.1.2 module load ufs_common -#setenv I_MPI_DAPL_UD 1 - setenv CC mpiicc setenv CXX mpiicpc setenv FC mpiifort diff --git a/modulefiles/ufs_jet.intel_debug b/modulefiles/ufs_jet.intel_debug index 55525bfd97..a8055ca991 100644 --- a/modulefiles/ufs_jet.intel_debug +++ b/modulefiles/ufs_jet.intel_debug @@ -19,8 +19,6 @@ module load hpc-impi/2022.1.2 module load ufs_common_debug -#setenv I_MPI_DAPL_UD 1 - setenv CC mpiicc setenv CXX mpiicpc setenv FC mpiifort diff --git a/modulefiles/ufs_orion.intel b/modulefiles/ufs_orion.intel index e09510dcc7..92dbe9a7d9 100644 --- a/modulefiles/ufs_orion.intel +++ b/modulefiles/ufs_orion.intel @@ -23,5 +23,3 @@ setenv CC mpiicc setenv CXX mpiicpc setenv FC mpiifort setenv CMAKE_Platform orion.intel - -#setenv I_MPI_DAPL_UD 1 From 3dae5540a4b8686b654e0252654cb420ce7b208a Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Mon, 16 May 2022 15:04:04 +0000 Subject: [PATCH 05/12] update libraries g2 (3.4.5), Jasper (2.0.25), PIO (2.5.3), libpng (1.6.37) --- modulefiles/ufs_common | 8 ++++---- modulefiles/ufs_common_debug | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common index 271c041d26..d801581b94 100644 --- a/modulefiles/ufs_common +++ b/modulefiles/ufs_common @@ -1,18 +1,18 @@ #%Module -module load jasper/2.0.22 +module load jasper/2.0.25 module load zlib/1.2.11 -module load libpng/1.6.35 +module load libpng/1.6.37 module load hdf5/1.10.6 module load netcdf/4.7.4 -module load pio/2.5.2 +module load pio/2.5.3 module load esmf/8.3.0b09 module load fms/2022.01 module load bacio/2.4.1 module load crtm/2.3.0 -module load g2/3.4.2 +module load g2/3.4.5 module load g2tmpl/1.10.0 module load ip/3.3.3 module load sp/2.3.3 diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug index 342899079c..d8627a0aaa 100644 --- a/modulefiles/ufs_common_debug +++ b/modulefiles/ufs_common_debug @@ -1,18 +1,18 @@ #%Module -module load jasper/2.0.22 +module load jasper/2.0.25 module load zlib/1.2.11 -module load libpng/1.6.35 +module load libpng/1.6.37 module load hdf5/1.10.6 module load netcdf/4.7.4 -module load pio/2.5.2 +module load pio/2.5.3 module load esmf/8.3.0b09-debug module load fms/2022.01 module load bacio/2.4.1 module load crtm/2.3.0 -module load g2/3.4.2 +module load g2/3.4.5 module load g2tmpl/1.10.0 module load ip/3.3.3 module load sp/2.3.3 From c10ab6d6f241280bb30a1bb2b2fc736568f05697 Mon Sep 17 00:00:00 2001 From: JONG KIM Date: Mon, 16 May 2022 16:42:30 -0400 Subject: [PATCH 06/12] updated gnu/cheyenne hpc-stack location --- modulefiles/ufs_cheyenne.gnu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/ufs_cheyenne.gnu b/modulefiles/ufs_cheyenne.gnu index a157b7369c..d61433a40f 100644 --- a/modulefiles/ufs_cheyenne.gnu +++ b/modulefiles/ufs_cheyenne.gnu @@ -16,7 +16,7 @@ module load mpt/2.22 module load ncarcompilers/0.5.0 module unload netcdf -module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/modulefiles/stack +module use /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack module load hpc/1.2.0 module load hpc-gnu/10.1.0 module load hpc-mpt/2.22 From 4f506f497e8924ce62419bc08f87117a16f1ce2c Mon Sep 17 00:00:00 2001 From: JONG KIM Date: Mon, 16 May 2022 16:43:55 -0400 Subject: [PATCH 07/12] Update ufs_cheyenne.gnu_debug --- modulefiles/ufs_cheyenne.gnu_debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/ufs_cheyenne.gnu_debug b/modulefiles/ufs_cheyenne.gnu_debug index 9c015b390a..8b8af506b6 100644 --- a/modulefiles/ufs_cheyenne.gnu_debug +++ b/modulefiles/ufs_cheyenne.gnu_debug @@ -16,7 +16,7 @@ module load mpt/2.22 module load ncarcompilers/0.5.0 module unload netcdf -module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/modulefiles/stack +module use /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack module load hpc/1.2.0 module load hpc-gnu/10.1.0 module load hpc-mpt/2.22 From d0c46da2c8064adc102adfad3fd69984da909d39 Mon Sep 17 00:00:00 2001 From: JONG KIM Date: Mon, 16 May 2022 16:45:27 -0400 Subject: [PATCH 08/12] Update ufs_cheyenne.intel --- modulefiles/ufs_cheyenne.intel | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/ufs_cheyenne.intel b/modulefiles/ufs_cheyenne.intel index 0a3b75144e..1eae6e2f7b 100644 --- a/modulefiles/ufs_cheyenne.intel +++ b/modulefiles/ufs_cheyenne.intel @@ -11,16 +11,16 @@ module load python/3.7.9 # load programming environment module load ncarenv/1.3 -module load intel/2021.2 -module load mpt/2.22 +module load intel/2022.1 +module load mpt/2.25 module load ncarcompilers/0.5.0 module unload netcdf -module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/modulefiles/stack +module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack module load hpc/1.2.0 module load hpc-intel/2021.2 -module load hpc-mpt/2.22 +module load hpc-mpt/2.25 module load ufs_common From 5b25383b418510cd5d999429c4c56722eaf7f75e Mon Sep 17 00:00:00 2001 From: JONG KIM Date: Mon, 16 May 2022 16:46:19 -0400 Subject: [PATCH 09/12] Update ufs_cheyenne.intel_debug --- modulefiles/ufs_cheyenne.intel_debug | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modulefiles/ufs_cheyenne.intel_debug b/modulefiles/ufs_cheyenne.intel_debug index 98a6febd75..4564060569 100644 --- a/modulefiles/ufs_cheyenne.intel_debug +++ b/modulefiles/ufs_cheyenne.intel_debug @@ -11,15 +11,16 @@ module load python/3.7.9 # load programming environment module load ncarenv/1.3 -module load intel/2021.2 -module load mpt/2.22 +module load intel/2022.1 +module load mpt/2.25 module load ncarcompilers/0.5.0 module unload netcdf -module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/modulefiles/stack +module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack + module load hpc/1.2.0 -module load hpc-intel/2021.2 -module load hpc-mpt/2.22 +module load hpc-intel/2022.1 +module load hpc-mpt/2.25 module load ufs_common_debug From a7df96e6cf65fa145e12a6c8255b3d400a375ce5 Mon Sep 17 00:00:00 2001 From: David Huber Date: Wed, 18 May 2022 15:56:11 +0000 Subject: [PATCH 10/12] Updated S4 RT resource allotments #1223 --- tests/default_vars.sh | 116 ++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 60 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 7baa1aeba5..3f3a3c1cd1 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -404,79 +404,75 @@ 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 - - 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_cpl_atmw=200; TPN_cpl_atmw=16; INPES_cpl_atmw=3; JNPES_cpl_atmw=8 - THRD_cpl_atmw=2; WPG_cpl_atmw=6; APB_cpl_atmw="0 149"; WPB_cpl_atmw="150 199" + TPN=32 - 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_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_c96=192; TPN_cpl_c96=32; INPES_cpl_c96=3; JNPES_cpl_c96=8 - THRD_cpl_c96=1; WPG_cpl_c96=6; MPB_cpl_c96="0 143"; APB_cpl_c96="0 149" - CHM_cpl_c96="0 143"; OPB_cpl_c96="150 179"; IPB_cpl_c96="180 191" - NPROC_ICE_cpl_c96=12 + TASKS_cpl_atmw=192; THRD_cpl_atmw=1 + INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6 + WAV_tasks_atmw=42 - TASKS_cpl_dflt=200; TPN_cpl_dflt=32; INPES_cpl_dflt=3; JNPES_cpl_dflt=8 - THRD_cpl_dflt=1; WPG_cpl_dflt=6; MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149" - CHM_cpl_dflt="0 143"; OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 179"; WPB_cpl_dflt="180 199" - NPROC_ICE_cpl_dflt=10 + TASKS_cpl_atmw_gdas=544; THRD_cpl_atmw_gdas=2 + INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24 + WAV_tasks_atmw_gdas=232 - TASKS_cpl_thrd=120; TPN_cpl_thrd=16; INPES_cpl_thrd=3; JNPES_cpl_thrd=4 - THRD_cpl_thrd=2; WPG_cpl_thrd=6; MPB_cpl_thrd="0 71"; APB_cpl_thrd="0 77" - CHM_cpl_thrd="0 71"; OPB_cpl_thrd="78 97"; IPB_cpl_thrd="98 107"; WPB_cpl_thrd="108 119" - NPROC_ICE_cpl_thrd=10 + TASKS_cpl_c96=192; THRD_cpl_c96=1 + INPES_cpl_c96=3; JNPES_cpl_c96=8; WPG_cpl_c96=6 + OCN_tasks_cpl_c96=30 + ICE_tasks_cpl_c96=12 - TASKS_cpl_dcmp=200; TPN_cpl_dcmp=32; INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6 - THRD_cpl_dcmp=1; WPG_cpl_dcmp=6; MPB_cpl_dcmp="0 143"; APB_cpl_dcmp="0 149" - CHM_cpl_dcmp="0 143"; OPB_cpl_dcmp="150 169"; IPB_cpl_dcmp="170 179"; WPB_cpl_dcmp="180 199" - NPROC_ICE_cpl_dcmp=10 + TASKS_cpl_dflt=200; THRD_cpl_dflt=1 + INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6 + OCN_tasks_cpl_dflt=20 + ICE_tasks_cpl_dflt=10 + WAV_tasks_cpl_dflt=20 - TASKS_cpl_mpi=280; TPN_cpl_mpi=32; INPES_cpl_mpi=4; JNPES_cpl_mpi=8 - THRD_cpl_mpi=1; WPG_cpl_mpi=6; MPB_cpl_mpi="0 191"; APB_cpl_mpi="0 197" - CHM_cpl_mpi="232 251"; OPB_cpl_mpi="198 231"; IPB_cpl_mpi="232 251"; WPB_cpl_mpi="252 279" - NPROC_ICE_cpl_mpi=20 + TASKS_cpl_thrd=120; THRD_cpl_thrd=2 + INPES_cpl_thrd=3; JNPES_cpl_thrd=4; WPG_cpl_thrd=6 + OCN_tasks_cpl_thrd=20 + ICE_tasks_cpl_thrd=10 + WAV_tasks_cpl_thrd=12 - TASKS_cpl_c384=480; TPN_cpl_c384=16; INPES_cpl_c384=6; JNPES_cpl_c384=8 - THRD_cpl_c384=2; WPG_cpl_c384=24; MPB_cpl_c384="0 287"; APB_cpl_c384="0 311" - CHM_cpl_c384="0 287"; OPB_cpl_c384="312 431"; IPB_cpl_c384="432 479" - NPROC_ICE_cpl_c384=48 + TASKS_cpl_dcmp=200; THRD_cpl_dcmp=1 + INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6; WPG_cpl_dcmp=6 + OCN_tasks_cpl_dcmp=20 + ICE_tasks_cpl_dcmp=10 + WAV_tasks_cpl_dcmp=20 - TASKS_cpl_bmrk=560; TPN_cpl_bmrk=32; INPES_cpl_bmrk=6; JNPES_cpl_bmrk=8 - THRD_cpl_bmrk=1; WPG_cpl_bmrk=24; MPB_cpl_bmrk="0 287"; APB_cpl_bmrk="0 311" - 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_mpi=280; THRD_cpl_mpi=1 + INPES_cpl_mpi=4; JNPES_cpl_mpi=8; WPG_cpl_mpi=6 + OCN_tasks_cpl_mpi=34 + ICE_tasks_cpl_mpi=20 + WAV_tasks_cpl_mpi=28 - TASKS_cpl_bmrk_aero=560; TPN_cpl_bmrk_aero=16; INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8 - THRD_cpl_bmrk_aero=2; WPG_cpl_bmrk_aero=24; MPB_cpl_bmrk_aero="0 287"; APB_cpl_bmrk_aero="0 311" - CHM_cpl_bmrk_aero="0 287"; OPB_cpl_bmrk_aero="312 431"; IPB_cpl_bmrk_aero="432 479"; WPB_cpl_bmrk_aero="480 559" - NPROC_ICE_cpl_bmrk_aero=48 + TASKS_cpl_c384=480; THRD_cpl_c384=2 + INPES_cpl_c384=6; JNPES_cpl_c384=8; WPG_cpl_c384=24 + OCN_tasks_cpl_c384=120 + ICE_tasks_cpl_c384=48 - TASKS_cpl_bmrk_mpi=600; TPN_cpl_bmrk_mpi=32; 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_bmrk_aero=560; THRD_cpl_bmrk_aero=2 + INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8; WPG_cpl_bmrk_aero=24 + OCN_tasks_cpl_bmrk_aero=120 + ICE_tasks_cpl_bmrk_aero=48 + WAV_tasks_cpl_bmrk_aero=80 - TASKS_cpl_c192=288; TPN_cpl_c192=32; INPES_cpl_c192=4; JNPES_cpl_c192=8 - THRD_cpl_c192=1; WPG_cpl_c192=12; MPB_cpl_c192="0 191"; APB_cpl_c192="0 203" - CHM_cpl_c192="0 191"; OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287" - NPROC_ICE_cpl_c192=24 + TASKS_cpl_c192=384; THRD_cpl_c192=1 + INPES_cpl_c192=6; JNPES_cpl_c192=8; WPG_cpl_c192=12 + OCN_tasks_cpl_c192=60 + ICE_tasks_cpl_c192=24 - TASKS_cdeps_100=40; TPN_cdeps_100=32 - MPB_cdeps_100="0 11"; APB_cdeps_100="0 11" - OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39" + TASKS_cdeps_100=40 + ATM_compute_tasks_cdeps_100=12 + OCN_tasks_cdeps_100=16 + ICE_tasks_cdeps_100=12 - TASKS_cdeps_025=208; TPN_cdeps_025=32 - MPB_cdeps_025="0 39"; APB_cdeps_025="0 39" - OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207" + TASKS_cdeps_025=208 + ATM_compute_tasks_cdeps_025=40 + OCN_tasks_cdeps_025=120 + ICE_tasks_cdeps_025=48 elif [[ $MACHINE_ID = gaea.* ]]; then From cedbb2c18a0c340cec25cfb6264ebd7fadf9307d Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 26 May 2022 15:07:28 +0000 Subject: [PATCH 11/12] Updated S4 compiler versions #1223 --- modulefiles/ufs_s4.intel | 4 ++-- modulefiles/ufs_s4.intel_debug | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modulefiles/ufs_s4.intel b/modulefiles/ufs_s4.intel index da621b4a13..95029242b8 100644 --- 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 index 2259e980a9..f5b9643d43 100644 --- 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 From d47de1f388757b9604b681c193679c8cc8fd63fc Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 3 Jun 2022 11:48:49 +0000 Subject: [PATCH 12/12] Corrected cpl_atmw_gdas test task count for S4 #1235 #1223 --- tests/default_vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index e229e8e858..b467523132 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -175,7 +175,7 @@ elif [[ $MACHINE_ID = s4.* ]]; then 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=544; THRD_cpl_atmw_gdas=2 + 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