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

Smoke, dust, and MYNN updates #635

Merged
merged 33 commits into from
Mar 27, 2023
Merged

Smoke, dust, and MYNN updates #635

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0a7242e
MYNN update
joeolson42 Feb 28, 2023
ae5afce
update submodule pointer for ccpp-physics
joeolson42 Mar 1, 2023
3d7d051
"merge RRFS-SD from the GSL repo to the Community repo"
haiqinli Mar 10, 2023
fa0fc55
Merge branch 'NOAA-EMC:develop' into develop-rrfs-sd
haiqinli Mar 10, 2023
91030bf
"include MYNN-EDMF updates from PR #630"
haiqinli Mar 13, 2023
79b05a4
bug fixes from sam to get most regression tests to pass
SamuelTrahanNOAA Mar 14, 2023
1e5194a
Updating .gitmodules to point to correct branch/url
joeolson42 Mar 14, 2023
15e1eff
"include updates from Sam and Haiqin"
haiqinli Mar 14, 2023
70d7623
do not dereference a null pointer
SamuelTrahanNOAA Mar 14, 2023
4341911
point to sam's fork
SamuelTrahanNOAA Mar 14, 2023
ac70ac7
revert accidental change
SamuelTrahanNOAA Mar 14, 2023
2798b2c
1.2 GB of messages is a bit too much.
SamuelTrahanNOAA Mar 14, 2023
c3a1914
Merge branch 'develop' into mynn_01March
joeolson42 Mar 15, 2023
208263a
"point to MYNN-EDMF update from Joe"
haiqinli Mar 15, 2023
0be821e
merge joe's mynn_01March branch
SamuelTrahanNOAA Mar 15, 2023
5f8915e
update submodule pointer for ccpp-physics
joeolson42 Mar 21, 2023
947f84d
Merge branch 'develop' into mynn_01March
joeolson42 Mar 21, 2023
d5f4fc2
"Merge remote-tracking branch 'sam/develop-rrfs-sd' into develop-rrfs…
haiqinli Mar 22, 2023
ad84146
"to address the comments and suggestions from the ccpp reviewer"
haiqinli Mar 22, 2023
fcb8039
merge haiqin's ccpp/physics changes
SamuelTrahanNOAA Mar 22, 2023
70ab49f
Merge remote-tracking branch 'haiqin/develop-rrfs-sd' into develop-rr…
SamuelTrahanNOAA Mar 22, 2023
e1fd89d
point at Sam's fork of ccpp/physics
SamuelTrahanNOAA Mar 22, 2023
a35674a
bug fixes and updates from develop
SamuelTrahanNOAA Mar 23, 2023
f9792e8
merge joe/mynn_01March
SamuelTrahanNOAA Mar 23, 2023
cd3da84
ccpp/physics: restore a disabled debug check, and require debugging t…
SamuelTrahanNOAA Mar 23, 2023
b7d24e2
point to ufs/dev version of atmos_cubed_sphere
SamuelTrahanNOAA Mar 24, 2023
11a2703
point to correct ccpp-physics branch in .gitmodules
SamuelTrahanNOAA Mar 24, 2023
671d4be
"merge develop-rrfs-sd branch from Sam"
haiqinli Mar 24, 2023
ab8c385
"to address the comments from the ccpp reviewer"
haiqinli Mar 24, 2023
a77189f
merge haiqin/develop-rrfs-sd
SamuelTrahanNOAA Mar 24, 2023
08a9066
Merge remote-tracking branch 'haiqin/develop-rrfs-sd' into develop-rr…
SamuelTrahanNOAA Mar 24, 2023
56d8d36
point to correct atmos_cubed_sphere
SamuelTrahanNOAA Mar 24, 2023
ef10112
point to ufs/dev ccpp/physics
SamuelTrahanNOAA Mar 27, 2023
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/ufs-community/ccpp-physics
branch = ufs/dev
url = https://github.com/SamuelTrahanNOAA/ccpp-physics
branch = ufs/dev-rrfs-sd
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
5 changes: 2 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 @@ -188,9 +188,8 @@
# 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_dust/rrfs_smoke_wrapper.F90',
'physics/physics/smoke_dust/rrfs_smoke_postpbl.F90',
# RRTMGP
'physics/physics/rrtmgp_aerosol_optics.F90',
'physics/physics/rrtmgp_lw_main.F90',
Expand Down
193 changes: 113 additions & 80 deletions ccpp/data/GFS_typedefs.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading