Skip to content

Update UFS (no GOCART updates) #3872

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
DavidHuber-NOAA merged 13 commits into from
Jul 17, 2025
Merged

Update UFS (no GOCART updates) #3872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0f2e1d4
update to new ufs model
JessicaMeixner-NOAA Jun 26, 2025
f631192
Merge branch 'NOAA-EMC:develop' into updatemodel20250625
JessicaMeixner-NOAA Jun 27, 2025
73d66e1
rt_cutoff should only be changed for C768 and higher resolutions
JessicaMeixner-NOAA Jun 27, 2025
99ad8a1
Merge remote-tracking branch 'EMC/develop' into updatemodel20250625
JessicaMeixner-NOAA Jul 1, 2025
005b7b1
update model to latest
JessicaMeixner-NOAA Jul 1, 2025
fb59e1d
update rt_cutoff for all resolutions all applications
JessicaMeixner-NOAA Jul 1, 2025
6e7fb0e
Merge remote-tracking branch 'EMC/develop' into updatemodel_pregocart
JessicaMeixner-NOAA Jul 14, 2025
f1fd4b8
update gdas to use "stable-nightly" branch
JessicaMeixner-NOAA Jul 14, 2025
c4aba92
Merge branch 'develop' into updatemodel_pregocart
aerorahul Jul 15, 2025
534f0ab
Merge branch 'develop' into updatemodel_pregocart
DavidHuber-NOAA Jul 16, 2025
b0115f3
Merge branch 'NOAA-EMC:develop' into updatemodel_pregocart
JessicaMeixner-NOAA Jul 17, 2025
0ee1e1e
update gdas hash
JessicaMeixner-NOAA Jul 17, 2025
9231d9e
Merge branch 'develop' into updatemodel_pregocart
DavidHuber-NOAA Jul 17, 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
14 changes: 7 additions & 7 deletions dev/parm/config/gefs/config.ufs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ case "${fv3_res}" in
export k_split=1
export n_split=4
export tau=10.0
export rf_cutoff=100.0
export rf_cutoff=300.0
Comment thread
DavidHuber-NOAA marked this conversation as resolved.
export fv_sg_adj=3600
export knob_ugwp_tauamp=6.0e-3 # setting for UGWPv1 non-stationary GWD
export WRITE_GROUP=1
Expand All @@ -106,7 +106,7 @@ case "${fv3_res}" in
export k_split=1
export n_split=4
export tau=8.0
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=1800
export WRITE_GROUP=1
export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1
Expand All @@ -125,7 +125,7 @@ case "${fv3_res}" in
export k_split=2
export n_split=4
export tau=6.0
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=1800
export WRITE_GROUP=1
export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10
Expand All @@ -143,7 +143,7 @@ case "${fv3_res}" in
export k_split=2
export n_split=4
export tau=4.0
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=900
export WRITE_GROUP=2
export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=8
Expand All @@ -161,7 +161,7 @@ case "${fv3_res}" in
export k_split=2
export n_split=4
export tau=3.0
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=450
export WRITE_GROUP=2
export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10
Expand All @@ -179,7 +179,7 @@ case "${fv3_res}" in
export k_split=2
export n_split=6
export tau=2.5
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=450
export WRITE_GROUP=4
export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available
Expand All @@ -197,7 +197,7 @@ case "${fv3_res}" in
export k_split=4
export n_split=5
export tau=0.5
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=300
export WRITE_GROUP=4
export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10 # TODO: refine these numbers when a case is available
Expand Down
14 changes: 7 additions & 7 deletions dev/parm/config/gfs/config.ufs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ case "${fv3_res}" in
export k_split=1
export n_split=4
export tau=8.0
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=3600
;;
"C96")
Expand Down Expand Up @@ -147,7 +147,7 @@ case "${fv3_res}" in
export k_split=1
export n_split=4
export tau=8.0
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=1800
fi
;;
Expand Down Expand Up @@ -195,7 +195,7 @@ case "${fv3_res}" in
export k_split=2
export n_split=4
export tau=6.0
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=1800
fi
;;
Expand Down Expand Up @@ -238,7 +238,7 @@ case "${fv3_res}" in
export k_split=2
export n_split=4
export tau=4.0
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=900
fi
;;
Expand Down Expand Up @@ -283,7 +283,7 @@ case "${fv3_res}" in
export k_split=2
export n_split=4
export tau=3.0
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=450
fi
;;
Expand Down Expand Up @@ -311,7 +311,7 @@ case "${fv3_res}" in
export k_split=2
export n_split=6
export tau=2.5
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=450
;;
"C3072")
Expand All @@ -329,7 +329,7 @@ case "${fv3_res}" in
export k_split=4
export n_split=5
export tau=0.5
export rf_cutoff=100.0
export rf_cutoff=300.0
export fv_sg_adj=300
;;
*)
Expand Down
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Open in desktop
Submodule gdas.cd updated 86 files
+3 −3 .github/workflows/norms.yaml
+1 −1 .gitmodules
+1 −1 ci/driver.sh
+7 −2 ci/run_ci.sh
+58 −28 ci/stable_driver.sh
+17 −2 ci/sync_forks.sh
+10 −0 ci/ursa.sh
+2 −2 ci/validation/validation_driver.sh
+30 −35 modulefiles/GDAS/gaeac6.intel.lua
+34 −42 modulefiles/GDAS/hera.intel.lua
+36 −35 modulefiles/GDAS/hercules.intel.lua
+44 −44 modulefiles/GDAS/orion.intel.lua
+3 −4 modulefiles/GDAS/ursa.intel.lua
+3 −1 parm/atm/jcb-prototype_3dvar.yaml.j2
+3 −1 parm/atm/jcb-prototype_4d.yaml.j2
+3 −1 parm/atm/jcb-prototype_lgetkf.yaml.j2
+3 −1 parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
+3 −1 parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
+1 −1 parm/jcb-gdas
+5 −1 parm/soca/ensda/stage_ens_mem.yaml.j2
+9 −1 parm/soca/fields_metadata.yaml
+1 −1 parm/soca/soca_det_files_stage.yaml.j2
+2 −1 parm/soca/soca_det_finalize.yaml.j2
+2 −2 scripts/old/exgdas_global_marine_analysis_post.py
+1 −1 sorc/bufr-query
+1 −1 sorc/fv3-jedi
+1 −1 sorc/ioda
+1 −1 sorc/iodaconv
+1 −1 sorc/land-imsproc
+1 −1 sorc/oops
+1 −1 sorc/saber
+1 −1 sorc/soca
+1 −1 sorc/ufo
+3 −2 test/aero/genyaml_3dvar.sh
+0 −1 test/aero/global-workflow/jjob_var_final.sh
+3 −5 test/aero/global-workflow/jjob_var_init.sh
+0 −2 test/aero/global-workflow/jjob_var_run.sh
+0 −1 test/atm/global-workflow/jjob_ens_final.sh
+0 −1 test/atm/global-workflow/jjob_ens_inc.sh
+3 −5 test/atm/global-workflow/jjob_ens_init.sh
+3 −5 test/atm/global-workflow/jjob_ens_init_split.sh
+1 −3 test/atm/global-workflow/jjob_ens_letkf.sh
+0 −2 test/atm/global-workflow/jjob_ens_obs.sh
+0 −2 test/atm/global-workflow/jjob_ens_sol.sh
+0 −1 test/atm/global-workflow/jjob_var_final.sh
+0 −1 test/atm/global-workflow/jjob_var_inc.sh
+3 −5 test/atm/global-workflow/jjob_var_init.sh
+1 −3 test/atm/global-workflow/jjob_var_run.sh
+6 −1 test/gw-ci/CMakeLists.txt
+3 −1 test/gw-ci/atm/jcb-prototype_3dvar_ufs_hybatmDA.yaml.j2
+3 −1 test/gw-ci/atm/jcb-prototype_lgetkf_observer_ufs_hybatmDA.yaml.j2
+3 −1 test/gw-ci/atm/jcb-prototype_lgetkf_solver_ufs_hybatmDA.yaml.j2
+3 −1 test/gw-ci/atm/jcb-prototype_lgetkf_ufs_hybatmDA.yaml.j2
+7 −7 ush/convert_yaml_ewok2gdas.py
+0 −2 ush/soca/run_jjobs.py
+12 −15 ush/ufoeval/run_ufo_hofx_test.sh
+7 −2 ush/ufsda/ufs_yaml.py
+2 −0 utils/chem/chem_diagb.h
+21 −1 utils/soca/CMakeLists.txt
+4 −0 utils/soca/coupled/CMakeLists.txt
+53 −0 utils/soca/coupled/README.md
+8 −0 utils/soca/coupled/gdas_soca_to_fv3.cc
+79 −0 utils/soca/coupled/gdas_soca_to_fv3.h
+145 −0 utils/soca/diagnostics/Diagnostics.cc
+54 −0 utils/soca/diagnostics/Diagnostics.h
+76 −0 utils/soca/diagnostics/gdas_soca_diagnostics.cc
+22 −0 utils/soca/gdas_incr_handler.h
+2 −2 utils/soca/gdas_soca_utils.h
+14 −0 utils/soca/test/CMakeLists.txt
+49 −0 utils/soca/test/generate_coupled_resources.py
+2 −0 utils/soca/test/generate_soca_resources.py
+544 −0 utils/soca/test/testdata/fv3jedi/20201214.210000.sfc_data.tile1.cdl
+553 −0 utils/soca/test/testdata/fv3jedi/20201214.210000.sfc_data.tile2.cdl
+592 −0 utils/soca/test/testdata/fv3jedi/20201214.210000.sfc_data.tile3.cdl
+506 −0 utils/soca/test/testdata/fv3jedi/20201214.210000.sfc_data.tile4.cdl
+530 −0 utils/soca/test/testdata/fv3jedi/20201214.210000.sfc_data.tile5.cdl
+497 −0 utils/soca/test/testdata/fv3jedi/20201214.210000.sfc_data.tile6.cdl
+65 −0 utils/soca/test/testdata/fv3jedi/C12_oro_data.tile1.cdl
+66 −0 utils/soca/test/testdata/fv3jedi/C12_oro_data.tile2.cdl
+70 −0 utils/soca/test/testdata/fv3jedi/C12_oro_data.tile3.cdl
+57 −0 utils/soca/test/testdata/fv3jedi/C12_oro_data.tile4.cdl
+62 −0 utils/soca/test/testdata/fv3jedi/C12_oro_data.tile5.cdl
+58 −0 utils/soca/test/testdata/fv3jedi/C12_oro_data.tile6.cdl
+21 −0 utils/soca/test/testinput/gdas_soca_diagnostics.yaml
+37 −0 utils/soca/test/testinput/gdas_soca_to_fv3.yaml
+1 −1 utils/test/CMakeLists.txt
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Open in desktop
Submodule ufs_model.fd updated 20 files
+1 −1 FV3
+1 −1 MOM6-interface/MOM6
+24 −2 MOM6-interface/mom6_files.cmake
+1 −1 WW3
+1 −1 tests/bl_date.conf
+3 −3 tests/default_vars.sh
+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
+278 −362 tests/logs/RegressionTests_acorn.log
+294 −367 tests/logs/RegressionTests_derecho.log
+285 −370 tests/logs/RegressionTests_gaeac6.log
+401 −493 tests/logs/RegressionTests_hera.log
+389 −483 tests/logs/RegressionTests_hercules.log
+306 −307 tests/logs/RegressionTests_orion.log
+244 −328 tests/logs/RegressionTests_wcoss2.log
+92 −1 tests/parm/MOM_input_025.IN
+2 −2 tests/rt.conf
+0 −96 tests/test_changes.list
+2 −2 tests/tests/cpld_control_gefs