Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZStd with Netcdf #2444

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions modulefiles/ufs_wcoss2.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"] = "2024.01"},
-- {["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"},
Expand All @@ -35,8 +35,8 @@ local ufs_modules = {
{["sp"] = "2.3.3"},
{["w3emc"] = "2.12.0"},
{["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"},
}

Expand All @@ -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")
Expand Down
1 change: 1 addition & 0 deletions tests/parm/model_configure_atmaq.IN
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions tests/parm/model_configure_fire.IN
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/model_configure_hafs.IN
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/model_configure_regional_rrfs_a.IN
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ dt_atmos: 60
cpl: .false.
restart_interval: @[RESTART_INTERVAL]
quilting: @[QUILTING]
zstandard_level: @[ZSTANDARD_LEVEL]
ideflate: @[IDEFLATE]


#
Expand Down
1 change: 1 addition & 0 deletions tests/parm/model_configure_regional_stoch.IN
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions tests/parm/model_configure_rrfs_conus13km.IN
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
19 changes: 17 additions & 2 deletions tests/test_changes.list
Original file line number Diff line number Diff line change
@@ -1,2 +1,17 @@
datm_cdeps_lm4_gswp3 intel
datm_cdeps_lm4_gswp3_rst intel
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
2 changes: 1 addition & 1 deletion tests/tests/control_c768
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/control_debug_p8
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/tests/control_p8
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/tests/control_p8.v2.sfc
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/tests/control_wam
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/tests/control_wam_debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/tests/control_wrtGauss_netcdf_parallel
Original file line number Diff line number Diff line change
Expand Up @@ -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
junwang-noaa marked this conversation as resolved.
Show resolved Hide resolved

export FV3_RUN=control_run.IN
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/control_wrtGauss_netcdf_parallel_debug
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/conus13km_control
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/tests/cpld_regional_atm_fbh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/dependency_unmet
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/tests/fail_to_run
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/tests/gnv1_nested
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_global_1nest_atm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_global_multiple_4nests_atm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_global_storm_following_1nest_atm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_1nest_atm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_atm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_atm_ocn
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_atm_ocn_wav
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_atm_thompson_gfdlsf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_atm_wav
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_docn
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_docn_oisst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_specified_moving_1nest_atm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_storm_following_1nest_atm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_storm_following_1nest_atm_ocn
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_telescopic_2nests_atm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading