Add option to use netcdf quantization (#1990)

* Convert tests to use netcdf quantize options
ufs-community · Nov 27, 2023 · f6918a1 · f6918a1
1 parent f431fbe
commit f6918a1
Show file tree

Hide file tree

Showing 18 changed files with 12,395 additions and 6,841 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20231117
+export BL_DATE=20231122
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -372,7 +372,7 @@ export OUTPUT_GRID="'cubed_sphere_grid'"
 export OUTPUT_FILE="'netcdf'"
 export ZSTANDARD_LEVEL=0
 export IDEFLATE=0
-export NBITS=0
+export QUANTIZE_NSD=0
 export ICHUNK2D=0
 export JCHUNK2D=0
 export ICHUNK3D=0
@@ -1172,7 +1172,7 @@ export FILENAME_BASE="'atm' 'sfc'"
 export OUTPUT_GRID="'regional_latlon'"
 export OUTPUT_FILE="'netcdf'"
 export IDEFLATE=0
-export NBITS=0
+export QUANTIZE_NSD=0
 export NFHOUT=3
 export NFHMAX_HF=-1
 export NFHOUT_HF=3

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/parm/model_configure.IN b/tests/parm/model_configure.IN
@@ -24,7 +24,8 @@ output_grid:             @[OUTPUT_GRID]
 output_file:             @[OUTPUT_FILE]
 zstandard_level:         @[ZSTANDARD_LEVEL]
 ideflate:                @[IDEFLATE]
-nbits:                   @[NBITS]
+quantize_mode:           'quantize_bitround'
+quantize_nsd:            @[QUANTIZE_NSD]
 ichunk2d:                @[ICHUNK2D]
 jchunk2d:                @[JCHUNK2D]
 ichunk3d:                @[ICHUNK3D]

diff --git a/tests/parm/model_configure_atmaq.IN b/tests/parm/model_configure_atmaq.IN
@@ -9,7 +9,8 @@ dt_atmos:                @[DT_ATMOS]
 restart_interval:        @[RESTART_INTERVAL]
 write_dopost:            @[WRITE_DOPOST]
 ideflate:                @[IDEFLATE]
-nbits:                   @[NBITS]
+quantize_mode:           'quantize_bitround'
+quantize_nsd:            @[QUANTIZE_NSD]
 quilting:                @[QUILTING]
 
 write_groups:            @[WRITE_GROUP]

diff --git a/tests/parm/model_configure_fhout.IN b/tests/parm/model_configure_fhout.IN
@@ -22,7 +22,8 @@ filename_base:           @[FILENAME_BASE]
 output_grid:             @[OUTPUT_GRID]
 output_file:             @[OUTPUT_FILE]
 ideflate:                @[IDEFLATE]
-nbits:                   @[NBITS]
+quantize_mode:           'quantize_bitround'
+quantize_nsd:            @[QUANTIZE_NSD]
 imo:                     @[IMO]
 jmo:                     @[JMO]
 

diff --git a/tests/parm/model_configure_hafs.IN b/tests/parm/model_configure_hafs.IN
@@ -23,7 +23,8 @@ ichunk3d:                -1
 jchunk3d:                -1
 kchunk3d:                -1
 ideflate:                @[IDEFLATE]
-nbits:                   @[NBITS]
+quantize_mode:           'quantize_bitround'
+quantize_nsd:            @[QUANTIZE_NSD]
 
 output_grid:             @[OUTPUT_GRID]     # gaussian_grid, global_latlon, regional_latlon[_moving], rotated_latlon[_moving], lambert_conformal, cubed_sphere_grid
 imo:                     @[IMO]             # number of grid points along longitude/latitude direction

diff --git a/tests/parm/model_configure_rrfs_conus13km.IN b/tests/parm/model_configure_rrfs_conus13km.IN
@@ -21,7 +21,8 @@ num_files:               @[NUM_FILES]
 filename_base:           @[FILENAME_BASE]
 output_file:             @[OUTPUT_FILE]
 ideflate:                @[IDEFLATE]
-nbits:                   @[NBITS]
+quantize_mode:           'quantize_bitround'
+quantize_nsd:            @[QUANTIZE_NSD]
 ichunk3d:                @[ICHUNK3D]
 jchunk3d:                @[JCHUNK3D]
 kchunk3d:                @[KCHUNK3D]

diff --git a/tests/tests/control_c768 b/tests/tests/control_c768
@@ -45,7 +45,7 @@ export IOVR=3
 export IMO=3072
 export JMO=1536
 export IDEFLATE=1
-export NBITS=14
+export QUANTIZE_NSD=14
 export ICHUNK3D=${IMO}
 export JCHUNK3D=${JMO}
 export KCHUNK3D=1

diff --git a/tests/tests/control_wrtGauss_netcdf_parallel b/tests/tests/control_wrtGauss_netcdf_parallel
@@ -32,7 +32,7 @@ export IAER=5111
 export IOVR=3
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export IDEFLATE=1
-export NBITS=14
+export QUANTIZE_NSD=14
 
 export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16

diff --git a/tests/tests/control_wrtGauss_netcdf_parallel_debug b/tests/tests/control_wrtGauss_netcdf_parallel_debug
@@ -28,7 +28,7 @@ export IAER=5111
 export IOVR=3
 export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export IDEFLATE=1
-export NBITS=14
+export QUANTIZE_NSD=14
 export OUTPUT_FH="0 1"
 
 export FV3_RUN=control_run.IN
+2 −1		io/module_fv3_io_def.F90
+24 −107		io/module_write_netcdf.F90
+18 −16		io/module_wrt_grid_comp.F90