Skip to content

Update ufs-weather-model #3784

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.

Sign up for GitHub

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

Merged
aerorahul merged 8 commits into from
Jun 12, 2025
Merged

Update ufs-weather-model #3784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1887804
update /dev paths that were missed
JessicaMeixner-NOAA Jun 6, 2025
045c527
updates for FV3 namelists
JessicaMeixner-NOAA Jun 9, 2025
88f3356
Merge remote-tracking branch 'EMC/develop' into updatemodel20250606
JessicaMeixner-NOAA Jun 9, 2025
98f81fb
update model
JessicaMeixner-NOAA Jun 9, 2025
bcdc830
Merge branch 'NOAA-EMC:develop' into updatemodel20250606
JessicaMeixner-NOAA Jun 9, 2025
c524c2d
Merge branch 'develop' into updatemodel20250606
aerorahul Jun 10, 2025
214cd0a
Merge branch 'develop' into updatemodel20250606
aerorahul Jun 11, 2025
f839dc4
Merge branch 'develop' into updatemodel20250606
aerorahul Jun 12, 2025
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 dev/ci/cases/gfsv17/C1152mx025_S2SW.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ arguments:
#idate: 2023041506
#edate: 2023061600
#icsdir: /lfs/h2/emc/da/noscrub/catherine.thomas/ICS/C1152C384/2023041506
yaml: {{ HOMEgfs }}/ci/cases/gfsv17/s2sw.yaml
yaml: {{ HOMEgfs }}/dev/ci/cases/gfsv17/s2sw.yaml
2 changes: 1 addition & 1 deletion dev/ci/cases/gfsv17/s2sw.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
defaults:
!INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
!INC {{ HOMEgfs }}/dev/parm/config/gfs/yaml/defaults.yaml

base:
DOIAU: "YES"
Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Open in desktop
Submodule ufs_model.fd updated 94 files
+1 −1 FV3
+1 −1 MOM6-interface/MOM6
+1 −1 WW3
+94 −0 doc/UsersGuide/source/AddingHSDCase.rst
+0 −2 doc/UsersGuide/source/BuildingAndRunning.rst
+2 −2 doc/UsersGuide/source/CAPE2020.rst
+3 −0 doc/UsersGuide/source/HSD.rst
+15 −16 doc/UsersGuide/source/HSDcontainer.rst
+122 −0 doc/UsersGuide/source/IdealizedTC.rst
+1 −2 doc/UsersGuide/source/InputsOutputs.rst
+0 −11 doc/UsersGuide/source/baroclinic_wave.rst
+1 −1 doc/UsersGuide/source/doc-snippets/hsd_data.rst
+2 −2 doc/UsersGuide/source/doc-snippets/hsd_run_multiple.rst
+1 −1 doc/UsersGuide/source/doc-snippets/hsd_run_tests.rst
+8 −0 doc/UsersGuide/source/references.bib
+2 −1 modulefiles/ufs_hera.gnu.lua
+6 −6 modulefiles/ufs_hercules.gnu.lua
+21 −34 tests-dev/baseline_setup.yaml
+4 −4 tests-dev/create_log.py
+10 −6 tests-dev/create_xml.py
+34 −289 tests-dev/logs/RegressionTests_derecho.log
+69 −0 tests-dev/logs/RegressionTests_gaeac6.log
+34 −395 tests-dev/logs/RegressionTests_hera.log
+34 −459 tests-dev/logs/RegressionTests_hercules.log
+32 −307 tests-dev/logs/RegressionTests_orion.log
+6 −6 tests-dev/machine_config/machine_derecho.config
+0 −15 tests-dev/machine_config/machine_gaea.config
+16 −0 tests-dev/machine_config/machine_gaeac6.config
+0 −14 tests-dev/machine_config/machine_jet.config
+684 −0 tests-dev/rt.yaml
+497 −0 tests-dev/test_cases/diag_table/diag_table_tc
+1 −1 tests-dev/test_cases/exp_conf/2020_CAPE.IN
+3 −2 tests-dev/test_cases/exp_conf/baroclinic_wave.IN
+16 −0 tests-dev/test_cases/exp_conf/tropical_cyclone.IN
+65 −0 tests-dev/test_cases/field_table/field_table_tc
+1,317 −0 tests-dev/test_cases/parm/fd_ufs.tc.yaml
+56 −0 tests-dev/test_cases/parm/model_configure_tc.IN
+441 −0 tests-dev/test_cases/parm/tropical_cyclone.nml.IN
+18 −0 tests-dev/test_cases/parm/ufs.configure.tc.IN
+105 −0 tests-dev/test_cases/tests/tropical_cyclone
+9 −3 tests-dev/test_cases/utils/README.txt
+94 −0 tests-dev/test_cases/utils/cbar.gs
+78 −0 tests-dev/test_cases/utils/plot_tc.sh
+6 −4 tests-dev/ufs_test.sh
+6 −648 tests-dev/ufs_test.yaml
+1 −1 tests-dev/ufs_test_utils.py
+1 −1 tests/bl_date.conf
+7 −1 tests/default_vars.sh
+12 −2 tests/fv3_conf/control_run.IN
+186 −174 tests/fv3_conf/cpld_control_run.IN
+1 −1 tests/fv3_conf/hafs_fv3_run.IN
+1 −1 tests/fv3_conf/lake_control_run.IN
+28 −28 tests/fv3_conf/noahmp_run.IN
+1 −1 tests/fv3_conf/regional_run.IN
+1 −1 tests/fv3_conf/regional_run_stoch.IN
+3 −3 tests/fv3_conf/wam_run.IN
+24 −24 tests/logs/OpnReqTests_control_p8_hera.log
+12 −12 tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+15 −15 tests/logs/OpnReqTests_regional_control_hera.log
+314 −291 tests/logs/RegressionTests_acorn.log
+371 −289 tests/logs/RegressionTests_derecho.log
+0 −361 tests/logs/RegressionTests_gaeac5.log
+384 −291 tests/logs/RegressionTests_gaeac6.log
+494 −390 tests/logs/RegressionTests_hera.log
+484 −381 tests/logs/RegressionTests_hercules.log
+0 −304 tests/logs/RegressionTests_jet.log
+309 −301 tests/logs/RegressionTests_orion.log
+0 −297 tests/logs/RegressionTests_s4.log
+333 −241 tests/logs/RegressionTests_wcoss2.log
+1 −1 tests/opnReqTest
+646 −0 tests/parm/MOM_input_900.IN
+316 −0 tests/parm/cpld_lowres.nml.IN
+3 −3 tests/parm/global_control.nml.IN
+0 −1,663 tests/parm/params_grib2_tbl_new
+26 −16 tests/rt.conf
+2 −2 tests/rt.sh
+4 −5 tests/run_test.sh
+98 −0 tests/test_changes.list
+165 −0 tests/tests/cpld_control_c12_9deg
+164 −0 tests/tests/cpld_control_c24_5deg
+164 −0 tests/tests/cpld_control_c24_9deg
+29 −12 tests/tests/cpld_control_c48_5deg
+61 −0 tests/tests/cpld_control_gfsv17_nowav_iau
+1 −0 tests/tests/cpld_control_p8_lnd
+199 −0 tests/tests/cpld_restart_c12_9deg
+195 −0 tests/tests/cpld_restart_c24_5deg
+196 −0 tests/tests/cpld_restart_c24_9deg
+197 −0 tests/tests/cpld_restart_c48_5deg
+34 −0 tests/tests/cpld_restart_gfsv17_nowav_iau
+1 −0 tests/tests/cpld_restart_p8_lnd
+195 −0 tests/tests/cpld_warmstart_c12_9deg
+73 −59 tests/tests/cpld_warmstart_c24_5deg
+191 −0 tests/tests/cpld_warmstart_c24_9deg
+29 −16 tests/tests/cpld_warmstart_c48_5deg
3 changes: 3 additions & 0 deletions ush/parsing_namelists_FV3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,17 +441,20 @@ local SKEB_LSCALE=${SKEB_LSCALE:-"-999."}
local SKEBNORM=${SKEBNORM:-"1"}
local SKEB_NPASS=${SKEB_NPASS:-"30"}
local SKEB_VDOF=${SKEB_VDOF:-"5"}
local SKEBINT=${SKEBINT:-"1800"}
Copy link
Copy Markdown
Contributor

@bingfu-NOAA bingfu-NOAA Jun 11, 2025

Choose a reason for hiding this comment

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

I would suggest set 0 as default for SKEBINT, SPPTINT and SHUMINT to be consistent with the stochastic physics model code.

Copy link
Copy Markdown
Contributor Author

@JessicaMeixner-NOAA JessicaMeixner-NOAA Jun 11, 2025

Choose a reason for hiding this comment

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

Did i mis-update based on what's being done in the ufs-wetaher-model regression tests? (comparison diffs: ufs-community/ufs-weather-model@aba31a4...9193010)

What I saw was that the default value before was hard-coded to 1800 and this is what is now being set in default vars in the rt.sh system.

We need updates to ufs-weather-model regression tests if this needs to be changed as well I think.

Copy link
Copy Markdown
Contributor Author

@JessicaMeixner-NOAA JessicaMeixner-NOAA Jun 11, 2025

Choose a reason for hiding this comment

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

Here are the relevant screen shots of the code diffs:

Screenshot 2025-06-11 at 10 59 58 AM Screenshot 2025-06-11 at 11 00 41 AM

Copy link
Copy Markdown
Contributor

@bingfu-NOAA bingfu-NOAA Jun 11, 2025

Choose a reason for hiding this comment

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

adding @NickSzapiro-NOAA to the conversation. Nick, can we update the default value to 0 for SKEBINT/SPPTINT/SHUMINT in regression test?

Copy link
Copy Markdown
Contributor Author

@JessicaMeixner-NOAA JessicaMeixner-NOAA Jun 11, 2025

Choose a reason for hiding this comment

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

@bingfu-NOAA - can this be a separate issue from this PR? This PR is not changing any default values. If we need to add variables to the GEFS configuration files here in this PR I can do that, otherwise, perhaps this can be handled via follow-up PRs? @RuiyuSun has confirmed that the values we have here are what the physics team is expecting for GFS, but I am happy to change GEFS configs to add it there.

Copy link
Copy Markdown
Contributor

@bingfu-NOAA bingfu-NOAA Jun 12, 2025

Choose a reason for hiding this comment

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

@JessicaMeixner-NOAA @NickSzapiro-NOAA What we need is set the default to 0 for these parameters, Othewise, gefs configuration file in g-w need to be added these parameters and reset these values to 0. GEFS are using 300s (atm time step, which is triggered when these parameters are set to 0) for these parameters.

Copy link
Copy Markdown
Contributor

@aerorahul aerorahul Jun 12, 2025

Choose a reason for hiding this comment

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

I am in favor of merging this PR now that tests have passed. If there are updates needed in the defaults, that need a PR in the ufs-weather-model, then let that be in the next PR. We shouldn't hold this one up. my 2c.

Copy link
Copy Markdown
Contributor

@aerorahul aerorahul Jun 12, 2025

Choose a reason for hiding this comment

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

@bingfu-NOAA, please open a PR in the g-w, with changes in dev/parm/config/gefs/config.efcs providing the necessary exports.

Copy link
Copy Markdown
Contributor Author

@JessicaMeixner-NOAA JessicaMeixner-NOAA Jun 12, 2025

Choose a reason for hiding this comment

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

This shouldn't have even changed anything from the GEFS configuration in develop branch from what i can tell. So I agree this shouldn't delay this PR moving forward. I think work in both ufs-weather-model and g-w need updates for the GEFS side of things -- but just my 2c.

Copy link
Copy Markdown
Contributor

@bingfu-NOAA bingfu-NOAA Jun 12, 2025

Choose a reason for hiding this comment

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

@aerorahul I agree we should let it go. We can fix this later.

local SHUM=${SHUM:-"-999."}
local ISEED_SHUM=${ISEED_SHUM:-${ISEED}}
local SHUM_TAU=${SHUM_TAU:-"-999."}
local SHUM_LSCALE=${SHUM_LSCALE:-"-999."}
local SHUMINT=${SHUMINT:-"3600"}
local SPPT=${SPPT:-"-999."}
local ISEED_SPPT=${ISEED_SPPT:-${ISEED}}
local SPPT_TAU=${SPPT_TAU:-"-999."}
local SPPT_LSCALE=${SPPT_LSCALE:-"-999."}
local SPPT_LOGIT=${SPPT_LOGIT:-".true."}
local SPPT_SFCLIMIT=${SPPT_SFCLIMIT:-".true."}
local USE_ZMTNBLCK=${use_zmtnblck:-".true."}
local SPPTINT=${SPPTINT:-"1800"}
local PBL_TAPER=${pbl_taper:-"0,0,0,0.125,0.25,0.5,0.75"}
local OCNSPPT=${OCNSPPT:-"0.8,0.4,0.2,0.08,0.04"}
local OCNSPPT_LSCALE=${OCNSPPT_LSCALE:-"500.E3,1000.E3,2000.E3,2000.E3,2000.E3"}
Expand Down