Merge branch 'master' into master

Author: szerrade-uw

src/rhizosphere/soil.jl

@@ -7,14 +7,17 @@
     NH4 => 25 ~ preserve(parameter, u"μg/g")
 
     soil_table => [
-        63 365 135
-        96 420 198
-        181 506 332
+	    0 200 200
+        71 377 144
+        93 418 198
+        184 502 321
     ] ~ tabulate(
-        rows=(:S, :SL, :CL),
+        rows=(:N, :S, :SL, :CL),
         columns=(:wilting_point,:saturation,:field_capacity),
         parameter
     )
 
 
+
+
 end

src/rhizosphere/waterbalance.jl

@@ -60,8 +60,12 @@ Transpiration
     #     ((Int(soil_class) > 0) ? (11 - 2 * Int(c)) : (SWpower0))
     # end ~ preserve
 
+
     fc => 0.5 ~ preserve(parameter)
-    field_capacity(fc, soil_saturation, minSW) => fc * (soil_saturation + minSW) ~ preserve(u"mm")
+    field_capacity(soil_table,soil_class) => begin     	
+        soil_table[Symbol(soil_class)].field_capacity
+    end ~ preserve(u"mm")
+
 
 
     "Proportion of rain intercepted"