From 96b2de5b47a1be67b50e28212dc3a7588c8fd5fd Mon Sep 17 00:00:00 2001 From: Brian Curtis Date: Mon, 23 Sep 2024 19:19:58 +0000 Subject: [PATCH 1/4] Temporary testing modulefile update for WCOSS2 --- modulefiles/ufs_wcoss2.intel.lua | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua index a2445a9026..c20b4869c7 100644 --- a/modulefiles/ufs_wcoss2.intel.lua +++ b/modulefiles/ufs_wcoss2.intel.lua @@ -22,11 +22,11 @@ local ufs_modules = { {["jasper"] = "2.0.25"}, {["zlib"] = "1.2.11"}, {["libpng"] = "1.6.37"}, - {["hdf5-C"] = "1.14.0"}, - {["netcdf-C"] = "4.9.2"}, - {["pio-C"] = "2.5.10"}, - {["esmf-C"] = "8.6.0"}, - {["fms-C"] = "2023.04"}, +-- {["hdf5-C"] = "1.14.0"}, +-- {["netcdf-C"] = "4.9.2"}, +-- {["pio-C"] = "2.5.10"}, +-- {["esmf-C"] = "8.6.0"}, + {["fms"] = "2024.01"}, {["bacio"] = "2.4.1"}, {["crtm"] = "2.4.0"}, {["g2"] = "3.5.1"}, @@ -35,8 +35,8 @@ local ufs_modules = { {["sp"] = "2.3.3"}, {["w3emc"] = "2.9.2"}, {["gftl-shared"] = "1.6.1"}, - {["mapl-C"] = "2.40.3"}, - {["pnetcdf-C"] = "1.12.2"}, +-- {["mapl-C"] = "2.40.3"}, +-- {["pnetcdf-C"] = "1.12.2"}, {["scotch"] = "7.0.4"}, } @@ -46,6 +46,20 @@ for i = 1, #ufs_modules do load(pathJoin(name, os.getenv(env_version_name) or default_version)) end end +--append_path("MODULEPATH", "/lfs/h2/emc/eib/save/hang.lei/forgdit/nco_wcoss2/install/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9") +--append_path("MODULEPATH", "/lfs/h2/emc/eib/noscrub/hang.lei/c-libs/modulefiles") +append_path("MODULEPATH", "/lfs/h2/emc/eib/save/hang.lei/forgdit/nco_wcoss2/install2/modulefiles/compiler/intel/19.1.3.304") +append_path("MODULEPATH", "/lfs/h2/emc/eib/save/hang.lei/forgdit/nco_wcoss2/install2/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.12") +load("zstd/1.5.0") +load("hdf5/1.14.0") +load("pnetcdf/1.12.2") +load("netcdf/4.9.2") +load("pio/2.5.10") +load("esmf/8.6.0") +load("mapl/2.40.3-esmf-8.6.0") + +--append_path("MODULEPATH","/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9/") +--load("fms/2024.01") setenv("CC", "cc") setenv("CXX", "CC") From 6c87d35939e2b71e467a31b290d4105450060de5 Mon Sep 17 00:00:00 2001 From: Brian Curtis Date: Tue, 24 Sep 2024 12:21:23 +0000 Subject: [PATCH 2/4] Initial WCOSS2 testing, test changes --- tests/test_changes.list | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/test_changes.list b/tests/test_changes.list index e69de29bb2..13e7a84f10 100644 --- a/tests/test_changes.list +++ b/tests/test_changes.list @@ -0,0 +1,17 @@ +cpld_control_p8_mixedmode intel +cpld_control_p8 intel +cpld_control_p8.v2.sfc intel +cpld_restart_p8 intel +cpld_control_qr_p8 intel +cpld_restart_qr_p8 intel +cpld_2threads_p8 intel +cpld_decomp_p8 intel +cpld_mpi_p8 intel +cpld_control_ciceC_p8 intel +cpld_bmark_p8 intel +cpld_restart_bmark_p8 intel +cpld_s2sa_p8 intel +cpld_control_p8_faster intel +atmaero_control_p8 intel +atmaero_control_p8_rad intel +atmaero_control_p8_rad_micro intel From a7195bb305dc2651bc2b3285220caf7002c760e6 Mon Sep 17 00:00:00 2001 From: Brian Curtis Date: Fri, 27 Sep 2024 13:09:29 +0000 Subject: [PATCH 3/4] IDEFLATE=1 -> ZSTANDARD_LEVEL=5 and add acorn/wcoss2 to tests using ZSTANDARD_LEVEL already --- tests/tests/control_c768 | 2 +- tests/tests/control_debug_p8 | 2 +- tests/tests/control_p8 | 2 +- tests/tests/control_p8.v2.sfc | 2 +- tests/tests/control_wam | 2 +- tests/tests/control_wam_debug | 2 +- tests/tests/control_wrtGauss_netcdf_parallel | 2 +- tests/tests/control_wrtGauss_netcdf_parallel_debug | 2 +- tests/tests/conus13km_control | 2 +- tests/tests/cpld_regional_atm_fbh | 1 - tests/tests/dependency_unmet | 2 +- tests/tests/fail_to_run | 2 +- tests/tests/gnv1_nested | 2 +- tests/tests/hafs_global_1nest_atm | 2 +- tests/tests/hafs_global_multiple_4nests_atm | 2 +- tests/tests/hafs_global_storm_following_1nest_atm | 2 +- tests/tests/hafs_regional_1nest_atm | 2 +- tests/tests/hafs_regional_atm | 2 +- tests/tests/hafs_regional_atm_ocn | 2 +- tests/tests/hafs_regional_atm_ocn_wav | 2 +- tests/tests/hafs_regional_atm_thompson_gfdlsf | 2 +- tests/tests/hafs_regional_atm_wav | 2 +- tests/tests/hafs_regional_docn | 2 +- tests/tests/hafs_regional_docn_oisst | 2 +- tests/tests/hafs_regional_specified_moving_1nest_atm | 2 +- tests/tests/hafs_regional_storm_following_1nest_atm | 2 +- tests/tests/hafs_regional_storm_following_1nest_atm_ocn | 2 +- tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug | 2 +- tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav | 2 +- .../hafs_regional_storm_following_1nest_atm_ocn_wav_inline | 2 +- .../tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 | 2 +- tests/tests/hafs_regional_telescopic_2nests_atm | 2 +- tests/tests/regional_debug | 2 +- tests/tests/regional_netcdf_parallel | 2 +- tests/tests/rrfs_v1beta | 2 +- 35 files changed, 34 insertions(+), 35 deletions(-) diff --git a/tests/tests/control_c768 b/tests/tests/control_c768 index 7794c7dfed..d4020f0214 100644 --- a/tests/tests/control_c768 +++ b/tests/tests/control_c768 @@ -46,7 +46,7 @@ export IAER=5111 export IOVR=3 export IMO=3072 export JMO=1536 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export QUANTIZE_NSD=14 export ICHUNK3D=${IMO} export JCHUNK3D=${JMO} diff --git a/tests/tests/control_debug_p8 b/tests/tests/control_debug_p8 index dc8521b587..61a1a0a462 100644 --- a/tests/tests/control_debug_p8 +++ b/tests/tests/control_debug_p8 @@ -97,6 +97,6 @@ export DOGP_SGS_CNV=.true. export SATMEDMF=.true. -if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules jet acorn wcoss2 " =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi diff --git a/tests/tests/control_p8 b/tests/tests/control_p8 index 5ef5b0acae..a5f635cba7 100644 --- a/tests/tests/control_p8 +++ b/tests/tests/control_p8 @@ -138,6 +138,6 @@ export DOGP_SGS_CNV=.true. export SATMEDMF=.true. -if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules jet acorn wcoss2 " =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi diff --git a/tests/tests/control_p8.v2.sfc b/tests/tests/control_p8.v2.sfc index d08987ae87..05f1571f8d 100644 --- a/tests/tests/control_p8.v2.sfc +++ b/tests/tests/control_p8.v2.sfc @@ -153,6 +153,6 @@ export DOGP_SGS_CNV=.true. export SATMEDMF=.true. -if [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules gaea jet acorn wcoss2 " =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi diff --git a/tests/tests/control_wam b/tests/tests/control_wam index 5018e6208c..54cc79114e 100644 --- a/tests/tests/control_wam +++ b/tests/tests/control_wam @@ -106,6 +106,6 @@ export DIAG_TABLE=diag_table_wam export INPUT_NML=wam_v17.nml.IN -if [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules gaea jet acorn wcoss2 " =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi diff --git a/tests/tests/control_wam_debug b/tests/tests/control_wam_debug index 4c1852e2e0..4bc1e787ea 100644 --- a/tests/tests/control_wam_debug +++ b/tests/tests/control_wam_debug @@ -107,6 +107,6 @@ export DIAG_TABLE=diag_table_wam export INPUT_NML=wam_v17.nml.IN -if [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules gaea jet acorn wcoss2 " =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi diff --git a/tests/tests/control_wrtGauss_netcdf_parallel b/tests/tests/control_wrtGauss_netcdf_parallel index 8ee30f0ad1..67a4d53c68 100644 --- a/tests/tests/control_wrtGauss_netcdf_parallel +++ b/tests/tests/control_wrtGauss_netcdf_parallel @@ -34,7 +34,7 @@ export WRITE_DOPOST=.true. export IAER=5111 export IOVR=3 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'" -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export QUANTIZE_NSD=14 export FV3_RUN=control_run.IN diff --git a/tests/tests/control_wrtGauss_netcdf_parallel_debug b/tests/tests/control_wrtGauss_netcdf_parallel_debug index 8d29303cef..8b1e922819 100644 --- a/tests/tests/control_wrtGauss_netcdf_parallel_debug +++ b/tests/tests/control_wrtGauss_netcdf_parallel_debug @@ -30,7 +30,7 @@ export NSTF_NAME='2,0,0,0,0' export IAER=5111 export IOVR=3 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'" -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export QUANTIZE_NSD=14 export OUTPUT_FH="0 1" diff --git a/tests/tests/conus13km_control b/tests/tests/conus13km_control index 5b4bcb4f12..fc564a2496 100644 --- a/tests/tests/conus13km_control +++ b/tests/tests/conus13km_control @@ -30,6 +30,6 @@ export RESTART_INTERVAL=1 export QUILTING_RESTART=.false. export USE_MERRA2=.true. -if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules jet acorn wcoss2 " =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi diff --git a/tests/tests/cpld_regional_atm_fbh b/tests/tests/cpld_regional_atm_fbh index 8e995d5a43..ce3d7c7b76 100644 --- a/tests/tests/cpld_regional_atm_fbh +++ b/tests/tests/cpld_regional_atm_fbh @@ -48,7 +48,6 @@ export NUM_FILES=2 export FILENAME_BASE="'dyn' 'phy'" export OUTPUT_FILE="'netcdf' 'netcdf'" export WRITE_DOPOST=.false. -export IDEFLATE=0 export OUTPUT_GRID="'lambert_conformal'" export CEN_LON=-105.6041 export CEN_LAT=39.01736 diff --git a/tests/tests/dependency_unmet b/tests/tests/dependency_unmet index 22e56406e7..487c61ea9f 100644 --- a/tests/tests/dependency_unmet +++ b/tests/tests/dependency_unmet @@ -81,6 +81,6 @@ export FV3_RUN=control_run.IN export CCPP_SUITE=FV3_GFS_v17_p8 export INPUT_NML=global_control.nml.IN -if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules jet acorn wcoss2 " =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi diff --git a/tests/tests/fail_to_run b/tests/tests/fail_to_run index cf906e532e..995bf4b1c7 100644 --- a/tests/tests/fail_to_run +++ b/tests/tests/fail_to_run @@ -84,6 +84,6 @@ export FV3_RUN=control_run.IN export CCPP_SUITE=FV3_GFS_v17_p8 export INPUT_NML=global_control.nml.IN -if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules jet acorn wcoss2" =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi diff --git a/tests/tests/gnv1_nested b/tests/tests/gnv1_nested index f01ec88bdb..b0bc4b0d86 100644 --- a/tests/tests/gnv1_nested +++ b/tests/tests/gnv1_nested @@ -83,7 +83,7 @@ export WRITE_NSFLIP=.true. export FILENAME_BASE="'atm' 'sfc'" export OUTPUT_GRID=gaussian_grid export OUTPUT_FILE="'netcdf' 'netcdf'" -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export ICHUNK2D=-1 export JCHUNK2D=-1 export ICHUNK3D=-1 diff --git a/tests/tests/hafs_global_1nest_atm b/tests/tests/hafs_global_1nest_atm index fef76044e1..9e7815a804 100644 --- a/tests/tests/hafs_global_1nest_atm +++ b/tests/tests/hafs_global_1nest_atm @@ -62,7 +62,7 @@ export FHMAX=6 export RESTART_N=${FHMAX} export atm_omp_num_threads=2 export DT_ATMOS=90 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_global_multiple_4nests_atm b/tests/tests/hafs_global_multiple_4nests_atm index 868d18ef36..abf733d5d6 100644 --- a/tests/tests/hafs_global_multiple_4nests_atm +++ b/tests/tests/hafs_global_multiple_4nests_atm @@ -96,7 +96,7 @@ export FHMAX=6 export RESTART_N=${FHMAX} export atm_omp_num_threads=2 export DT_ATMOS=90 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_global_storm_following_1nest_atm b/tests/tests/hafs_global_storm_following_1nest_atm index 00bf0ca217..ed58b51cee 100644 --- a/tests/tests/hafs_global_storm_following_1nest_atm +++ b/tests/tests/hafs_global_storm_following_1nest_atm @@ -22,7 +22,7 @@ export RESTART_N=${FHMAX} export atm_omp_num_threads=2 export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_regional_1nest_atm b/tests/tests/hafs_regional_1nest_atm index e032112d5c..91c1caa1d5 100644 --- a/tests/tests/hafs_regional_1nest_atm +++ b/tests/tests/hafs_regional_1nest_atm @@ -36,7 +36,7 @@ export FHMAX=6 export RESTART_N=${FHMAX} export atm_omp_num_threads=2 export DT_ATMOS=90 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_regional_atm b/tests/tests/hafs_regional_atm index bc75d82dc4..b83c6f86f1 100644 --- a/tests/tests/hafs_regional_atm +++ b/tests/tests/hafs_regional_atm @@ -20,7 +20,7 @@ export FHMAX=6 export RESTART_N=${FHMAX} export atm_omp_num_threads=2 export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=29 diff --git a/tests/tests/hafs_regional_atm_ocn b/tests/tests/hafs_regional_atm_ocn index 7ec5159cdc..437c476b14 100644 --- a/tests/tests/hafs_regional_atm_ocn +++ b/tests/tests/hafs_regional_atm_ocn @@ -23,7 +23,7 @@ export HAFS=true export FHMAX=6 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=29 diff --git a/tests/tests/hafs_regional_atm_ocn_wav b/tests/tests/hafs_regional_atm_ocn_wav index 5fab96a158..a33a578882 100644 --- a/tests/tests/hafs_regional_atm_ocn_wav +++ b/tests/tests/hafs_regional_atm_ocn_wav @@ -25,7 +25,7 @@ export HAFS=true export FHMAX=6 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=29 diff --git a/tests/tests/hafs_regional_atm_thompson_gfdlsf b/tests/tests/hafs_regional_atm_thompson_gfdlsf index 8b19ff6aa1..b6f297efa3 100644 --- a/tests/tests/hafs_regional_atm_thompson_gfdlsf +++ b/tests/tests/hafs_regional_atm_thompson_gfdlsf @@ -20,7 +20,7 @@ export RESTART_N=${FHMAX} export atm_omp_num_threads=2 export DT_ATMOS=180 export DT_INNER=${DT_ATMOS} -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=29 diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav index 588af2cc02..b2f44efed5 100644 --- a/tests/tests/hafs_regional_atm_wav +++ b/tests/tests/hafs_regional_atm_wav @@ -23,7 +23,7 @@ export HAFS=true export FHMAX=6 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=29 diff --git a/tests/tests/hafs_regional_docn b/tests/tests/hafs_regional_docn index cf63e3c3e2..6514198369 100644 --- a/tests/tests/hafs_regional_docn +++ b/tests/tests/hafs_regional_docn @@ -23,7 +23,7 @@ export HAFS=true export FHMAX=6 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=29 diff --git a/tests/tests/hafs_regional_docn_oisst b/tests/tests/hafs_regional_docn_oisst index 5daf17b36d..3f6efb2ff0 100644 --- a/tests/tests/hafs_regional_docn_oisst +++ b/tests/tests/hafs_regional_docn_oisst @@ -23,7 +23,7 @@ export HAFS=true export FHMAX=6 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=29 diff --git a/tests/tests/hafs_regional_specified_moving_1nest_atm b/tests/tests/hafs_regional_specified_moving_1nest_atm index c97013a787..375260a072 100644 --- a/tests/tests/hafs_regional_specified_moving_1nest_atm +++ b/tests/tests/hafs_regional_specified_moving_1nest_atm @@ -23,7 +23,7 @@ export FHMAX=6 export RESTART_N=${FHMAX} export atm_omp_num_threads=2 export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm b/tests/tests/hafs_regional_storm_following_1nest_atm index 86bcd9a155..275f21fa61 100644 --- a/tests/tests/hafs_regional_storm_following_1nest_atm +++ b/tests/tests/hafs_regional_storm_following_1nest_atm @@ -36,7 +36,7 @@ export FHMAX=6 export RESTART_N=${FHMAX} export atm_omp_num_threads=2 export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn index ea93a7bcbd..d798781e65 100644 --- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn +++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn @@ -23,7 +23,7 @@ export HAFS=true export FHMAX=6 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug index 5c154521f5..efc8024e29 100644 --- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug +++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug @@ -21,7 +21,7 @@ export HAFS=true export FHMAX=1 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='1 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav index 01e0e6985e..2ba36df5ea 100644 --- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav +++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav @@ -25,7 +25,7 @@ export HAFS=true export FHMAX=6 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline index 796c165057..53c330d072 100644 --- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline +++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline @@ -25,7 +25,7 @@ export HAFS=true export FHMAX=6 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 index a0bd1aba05..dd79b568b1 100644 --- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 +++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 @@ -25,7 +25,7 @@ export HAFS=true export FHMAX=3 export RESTART_N=${FHMAX} export DT_ATMOS=180 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/hafs_regional_telescopic_2nests_atm b/tests/tests/hafs_regional_telescopic_2nests_atm index b2dbfbab9c..3dec5bf90c 100644 --- a/tests/tests/hafs_regional_telescopic_2nests_atm +++ b/tests/tests/hafs_regional_telescopic_2nests_atm @@ -23,7 +23,7 @@ export FHMAX=6 export RESTART_N=${FHMAX} export atm_omp_num_threads=2 export DT_ATMOS=90 -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export OUTPUT_FH='3 -1' export OUTPUT_FILE="'netcdf' 'netcdf'" export SDAY=25 diff --git a/tests/tests/regional_debug b/tests/tests/regional_debug index 46ff346b68..5475d74b56 100644 --- a/tests/tests/regional_debug +++ b/tests/tests/regional_debug @@ -37,6 +37,6 @@ WRITE_GROUP=1 WRTTASK_PER_GROUP=10 NTILES=1 -if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules jet acorn wcoss2" =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi diff --git a/tests/tests/regional_netcdf_parallel b/tests/tests/regional_netcdf_parallel index 13065d2da8..81dc9d99a0 100644 --- a/tests/tests/regional_netcdf_parallel +++ b/tests/tests/regional_netcdf_parallel @@ -28,7 +28,7 @@ export MODEL_CONFIGURE=model_configure_regional.IN export DIAG_TABLE=diag_table_lam export FIELD_TABLE=field_table_regional export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'" -export IDEFLATE=1 +export ZSTANDARD_LEVEL=5 export WLCLK=15 export FHMAX=6 diff --git a/tests/tests/rrfs_v1beta b/tests/tests/rrfs_v1beta index 0e64a52624..598c4eaa97 100644 --- a/tests/tests/rrfs_v1beta +++ b/tests/tests/rrfs_v1beta @@ -57,6 +57,6 @@ export_rrfs_v1 export RESTART_INTERVAL="6 -1" export OUTPUT_FH='0 09 12' -if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then +if [[ " hera orion hercules jet acorn wcoss2 " =~ " ${MACHINE_ID} " ]] ; then ZSTANDARD_LEVEL=5 fi From 65e18476ffa6e9158952e72d9545c42e76ed0537 Mon Sep 17 00:00:00 2001 From: Brian Curtis Date: Mon, 30 Sep 2024 15:24:26 +0000 Subject: [PATCH 4/4] Modify model_configure files to bring in zstandard_level --- tests/parm/model_configure_atmaq.IN | 1 + tests/parm/model_configure_fire.IN | 1 + tests/parm/model_configure_hafs.IN | 1 + tests/parm/model_configure_regional_rrfs_a.IN | 2 ++ tests/parm/model_configure_regional_stoch.IN | 1 + tests/parm/model_configure_rrfs_conus13km.IN | 1 + 6 files changed, 7 insertions(+) diff --git a/tests/parm/model_configure_atmaq.IN b/tests/parm/model_configure_atmaq.IN index f28f81da55..805773be36 100644 --- a/tests/parm/model_configure_atmaq.IN +++ b/tests/parm/model_configure_atmaq.IN @@ -8,6 +8,7 @@ nhours_fcst: @[FHMAX] dt_atmos: @[DT_ATMOS] restart_interval: @[RESTART_INTERVAL] write_dopost: @[WRITE_DOPOST] +zstandard_level: @[ZSTANDARD_LEVEL] ideflate: @[IDEFLATE] quantize_mode: 'quantize_bitround' quantize_nsd: @[QUANTIZE_NSD] diff --git a/tests/parm/model_configure_fire.IN b/tests/parm/model_configure_fire.IN index 61fe2986a7..80b8078f67 100644 --- a/tests/parm/model_configure_fire.IN +++ b/tests/parm/model_configure_fire.IN @@ -14,6 +14,7 @@ memuse_verbose: .false. restart_interval: @[RESTART_INTERVAL] output_1st_tstep_rst: .false. write_dopost: @[WRITE_DOPOST] +zstandard_level: @[ZSTANDARD_LEVEL] ideflate: @[IDEFLATE] nbits: 0 ichunk2d: -1 diff --git a/tests/parm/model_configure_hafs.IN b/tests/parm/model_configure_hafs.IN index 5408507b7e..73de3b5d0f 100644 --- a/tests/parm/model_configure_hafs.IN +++ b/tests/parm/model_configure_hafs.IN @@ -21,6 +21,7 @@ jchunk2d: -1 ichunk3d: -1 jchunk3d: -1 kchunk3d: -1 +zstandard_level: @[ZSTANDARD_LEVEL] ideflate: @[IDEFLATE] quantize_mode: 'quantize_bitround' quantize_nsd: @[QUANTIZE_NSD] diff --git a/tests/parm/model_configure_regional_rrfs_a.IN b/tests/parm/model_configure_regional_rrfs_a.IN index bfe5b89802..16938bdda4 100644 --- a/tests/parm/model_configure_regional_rrfs_a.IN +++ b/tests/parm/model_configure_regional_rrfs_a.IN @@ -9,6 +9,8 @@ dt_atmos: 60 cpl: .false. restart_interval: @[RESTART_INTERVAL] quilting: @[QUILTING] +zstandard_level: @[ZSTANDARD_LEVEL] +ideflate: @[IDEFLATE] # diff --git a/tests/parm/model_configure_regional_stoch.IN b/tests/parm/model_configure_regional_stoch.IN index 64928e436f..21226fe47a 100644 --- a/tests/parm/model_configure_regional_stoch.IN +++ b/tests/parm/model_configure_regional_stoch.IN @@ -18,6 +18,7 @@ write_dopost: @[WRITE_DOPOST] num_files: 2 filename_base: 'dyn' 'phy' output_file: @[OUTPUT_FILE] +zstandard_level: @[ZSTANDARD_LEVEL] ideflate: @[IDEFLATE] output_grid: 'lambert_conformal' diff --git a/tests/parm/model_configure_rrfs_conus13km.IN b/tests/parm/model_configure_rrfs_conus13km.IN index 792afa352f..97b95f17b0 100644 --- a/tests/parm/model_configure_rrfs_conus13km.IN +++ b/tests/parm/model_configure_rrfs_conus13km.IN @@ -19,6 +19,7 @@ write_dopost: @[WRITE_DOPOST] num_files: @[NUM_FILES] filename_base: @[FILENAME_BASE] output_file: @[OUTPUT_FILE] +zstandard_level: @[ZSTANDARD_LEVEL] ideflate: @[IDEFLATE] quantize_mode: 'quantize_bitround' quantize_nsd: @[QUANTIZE_NSD]