GEOS-ESM · gmao-jkolassa · Mar 28, 2023 · Mar 28, 2023 · Mar 30, 2023 · Mar 30, 2023
@@ -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
@@ -2963,7 +2963,7 @@ subroutine SetServices ( GC, RC )
        RC=STATUS  )
      VERIFY_(STATUS)
 
-  IF(LSM_CHOICE > 1) THEN
+  IF(LSM_CHOICE >= 2) THEN
 
      call MAPL_AddExportSpec(GC                         ,&
           LONG_NAME          = 'CN_exposed_leaf-area_index',&
@@ -3019,7 +3019,7 @@ subroutine SetServices ( GC, RC )
           RC=STATUS  )
      VERIFY_(STATUS)
 
-     if (LSM_CHOICE == 3) then
+     if (LSM_CHOICE >= 4) then
         call MAPL_AddExportSpec(GC                         ,&
           LONG_NAME          = 'CN_fine_root_carbon'       ,&
           UNITS              = 'kg m-2'                    ,&
@@ -3057,6 +3057,24 @@ subroutine SetServices ( GC, RC )
           RC=STATUS  )
      VERIFY_(STATUS)
 
+     call MAPL_AddExportSpec(GC                         ,&
+          LONG_NAME          = 'CN_total_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_total_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'                ,&
@@ -5663,6 +5681,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()
@@ -5970,6 +5990,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()
@@ -6853,15 +6875,17 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
     call MAPL_GetPointer(EXPORT  , CDCR2   ,  'CDCR2' ,  RC=STATUS); VERIFY_(STATUS)
     call MAPL_GetPointer(EXPORT  , POROS   ,  'POROS' ,  RC=STATUS); VERIFY_(STATUS)
 
-    IF(LSM_CHOICE > 1) THEN
+    IF(LSM_CHOICE >= 2) THEN
        call MAPL_GetPointer(EXPORT  , CNLAI   , 'CNLAI'  ,  RC=STATUS); VERIFY_(STATUS)
        call MAPL_GetPointer(EXPORT  , CNTLAI  , 'CNTLAI' ,  RC=STATUS); VERIFY_(STATUS)
        call MAPL_GetPointer(EXPORT  , CNSAI   , 'CNSAI'  ,  RC=STATUS); VERIFY_(STATUS)
        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 >= 4) 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)
@@ -7489,15 +7513,17 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
     call MKTILE(CDCR2   ,CDCR2TILE   ,NT,RC=STATUS); VERIFY_(STATUS)
     call MKTILE(POROS   ,POROSTILE   ,NT,RC=STATUS); VERIFY_(STATUS)
 
-    IF (LSM_CHOICE > 1) THEN
+    IF (LSM_CHOICE >= 2) THEN
        call MKTILE(CNLAI   ,CNLAITILE   ,NT,RC=STATUS); VERIFY_(STATUS)
        call MKTILE(CNTLAI  ,CNTLAITILE  ,NT,RC=STATUS); VERIFY_(STATUS)
        call MKTILE(CNSAI   ,CNSAITILE   ,NT,RC=STATUS); VERIFY_(STATUS)
        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 >= 4) 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)
@@ -8444,6 +8470,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)
@@ -9081,6 +9115,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   )
@@ -9445,7 +9481,7 @@ subroutine DOTYPE(type,RC)
       VERIFY_(STATUS)
 
 
-      IF (LSM_CHOICE > 1) THEN
+      IF (LSM_CHOICE >= 2) THEN
          call MAPL_GetPointer(GEX(type), dum, 'CNLAI'   , ALLOC=associated(CNLAITILE   ), notFoundOK=.true., RC=STATUS)
          VERIFY_(STATUS)
          call MAPL_GetPointer(GEX(type), dum, 'CNTLAI'  , ALLOC=associated(CNTLAITILE  ), notFoundOK=.true., RC=STATUS)
@@ -9458,8 +9494,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 >= 4) 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)
@@ -10131,6 +10172,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)

@@ -177,7 +177,7 @@ subroutine SetServices ( GC, RC )
           end do
        end if
 
-    CASE (2,3) 
+    CASE (2,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,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 >= 4) 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,4)
           call MAPL_AddConnectivity (                                    & 
             GC                                                 ,         &
             SHORT_NAME  = (/'LAI    ', 'GRN    ', 'ROOTL  ', 'Z2CH   ',  &

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

@@ -1,4 +1,4 @@
-! It is a proxy of clm 4.0 and clm 4.5
+! It is a proxy of CNCLM40 and CNCLM51
 
 #include "MAPL_Generic.h"
 
@@ -48,12 +48,12 @@ subroutine SetServices ( GC, RC )
 
 ! Local Variables
 
-    type(MAPL_MetaComp), pointer :: MAPL=>null()
-    character(len=ESMF_MAXSTR)   :: CATCHCN_VERSION
-    type(ESMF_GridComp), pointer :: gcs(:)
-    type(T_CATCHCN_STATE), pointer :: CATCHCN_INTERNAL_STATE
-    class(T_CATCH_STATE),  pointer :: statePtr
-    type(CATCHCN_WRAP)             :: wrap
+    type(MAPL_MetaComp),            pointer :: MAPL=>null()
+    character(len=ESMF_MAXSTR)              :: CATCHCN_VERSION
+    type(ESMF_GridComp),            pointer :: gcs(:)
+    type(T_CATCHCN_STATE),          pointer :: CATCHCN_INTERNAL_STATE
+    class(T_CATCH_STATE),           pointer :: statePtr
+    type(CATCHCN_WRAP)                      :: wrap
 
     character(len=ESMF_MAXSTR)              :: SURFRC
     type(ESMF_Config)                       :: SCF, CF
@@ -86,38 +86,48 @@ subroutine SetServices ( GC, RC )
     call MAPL_GetResource ( MAPL, CATCHCN_INTERNAL_STATE%CATCH_SPINUP,  Label="CATCHMENT_SPINUP:",  DEFAULT=0, RC=STATUS)
     VERIFY_(STATUS)
 
-    ! resource variables from GEOS_SurfaceGridComp.rc
+    ! put resource variables from rc file into SCF config object (GCM: SURFRC=GEOS_SurfaceGridComp.rc, LDAS: SURFRC=LDAS.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)
 
+    ! assemble internal state from SCF config object
     call surface_params_to_wrap_state(statePtr, SCF,  _RC)
 
     call ESMF_ConfigDestroy(SCF, _RC)
-
+
+    call MAPL_GetResource ( MAPL, LSM_CHOICE, Label="LSM_CHOICE:", DEFAULT=2, RC=STATUS)
+    VERIFY_(STATUS)
+
+    ! Add select rc variables to [the CF config object within] MAPL so that the Children GridComps (CNCLM40 and CNCLM51) can get
+    !   them in SetServices() from MAPL.  In the Children's SetServices(), "catchcn_internal" is not yet available.
     call MAPL_Get (MAPL, CF=CF, _RC)
-    call ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%ATM_CO2, Label='ATM_CO2:', _RC)
-    call ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%N_CONST_LAND4SNWALB, Label='N_CONST_LAND4SNWALB:', _RC)
-    call ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%RUN_IRRIG, Label='RUN_IRRIG:', _RC)
-    call ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%PRESCRIBE_DVG, Label='PRESCRIBE_DVG:', _RC)
-    call ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%SNOW_ALBEDO_INFO, Label='SNOW_ALBEDO_INFO:', _RC)
+    call    ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%ATM_CO2,                      Label='ATM_CO2:',                      _RC)
+    call    ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%N_CONST_LAND4SNWALB,          Label='N_CONST_LAND4SNWALB:',          _RC)
+    call    ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%SNOW_ALBEDO_INFO,             Label='SNOW_ALBEDO_INFO:',             _RC)  
+    if     (LSM_CHOICE==2) then
+       call ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%RUN_IRRIG,                    Label='RUN_IRRIG:',                    _RC)
+       call ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%PRESCRIBE_DVG,                Label='PRESCRIBE_DVG:',                _RC)
+    elseif (LSM_CHOICE==4) then
+       call ESMF_ConfigSetAttribute(CF, value=CATCHCN_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND, Label='MOSFC_EXTRA_DERIVS_OFFL_LAND:', _RC)
+    end if
     call MAPL_Set (MAPL, CF=CF, _RC)
 
-    call MAPL_GetResource ( MAPL, LSM_CHOICE, Label="LSM_CHOICE:", DEFAULT=2, RC=STATUS)
-    VERIFY_(STATUS)
+    ! prep CatchCN ensemble and Children
     tmp = ''
     if (NUM_LDAS_ENSEMBLE >1) then
-        !catchcn_exxxx
-        tmp(1:ens_id_width)=COMP_NAME(8:8+ens_id_width-1)
+       !catchcn_exxxx
+       tmp(1:ens_id_width)=COMP_NAME(8:8+ens_id_width-1)
     endif
-    if ( LSM_CHOICE == 2 ) then
+
+    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 for CatchCN should equal 2 (CLM40) or 4 (CLM51)")
     endif
 
     wrap%ptr =>CATCHCN_INTERNAL_STATE
@@ -127,13 +137,13 @@ subroutine SetServices ( GC, RC )
     call MAPL_GridCompSetEntryPoint ( GC, ESMF_METHOD_INITIALIZE, Initialize, RC=STATUS )
     VERIFY_(STATUS)
 
-    call MAPL_GridCompSetEntryPoint ( GC, ESMF_METHOD_RUN, RUN1, RC=STATUS )
+    call MAPL_GridCompSetEntryPoint ( GC, ESMF_METHOD_RUN,        RUN1,       RC=STATUS )
     VERIFY_(STATUS)
 
-    call MAPL_GridCompSetEntryPoint ( GC, ESMF_METHOD_RUN, RUN2, RC=STATUS )
+    call MAPL_GridCompSetEntryPoint ( GC, ESMF_METHOD_RUN,        RUN2,       RC=STATUS )
     VERIFY_(STATUS)
 
-    call MAPL_GridCompSetEntryPoint ( GC, ESMF_METHOD_FINALIZE, Finalize, RC=status)
+    call MAPL_GridCompSetEntryPoint ( GC, ESMF_METHOD_FINALIZE,   Finalize,   RC=status)
     VERIFY_(status)
 
 ! Set the state variable specs. ( should be the combinations of clm4.0 and clm4.5
@@ -936,9 +946,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 >= 4) 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)

@@ -10,10 +10,13 @@ module clm_varpar
 !
 ! !USES:
 
- use clm_varpar_shared, only : VAR_COL =>VAR_COL_40, VAR_PFT => VAR_PFT_40, &
-                               numpft => numpft_CN, NUM_ZON => NUM_ZON_CN, &
-                               NUM_VEG => NUM_VEG_CN
-
+  use clm_varpar_shared, only :    &
+       VAR_COL => VAR_COL_40,      &
+       VAR_PFT => VAR_PFT_40,      &
+       numpft  => NUM_PFT_CN_40,   &
+       NUM_ZON => NUM_ZON_CN,      &
+       NUM_VEG => NUM_VEG_CN_40
+
 !
 ! !PUBLIC TYPES:
   implicit none
@@ -32,7 +35,8 @@ module clm_varpar
 
 ! clm_varpar_init seems to do something similar; less prone to error to move
 ! these three lines there? (slevis)
-  integer, parameter :: max_pft_per_col   = numpft+1
+
+  integer, parameter :: max_pft_per_col   = numpft + 1
 
 ! !PUBLIC MEMBER FUNCTIONS:
   public clm_varpar_init          ! set parameters