Add river routing module

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/CMakeLists.txt

@@ -4,6 +4,7 @@ set (alldirs
    GEOSlandice_GridComp
    GEOSlake_GridComp
    GEOSland_GridComp
+   GEOSroute_GridComp
    GEOSsaltwater_GridComp
    )
 

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/CMakeLists.txt

@@ -5,7 +5,6 @@ set (alldirs
   GEOScatch_GridComp
   GEOScatchCN_GridComp
   GEOSlana_GridComp
-  GEOSroute_GridComp
   GEOSigni_GridComp
   )
 

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOS_LandGridComp.F90

@@ -31,7 +31,6 @@ module GEOS_LandGridCompMod
   use GEOS_CatchGridCompMod,   only : CatchSetServices    => SetServices
   use GEOS_CatchCNGridCompMod, only : CatchCNSetServices  => SetServices
   use GEOS_IgniGridCompMod,    only : IgniSetServices     => SetServices
-!  use GEOS_RouteGridCompMod,   only : RouteSetServices    => SetServices
 
   implicit none
   private
@@ -45,8 +44,8 @@ module GEOS_LandGridCompMod
 
 
   integer                                 :: VEGDYN
-  integer, allocatable                    :: CATCH(:), ROUTE (:), CATCHCN (:)
-  integer                                 :: LSM_CHOICE, RUN_ROUTE, DO_GOSWIM
+  integer, allocatable                    :: CATCH(:), CATCHCN(:)
+  integer                                 :: LSM_CHOICE, DO_GOSWIM
   integer                                 :: IGNI
   logical                                 :: DO_FIRE_DANGER
 
@@ -68,7 +67,7 @@ subroutine SetServices ( GC, RC )
 ! !DESCRIPTION:  The SetServices for the Physics GC needs to register its
 !   Initialize and Run.  It uses the MAPL\_Generic construct for defining 
 !   state specs and couplings among its children.  In addition, it creates the   
-!   children GCs (VegDyn, Catch, CatchCN, Route) and runs their respective SetServices.
+!   children GCs (VegDyn, Catch, CatchCN) and runs their respective SetServices.
 
 !EOP
 
@@ -84,7 +83,7 @@ subroutine SetServices ( GC, RC )
 
     character(len=ESMF_MAXSTR)              :: GCName
     type(ESMF_Config)                       :: CF, SCF
-    integer                                 :: NUM_CATCH
+    integer                                 :: NUM_CATCH_ENS
     integer                                 :: I
     character(len=ESMF_MAXSTR)              :: TMP
     type(MAPL_MetaComp),pointer             :: MAPL=>null()
@@ -134,7 +133,7 @@ subroutine SetServices ( GC, RC )
     call MAPL_GridCompSetEntryPoint ( GC, ESMF_METHOD_RUN, Run2, RC=STATUS )
     VERIFY_(STATUS)
 
-    call ESMF_ConfigGetAttribute ( CF, NUM_CATCH, Label="NUM_CATCH_ENSEMBLES:", default=1, RC=STATUS)
+    call ESMF_ConfigGetAttribute ( CF, NUM_CATCH_ENS, Label="NUM_CATCH_ENSEMBLES:", default=1, RC=STATUS)
     VERIFY_(STATUS)
 
 !------------------------------------------------------------
@@ -154,7 +153,6 @@ subroutine SetServices ( GC, RC )
     call MAPL_GetResource (MAPL, SURFRC, label = 'SURFRC:', default = 'GEOS_SurfaceGridComp.rc', RC=STATUS) ; VERIFY_(STATUS)
     SCF = ESMF_ConfigCreate(rc=status) ; VERIFY_(STATUS)
     call ESMF_ConfigLoadFile(SCF,SURFRC,rc=status) ; VERIFY_(STATUS)
-    call MAPL_GetResource (SCF, RUN_ROUTE, label='RUN_ROUTE:',           DEFAULT=0, __RC__ )
     call MAPL_GetResource (SCF, DO_GOSWIM, label='N_CONST_LAND4SNWALB:', DEFAULT=0, __RC__ )
     call MAPL_GetResource (SCF, DO_FIRE_DANGER, label='FIRE_DANGER:',    DEFAULT=.false., __RC__ )
     call ESMF_ConfigDestroy      (SCF, __RC__)
@@ -163,13 +161,13 @@ subroutine SetServices ( GC, RC )
 
     CASE (1) 
 
-       allocate (CATCH(NUM_CATCH), stat=status)
+       allocate (CATCH(NUM_CATCH_ENS), stat=status)
        VERIFY_(STATUS)
-       if (NUM_CATCH == 1) then
+       if (NUM_CATCH_ENS == 1) then
           CATCH(1) = MAPL_AddChild(GC, NAME='CATCH'//trim(tmp), SS=CatchSetServices, RC=STATUS)
           VERIFY_(STATUS)
        else
-          do I = 1, NUM_CATCH
+          do I = 1, NUM_CATCH_ENS
              WRITE(TMP,'(I3.3)') I
              GCName  = 'ens' // trim(TMP) // ':CATCH'
              CATCH(I) = MAPL_AddChild(GC, NAME=GCName, SS=CatchSetServices, RC=STATUS)
@@ -179,13 +177,13 @@ subroutine SetServices ( GC, RC )
 
     CASE (2,3) 
 
-       allocate (CATCHCN(NUM_CATCH), stat=status)
+       allocate (CATCHCN(NUM_CATCH_ENS), stat=status)
        VERIFY_(STATUS)
-       if (NUM_CATCH == 1) then
+       if (NUM_CATCH_ENS == 1) then
           CATCHCN(1) = MAPL_AddChild(GC, NAME='CATCHCN'//trim(tmp), SS=CatchCNSetServices, RC=STATUS)
           VERIFY_(STATUS)
        else
-          do I = 1, NUM_CATCH
+          do I = 1, NUM_CATCH_ENS
              WRITE(TMP,'(I3.3)') I
              GCName  = 'ens' // trim(TMP) // ':CATCHCN'
              CATCHCN(I) = MAPL_AddChild(GC, NAME=GCName, SS=CatchCNSetServices, RC=STATUS)
@@ -195,20 +193,6 @@ subroutine SetServices ( GC, RC )
 
     END SELECT
 
-!    IF(RUN_ROUTE == 1) THEN
-!       if (NUM_CATCH == 1) then
-!          ROUTE(1) = MAPL_AddChild(GC, NAME='ROUTE', SS=RouteSetServices, RC=STATUS)
-!          VERIFY_(STATUS)
-!       else
-!          do I = 1, NUM_CATCH
-!             WRITE(TMP,'(I3.3)') I
-!             GCName  = 'ens' // trim(TMP) // ':ROUTE'
-!             ROUTE(I) = MAPL_AddChild(GC, NAME=GCName, SS=RouteSetServices, RC=STATUS)
-!             VERIFY_(STATUS)
-!          end do
-!       end if
-!    ENDIF
-
     if (DO_FIRE_DANGER) then
         IGNI = MAPL_AddChild(GC, NAME='IGNI'//trim(tmp), SS=IgniSetServices, RC=STATUS)
         VERIFY_(STATUS)
@@ -1377,14 +1361,6 @@ subroutine SetServices ( GC, RC )
                               CHILD_ID = VEGDYN,&
                               RC=STATUS  )
     VERIFY_(STATUS) 
-!    IF(RUN_ROUTE == 1) THEN
-!       call MAPL_AddExportSpec ( GC, &
-!            SHORT_NAME = 'QOUTFLOW', &
-!            CHILD_ID = ROUTE(1),     &
-!            RC=STATUS  )
-!       VERIFY_(STATUS)       
-!    ENDIF
-
 
     if (DO_FIRE_DANGER) then
        call MAPL_AddExportSpec ( GC, SHORT_NAME = 'FFMC',        CHILD_ID = IGNI,  __RC__ )
@@ -1426,7 +1402,7 @@ subroutine SetServices ( GC, RC )
 
 ! !CONNECTIONS:
 
-    DO I = 1, NUM_CATCH
+    DO I = 1, NUM_CATCH_ENS
 
        SELECT CASE (LSM_CHOICE)
 
@@ -1453,17 +1429,6 @@ subroutine SetServices ( GC, RC )
               VERIFY_(STATUS)
           end if
 
-!          IF(RUN_ROUTE == 1) THEN
-!             call MAPL_AddConnectivity (                              &
-!                  GC                                                 ,&
-!                  SHORT_NAME  = (/'RUNOFF  '/)                       ,&
-!                  SRC_ID =  CATCH(I)                                 ,&
-!                  DST_ID =  ROUTE(I)                                 ,&
-!                  
-!                  RC=STATUS )
-!             VERIFY_(STATUS)            
-!          ENDIF
-
        CASE (2,3)
           call MAPL_AddConnectivity (                                    & 
             GC                                                 ,         &
@@ -1486,19 +1451,9 @@ subroutine SetServices ( GC, RC )
               VERIFY_(STATUS)
           end if
 
-!          IF(RUN_ROUTE == 1) THEN
-!             call MAPL_AddConnectivity (                              &
-!                  GC                                                 ,&
-!                  SHORT_NAME  = (/'RUNOFF  '/)                       ,&
-!                  SRC_ID =  CATCHCN(I)                               ,&
-!                  DST_ID =  ROUTE(I)                                 ,&
-!                  
-!                  RC=STATUS )
-!             VERIFY_(STATUS)            
-!          ENDIF
        END SELECT
     END DO
-
+    
 
     call MAPL_TimerAdd(GC, name="INITIALIZE"    ,RC=STATUS)
     VERIFY_(STATUS)
@@ -1714,7 +1669,7 @@ subroutine Run2(GC, IMPORT, EXPORT, CLOCK, RC )
    type (ESMF_State),     pointer  :: GEX(:)
    character(len=ESMF_MAXSTR),pointer  :: GCnames(:)
 
-   integer :: I
+   integer :: I, phase
 
 !=============================================================================