Merge pull request #900 from GEOS-ESM/feature/jkolassa_disable_cn45

disable CatchmentCNCLM45 (LSM_CHOICE=3)

Author: sdrabenh

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90

@@ -255,8 +255,8 @@ subroutine SetServices ( GC, RC )
        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.3) then                                                                                         
+!       call MAPL_GetResource (SCF,  LAND_PARAMS,   label='LAND_PARAMS:',            DEFAULT="CN_CLM45", __RC__ )          
     else
        _ASSERT(.FALSE.,'unknown LSM_CHOICE')
     end if

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 == 3 ) then
+!       CATCHCN = MAPL_AddChild('CATCHCNCLM45'//trim(tmp), 'setservices_', parentGC=GC, sharedObj='libGEOScatchCNCLM45_GridComp.so', RC=STATUS)
+!       VERIFY_(STATUS)
     else
-       _ASSERT( .false., " LSM_CHOICE should equal 2 (CLM40) or 3 (CLM45)")
+       _ASSERT( .false., " LSM_CHOICE should equal 2 (CLM40)")
     endif
 
     wrap%ptr =>CATCHCN_INTERNAL_STATE

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc

@@ -56,7 +56,6 @@
 #    CATCHMENT-CN model versions
 #    ---------------------------
 #    CN_CLM40 : Fanwei Zeng's science-validated and published Catchment-CN.4.0 (e0004s_transientCO2_05)   
-#    CN_CLM45 : Eunjee Lee's Catchment-CN.4.5 simulations 
 #
 # GEOSagcm=>LAND_PARAMS: NRv7.2
 # GEOSldas=>LAND_PARAMS: NRv7.2
@@ -234,8 +233,6 @@
 
 # ---- Prescribe daily LAI and SAI data from an archived CATCHCN simulation
 #
-#      ! Important: PRESCRIBE_DVG is NOT functional for CN_CLM45 land model choice (LSM_CHOICE = 3);
-#      !            setting will be ignored
 #
 #    0 : NO,  run CN Model interactively (default)
 #    1 : YES, prescribe interannually varying LAI and SAI

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/SurfParams.F90

@@ -109,23 +109,24 @@ subroutine SurfParams_init(LAND_PARAMS,LSM_CHOICE, rc)
           _ASSERT(.FALSE.,'LAND_PARAMS not valid or incompatible with LSM_CHOICE')
        end select
 
-    else if (LSM_CHOICE==3) then
-       select case (LAND_PARAMS)      
-          
-       case ("CN_CLM45")  ! parameters to reproduce Eunjee Lee's Catchment-CN4.5 fire carbon emission simulations
-          LAND_FIX 	= .TRUE.
-          CSOIL_2  	= 70000. ! Post H5_0
-          WEMIN    	= 13.
-          AICEV    	= 0.107
-          AICEN    	= 19.893
-          FLWALPHA 	= 0.005
-          ASTRFR   	= 0.333  ! reverted
-          STEXP    	= 1.     ! reverted
-          RSWILT   	= 2000.
-          
-       case DEFAULT
-          _ASSERT(.FALSE.,'LAND_PARAMS not valid or incompatible with LSM_CHOICE')
-       end select
+!    else if (LSM_CHOICE==3) then
+!       select case (LAND_PARAMS)      
+!          
+!       case ("CN_CLM45")  ! parameters to reproduce Eunjee Lee's Catchment-CN4.5 fire carbon emission simulations
+!          LAND_FIX 	= .TRUE.
+!          CSOIL_2  	= 70000. ! Post H5_0
+!          WEMIN    	= 13.
+!          AICEV    	= 0.107
+!          AICEN    	= 19.893
+!          FLWALPHA 	= 0.005
+!          ASTRFR   	= 0.333  ! reverted
+!          STEXP    	= 1.     ! reverted
+!          RSWILT   	= 2000.
+!          
+!       case DEFAULT
+!          _ASSERT(.FALSE.,'LAND_PARAMS not valid or incompatible with LSM_CHOICE')
+!       end select
+
     else
        _ASSERT(.FALSE.,'land model choice not valid')
     end if ! LSM_CHOICE