Skip to content

followup to gsl/develop PR #145

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
SamuelTrahanNOAA merged 5 commits into from
May 23, 2022
Merged

followup to gsl/develop PR #145

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95a675d
Fix from Joe to remove code that was added back in by the big merge.
SamuelTrahanNOAA May 19, 2022
473f95b
Change suite_FV3_GFS_v15_thompson_mynn to not use mynn surface layer …
SamuelTrahanNOAA May 19, 2022
a387339
move physics/smoke to physics/physics/smoke
SamuelTrahanNOAA May 19, 2022
f1ddad3
Switch to rad_sw_pre in ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.x…
SamuelTrahanNOAA May 20, 2022
51ccf8c
point to gsl/develop for ccpp/physics
SamuelTrahanNOAA May 23, 2022
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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NOAA-GSL/ccpp-physics
branch = gsl/develop
url = ssh://git@github.com/SamuelTrahanNOAA/ccpp-physics
branch = gsl/may16-followup-pr
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
6 changes: 3 additions & 3 deletions ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@
# HAFS FER_HIRES
'physics/physics/mp_fer_hires.F90',
# SMOKE
'physics/smoke/rrfs_smoke_wrapper.F90',
'physics/smoke/rrfs_smoke_postpbl.F90',
'physics/smoke/rrfs_smoke_lsdep_wrapper.F90',
'physics/physics/smoke/rrfs_smoke_wrapper.F90',
'physics/physics/smoke/rrfs_smoke_postpbl.F90',
'physics/physics/smoke/rrfs_smoke_lsdep_wrapper.F90',
# RRTMGP
'physics/physics/rrtmgp_lw_gas_optics.F90',
'physics/physics/rrtmgp_lw_cloud_optics.F90',
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 24 files
+5 −14 physics/GFS_rrtmgp_cloud_mp.F90
+0 −0 physics/smoke/dep_dry_gocart_mod.F90
+0 −0 physics/smoke/dep_dry_mod.F90
+0 −0 physics/smoke/dep_simple_mod.F90
+0 −0 physics/smoke/dep_vertmx_mod.F90
+0 −0 physics/smoke/dep_wet_ls_mod.F90
+0 −0 physics/smoke/dust_data_mod.F90
+0 −0 physics/smoke/dust_fengsha_mod.F90
+0 −0 physics/smoke/module_add_emiss_burn.F90
+0 −0 physics/smoke/module_plumerise1.F90
+0 −0 physics/smoke/module_smoke_plumerise.F90
+0 −0 physics/smoke/module_zero_plumegen_coms.F90
+0 −0 physics/smoke/plume_data_mod.F90
+0 −0 physics/smoke/rrfs_smoke_config.F90
+0 −0 physics/smoke/rrfs_smoke_data.F90
+0 −0 physics/smoke/rrfs_smoke_lsdep_wrapper.F90
+0 −0 physics/smoke/rrfs_smoke_lsdep_wrapper.meta
+0 −0 physics/smoke/rrfs_smoke_postpbl.F90
+0 −0 physics/smoke/rrfs_smoke_postpbl.meta
+0 −0 physics/smoke/rrfs_smoke_wrapper.F90
+0 −0 physics/smoke/rrfs_smoke_wrapper.meta
+0 −0 physics/smoke/seas_data_mod.F90
+0 −0 physics/smoke/seas_mod.F90
+0 −0 physics/smoke/seas_ngac_mod.F90
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>mynnsfc_wrapper</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
Expand Down