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

Feature: NSSL Microphysics support #472

Merged
merged 33 commits into from
Mar 4, 2022
Merged

Feature: NSSL Microphysics support #472

Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d3521d5
Updates to support NSSL microphysics in CCPP
MicroTed Oct 16, 2021
2a3a156
Switched atmos and ccpp modules to NSSL versions
MicroTed Oct 19, 2021
99c9579
Bug fix for allocating/loading array2d
MicroTed Oct 28, 2021
c485881
Made setting of otsptflag more logical
MicroTed Oct 29, 2021
7655fc5
Fixed size and logic of otsptflag
MicroTed Nov 10, 2021
fa5bfc6
Merge branch 'feature/nsslmicro' of https://github.com/MicroTed/fv3at…
MicroTed Nov 10, 2021
4e524c8
Merge remote-tracking branch 'tedsrepo/feature/nsslmicro' into featur…
MicroTed Jan 20, 2022
81d33d9
Revert URL to default in .gitmodules
MicroTed Jan 20, 2022
40a3c66
Removed commented line and added whitespace
MicroTed Jan 20, 2022
2e0abb7
Merge remote-tracking branch 'tedsrepo/develop' into feature/nsslmicr…
MicroTed Jan 27, 2022
2dfb094
Update GFS_diagnostics.F90 and submodules
MicroTed Jan 27, 2022
7901983
Add suite file
MicroTed Jan 28, 2022
59c2453
Update .gitmodules
MicroTed Jan 29, 2022
23287bd
change dimensions of flag_convective_tracer_transport_interstitial to…
grantfirl Jan 31, 2022
91daade
Merge branch 'feature/nsslmicro-merge' into feature/nsslmicro-merge_gjf
grantfirl Feb 1, 2022
09f57a2
Merge pull request #1 from grantfirl/feature/nsslmicro-merge_gjf
MicroTed Feb 1, 2022
bb1207f
ccpp/physics update
MicroTed Feb 2, 2022
6613a8c
Update submodule
MicroTed Feb 11, 2022
b7cd45a
change units of NSSL flags
grantfirl Feb 14, 2022
61160e6
edit suite_FV3_RRFS_v1nssl.xml to match suite_FV3_RRFS_v1.xml
grantfirl Feb 15, 2022
507509d
Merge pull request #2 from grantfirl/feature/nsslmicro-merge_gjf
MicroTed Feb 15, 2022
d974856
remove GFS_suite_interstsitial_3/4 from FV3_RRFS_v1nssl suite since t…
grantfirl Feb 16, 2022
9e2bc64
Merge pull request #3 from grantfirl/feature/nsslmicro-merge_gjf
MicroTed Feb 17, 2022
dbc268b
Merge current develop branch
MicroTed Feb 17, 2022
9e3ab9e
Merge branch 'develop' into feature/nsslmicro-merge-tmp1
MicroTed Feb 17, 2022
073a4e8
Merge commit 'bc562d79211bb643e9b1ee9aa9831895d103efba' into feature/…
MicroTed Feb 25, 2022
2ae9f76
Update submodules and merge upstream
MicroTed Feb 25, 2022
24ec9a8
Changed atmos_cubed_sphere pointer
MicroTed Feb 25, 2022
dfbed13
update atmos_cubed_sphere
grantfirl Feb 25, 2022
fb3bce3
Merge pull request #4 from grantfirl/feature/nsslmicro-merge_gjf
MicroTed Feb 25, 2022
072418a
update ccpp/physics submodule pointer
MicroTed Mar 3, 2022
e7297e8
Switch to merged dev/emc branch of atmos_cubed_sphere
MicroTed Mar 4, 2022
adb0b44
Updated submodules and removed unneeded suite files
MicroTed Mar 4, 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
Bug fix for allocating/loading array2d
  • Loading branch information
@MicroTed
MicroTed committed Oct 28, 2021
commit 99c9579d553c6d6d9b7e12c22ba2911f5dcd5811
7 changes: 4 additions & 3 deletions io/FV3GFS_io.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ subroutine FV3GFS_GFS_checksum (Model, GFS_Data, Atm_block)
nsfcprop2d = 107
endif

allocate (temp2d(isc:iec,jsc:jec,nsfcprop2d+Model%ntot3d+Model%nctp))
! allocate (temp2d(isc:iec,jsc:jec,nsfcprop2d+Model%ntot3d+Model%nctp))
allocate (temp2d(isc:iec,jsc:jec,nsfcprop2d+Model%ntot2d+Model%nctp))
allocate (temp3d(isc:iec,jsc:jec,1:lev,14+Model%ntot3d+2*ntr))
allocate (temp3dlevsp1(isc:iec,jsc:jec,1:lev+1,3))

Expand Down Expand Up @@ -320,8 +321,8 @@ subroutine FV3GFS_GFS_checksum (Model, GFS_Data, Atm_block)
temp2d(i,j,idx_opt+2) = GFS_Data(nb)%Sfcprop%albdirnir_ice(ix)
temp2d(i,j,idx_opt+3) = GFS_Data(nb)%Sfcprop%albdifvis_ice(ix)
temp2d(i,j,idx_opt+4) = GFS_Data(nb)%Sfcprop%albdifnir_ice(ix)
idx_opt = idx_opt + 5
endif
idx_opt = idx_opt + 5

if (Model%lsm == Model%lsm_noahmp) then
temp2d(i,j,idx_opt) = GFS_Data(nb)%Sfcprop%snowxy(ix)
Expand Down Expand Up @@ -2764,7 +2765,7 @@ subroutine fv3gfs_diag_output(time, diag, atm_block, nx, ny, levs, ntcw, ntoz, &
!--- skipping other 3D variables with the following else statement
!---
if(mpp_pe()==mpp_root_pe())print *,'in,fv3gfs_io. 3D fields, idx=',idx,'varname=',trim(diag(idx)%name), &
'lcnvfac=',lcnvfac, 'levo=',levo,'nx=',nx,'ny=',ny
' lcnvfac=',lcnvfac, ' levo=',levo,' nx=',nx,' ny=',ny
do k=1, levo
do j = 1, ny
jj = j + jsc -1
Expand Down