Skip to content

UFS-dev PR#85 #399

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
grantfirl merged 7 commits into from
Oct 3, 2023
Merged

UFS-dev PR#85 #399

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b293c12
update GFS_typedefs.F90 for ccpp/physics ufs/dev PR#85
grantfirl Sep 7, 2023
012c568
Merge branch 'main' into ufs-dev-PR85
grantfirl Sep 7, 2023
c620522
update ccpp/physics
grantfirl Sep 7, 2023
cd86fb9
update ccpp/physics submodule pointer and .gitmodules
grantfirl Sep 13, 2023
069fda5
Merge branch 'main' into ufs-dev-PR85
grantfirl Sep 19, 2023
a0bfdbb
add link in README.md
grantfirl Sep 19, 2023
69e04d4
update ccpp/physics pointer and revert .gitmodules
grantfirl Oct 3, 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
branch = main
[submodule "ccpp-physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
#url = https://github.com/NCAR/ccpp-physics
#branch = main
url = https://github.com/grantfirl/ccpp-physics
branch = ufs-dev-PR85
[submodule "CMakeModules"]
path = CMakeModules
url = https://github.com/noaa-emc/CMakeModules
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# User's Guide

Please find the up-to-date User's Guide located in this repository in ccpp-scm/scm/doc/TechGuide/main.pdf
Please find the up-to-date User's Guide located in this repository in [`scm/doc/TechGuide/main.pdf`](https://github.com/NCAR/ccpp-scm/blob/main/scm/doc/TechGuide/main.pdf)
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 3 files
+4 −1 physics/GFS_phys_time_vary.fv3.F90
+4 −1 physics/GFS_phys_time_vary.scm.F90
+119 −32 physics/aerinterp.F90
27 changes: 27 additions & 0 deletions scm/src/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6876,13 +6876,21 @@ subroutine grid_create (Grid, IM, Model)
allocate (Grid%ddy_o3 (IM))
allocate (Grid%jindx1_o3 (IM))
allocate (Grid%jindx2_o3 (IM))

Grid%ddy_o3 = clear_val
Grid%jindx1_o3 = clear_val
Grid%jindx2_o3 = clear_val
endif

!--- stratosphere h2o active
if ( Model%h2o_phys ) then
allocate (Grid%ddy_h (IM))
allocate (Grid%jindx1_h (IM))
allocate (Grid%jindx2_h (IM))

Grid%ddy_h = clear_val
Grid%jindx1_h = clear_val
Grid%jindx2_h = clear_val
endif

!--- iccn active
Expand All @@ -6893,6 +6901,13 @@ subroutine grid_create (Grid, IM, Model)
allocate (Grid%ddx_ci (IM))
allocate (Grid%iindx1_ci (IM))
allocate (Grid%iindx2_ci (IM))

Grid%ddy_ci = clear_val
Grid%jindx1_ci = clear_val
Grid%jindx2_ci = clear_val
Grid%ddx_ci = clear_val
Grid%iindx1_ci = clear_val
Grid%iindx2_ci = clear_val
endif

!--- iaerclm active
Expand All @@ -6903,6 +6918,13 @@ subroutine grid_create (Grid, IM, Model)
allocate (Grid%ddx_aer (IM))
allocate (Grid%iindx1_aer(IM))
allocate (Grid%iindx2_aer(IM))

Grid%ddy_aer = clear_val
Grid%jindx1_aer = clear_val
Grid%jindx2_aer = clear_val
Grid%ddx_aer = clear_val
Grid%iindx1_aer = clear_val
Grid%iindx2_aer = clear_val
endif

!--- Model%do_ugwpv1
Expand All @@ -6911,6 +6933,11 @@ subroutine grid_create (Grid, IM, Model)
allocate (Grid%ddy_j2tau (IM))
allocate (Grid%jindx1_tau (IM))
allocate (Grid%jindx2_tau (IM))

Grid%ddy_j1tau = clear_val
Grid%ddy_j2tau = clear_val
Grid%jindx1_tau = clear_val
Grid%jindx2_tau = clear_val
endif

end subroutine grid_create
Expand Down