Reverted parameter file to not-include kmax_rsurf2, will add in next changeset

Author: rgknox

parameter_files/fates_params_default.cdl

@@ -49,12 +49,9 @@ variables:
 	float fates_fire_nignitions(fates_scalar) ;
 		fates_fire_nignitions:units = "/m2 (?)" ;
 		fates_fire_nignitions:long_name = "number of daily ignitions (nfires = nignitions*FDI*area_scaling)" ;
-	float fates_hydr_kmax_rsurf1(fates_scalar) ;
-		fates_hydr_kmax_rsurf1:units = "kg water/m2 root area/Mpa/s" ;
-		fates_hydr_kmax_rsurf1:long_name = "maximum conducitivity for unit root surface for water uptake" ;
-	float fates_hydr_kmax_rsurf2(fates_scalar) ;
-		fates_hydr_kmax_rsurf2:units = "kg water/m2 root area/Mpa/s" ;
-		fates_hydr_kmax_rsurf2:long_name = "maximum conducitivity for unit root surface for water loss" ;		
+	float fates_hydr_kmax_rsurf(fates_scalar) ;
+		fates_hydr_kmax_rsurf:units = "kg water/m2 root area/Mpa/s" ;
+		fates_hydr_kmax_rsurf:long_name = "maximum conducitivity for unit root surface for water uptake" ;
 	float fates_hydr_psi0(fates_scalar) ;
 		fates_hydr_psi0:units = "MPa" ;
 		fates_hydr_psi0:long_name = "sapwood water potential at saturation" ;
@@ -620,9 +617,7 @@ data:
 
  fates_fire_nignitions = 15 ;
 
- fates_hydr_kmax_rsurf1 = 20.0 ;
- 
- fates_hydr_kmax_rsurf2 = 0.0001;
+ fates_hydr_kmax_rsurf = 20.0 ;
 
  fates_hydr_psi0 = 0 ;