Temporarily setting hydr_kmax_rsurf2 to be a hard-wired parameter con…

…stant. Will add this to parameter file during next API change
rgknox · Apr 26, 2019 · f311ef5 · f311ef5
1 parent 3e71640
commit f311ef5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/biogeophys/FatesPlantHydraulicsMod.F90 b/biogeophys/FatesPlantHydraulicsMod.F90
@@ -41,7 +41,7 @@ module FatesPlantHydraulicsMod
    use FatesConstantsMod, only : g_per_kg
 
    use EDParamsMod       , only : hydr_kmax_rsurf1
-   use EDParamsMod       , only : hydr_kmax_rsurf2
+   !   use EDParamsMod       , only : hydr_kmax_rsurf2
 
    use EDTypesMod        , only : ed_site_type
    use EDTypesMod        , only : ed_patch_type
@@ -886,6 +886,10 @@ subroutine UpdateWaterDepTreeHydrCond(currentSite,ccohort,nlevsoi_hyd,bc_in)
                                                      ! which is equiv to   [kg m-1 s-1 MPa-1]    
       real(r8) :: kmax_root_surf                     ! maximum conducitivity for unit root surface (kg water/m2 root area/Mpa/s) 
 
+      ! (RGK 4-2019) THE FOLLOWING SHOULD BE ADDED TO THE PARAMETER FILE IN NEXT GROUPING
+      real(r8), parameter :: hydr_kmax_rsurf2 = 0.0001_r8  ! kg water/m2 root area/Mpa/s
+
+
       ccohort_hydr => ccohort%co_hydr
       csite_hydr => currentSite%si_hydr
       k = 1   !only for the first soil shell

diff --git a/main/EDParamsMod.F90 b/main/EDParamsMod.F90
@@ -80,10 +80,10 @@ module EDParamsMod
    ! Hydraulics Control Parameters (ONLY RELEVANT WHEN USE_FATES_HYDR = TRUE)
    ! ----------------------------------------------------------------------------------------------
    real(r8),protected :: hydr_kmax_rsurf1         !  maximum conducitivity for unit root surface for water uptake(kg water/m2 root area/Mpa/s)
-   real(r8),protected :: hydr_kmax_rsurf2         !  maximum conducitivity for unit root surface for water loss (kg water/m2 root area/Mpa/s)
+!   real(r8),protected :: hydr_kmax_rsurf2         !  maximum conducitivity for unit root surface for water loss (kg water/m2 root area/Mpa/s)
 
-   character(len=param_string_length),parameter :: hydr_name_kmax_rsurf1 = "fates_hydr_kmax_rsurf1"  
-   character(len=param_string_length),parameter :: hydr_name_kmax_rsurf2 = "fates_hydr_kmax_rsurf2"  
+   character(len=param_string_length),parameter :: hydr_name_kmax_rsurf1 = "fates_hydr_kmax_rsurf"  
+!   character(len=param_string_length),parameter :: hydr_name_kmax_rsurf2 = "fates_hydr_kmax_rsurf2"  
 
    real(r8),protected :: hydr_psi0          !  sapwood water potential at saturation (MPa)
    character(len=param_string_length),parameter :: hydr_name_psi0 = "fates_hydr_psi0"
@@ -161,7 +161,7 @@ subroutine FatesParamsInit()
     ED_val_canopy_closure_thresh          = nan    
 
     hydr_kmax_rsurf1                      = nan
-    hydr_kmax_rsurf2                      = nan
+!    hydr_kmax_rsurf2                      = nan
     hydr_psi0                             = nan
     hydr_psicap                           = nan
 
@@ -266,8 +266,8 @@ subroutine FatesRegisterParams(fates_params)
     call fates_params%RegisterParameter(name=hydr_name_kmax_rsurf1, dimension_shape=dimension_shape_1d, &
          dimension_names=dim_names)
 
-    call fates_params%RegisterParameter(name=hydr_name_kmax_rsurf2, dimension_shape=dimension_shape_1d, &
-         dimension_names=dim_names)	 
+!    call fates_params%RegisterParameter(name=hydr_name_kmax_rsurf2, dimension_shape=dimension_shape_1d, &
+!         dimension_names=dim_names)	 
 
     call fates_params%RegisterParameter(name=hydr_name_psi0, dimension_shape=dimension_shape_1d, &
          dimension_names=dim_names)
@@ -390,8 +390,8 @@ subroutine FatesReceiveParams(fates_params)
     call fates_params%RetreiveParameter(name=hydr_name_kmax_rsurf1, &
           data=hydr_kmax_rsurf1)	 
 
-   call fates_params%RetreiveParameter(name=hydr_name_kmax_rsurf2, &
-          data=hydr_kmax_rsurf2)		  
+!   call fates_params%RetreiveParameter(name=hydr_name_kmax_rsurf2, &
+!          data=hydr_kmax_rsurf2)		  
 
     call fates_params%RetreiveParameter(name=hydr_name_psi0, &
           data=hydr_psi0)
@@ -470,8 +470,8 @@ subroutine FatesReportParams(is_master)
         write(fates_log(),fmt0) 'ED_val_cohort_fusion_tol = ',ED_val_cohort_fusion_tol
         write(fates_log(),fmt0) 'ED_val_patch_fusion_tol = ',ED_val_patch_fusion_tol
         write(fates_log(),fmt0) 'ED_val_canopy_closure_thresh = ',ED_val_canopy_closure_thresh      
-	write(fates_log(),fmt0) 'hydr_kmax_rsurf1 = ',hydr_kmax_rsurf1  
-	write(fates_log(),fmt0) 'hydr_kmax_rsurf2 = ',hydr_kmax_rsurf2  
+        write(fates_log(),fmt0) 'hydr_kmax_rsurf1 = ',hydr_kmax_rsurf1  
+        !        write(fates_log(),fmt0) 'hydr_kmax_rsurf2 = ',hydr_kmax_rsurf2  
         write(fates_log(),fmt0) 'hydr_psi0 = ',hydr_psi0
         write(fates_log(),fmt0) 'hydr_psicap = ',hydr_psicap
         write(fates_log(),fmt0) 'bgc_soil_salinity = ', bgc_soil_salinity