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

Fixes #15. Update Moist to Jason-3_2 #19

Merged
merged 1 commit into from
Aug 5, 2019
Merged

Fixes #15. Update Moist to Jason-3_2 #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5685,6 +5685,7 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
real , dimension(IM,JM) :: CNV_FRACTION
real :: CNV_FRACTION_MIN
real :: CNV_FRACTION_MAX
real :: GF_MIN_AREA

real :: cNN, cNN_OCEAN, cNN_LAND, CONVERT

Expand Down Expand Up @@ -7201,6 +7202,9 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
if(associated(Q600 )) Q600 = QV600
if(associated(RH600 )) RH600 = RHat600

call MAPL_GetResource(STATE,GF_MIN_AREA, 'GF_MIN_AREA:', DEFAULT= 1.e6, RC=STATUS)
VERIFY_(STATUS)

K0 = LM
ICMIN = max(1,count(PREF < PMIN_DET))
KCBLMIN = count(PREF < PMIN_CBL)
Expand Down Expand Up @@ -7772,7 +7776,11 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)

! WMP
! Modify AREA (m^2) here so GF scale dependence has a CNV_FRACTION dependence
GF_AREA = (1.e6)*CNV_FRACTION + AREA*(1.0-CNV_FRACTION)
if (GF_MIN_AREA > 0) then
GF_AREA = GF_MIN_AREA*CNV_FRACTION + AREA*(1.0-CNV_FRACTION)
else
GF_AREA = AREA
endif
! WMP

!- call GF/GEOS5 interface routine
Expand Down