Skip to content

Commit 9056ca2

Browse files
committed
UW settings like JASON/KROK but using new MFD_SC
1 parent a36df1f commit 9056ca2

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_UW_InterfaceMod.F90

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module GEOS_UW_InterfaceMod
1919

2020
integer USE_TRACER_TRANSP_UW ! transport tracers in UW
2121
real :: SCLM_SHALLOW
22-
logical :: JASON_UW
22+
logical :: JASON_UW, JASON_MFD_SC
2323

2424
private
2525

@@ -96,10 +96,14 @@ subroutine UW_Initialize (MAPL, CLOCK, RC)
9696
call MAPL_Get ( MAPL, LM=LM, RC=STATUS )
9797
VERIFY_(STATUS)
9898

99-
JASON_UW = .FALSE.
99+
JASON_UW = .TRUE.
100100
if (LM==72) JASON_UW = .TRUE.
101101
call MAPL_GetResource(MAPL, JASON_UW, 'JASON_UW:', default=JASON_UW, RC=STATUS) ; VERIFY_(STATUS)
102102

103+
JASON_MFD_SC = .FALSE.
104+
if (LM==72) JASON_MFD_SC = .TRUE.
105+
call MAPL_GetResource(MAPL, JASON_MFD_SC, 'JASON_MFD_SC:', default=JASON_MFD_SC, RC=STATUS) ; VERIFY_(STATUS)
106+
103107
call MAPL_GetResource(MAPL, USE_TRACER_TRANSP_UW, 'USE_TRACER_TRANSP_UW:',default= 1 , RC=STATUS) ; VERIFY_(STATUS)
104108
if (JASON_UW) then
105109
call MAPL_GetResource(MAPL, SHLWPARAMS%WINDSRCAVG, 'WINDSRCAVG:' ,DEFAULT=0, RC=STATUS) ; VERIFY_(STATUS)
@@ -380,7 +384,7 @@ subroutine UW_Run (GC, IMPORT, EXPORT, CLOCK, RC)
380384

381385
! Calculate detrained mass flux
382386
!--------------------------------------------------------------
383-
if (JASON_UW) then
387+
if (JASON_MFD_SC) then
384388
where (DETR_SC.ne.MAPL_UNDEF)
385389
MFD_SC = 0.5*(UMF_SC(:,:,1:LM)+UMF_SC(:,:,0:LM-1))*DETR_SC*DP
386390
elsewhere

0 commit comments

Comments
 (0)