add cnclm51

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90

@@ -253,10 +253,10 @@ subroutine SetServices ( GC, RC )
     call MAPL_GetResource    (SCF,  landicegoswim, label='N_CONST_LANDICE4SNWALB:', DEFAULT=0,          __RC__ )
     if     (LSM_CHOICE.eq.1) then
        call MAPL_GetResource (SCF,  LAND_PARAMS,   label='LAND_PARAMS:',            DEFAULT="NRv7.2",   __RC__ )
-    elseif (LSM_CHOICE.eq.2) then
-       call MAPL_GetResource (SCF,  LAND_PARAMS,   label='LAND_PARAMS:',            DEFAULT="CN_CLM40",  __RC__ )
-!    elseif (LSM_CHOICE.eq.3) then
-!       call MAPL_GetResource (SCF,  LAND_PARAMS,   label='LAND_PARAMS:',            DEFAULT="CN_CLM45", __RC__ )
+    elseif (LSM_CHOICE.eq.2) then                                                                                             
+       call MAPL_GetResource (SCF,  LAND_PARAMS,   label='LAND_PARAMS:',            DEFAULT="CN_CLM40",  __RC__ )           
+    elseif (LSM_CHOICE.eq.4) then                                                                                  
+       call MAPL_GetResource (SCF,  LAND_PARAMS,   label='LAND_PARAMS:',            DEFAULT="CN_CLM51", __RC__ )   
     else
        _ASSERT(.FALSE.,'unknown LSM_CHOICE')
     end if
@@ -3001,7 +3001,7 @@ subroutine SetServices ( GC, RC )
           RC=STATUS  )
      VERIFY_(STATUS)
 
-     if (LSM_CHOICE == 3) then
+     if (LSM_CHOICE >= 3) then
         call MAPL_AddExportSpec(GC                         ,&
           LONG_NAME          = 'CN_fine_root_carbon'       ,&
           UNITS              = 'kg m-2'                    ,&
@@ -3039,6 +3039,24 @@ subroutine SetServices ( GC, RC )
           RC=STATUS  )
      VERIFY_(STATUS)
 
+     call MAPL_AddExportSpec(GC                         ,&
+          LONG_NAME          = 'CN_autotrophic_respiration' ,&
+          UNITS              = 'kg m-2 s-1'                ,&
+          SHORT_NAME         = 'CNAR'                      ,&
+          DIMS               = MAPL_DimsHorzOnly           ,&
+          VLOCATION          = MAPL_VLocationNone          ,&
+          RC=STATUS  ) 
+     VERIFY_(STATUS)
+
+     call MAPL_AddExportSpec(GC                         ,&
+          LONG_NAME          = 'CN_heterotrophic_respiration' ,&
+          UNITS              = 'kg m-2 s-1'                ,&
+          SHORT_NAME         = 'CNHR'                      ,&
+          DIMS               = MAPL_DimsHorzOnly           ,&
+          VLOCATION          = MAPL_VLocationNone          ,&
+          RC=STATUS  ) 
+     VERIFY_(STATUS)
+
      call MAPL_AddExportSpec(GC                         ,&
           LONG_NAME          = 'CN_net_ecosystem_exchange' ,&
           UNITS              = 'kg m-2 s-1'                ,&
@@ -5643,6 +5661,8 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
     real, pointer, dimension(:,:) :: CNNPP       => NULL()
     real, pointer, dimension(:,:) :: CNGPP       => NULL()
     real, pointer, dimension(:,:) :: CNSR        => NULL()
+    real, pointer, dimension(:,:) :: CNAR        => NULL()
+    real, pointer, dimension(:,:) :: CNHR        => NULL()
     real, pointer, dimension(:,:) :: CNNEE       => NULL()
     real, pointer, dimension(:,:) :: CNXSMR      => NULL()
     real, pointer, dimension(:,:) :: CNADD       => NULL()
@@ -5948,6 +5968,8 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
     real, pointer, dimension(:) :: CNNPPTILE        => NULL()
     real, pointer, dimension(:) :: CNGPPTILE        => NULL()
     real, pointer, dimension(:) :: CNSRTILE         => NULL()
+    real, pointer, dimension(:) :: CNARTILE         => NULL()
+    real, pointer, dimension(:) :: CNHRTILE         => NULL()
     real, pointer, dimension(:) :: CNNEETILE        => NULL()
     real, pointer, dimension(:) :: CNXSMRTILE       => NULL()
     real, pointer, dimension(:) :: CNADDTILE        => NULL()
@@ -6832,8 +6854,10 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
        call MAPL_GetPointer(EXPORT  , CNTOTC  , 'CNTOTC' ,  RC=STATUS); VERIFY_(STATUS)
        call MAPL_GetPointer(EXPORT  , CNVEGC  , 'CNVEGC' ,  RC=STATUS); VERIFY_(STATUS)
        call MAPL_GetPointer(EXPORT  , CNROOT  , 'CNROOT' ,  RC=STATUS); VERIFY_(STATUS)
-       if (LSM_CHOICE == 3) then
+       if (LSM_CHOICE >= 3) then
            call MAPL_GetPointer(EXPORT  , CNFROOTC, 'CNFROOTC' ,RC=STATUS); VERIFY_(STATUS)
+           call MAPL_GetPointer(EXPORT  , CNAR,     'CNAR'     ,RC=STATUS); VERIFY_(STATUS)
+           call MAPL_GetPointer(EXPORT  , CNHR,     'CNHR'     ,RC=STATUS); VERIFY_(STATUS)
        endif
        call MAPL_GetPointer(EXPORT  , CNNPP   , 'CNNPP'  ,  RC=STATUS); VERIFY_(STATUS)
        call MAPL_GetPointer(EXPORT  , CNGPP   , 'CNGPP'  ,  RC=STATUS); VERIFY_(STATUS)
@@ -7466,8 +7490,10 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
        call MKTILE(CNTOTC  ,CNTOTCTILE  ,NT,RC=STATUS); VERIFY_(STATUS)
        call MKTILE(CNVEGC  ,CNVEGCTILE  ,NT,RC=STATUS); VERIFY_(STATUS)
        call MKTILE(CNROOT  ,CNROOTTILE  ,NT,RC=STATUS); VERIFY_(STATUS)
-       if (LSM_CHOICE == 3) then
-          call MKTILE(CNFROOTC,CNFROOTCTILE  ,NT,RC=STATUS);VERIFY_(STATUS)
+       if (LSM_CHOICE >= 3) then
+          call MKTILE(CNFROOTC,CNFROOTCTILE  ,NT,RC=STATUS); VERIFY_(STATUS)
+          call MKTILE(CNAR    ,CNARTILE      ,NT,RC=STATUS); VERIFY_(STATUS)
+          call MKTILE(CNHR    ,CNHRTILE      ,NT,RC=STATUS); VERIFY_(STATUS)
        endif
        call MKTILE(CNNPP   ,CNNPPTILE   ,NT,RC=STATUS); VERIFY_(STATUS)
        call MKTILE(CNGPP   ,CNGPPTILE   ,NT,RC=STATUS); VERIFY_(STATUS)
@@ -8404,6 +8430,14 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
        call MAPL_LocStreamTransform( LOCSTREAM,CNSR  ,CNSRTILE  , RC=STATUS)
        VERIFY_(STATUS)
     endif
+    if(associated(CNAR)) then
+       call MAPL_LocStreamTransform( LOCSTREAM,CNAR  ,CNARTILE  , RC=STATUS)
+       VERIFY_(STATUS)
+    endif
+    if(associated(CNHR)) then
+       call MAPL_LocStreamTransform( LOCSTREAM,CNHR  ,CNHRTILE  , RC=STATUS)
+       VERIFY_(STATUS)
+    endif
     if(associated(CNNEE)) then
        call MAPL_LocStreamTransform( LOCSTREAM,CNNEE ,CNNEETILE , RC=STATUS)
        VERIFY_(STATUS)
@@ -9039,6 +9073,8 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
     if(associated(CNNPPTILE   )) deallocate(CNNPPTILE   )
     if(associated(CNGPPTILE   )) deallocate(CNGPPTILE   )
     if(associated(CNSRTILE    )) deallocate(CNSRTILE    )
+    if(associated(CNARTILE    )) deallocate(CNARTILE    )
+    if(associated(CNHRTILE    )) deallocate(CNHRTILE    )
     if(associated(CNNEETILE   )) deallocate(CNNEETILE   )
     if(associated(CNXSMRTILE  )) deallocate(CNXSMRTILE  )
     if(associated(CNADDTILE   )) deallocate(CNADDTILE   )
@@ -9416,8 +9452,13 @@ subroutine DOTYPE(type,RC)
          VERIFY_(STATUS)
          call MAPL_GetPointer(GEX(type), dum, 'CNROOT'  , ALLOC=associated(CNROOTTILE  ), notFoundOK=.true., RC=STATUS)
          VERIFY_(STATUS)
-         if (LSM_CHOICE == 3) then
+         if (LSM_CHOICE >= 3) then
 	    call MAPL_GetPointer(GEX(type), dum, 'CNFROOTC' , ALLOC=associated(CNFROOTCTILE), notFoundOK=.true., RC=STATUS)
+            VERIFY_(STATUS)
+            call MAPL_GetPointer(GEX(type), dum, 'CNAR'    , ALLOC=associated(CNARTILE    ), notFoundOK=.true., RC=STATUS)
+            VERIFY_(STATUS)
+            call MAPL_GetPointer(GEX(type), dum, 'CNHR'    , ALLOC=associated(CNHRTILE    ), notFoundOK=.true., RC=STATUS)
+            VERIFY_(STATUS)
          endif
          VERIFY_(STATUS)
          call MAPL_GetPointer(GEX(type), dum, 'CNNPP'   , ALLOC=associated(CNNPPTILE   ), notFoundOK=.true., RC=STATUS)
@@ -10085,6 +10126,14 @@ subroutine DOTYPE(type,RC)
          call FILLOUT_TILE(GEX(type), 'CNSR'  ,   CNSRTILE  , XFORM, RC=STATUS)
          VERIFY_(STATUS)
       end if
+      if(associated(CNARTILE)) then
+         call FILLOUT_TILE(GEX(type), 'CNAR'  ,   CNARTILE  , XFORM, RC=STATUS)
+         VERIFY_(STATUS)
+      end if
+      if(associated(CNHRTILE)) then
+         call FILLOUT_TILE(GEX(type), 'CNHR'  ,   CNHRTILE  , XFORM, RC=STATUS)
+         VERIFY_(STATUS)
+      end if
       if(associated(CNNEETILE)) then
          call FILLOUT_TILE(GEX(type), 'CNNEE' ,   CNNEETILE , XFORM, RC=STATUS)
          VERIFY_(STATUS)

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOS_LandGridComp.F90

@@ -177,7 +177,7 @@ subroutine SetServices ( GC, RC )
           end do
        end if
 
-    CASE (2,3) 
+    CASE (2,3,4) 
 
        allocate (CATCHCN(NUM_CATCH), stat=status)
        VERIFY_(STATUS)
@@ -972,7 +972,7 @@ subroutine SetServices ( GC, RC )
           call MAPL_AddExportSpec ( GC, SHORT_NAME = 'ROC002', CHILD_ID = CATCH(1), RC=STATUS) ; VERIFY_(STATUS)     
        end if
 
-    CASE (2,3)           ! CatchmentCN model
+    CASE (2,3,4) 
 
        call MAPL_AddExportSpec ( GC, SHORT_NAME = 'LST',      CHILD_ID = CATCHCN(1), RC=STATUS  )
        VERIFY_(STATUS)
@@ -1244,9 +1244,13 @@ subroutine SetServices ( GC, RC )
        VERIFY_(STATUS)
        call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNROOT' ,  CHILD_ID = CATCHCN(1), RC=STATUS  )
        VERIFY_(STATUS)
-       if (LSM_CHOICE == 3) then
+       if (LSM_CHOICE >= 3) then
          call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNFROOTC' ,  CHILD_ID = CATCHCN(1), RC=STATUS  )
          VERIFY_(STATUS)
+         call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNAR'   ,  CHILD_ID = CATCHCN(1), RC=STATUS  )
+         VERIFY_(STATUS)
+         call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNHR'   ,  CHILD_ID = CATCHCN(1), RC=STATUS  )
+         VERIFY_(STATUS)
        endif
        call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNNPP'  ,  CHILD_ID = CATCHCN(1), RC=STATUS  )
        VERIFY_(STATUS)
@@ -1464,7 +1468,7 @@ subroutine SetServices ( GC, RC )
 !             VERIFY_(STATUS)            
 !          ENDIF
 
-       CASE (2,3)
+       CASE (2,3,4)
           call MAPL_AddConnectivity (                                    & 
             GC                                                 ,         &
             SHORT_NAME  = (/'LAI    ', 'GRN    ', 'ROOTL  ', 'Z2CH   ',  &

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/CMakeLists.txt

@@ -2,6 +2,7 @@ esma_set_this ()
 
 add_subdirectory (GEOScatchCNCLM40_GridComp)
 add_subdirectory (GEOScatchCNCLM45_GridComp)
+add_subdirectory (GEOScatchCNCLM51_GridComp)
 
 esma_add_library (${this}
   SRCS GEOS_CatchCNGridComp.F90

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOS_CatchCNGridComp.F90

@@ -113,11 +113,11 @@ subroutine SetServices ( GC, RC )
     if ( LSM_CHOICE == 2 ) then
        CATCHCN = MAPL_AddChild('CATCHCNCLM40'//trim(tmp), 'setservices_', parentGC=GC, sharedObj='libGEOScatchCNCLM40_GridComp.so', RC=STATUS)
        VERIFY_(STATUS)
-!    else if ( LSM_CHOICE == 3 ) then
-!       CATCHCN = MAPL_AddChild('CATCHCNCLM45'//trim(tmp), 'setservices_', parentGC=GC, sharedObj='libGEOScatchCNCLM45_GridComp.so', RC=STATUS)
-!       VERIFY_(STATUS)
+    else if ( LSM_CHOICE == 4 ) then
+       CATCHCN = MAPL_AddChild('CATCHCNCLM51'//trim(tmp), 'setservices_', parentGC=GC, sharedObj='libGEOScatchCNCLM51_GridComp.so', RC=STATUS)
+       VERIFY_(STATUS)
     else
-       _ASSERT( .false., " LSM_CHOICE should equal 2 (CLM40)")
+       _ASSERT( .false., " LSM_CHOICE should equal 2 (CLM40) or 4 (CLM51)")
     endif
 
     wrap%ptr =>CATCHCN_INTERNAL_STATE
@@ -936,9 +936,13 @@ subroutine SetServices ( GC, RC )
     VERIFY_(STATUS)
     call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNROOT' ,  CHILD_ID = CATCHCN, RC=STATUS  )
     VERIFY_(STATUS)
-    if (LSM_CHOICE == 3) then
+    if (LSM_CHOICE >= 3) then ! jkolassa: needed for CNCLM51
        call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNFROOTC' ,  CHILD_ID = CATCHCN, RC=STATUS  )
        VERIFY_(STATUS)
+       call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNAR'   ,  CHILD_ID = CATCHCN, RC=STATUS  )
+       VERIFY_(STATUS)
+       call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNHR'   ,  CHILD_ID = CATCHCN, RC=STATUS  )
+       VERIFY_(STATUS)
     endif
     call MAPL_AddExportSpec ( GC, SHORT_NAME = 'CNNPP'  ,  CHILD_ID = CATCHCN, RC=STATUS  )
     VERIFY_(STATUS)