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.

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

Combination for CCPP-physics #213 and #218 (H2O scheme refactor and C3/SAS/MYNN fix) #865

Merged
merged 32 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ad7f19f
Host side changes for h2o photochemistry scheme
dustinswales Jun 13, 2024
024d89d
Update SDFs
dustinswales Jun 13, 2024
aa3c004
Fix in ccpp prebuild config
dustinswales Jun 13, 2024
b6b26fc
Update .gitmodules
dustinswales Jun 13, 2024
e22228e
Update physics
dustinswales Jun 13, 2024
f37e260
Now B4B Identical
dustinswales Jun 14, 2024
12e9b08
Output tendency_of_vertically_diffused_tracer_concentration from MYNN…
lisa-bengtsson Jun 26, 2024
75e7660
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Jul 1, 2024
fafad9b
Merge branch 'feature/refactor_h2ophys' of https://github.com/dustins…
dustinswales Jul 1, 2024
0e876fa
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into myc3
lisa-bengtsson Jul 5, 2024
db9d160
merge upstream
lisa-bengtsson Jul 5, 2024
b96286e
update submodule pointer to atmos_cubed_sphere
lisa-bengtsson Jul 5, 2024
4d95cf8
update submodule pointer to ccpp/physics
lisa-bengtsson Jul 15, 2024
efaf103
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into myc3
lisa-bengtsson Jul 15, 2024
9f18ae2
update .gitmodules
lisa-bengtsson Jul 15, 2024
19890d5
Address reviewers comments
dustinswales Jul 15, 2024
b7853c5
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Jul 15, 2024
2470003
Merge branch 'feature/refactor_h2ophys' of https://github.com/dustins…
dustinswales Jul 15, 2024
c8fa753
update submodule pointer to ccpp/physics
lisa-bengtsson Aug 7, 2024
bacf13a
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into myc3
lisa-bengtsson Aug 7, 2024
9cf3b7a
Updated ccpp/physics submodule to the commit from pull request #218
lisa-bengtsson Aug 7, 2024
51a768a
update submodule pointer to ccpp/physics
lisa-bengtsson Aug 7, 2024
3884035
update submodule pointer to ccpp/physics
lisa-bengtsson Aug 7, 2024
57c4f92
update submodule pointer to ccpp/physics
lisa-bengtsson Aug 22, 2024
f9f218d
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into myc3
lisa-bengtsson Aug 22, 2024
7b6bf76
Merge branch 'develop' into combo_213_218
grantfirl Aug 22, 2024
648a9bf
Merge remote-tracking branch 'lisa-fork/myc3' into combo_213_218
grantfirl Aug 22, 2024
bc10ce8
fix missing dimensions in GFS_typedefs.meta
grantfirl Aug 22, 2024
6843b8f
update ccpp/physics submodule pointer
grantfirl Aug 23, 2024
f71911c
Merge branch 'develop' into combo_213_218
grantfirl Aug 23, 2024
30f1bca
Merge branch 'develop' into combo_213_218
grantfirl Aug 27, 2024
95a4f01
update ccpp/physics after merging
grantfirl Aug 29, 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
4 changes: 2 additions & 2 deletions .gitmodules
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/dustinswales/ccpp-physics
branch = feature/refactor_h2ophys
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
1 change: 0 additions & 1 deletion ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
'physics/physics/hooks/machine.F',
'physics/physics/Radiation/RRTMG/radsw_param.f',
'physics/physics/Radiation/RRTMG/radlw_param.f',
'physics/physics/photochem/h2o_def.f',
'physics/physics/photochem/module_ozphys.F90',
'physics/physics/photochem/module_h2ophys.F90',
'data/CCPP_typedefs.F90',
Expand Down