fixup: stomatal

src/biogeophys/PhotosynthesisMod.F90

@@ -225,7 +225,7 @@ module  PhotosynthesisMod
      logical, public  :: rootstem_acc                      ! Respiratory acclimation for roots and stems
      logical, private :: light_inhibit                     ! If light should inhibit respiration
      integer, public  :: leafresp_method                   ! leaf maintencence respiration at 25C for canopy top method to use
-     integer, private :: stomatalcond_mtd                  ! Stomatal conduction method type
+     integer, public  :: stomatalcond_mtd                  ! Stomatal conduction method type
      logical, private :: modifyphoto_and_lmr_forcrop       ! Modify photosynthesis and LMR for crop
    contains
 

src/utils/clmfates_interfaceMod.F90

@@ -88,7 +88,6 @@ module CLMFatesInterfaceMod
    use clm_varpar        , only : nlevdecomp_full
    use clm_varpar        , only : nlevsoi
    use PhotosynthesisMod , only : photosyns_type
-   use PhotosynthesisMod , only : stomatalcond_method
    use PhotosynthesisMod , only : stomatalcond_mtd_bb1987
    use PhotosynthesisMod , only : stomatalcond_mtd_medlyn2011
    use PhotosynthesisMod , only : leafresp_mtd_ryan1991
@@ -551,10 +550,10 @@ subroutine CLMFatesGlobals2()
         end if
         call set_fates_ctrlparms('use_daylength_factor_switch',ival=pass_daylength_factor_switch)
 
-        if (trim(stomatalcond_method) == 'Ball-Berry1987') then
-           pass_stomatal_model = stomatalcond_mtd_bb1987
-        else if (trim(stomatalcond_method) == 'Medlyn2011') then
-           pass_stomatal_model = stomatalcond_mtd_medlyn2011
+        if (photosyns_inst%stomatalcond_mtd == stomatalcond_mtd_bb1987) then
+           pass_stomatal_model = 1
+        else if (photosyns_inst%stomatalcond_mtd == stomatalcond_mtd_medlyn2011) then
+           pass_stomatal_model = 2
         end if
         call set_fates_ctrlparms('stomatal_model',ival=pass_stomatal_model)