Skip to content
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

Jump to bottom

Update omega calculation #2751

Merged
merged 12 commits into from
Aug 23, 2024
Merged

Update omega calculation #2751

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
23d8fe1
Update omega calculation
XiaqiongZhou-NOAA Jul 8, 2024
d4bfdc0
Update the model harsh
XiaqiongZhou-NOAA Jul 8, 2024
24fb7e4
Merge remote-tracking branch 'NOAA-EMC/develop' into omega
XiaqiongZhou-NOAA Aug 2, 2024
04b5824
Merge remote-tracking branch 'NOAA-EMC/develop' into omega
XiaqiongZhou-NOAA Aug 6, 2024
1554944
update ufs_model
XiaqiongZhou-NOAA Aug 6, 2024
2f9d291
Merge branch 'NOAA-EMC:develop' into omega
XiaqiongZhou-NOAA Aug 8, 2024
c8d2cb4
Merge branch 'NOAA-EMC:develop' into omega
XiaqiongZhou-NOAA Aug 20, 2024
d4f9360
set 300s limit for dt_inner
XiaqiongZhou-NOAA Aug 20, 2024
f1a4ca1
correct fi
XiaqiongZhou-NOAA Aug 20, 2024
92f644f
Merge branch 'NOAA-EMC:develop' into omega
XiaqiongZhou-NOAA Aug 22, 2024
593bbff
Correct indentation
WalterKolczynski-NOAA Aug 23, 2024
8558dd8
Correct indentation
WalterKolczynski-NOAA Aug 23, 2024
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
1 change: 1 addition & 0 deletions parm/config/gefs/config.fcst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ case ${imp_physics} in
export dt_inner=$((DELTIM/2))
export sedi_semi=.true.
if [[ "${sedi_semi}" == .true. ]]; then export dt_inner=${DELTIM} ; fi
if [[ dt_inner -gt 300 ]]; then export dt_inner=300 ; fi
WalterKolczynski-NOAA marked this conversation as resolved.
Show resolved Hide resolved
export decfl=10

export hord_mt_nh_nonmono=5
Expand Down
1 change: 1 addition & 0 deletions parm/config/gfs/config.fcst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ case ${imp_physics} in
export dt_inner=$((DELTIM/2))
export sedi_semi=.true.
if [[ "${sedi_semi}" == .true. ]]; then export dt_inner=${DELTIM} ; fi
if [[ dt_inner -gt 300 ]]; then export dt_inner=300; fi
WalterKolczynski-NOAA marked this conversation as resolved.
Show resolved Hide resolved
export decfl=10

export hord_mt_nh_nonmono=5
Expand Down
1 change: 1 addition & 0 deletions parm/ufs/fv3/diag_table
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
#"gfs_dyn", "pfhy", "preshy", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "pfnh", "presnh", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "w", "dzdt", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "omga", "omga", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2
"gfs_phys", "refl_10cm", "refl_10cm", "fv3_history", "all", .false., "none", 2
Expand Down
1 change: 1 addition & 0 deletions parm/ufs/fv3/diag_table_da
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#"gfs_dyn", "pfhy", "preshy", "fv3_history", "all", .false., "none", 2
#"gfs_dyn", "pfnh", "presnh", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "w", "dzdt", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "omga", "omga", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2

Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Open in desktop
Submodule ufs_model.fd updated 32 files
+1 −1 CMEPS-interface/CMEPS
+1 −1 FV3
+1 −1 NOAHMP-interface/noahmp
+1 −1 tests/bl_date.conf
+7 −0 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
+338 −267 tests/logs/RegressionTests_acorn.log
+346 −275 tests/logs/RegressionTests_derecho.log
+348 −277 tests/logs/RegressionTests_gaea.log
+384 −385 tests/logs/RegressionTests_hera.log
+368 −433 tests/logs/RegressionTests_hercules.log
+245 −245 tests/logs/RegressionTests_jet.log
+348 −277 tests/logs/RegressionTests_orion.log
+298 −232 tests/logs/RegressionTests_wcoss2.log
+1 −0 tests/parm/diag_table/diag_table_cpld.IN
+1 −0 tests/parm/diag_table/diag_table_template
+1 −0 tests/parm/diag_table/diag_table_thompson
+3 −2 tests/parm/diag_table/diag_table_wam
+1 −0 tests/parm/global_control.nml.IN
+17 −15 tests/parm/noahmptable.tbl
+1 −1 tests/rt.conf
+7 −10 tests/rt_utils.sh
+1 −42 tests/test_changes.list
+1 −1 tests/tests/cpld_control_gfsv17
+1 −1 tests/tests/cpld_control_gfsv17_iau
+1 −1 tests/tests/cpld_control_sfs
+1 −1 tests/tests/cpld_debug_gfsv17
+1 −1 tests/tests/cpld_mpi_gfsv17
+1 −1 tests/tests/cpld_restart_gfsv17
+1 −1 tests/tests/gnv1_nested
1 change: 1 addition & 0 deletions ush/forecast_predet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ FV3_predet(){
phys_hydrostatic=".false." # enable heating in hydrostatic balance in non-hydrostatic simulation
use_hydro_pressure=".false." # use hydrostatic pressure for physics
make_nh=".true." # running in non-hydrostatic mode
pass_full_omega_to_physics_in_non_hydrostatic_mode=".true."
else # hydrostatic options
hydrostatic=".true."
phys_hydrostatic=".false." # ignored when hydrostatic = T
Expand Down
1 change: 1 addition & 0 deletions ush/parsing_namelists_FV3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ cat > input.nml <<EOF
hydrostatic = ${hydrostatic}
phys_hydrostatic = ${phys_hydrostatic}
use_hydro_pressure = ${use_hydro_pressure}
pass_full_omega_to_physics_in_non_hydrostatic_mode = ${pass_full_omega_to_physics_in_non_hydrostatic_mode:-".false."}
beta = 0.
a_imp = 1.
p_fac = 0.1
Expand Down
1 change: 1 addition & 0 deletions ush/parsing_namelists_FV3_nest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ cat > "${nml_file}" <<EOF
hydrostatic = ${hydrostatic}
phys_hydrostatic = ${phys_hydrostatic}
use_hydro_pressure = ${use_hydro_pressure}
pass_full_omega_to_physics_in_non_hydrostatic_mode = ${pass_full_omega_to_physics_in_non_hydrostatic_mode:-".false."}
beta = 0.
a_imp = 1.
p_fac = 0.1
Expand Down
Loading