Skip to content
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "sorc/ufs_model.fd"]
path = sorc/ufs_model.fd
url = https://github.com/ufs-community/ufs-weather-model
url = https://github.com/dpsarmie/ufs-weather-model
ignore = dirty
[submodule "sorc/wxflow"]
path = sorc/wxflow
Expand Down
6 changes: 5 additions & 1 deletion dev/parm/config/gfs/config.ufs
Original file line number Diff line number Diff line change
Expand Up @@ -359,13 +359,17 @@ case ${fv3_res} in
"C48" | "C96" | "C192")
zstandard_level=0
ideflate=0
zstandard_level_rst=0
ideflate_rst=0
quantize_nsd=0
OUTPUT_FILETYPE_ATM="netcdf"
OUTPUT_FILETYPE_SFC="netcdf"
;;
"C384" | "C768" | "C1152" | "C3072")
zstandard_level=0
ideflate=1
zstandard_level_rst=0
ideflate_rst=0
quantize_nsd=14
OUTPUT_FILETYPE_ATM="netcdf_parallel"
if [[ "${fv3_res}" == "C384" ]]; then
Expand All @@ -379,7 +383,7 @@ case ${fv3_res} in
exit 15
;;
esac
export zstandard_level ideflate quantize_nsd
export zstandard_level ideflate quantize_nsd zstandard_level_rst ideflate_rst
export OUTPUT_FILETYPE_ATM OUTPUT_FILETYPE_SFC

# cpl defaults
Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Submodule ufs_model.fd updated 60 files
+1 −1 .gitmodules
+1 −1 UFSATM
+1 −1 WW3
+6 −1 tests/default_vars.sh
+1 −1 tests/parm/MOM_input_025.IN
+1 −1 tests/parm/MOM_input_050.IN
+1 −1 tests/parm/MOM_input_100.IN
+2 −0 tests/parm/model_configure.IN
+2 −0 tests/parm/model_configure_atmaq.IN
+2 −0 tests/parm/model_configure_fire.IN
+2 −0 tests/parm/model_configure_gnv1.IN
+2 −0 tests/parm/model_configure_hafs.IN
+2 −0 tests/parm/model_configure_regional.IN
+2 −0 tests/parm/model_configure_regional_rrfs_a.IN
+2 −0 tests/parm/model_configure_regional_stoch.IN
+2 −0 tests/parm/model_configure_rrfs_conus13km.IN
+1 −1 tests/tests/control_debug_p8
+1 −0 tests/tests/control_p8
+1 −0 tests/tests/control_p8.v2.sfc
+1 −0 tests/tests/control_p8_atmlnd
+1 −0 tests/tests/control_p8_rrtmgp
+1 −0 tests/tests/control_p8_rrtmgp_rad32
+1 −1 tests/tests/control_restart_p8
+1 −0 tests/tests/control_restart_p8_atmlnd
+1 −1 tests/tests/control_wam
+1 −0 tests/tests/control_wam_debug
+1 −0 tests/tests/control_wrtGauss_netcdf_parallel
+1 −0 tests/tests/control_wrtGauss_netcdf_parallel_debug
+1 −0 tests/tests/conus13km_2threads
+1 −0 tests/tests/conus13km_control
+1 −0 tests/tests/conus13km_decomp
+1 −0 tests/tests/conus13km_restart
+1 −0 tests/tests/cpld_control_gefs
+1 −1 tests/tests/cpld_control_p8
+1 −0 tests/tests/dependency_unmet
+1 −0 tests/tests/fail_to_run
+1 −0 tests/tests/gnv1_nested
+1 −0 tests/tests/hafs_global_1nest_atm
+1 −0 tests/tests/hafs_global_multiple_4nests_atm
+1 −0 tests/tests/hafs_global_storm_following_1nest_atm
+1 −0 tests/tests/hafs_regional_1nest_atm
+1 −0 tests/tests/hafs_regional_atm
+1 −0 tests/tests/hafs_regional_atm_gfdlmpv3
+1 −0 tests/tests/hafs_regional_atm_ocn
+1 −0 tests/tests/hafs_regional_atm_ocn_wav
+1 −0 tests/tests/hafs_regional_atm_thompson_gfdlsf
+1 −0 tests/tests/hafs_regional_atm_wav
+1 −0 tests/tests/hafs_regional_docn
+1 −0 tests/tests/hafs_regional_docn_oisst
+1 −0 tests/tests/hafs_regional_specified_moving_1nest_atm
+1 −0 tests/tests/hafs_regional_storm_following_1nest_atm
+1 −0 tests/tests/hafs_regional_storm_following_1nest_atm_ocn
+1 −0 tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug
+1 −0 tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
+1 −0 tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline
+1 −0 tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6
+1 −0 tests/tests/hafs_regional_telescopic_2nests_atm
+1 −0 tests/tests/regional_debug
+1 −0 tests/tests/regional_netcdf_parallel
+1 −1 tests/tests/rrfs_v1beta
2 changes: 2 additions & 0 deletions ush/parsing_model_configure_FV3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ FV3_model_configure() {
local OUTPUT_FILE="'${OUTPUT_FILETYPE_ATM}' '${OUTPUT_FILETYPE_SFC}'"
local ZSTANDARD_LEVEL=${zstandard_level:-0}
local IDEFLATE=${ideflate:-0} # netCDF zlib lossless compression (0-9); 0: no compression

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[shfmt] reported by reviewdog 🐶

Suggested change
local IDEFLATE=${ideflate:-0} # netCDF zlib lossless compression (0-9); 0: no compression
local IDEFLATE=${ideflate:-0} # netCDF zlib lossless compression (0-9); 0: no compression

local ZSTANDARD_LEVEL_RST=${zstandard_level_rst:-0} # For restart files
local IDEFLATE_RST=${ideflate_rst:-0} # Restart files: netCDF zlib lossless compression (0-9); 0: none
local QUANTIZE_NSD=${quantize_nsd:-0} # netCDF compression
Comment on lines +49 to 50

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[shfmt] reported by reviewdog 🐶

Suggested change
local IDEFLATE_RST=${ideflate_rst:-0} # Restart files: netCDF zlib lossless compression (0-9); 0: none
local QUANTIZE_NSD=${quantize_nsd:-0} # netCDF compression
local IDEFLATE_RST=${ideflate_rst:-0} # Restart files: netCDF zlib lossless compression (0-9); 0: none
local QUANTIZE_NSD=${quantize_nsd:-0} # netCDF compression

local ICHUNK2D=$((4 * restile))
local JCHUNK2D=$((2 * restile))
Expand Down
1 change: 1 addition & 0 deletions ush/parsing_namelists_MOM6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ MOM6_namelists() {
local PERT_EPBL="False"
fi
local MOM6_HFREEZE=20.0
local MOM6_WRITE_GEOM=0
# Ensure the template exists
local template=${MOM6_INPUT_TEMPLATE:-"${PARMgfs}/ufs/MOM_input_${OCNRES}.IN"}
if [[ ! -f "${template}" ]]; then
Expand Down
Loading