commented out calls to new sensitivity analysis parameters b_mort and…

… dbh2h_m, will be used in later commits
NGEET · Feb 29, 2016 · e2b2f4e · e2b2f4e
1 parent 880dfa3
commit e2b2f4e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/components/clm/src/ED/biogeochem/EDGrowthFunctionsMod.F90 b/components/clm/src/ED/biogeochem/EDGrowthFunctionsMod.F90
@@ -350,8 +350,10 @@ subroutine mortality_rates( cohort_in,cmort,hmort,bmort )
     real(r8) :: frac  ! relativised stored carbohydrate
 
     ! 'Background' mortality (can vary as a function of density as in ED1.0 and ED2.0, but doesn't here for tractability) 
-    bmort = EDecophyscon%b_mort(cohort_in%pft) !0.014_r8 
-
+    ! bmort = EDecophyscon%b_mort(cohort_in%pft) !0.014_r8 
+    ! RGK:/CX HOLDING OFF ON SENS-ANALYSIS UNTIL MACHINE CONFIGS SQUARED AWAY
+    bmort = 0.014_r8
+
     ! Proxy for hydraulic failure induced mortality. 
     if(cohort_in%patchptr%btran_ft(cohort_in%pft) <= 0.000001_r8)then 
        hmort = ED_val_stress_mort

diff --git a/components/clm/src/ED/main/EDPftvarcon.F90 b/components/clm/src/ED/main/EDPftvarcon.F90
@@ -132,9 +132,10 @@ subroutine EDpftconrd( ncid )
 
     call ncd_io('sapwood_ratio',EDPftvarcon_inst%sapwood_ratio, 'read', ncid,  readvar=readv)
     if   ( .not. readv) call endrun(trim(subname)// ' ERROR : error in reading in pft data')
-
-    call ncd_io('dbh2h_m',EDPftvarcon_inst%dbh2h_m, 'read', ncid,  readvar=readv)
-    if   ( .not. readv) call endrun(trim(subname)// ' ERROR : error in reading in pft data')   
+
+! HOLDING ON SEW ENSITIVITY-ANALYSIS PARAMETERS UNTIL MACHINE CONFIGS SET RGK/CX
+!    call ncd_io('dbh2h_m',EDPftvarcon_inst%dbh2h_m, 'read', ncid,  readvar=readv)
+!    if   ( .not. readv) call endrun(trim(subname)// ' ERROR : error in reading in pft data')   
 
   end subroutine EDpftconrd