Skip to content

Commit

Permalink
IDEFLATE=1 -> ZSTANDARD_LEVEL=5 and add acorn/wcoss2 to tests using Z…
Browse files Browse the repository at this point in the history
…STANDARD_LEVEL already
  • Loading branch information
BrianCurtis-NOAA committed Sep 27, 2024
1 parent 6c87d35 commit a7195bb
Show file tree
Hide file tree
Showing 35 changed files with 34 additions and 35 deletions.
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

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
2 changes: 1 addition & 1 deletion tests/tests/regional_debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/tests/regional_netcdf_parallel
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rrfs_v1beta
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit a7195bb

Please sign in to comment.