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

More 3D diagnostic tendencies #76

Merged
merged 34 commits into from
Apr 12, 2021
Merged

More 3D diagnostic tendencies #76

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
31916cc
Move dq3dt into a new 4D array (i,k,tracer,cause) that is sparse in t…
SamuelTrahanNOAA Dec 3, 2020
9dbb455
point to Sam's branch for ccpp/framework
SamuelTrahanNOAA Dec 3, 2020
8ef4939
More concise expression of GFS_Diagnostics.F90 content for dq4dt
SamuelTrahanNOAA Dec 3, 2020
3665f06
New trick in GFS_diagnostics allows concise representation of numerou…
SamuelTrahanNOAA Dec 5, 2020
04a9a24
Replace du3dt, dv3dt, dt3dt with dq4dt. Non-CCPP builds still have th…
SamuelTrahanNOAA Dec 7, 2020
0055e97
Give the new variables better names and correct some comments.
SamuelTrahanNOAA Dec 8, 2020
a999afe
remove all d*3dt variables and switch to dtend; move tracer&cause des…
SamuelTrahanNOAA Jan 4, 2021
8eebdf1
Changes to make the first test case run to completion in debug mode.
SamuelTrahanNOAA Jan 12, 2021
5ca9d0e
Changes needed to get identical output in debug mode for these tests,…
SamuelTrahanNOAA Jan 14, 2021
8d86e27
RRFS generates total physics tendencies
SamuelTrahanNOAA Jan 15, 2021
c2a7bcf
Changes needed for new 3d diagnostic tendency arrays in some schemes.
SamuelTrahanNOAA Jan 15, 2021
b3cbf90
revert to gsl/develop for ccpp/framework
SamuelTrahanNOAA Jan 15, 2021
514149e
Corrections to tracer names and dtend content list.
SamuelTrahanNOAA Jan 15, 2021
b8c2522
Allow dtend variables to be selected using unix-shell-style globs lik…
SamuelTrahanNOAA Jan 19, 2021
84be5a0
Five suites output nearly all of the tendencies for convection, PBL, …
SamuelTrahanNOAA Jan 22, 2021
490cb23
merge gsl/develop
SamuelTrahanNOAA Feb 1, 2021
a0fe03b
Revert a change mistakenly applied in ccpp/physics
SamuelTrahanNOAA Feb 1, 2021
2f30a86
Merge ccpp/physics's gsl/develop
SamuelTrahanNOAA Feb 23, 2021
69ef0be
Change for new variable names in ldiag3d logic
SamuelTrahanNOAA Feb 23, 2021
fefb80c
Merge gsl/develop
SamuelTrahanNOAA Feb 23, 2021
2fe9c1d
Diagnostics match dX3dt version for all five targeted suites.
SamuelTrahanNOAA Mar 2, 2021
6835441
New tendencies work, except maybe TKE and CLD_AMT
SamuelTrahanNOAA Mar 4, 2021
f8ccb9a
Rename many variables
SamuelTrahanNOAA Mar 24, 2021
1ef41fb
Fix syntax errors, indentation errors, and variable names.
SamuelTrahanNOAA Mar 29, 2021
02ab1c7
dtend(:,:,1) is used, dtend_o3_photochem sums all four ozphys values,…
SamuelTrahanNOAA Mar 29, 2021
842ff50
merge gsl/develop
SamuelTrahanNOAA Apr 1, 2021
ca80fb5
Corrections to prior merge
SamuelTrahanNOAA Apr 5, 2021
770e261
Update atmos_cubed_sphere and ccpp/framework to match FV3's gsl/develop
SamuelTrahanNOAA Apr 5, 2021
f51df34
Merge remote-tracking branch 'gsl/gsl/develop' into features/more-dia…
SamuelTrahanNOAA Apr 5, 2021
f46feab
Revert two accidental changes in ccpp/physics
SamuelTrahanNOAA Apr 7, 2021
f969936
Correct a bad intent clause detected by GNU but not INTEL
SamuelTrahanNOAA Apr 7, 2021
8cda9ba
Remove two unneeded changes.
SamuelTrahanNOAA Apr 12, 2021
81582bb
Fix whitespace issues in ccpp/physics.
SamuelTrahanNOAA Apr 12, 2021
0d72cba
Point to GSL repos.
SamuelTrahanNOAA Apr 12, 2021
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,5 +8,5 @@
branch = gsl/develop
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NOAA-GSL/ccpp-physics
branch = gsl/develop
url = https://github.com/SamuelTrahanNOAA/ccpp-physics
branch = features/more-diag-tend
48 changes: 34 additions & 14 deletions atmos_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ subroutine update_atmos_radiation_physics (Atmos)
implicit none
type (atmos_data_type), intent(in) :: Atmos
!--- local variables---
integer :: idtend, itrac
integer :: nb, jdat(8), rc, ierr

if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "statein driver"
Expand Down Expand Up @@ -283,21 +284,40 @@ subroutine update_atmos_radiation_physics (Atmos)
! Calculate total non-physics tendencies by substracting old IPD Stateout
! variables from new/updated IPD Statein variables (gives the tendencies
! due to anything else than physics)
if (GFS_control%ldiag3d) then
do nb = 1,Atm_block%nblks
GFS_data(nb)%Intdiag%du3dt(:,:,8) = GFS_data(nb)%Intdiag%du3dt(:,:,8) &
+ (GFS_data(nb)%Statein%ugrs - GFS_data(nb)%Stateout%gu0)
GFS_data(nb)%Intdiag%dv3dt(:,:,8) = GFS_data(nb)%Intdiag%dv3dt(:,:,8) &
+ (GFS_data(nb)%Statein%vgrs - GFS_data(nb)%Stateout%gv0)
GFS_data(nb)%Intdiag%dt3dt(:,:,11) = GFS_data(nb)%Intdiag%dt3dt(:,:,11) &
+ (GFS_data(nb)%Statein%tgrs - GFS_data(nb)%Stateout%gt0)
enddo
if (GFS_control%qdiag3d) then
if (GFS_Control%ldiag3d) then
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I expect that we will be asked to move this into its own subroutine, but let's leave it for now.

idtend = GFS_Control%dtidx(GFS_Control%index_of_x_wind,GFS_Control%index_of_process_non_physics)
if(idtend>=1) then
do nb = 1,Atm_block%nblks
GFS_data(nb)%Intdiag%dtend(:,:,idtend) = GFS_data(nb)%Intdiag%dtend(:,:,idtend) &
+ (GFS_data(nb)%Statein%ugrs - GFS_data(nb)%Stateout%gu0)
enddo
endif

idtend = GFS_Control%dtidx(GFS_Control%index_of_y_wind,GFS_Control%index_of_process_non_physics)
if(idtend>=1) then
do nb = 1,Atm_block%nblks
GFS_data(nb)%Intdiag%dtend(:,:,idtend) = GFS_data(nb)%Intdiag%dtend(:,:,idtend) &
+ (GFS_data(nb)%Statein%vgrs - GFS_data(nb)%Stateout%gv0)
enddo
endif

idtend = GFS_Control%dtidx(GFS_Control%index_of_temperature,GFS_Control%index_of_process_non_physics)
if(idtend>=1) then
do nb = 1,Atm_block%nblks
GFS_data(nb)%Intdiag%dq3dt(:,:,12) = GFS_data(nb)%Intdiag%dq3dt(:,:,12) &
+ (GFS_data(nb)%Statein%qgrs(:,:,GFS_control%ntqv) - GFS_data(nb)%Stateout%gq0(:,:,GFS_control%ntqv))
GFS_data(nb)%Intdiag%dq3dt(:,:,13) = GFS_data(nb)%Intdiag%dq3dt(:,:,13) &
+ (GFS_data(nb)%Statein%qgrs(:,:,GFS_control%ntoz) - GFS_data(nb)%Stateout%gq0(:,:,GFS_control%ntoz))
GFS_data(nb)%Intdiag%dtend(:,:,idtend) = GFS_data(nb)%Intdiag%dtend(:,:,idtend) &
+ (GFS_data(nb)%Statein%tgrs - GFS_data(nb)%Stateout%gt0)
enddo
endif

if (GFS_Control%qdiag3d) then
do itrac=1,GFS_Control%ntrac
idtend = GFS_Control%dtidx(itrac+100,GFS_Control%index_of_process_non_physics)
if(idtend>=1) then
do nb = 1,Atm_block%nblks
GFS_data(nb)%Intdiag%dtend(:,:,idtend) = GFS_data(nb)%Intdiag%dtend(:,:,idtend) &
+ (GFS_data(nb)%Statein%qgrs(:,:,itrac) - GFS_data(nb)%Stateout%gq0(:,:,itrac))
enddo
endif
enddo
endif
endif
Expand Down
551 changes: 522 additions & 29 deletions ccpp/data/GFS_typedefs.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading