Skip to content

Commit 485a254

Browse files
Yujin ZengYujin Zeng
authored andcommitted
RUN_ROUTE>=1 replaced RUN_ROUTE==1
1 parent 5eebca3 commit 485a254

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

GEOS_LdasGridComp.F90

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ module GEOS_LdasGridCompMod
6464
logical :: ensemble_forcing ! switch between deterministic and ensemble forcing
6565
logical :: with_landice ! true if landice tiles requested by config
6666
logical :: with_land ! true if land tiles requested by config
67-
integer :: RUN_ROUTE ! 1 if run river-routine grid comp
67+
integer :: RUN_ROUTE ! 1/2 if run river-routine grid comp without/with reservoirs,
6868

6969
contains
7070

@@ -210,7 +210,7 @@ subroutine SetServices(gc, rc)
210210

211211
if (with_land) allocate(LAND( NUM_ENSEMBLE),LANDPERT(NUM_ENSEMBLE))
212212
if (with_landice) allocate(LANDICE(NUM_ENSEMBLE))
213-
if (RUN_ROUTE == 1) then
213+
if (RUN_ROUTE >= 1) then
214214
_ASSERT( with_land, "RUNOFF must be from the export of land_gridcomp for now.")
215215
allocate(ROUTE(NUM_ENSEMBLE))
216216
endif
@@ -262,7 +262,7 @@ subroutine SetServices(gc, rc)
262262
VERIFY_(status)
263263
endif
264264

265-
if (RUN_ROUTE == 1) then
265+
if (RUN_ROUTE >= 1) then
266266
childname='ROUTE'//trim(ensid_string)
267267
ROUTE(i) = MAPL_AddChild(gc, name=childname, ss=RouteSetServices, rc=status)
268268
VERIFY_(status)
@@ -317,7 +317,7 @@ subroutine SetServices(gc, rc)
317317
)
318318
VERIFY_(status)
319319

320-
IF(RUN_ROUTE == 1) THEN
320+
IF(RUN_ROUTE >= 1) THEN
321321
call MAPL_AddConnectivity ( &
322322
GC ,&
323323
SHORT_NAME = (/'RUNOFF '/) ,& ! RUNOFF = total runoff = surface runoff + baseflow
@@ -814,7 +814,7 @@ subroutine Initialize(gc, import, export, clock, rc)
814814
VERIFY_(status)
815815
endif
816816

817-
if (RUN_ROUTE == 1) then
817+
if (RUN_ROUTE >= 1) then
818818
call MAPL_GetObjectFromGC(gcs(ROUTE(i)), CHILD_MAPL, rc=status)
819819
VERIFY_(status) ! CHILD = ens_avg
820820
call MAPL_Set(CHILD_MAPL, LocStream=land_locstream, rc=status)
@@ -1048,7 +1048,7 @@ subroutine Run(gc, import, export, clock, rc)
10481048
call MAPL_TimerOff(MAPL, gcnames(igc))
10491049
endif ! with_land_ice
10501050

1051-
if ( RUN_ROUTE == 1 ) then
1051+
if ( RUN_ROUTE >= 1 ) then
10521052
igc = ROUTE(i)
10531053
call MAPL_TimerOn(MAPL, gcnames(igc))
10541054
call ESMF_GridCompRun(gcs(igc), importState=gim(igc), exportState=gex(igc), clock=clock, phase=1, userRC=status)

0 commit comments

Comments
 (0)