Merge remote-tracking branch 'upstream/develop' into develop

Fixes ufs-community#1977.
GeorgeGayno-NOAA · Dec 4, 2023 · 2014ca7 · 2014ca7
2 parents 3658bb5 + 7407bcf
commit 2014ca7
Show file tree

Hide file tree

Showing 20 changed files with 9,605 additions and 7,809 deletions.
diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua
@@ -49,7 +49,7 @@ for i = 1, #ufs_modules do
 end
 
 prepend_path("MODULEPATH", "/apps/prod/lmodules/INTEL_cray_mpich/19.1.3.304/cray-mpich/8.1.9")
-scotch_ver=os.getenv("scotch_ver") or "7.0.3"
+scotch_ver=os.getenv("scotch_ver") or "7.0.4"
 load(pathJoin("scotch",scotch_ver))
 
 setenv("CC", "cc")

diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20231115
+export BL_DATE=20231130
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/parm/regional.nml.IN b/tests/parm/regional.nml.IN
@@ -162,8 +162,8 @@
        random_clds    = .false.
        trans_trac     = .true.
        cnvcld         = .false.
-       imfshalcnv     = 2
-       imfdeepcnv     = 2
+       imfshalcnv     = -1 
+       imfdeepcnv     = -1 
        cdmbgwd        = 0.88, 0.04
        cnvgwd         = .false.
        do_gsl_drag_ls_bl = .false.

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -25,14 +25,14 @@ COMPILE | s2swa_32bit  | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v1
 RUN | cpld_control_p8_mixedmode                         |    - noaacloud                     | baseline |
 
 #GFS
-COMPILE | s2swa_32bit_pdlib  | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | + hera orion cheyenne wcoss2 acorn | fv3 |
-RUN | cpld_control_gfsv17                               | + hera orion cheyenne wcoss2 acorn | baseline |
-RUN | cpld_control_gfsv17_iau                           | + hera orion cheyenne wcoss2 acorn | baseline | cpld_control_gfsv17
-RUN | cpld_restart_gfsv17                               | + hera orion cheyenne wcoss2 acorn |          | cpld_control_gfsv17 
-RUN | cpld_mpi_gfsv17                                   | + hera orion cheyenne wcoss2 acorn |          |
+COMPILE | s2swa_32bit_pdlib  | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | - noaacloud | fv3 |
+RUN | cpld_control_gfsv17                               |    - noaacloud                     | baseline |
+RUN | cpld_control_gfsv17_iau                           |    - noaacloud                     | baseline | cpld_control_gfsv17
+RUN | cpld_restart_gfsv17                               |    - noaacloud                     |          | cpld_control_gfsv17 
+RUN | cpld_mpi_gfsv17                                   |    - noaacloud                     |          |
 
-COMPILE | s2swa_32bit_pdlib_debug | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | + hera orion cheyenne wcoss2 acorn | fv3 |
-RUN | cpld_debug_gfsv17                                 | + hera orion cheyenne wcoss2 acorn | baseline |
+COMPILE | s2swa_32bit_pdlib_debug | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
+RUN | cpld_debug_gfsv17                                 |    - noaacloud                     | baseline |
 
 COMPILE | s2swa | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
 RUN | cpld_control_p8                                   |   - noaacloud                       | baseline |
@@ -72,13 +72,13 @@ COMPILE | s2swa_faster | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p
 RUN | cpld_control_p8_faster                            | - cheyenne  noaacloud                 | baseline |
 
 # Unstructured WW3 mesh
-COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | + hera orion cheyenne wcoss2 | fv3 |
-RUN | cpld_control_pdlib_p8                             | + hera orion cheyenne wcoss2    | baseline |
-RUN | cpld_restart_pdlib_p8                             | + hera orion cheyenne wcoss2    |          | cpld_control_pdlib_p8
-RUN | cpld_mpi_pdlib_p8                                 | + hera orion cheyenne wcoss2    |          | cpld_control_pdlib_p8
+COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | - noaacloud | fv3 |
+RUN | cpld_control_pdlib_p8                             | - noaacloud                | baseline |
+RUN | cpld_restart_pdlib_p8                             | - noaacloud                |          | cpld_control_pdlib_p8
+RUN | cpld_mpi_pdlib_p8                                 | - noaacloud                |          | cpld_control_pdlib_p8
 
-COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | + hera orion cheyenne wcoss2 | fv3 |
-RUN | cpld_debug_pdlib_p8                               | + hera orion cheyenne wcoss2    | baseline |
+COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
+RUN | cpld_debug_pdlib_p8                               | - noaacloud                | baseline |
 
 ### ATM tests ###
 COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON | | fv3 |

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