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/narnold1/#560 shocmf updates #783

Merged
merged 29 commits into from
Aug 24, 2023
+2,521 −2,303
Merged

Feature/narnold1/#560 shocmf updates #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
01e4309
Initial commit on develop, confirmed builds and runs
narnold1 Jun 14, 2023
e2ff291
Slight adjustment to EDMF LTS dependence
narnold1 Jun 15, 2023
c9007b0
Reduce max L with height to prevent TKE around model top
narnold1 Jun 16, 2023
5f817af
shoc.F90 cleanup
narnold1 Jun 20, 2023
0d8c0a0
Further SHOC cleanup
narnold1 Jun 21, 2023
b0b575f
Restore duplicative TKE calculation, to achieve 0-diff
narnold1 Jun 21, 2023
70fbe73
Merge branch 'develop' into feature/narnold1/#560-shocmf-updates
narnold1 Jun 21, 2023
b137bf9
Moved params into shoc.F90 and edmf.F90, removed EDMF_DIAG ifdefs and…
narnold1 Jun 30, 2023
cff12fb
EDMF code cleanup
narnold1 Jul 3, 2023
efa9f8b
EDMF bugfix, and removed SCM_SL ifdefs
narnold1 Jul 7, 2023
ead2b26
Switch to using GEOS_QSAT in partition_dblgss
narnold1 Jul 7, 2023
329ab6f
Merge branch 'develop' into feature/narnold1/#560-shocmf-updates
narnold1 Jul 14, 2023
bcfc3f3
Reverted QSAT in dblgss, and fixed Prandtl limit in SHOC
narnold1 Jul 14, 2023
1c5ad30
Cleanup in TurbGC
narnold1 Jul 17, 2023
9713530
Update GEOSagcm_GridComp/GEOS_AgcmGridComp.F90
narnold1 Jul 17, 2023
bec4c46
Bug fixes for SCM_SURFACE, and WQT
narnold1 Jul 17, 2023
50ce9fb
Increased minimum TKE from 1e-6 to 1e-4. Small changes based on debu…
narnold1 Jul 19, 2023
bb6b24b
Added SCM_NO_RAD option to PhysicsGridComp.F90
narnold1 Jul 19, 2023
59b6ef5
Changed UMF_SC calculation below cloud base to ensure interpolation t…
narnold1 Jul 19, 2023
3afc75e
Merge branch 'feature/narnold1/#560-shocmf-updates' of github.com:GEO…
narnold1 Jul 19, 2023
7d51d26
defined isotropy on edges and removed min of adjacent isotropy, chang…
narnold1 Jul 28, 2023
35835e8
Limited MF dependence on wthv, reduced max ztop for ENT0 calc, fixed …
narnold1 Jul 30, 2023
b975aa2
Fixed UW UMF_SC below cloud base
narnold1 Jul 30, 2023
c76531f
Merge branch 'develop' into feature/narnold1/#560-shocmf-updates
narnold1 Jul 31, 2023
e441260
0-diff: Reverts uwshcu changes, restores duplicative TKE calc in TurbGC
narnold1 Jul 31, 2023
cf31c15
Merge branch 'develop' into feature/narnold1/#560-shocmf-updates
narnold1 Aug 1, 2023
3166608
Fixed EDMF_FRC issue
narnold1 Aug 1, 2023
6f113da
Fixed EDMF_FRC again
narnold1 Aug 1, 2023
d899e73
Merge branch 'develop' into feature/narnold1/#560-shocmf-updates
sdrabenh Aug 24, 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
15 changes: 11 additions & 4 deletions GEOSagcm_GridComp/GEOS_AgcmGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
#undef FULLPHYSICS
#endif


#if defined SCM
#define GEOS_superdynGridCompMod GEOS_singcolGridCompMod
#undef GCM
#endif


!=============================================================================
!BOP

Expand Down Expand Up @@ -137,7 +139,7 @@ subroutine SetServices ( GC, RC )
! Locals

integer :: I
integer :: RST
integer :: RST, SCM_SL
logical :: ANA_TS
type (ESMF_Config) :: CF
type (MAPL_MetaComp), pointer :: MAPL
Expand Down Expand Up @@ -189,6 +191,9 @@ subroutine SetServices ( GC, RC )
RST = MAPL_RestartSkip
end if

call MAPL_GetResource(MAPL, SCM_SL, Label="SCM_SL:", default=0, _RC)


call MAPL_GetResource(MAPL, ReplayMode, Label='REPLAY_MODE:', default="NoReplay", RC=STATUS )
VERIFY_(STATUS)
if(ANA_TS .and. ( adjustl(ReplayMode) /= "Exact" .and. &
Expand Down Expand Up @@ -1042,14 +1047,16 @@ subroutine SetServices ( GC, RC )
RC=STATUS )
VERIFY_(STATUS)

#ifdef SCMSURF
if (SCM_SL /= 0 ) then
print *,'AgcmGC: adding connectivity for LHOBS and SHOBS'
call MAPL_AddConnectivity ( GC, &
SHORT_NAME = (/'TSKINOBS','QSKINOBS','LHOBS ','SHOBS '/), &
! SHORT_NAME = (/'TSKINOBS','QSKINOBS','LHOBS ','SHOBS '/), &
SHORT_NAME = (/'LHOBS ','SHOBS '/), &
DST_ID = PHYS, &
SRC_ID = SDYN, &
RC=STATUS )
VERIFY_(STATUS)
#endif
end if

!ALT: we need this if we run with NCEP gwd
call MAPL_AddConnectivity ( GC, &
Expand Down
36 changes: 24 additions & 12 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,8 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddConnectivity ( GC, &
SHORT_NAME = (/'QV ','QLTOT','QITOT','QCTOT','WTHV2'/),&
SHORT_NAME = (/'QV ','QLTOT ','QITOT ','QCTOT ', &
'WTHV2 ','WQT_DC' /), &
DST_ID = TURBL, &
SRC_ID = MOIST, &
RC=STATUS )
Expand Down Expand Up @@ -1288,10 +1289,10 @@ subroutine SetServices ( GC, RC )

call MAPL_AddConnectivity ( GC, &
SHORT_NAME = (/'KH ', 'KPBL ', 'KPBL_SC ', &
'TKE ', 'TKESHOC ', 'EDMF_FRC ', &
'HL2 ', 'HL3 ', 'W2 ', &
'W3 ', 'HLQT ', 'WQT ', &
'WHL ', 'QT2 ', 'QT3 '/), &
'TKE ', 'TKESHOC ', 'PDF_A ', &
'SL2 ', 'SL3 ', 'W2 ', &
'W3 ', 'SLQT ', 'WQT ', &
'WSL ', 'QT2 ', 'QT3 '/), &
DST_ID = MOIST, &
SRC_ID = TURBL, &
RC=STATUS )
Expand Down Expand Up @@ -2091,7 +2092,7 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
real, allocatable, dimension(:,:,:) :: TFORQS
real, allocatable, dimension(:,:) :: qs,pmean

logical :: isPresent
logical :: isPresent, SCM_NO_RAD
real, allocatable, target :: zero(:,:,:)

real(kind=MAPL_R8), allocatable, dimension(:,:) :: sumdq
Expand Down Expand Up @@ -2137,6 +2138,9 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
call MAPL_TimerOn(STATE,"TOTAL")
call MAPL_TimerOn(STATE,"RUN")

call MAPL_GetResource(STATE, SCM_NO_RAD, Label="SCM_NO_RAD:", default=.FALSE., RC=STATUS)
VERIFY_(STATUS)

call MAPL_GetResource(STATE, DUMMY, Label="DPEDT_PHYS:", default='YES', RC=STATUS)
VERIFY_(STATUS)
DUMMY = ESMF_UtilStringUpperCase(DUMMY)
Expand Down Expand Up @@ -2762,12 +2766,20 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
VERIFY_(STATUS)
endif

TOT = TIR & ! Mass-Weighted Temperature Tendency due to Radiation
+ STN & ! Mass-Weighted Temperature Tendency due to Turbulent Mixing
+ TTN & ! Mass-Weighted Temperature Tendency due to Moist Processes
+ FRI & ! Mass-Weighted Temperature Tendency due to Friction (Turbulence)
+ TIG & ! Mass-Weighted Temperature Tendency due to GWD
+ TICU ! Mass-Weighted Temperature Tendency due to Cumulus Friction
if (SCM_NO_RAD) then
TOT = STN & ! Mass-Weighted Temperature Tendency due to Turbulent Mixing
+ TTN & ! Mass-Weighted Temperature Tendency due to Moist Processes
+ FRI & ! Mass-Weighted Temperature Tendency due to Friction (Turbulence)
+ TIG & ! Mass-Weighted Temperature Tendency due to GWD
+ TICU ! Mass-Weighted Temperature Tendency due to Cumulus Friction
else
TOT = TIR & ! Mass-Weighted Temperature Tendency due to Radiation
+ STN & ! Mass-Weighted Temperature Tendency due to Turbulent Mixing
+ TTN & ! Mass-Weighted Temperature Tendency due to Moist Processes
+ FRI & ! Mass-Weighted Temperature Tendency due to Friction (Turbulence)
+ TIG & ! Mass-Weighted Temperature Tendency due to GWD
+ TICU ! Mass-Weighted Temperature Tendency due to Cumulus Friction
end if

IF(DO_SPPT) THEN
allocate(TFORQS(IM,JM,LM))
Expand Down
10 changes: 8 additions & 2 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/ConvPar_GF2020.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ SUBROUTINE GF2020_INTERFACE( mxp,myp,mzp,LONS,LATS,DT_MOIST
,STOCHASTIC_SIG, SIGMA_DEEP, SIGMA_MID &
,DQDT_GF,DTDT_GF,DUDT_GF,DVDT_GF &
,MUPDP,MUPSH,MUPMD,MDNDP &
,MFDP,MFSH,MFMD,ERRDP,ERRSH,ERRMD &
,MFDP,MFSH,MFMD,ERRDP,ERRSH,ERRMD,WQT_DC &
,AA0,AA1,AA2,AA3,AA1_BL,AA1_CIN,TAU_BL,TAU_EC &
,DTDTDYN,DQVDTDYN &
,REVSU, PRFIL &
Expand Down Expand Up @@ -222,7 +222,7 @@ SUBROUTINE GF2020_INTERFACE( mxp,myp,mzp,LONS,LATS,DT_MOIST

REAL ,DIMENSION(mxp,myp,mzp) ,INTENT(INOUT):: CNV_TR

REAL ,DIMENSION(mxp,myp,0:mzp) ,INTENT(OUT) :: CNV_MFC
REAL ,DIMENSION(mxp,myp,0:mzp) ,INTENT(OUT) :: CNV_MFC, WQT_DC

REAL ,DIMENSION(mxp,myp,mzp) ,INTENT(OUT) :: CNV_MF0 , CNV_PRC3 , CNV_MFD , CNV_DQCDT, &
CNV_UPDF, CNV_CVW , CNV_QC , ENTLAM
Expand Down Expand Up @@ -352,7 +352,9 @@ SUBROUTINE GF2020_INTERFACE( mxp,myp,mzp,LONS,LATS,DT_MOIST
INTEGER, PARAMETER :: itest=1!3
REAL :: RL, RI, disp_factor,x1,x2
INTEGER :: mtp
real :: dtqw,qsatup

WQT_DC = 0.0
CNV_MFC = 0.0
CNV_MF0 = 0.0
CNV_PRC3 = 0.0
Expand Down Expand Up @@ -847,6 +849,10 @@ SUBROUTINE GF2020_INTERFACE( mxp,myp,mzp,LONS,LATS,DT_MOIST
!---only updraft
CNV_MFC (i,j,k) = CNV_MFC (i,j,k) + zup5d(i,j,flip(k),IENS)

! deep convective total water flux. assumes .033 fractional area.
qsatup = MAPL_EQsat(tup5d(i,j,flip(k),IENS),press(flip(k),i,j),dtqw) + clwup5d(i,j,flip(k),IENS)/0.033
WQT_DC (i,j,k) = WQT_DC (i,j,k) + zup5d(i,j,flip(k),IENS)*(qsatup - rvap(flip(k),i,j))

if(zup5d(i,j,flip(k),IENS) > 1.0e-6) then
!-'entrainment parameter', UNITS ='m-1',
ENTLAM (i,j,k) = ENTLAM (i,j,k) + (up_massentr5d(i,j,flip(k),IENS)/(DZ(i,j,k)*zup5d(i,j,flip(k),IENS)))
Expand Down
24 changes: 11 additions & 13 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_BACM_1M_InterfaceMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
! Imports
real, pointer, dimension(:,:,:) :: ZLE, PLE, T, U, V, KH
real, pointer, dimension(:,:) :: FRLAND, TS, DTSX, SH, EVAP, KPBLSC
real, pointer, dimension(:,:,:) :: HL2, HL3, QT2, QT3, W2, W3, HLQT, WQT, WQL, WHL, EDMF_FRC
real, pointer, dimension(:,:,:) :: SL2, SL3, QT2, QT3, W2, W3, SLQT, WQT, WQL, WSL, PDF_A
real, pointer, dimension(:,:,:) :: OMEGA
real, pointer, dimension(:,:,:) :: CNV_MFD, CNV_DQCDT, CNV_PRC3, CNV_UPDF
real, pointer, dimension(:,:,:) :: MFD_SC, QLDET_SC, QIDET_SC, SHLW_PRC3, SHLW_SNO3, CUFRC_SC
Expand Down Expand Up @@ -341,7 +341,7 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
real, pointer, dimension(:,:,:) :: ALPHT, ALPH1, ALPH2
real, pointer, dimension(:,:,:) :: CFPDF, RHCLR
real, pointer, dimension(:,:,:) :: DQRL, WTHV2
real, pointer, dimension(:,:,:) :: PDF_A, PDFITERS
real, pointer, dimension(:,:,:) :: PDFITERS
real, pointer, dimension(:,: ) :: CNV_FRC, SRF_TYPE
real, pointer, dimension(:,: ) :: LS_PRCP, CN_PRCP, AN_PRCP, SC_PRCP
real, pointer, dimension(:,: ) :: LS_ARF, CN_ARF, AN_ARF, SC_ARF
Expand Down Expand Up @@ -395,16 +395,16 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
call MAPL_GetPointer(IMPORT, V, 'V' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, FRLAND, 'FRLAND' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, KH, 'KH' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, EDMF_FRC,'EDMF_FRC', RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, PDF_A, 'PDF_A' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, W2, 'W2' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, W3, 'W3' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, WQT, 'WQT' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, WHL, 'WHL' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, HL2, 'HL2' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, HL3, 'HL3' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, WSL, 'WSL' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, SL2, 'SL2' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, SL3, 'SL3' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, QT2, 'QT2' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, QT3, 'QT3' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, HLQT, 'HLQT' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, SLQT, 'SLQT' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, TS, 'TS' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, KPBLSC, 'KPBL_SC' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, SH, 'SH' , RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -588,7 +588,6 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
call MAPL_GetPointer(EXPORT, CFPDF, 'CFPDF' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, RHCLR, 'RHCLR' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, DQRL, 'DQRL' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_A, 'PDF_A' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDFITERS, 'PDFITERS', ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, WTHV2, 'WTHV2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, WQL, 'WQL' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
Expand All @@ -603,16 +602,15 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
PK , &
FRLAND , & ! <- surf
KH , & ! <- turb
EDMF_FRC , & ! <- turb
WQT , & ! <- turb
WHL , & ! <- turb
WSL , & ! <- turb
QT2 , & ! <- turb
HL2 , & ! <- turb
HLQT , & ! <- turb
SL2 , & ! <- turb
SLQT , & ! <- turb
W2 , & ! <- turb
W3 , & ! <- turb
QT3 , & ! <- turb
HL3 , & ! <- turb
SL3 , & ! <- turb
CNV_MFD , & ! <- deep
CNV_DQCDT , & ! <- deep
CNV_PRC3 , & ! <- deep
Expand Down
24 changes: 11 additions & 13 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_GFDL_1M_InterfaceMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
! Imports
real, pointer, dimension(:,:,:) :: ZLE, PLE, T, U, V, W, KH
real, pointer, dimension(:,:) :: AREA, FRLAND, TS, DTSX, SH, EVAP, KPBLSC
real, pointer, dimension(:,:,:) :: HL2, HL3, QT2, QT3, W2, W3, HLQT, WQT, WQL, WHL, EDMF_FRC
real, pointer, dimension(:,:,:) :: SL2, SL3, QT2, QT3, W2, W3, SLQT, WQT, WQL, WSL, PDF_A
real, pointer, dimension(:,:,:) :: WTHV2
real, pointer, dimension(:,:,:) :: OMEGA
! Local
Expand Down Expand Up @@ -317,7 +317,7 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
real, pointer, dimension(:,:,:) :: RHX, REV_LS, RSU_LS
real, pointer, dimension(:,:,:) :: PFL_LS, PFL_AN
real, pointer, dimension(:,:,:) :: PFI_LS, PFI_AN
real, pointer, dimension(:,:,:) :: PDF_A, PDFITERS
real, pointer, dimension(:,:,:) :: PDFITERS
real, pointer, dimension(:,:,:) :: RHCRIT3D
real, pointer, dimension(:,:) :: EIS, LTS
real, pointer, dimension(:,:) :: DBZ_MAX, DBZ_1KM, DBZ_TOP, DBZ_M10C
Expand Down Expand Up @@ -378,16 +378,16 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
call MAPL_GetPointer(IMPORT, W, 'W' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, FRLAND, 'FRLAND' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, KH, 'KH' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, EDMF_FRC,'EDMF_FRC', RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, PDF_A, 'PDF_A' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, W2, 'W2' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, W3, 'W3' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, WQT, 'WQT' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, WHL, 'WHL' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, HL2, 'HL2' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, HL3, 'HL3' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, WSL, 'WSL' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, SL2, 'SL2' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, SL3, 'SL3' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, QT2, 'QT2' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, QT3, 'QT3' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, HLQT, 'HLQT' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, SLQT, 'SLQT' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, TS, 'TS' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, KPBLSC, 'KPBL_SC' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(IMPORT, SH, 'SH' , RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -474,7 +474,6 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
call MAPL_GetPointer(EXPORT, PFL_LS, 'PFL_LS' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PFI_AN, 'PFI_AN' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PFI_LS, 'PFI_LS' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_A, 'PDF_A' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, WTHV2, 'WTHV2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, WQL, 'WQL' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDFITERS, 'PDFITERS', ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -584,16 +583,15 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
CLCN(I,J,L) , &
NACTL(I,J,L) , &
NACTI(I,J,L) , &
WHL(I,J,L) , &
WSL(I,J,L) , &
WQT(I,J,L) , &
HL2(I,J,L) , &
SL2(I,J,L) , &
QT2(I,J,L) , &
HLQT(I,J,L) , &
SLQT(I,J,L) , &
W3(I,J,L) , &
W2(I,J,L) , &
QT3(I,J,L) , &
HL3(I,J,L) , &
EDMF_FRC(I,J,L), &
SL3(I,J,L) , &
PDF_A(I,J,L) , &
PDFITERS(I,J,L), &
WTHV2(I,J,L) , &
Expand Down
5 changes: 3 additions & 2 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_GF_InterfaceMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ subroutine GF_Run (GC, IMPORT, EXPORT, CLOCK, RC)
real, pointer, dimension(:,: ) :: CNV_FRC, SRF_TYPE
! Exports
real, pointer, dimension(:,:,:) :: CNV_MF0, ENTLAM
real, pointer, dimension(:,:,:) :: MUPDP,MDNDP,MUPSH,MUPMD
real, pointer, dimension(:,:,:) :: MUPDP,MDNDP,MUPSH,MUPMD,WQT_DC
real, pointer, dimension(:,:,:) :: VAR3d_a,VAR3d_b,VAR3d_c,VAR3d_d
real, pointer, dimension(:,: ) :: T2M,Q2M,TA,QA,SH,EVAP,PHIS
real, pointer, dimension(:,: ) :: MFDP,MFSH,MFMD,ERRDP,ERRSH,ERRMD
Expand Down Expand Up @@ -472,6 +472,7 @@ subroutine GF_Run (GC, IMPORT, EXPORT, CLOCK, RC)
call MAPL_GetPointer(EXPORT, AA1_CIN ,'AA1_CIN' ,ALLOC = .TRUE. ,RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, TAU_BL ,'TAU_BL' ,ALLOC = .TRUE. ,RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, TAU_EC ,'TAU_EC' ,ALLOC = .TRUE. ,RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, WQT_DC ,'WQT_DC' ,ALLOC = .TRUE., RC=STATUS); VERIFY_(STATUS)

! Initialize tendencies
call MAPL_GetPointer(EXPORT, DUDT_DC, 'DUDT_DC' , ALLOC = .TRUE., RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -527,7 +528,7 @@ subroutine GF_Run (GC, IMPORT, EXPORT, CLOCK, RC)
,SEEDCNV, SIGMA_DEEP, SIGMA_MID &
,DQVDT_DC,DTDT_DC,DUDT_DC,DVDT_DC &
,MUPDP,MUPSH,MUPMD,MDNDP &
,MFDP,MFSH,MFMD,ERRDP,ERRSH,ERRMD &
,MFDP,MFSH,MFMD,ERRDP,ERRSH,ERRMD,WQT_DC &
,AA0,AA1,AA2,AA3,AA1_BL,AA1_CIN,TAU_BL,TAU_EC &
,DTDTDYN,DQVDTDYN &
,REVSU, PRFIL &
Expand Down
Loading