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

merge gsl/develop into RRFS_dev #149

Merged
merged 28 commits into from
Jun 27, 2022
Merged

merge gsl/develop into RRFS_dev #149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
03bfaee
Merge NOAA-EMC develop into gsl/develop (#126)
christinaholtNOAA Mar 8, 2022
b82d5c6
Remove GF Consistency Check & Add SDFs - V2 (#127)
hannahcbarnes Mar 9, 2022
ae7feac
Update to top of gsl/physics to get codeowners (#130)
SamuelTrahanNOAA Mar 10, 2022
036f0b3
updates related to MYNN-EDMF (#135)
joeolson42 Mar 24, 2022
5d9f221
GWD, LSM and MYNN physics updates from RRFS_dev branch (#136)
mdtoyNOAA Mar 25, 2022
6f60c52
Point to top of gsl/develop for ccpp-physics
SamuelTrahanNOAA Mar 29, 2022
ae22dce
gsl/develop RRFS-Smoke (#141)
haiqinli Apr 21, 2022
75396de
Correction to prior commit: point ccpp-physics to NOAA-GSL gsl/develop
SamuelTrahanNOAA Apr 21, 2022
e671787
Merge May 16 EMC develop to gsl/develop (#144)
SamuelTrahanNOAA May 19, 2022
8bf5085
followup to gsl/develop PR (#145)
SamuelTrahanNOAA May 23, 2022
0fc9f34
update submodule pointer for ccpp-physics
joeolson42 Jun 9, 2022
de06413
emergency fix to mynn theta calculation
joeolson42 Jun 10, 2022
4c2f631
Merge dom's rap GF b4b fix
SamuelTrahanNOAA Jun 13, 2022
5000364
point to gsl/develop
SamuelTrahanNOAA Jun 14, 2022
cb06781
Merge branch 'bugfix/gf-dom-fix-to-gsl' into gsl/develop
SamuelTrahanNOAA Jun 14, 2022
8ed30c3
merge gsl/develop to ccpp/physics
SamuelTrahanNOAA Jun 14, 2022
ea22240
merge gsl/develop
SamuelTrahanNOAA Jun 14, 2022
21e6c0a
changes to get this to compile
SamuelTrahanNOAA Jun 15, 2022
d2f8a20
Convince FV3GFS_io to use FV3GFS_io_generic
SamuelTrahanNOAA Jun 16, 2022
e022fea
Remove accidental changes to ccpp/suites/suite_FV3_HAFS_v0_thompson_t…
SamuelTrahanNOAA Jun 16, 2022
35c36e5
Merge branch 'update-rrfs-dev-20220614' of ssh://github.com/SamuelTra…
SamuelTrahanNOAA Jun 16, 2022
a3c0cc9
FV3GFS NetCDF I/O works again
SamuelTrahanNOAA Jun 17, 2022
94b5082
Remove unneeded code in ccpp/physics
SamuelTrahanNOAA Jun 21, 2022
ff38daa
Merge branch 'update-rrfs-dev-20220614' of ssh://github.com/SamuelTra…
SamuelTrahanNOAA Jun 21, 2022
ee5bdc3
fix typos
SamuelTrahanNOAA Jun 21, 2022
c32c3f8
Bugfix: writing to pointer before allocating it
SamuelTrahanNOAA Jun 23, 2022
834cbe9
Default diag_flux is always false
SamuelTrahanNOAA Jun 23, 2022
855fd10
point to RRFS_dev for ccpp/physics
SamuelTrahanNOAA Jun 27, 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
Prev Previous commit
Next Next commit
followup to gsl/develop PR (#145) 
* Fix from Joe to remove code that was added back in by the big merge.

* Change suite_FV3_GFS_v15_thompson_mynn to not use mynn surface layer scheme (from Tanya Smirnova)

* move physics/smoke to physics/physics/smoke

* Switch to rad_sw_pre in ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml which replaced rrtmg_sw_pre.F90 a while ago

* point to gsl/develop for ccpp/physics
  • Loading branch information
@SamuelTrahanNOAA
SamuelTrahanNOAA authored May 23, 2022
commit 8bf5085b160a319f3c6a0275a6b58ab2e840cbab
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