Merge pull request #26 from junhyukjeon/master

Minor updates

Author: junhyukjeon

src/rhizosphere/waterbalance.jl

@@ -18,7 +18,7 @@ Transpiration
     minSW => 175 ~ preserve(parameter, u"mm")
 
     "Wilting point"
-    WP(saturation,soil_table,soil_class):wilting_point => begin
+    WP(saturation, #=soil_table,=# soil_class):wilting_point => begin
         175
         #soil_table[soil_class].wilting_point
     end ~ preserve(parameter, u"mm")
@@ -68,10 +68,15 @@ Transpiration
     "Intercepted rain"
     rainInterception(interception, rain) => interception * rain ~ track(u"mm/hr")
 
-    "Canopy transpiration" # Looks like missing soil surface evaporation 
+    "Canopy evapotranspiration" # Looks like missing soil surface evaporation 
     evapotranspiration(transpiration, rainInterception) => begin
         transpiration + rainInterception
     end ~ track(u"mm/hr", max=SWhour)
+
+    "Potential canopy evapotranspiration"
+    potential_evapotranspiration(transpiration, rainInterception) => begin
+        transpiration + rainInterception
+    end ~ track(u"mm/hr")
 
     "Hourly excess soil water"
     excessSW(SWhour, maxSWhour, evapotranspiration, irrigation, rain, poolHour) => begin
@@ -96,16 +101,15 @@ Transpiration
         (1 - pool_fraction) * excessSW
     end ~ track(u"mm/hr")
 
-###
     dSW(dPool, evapotranspiration, irrigation, rain) => begin
          -dPool - evapotranspiration + irrigation + rain
     end ~ track(u"mm/hr")
 
     flag_transpiration(transpiration) => transpiration > 0u"mm/hr" ~ flag
 
     "Production modifier for GPP"
-    transpScaleFactor(evapotranspiration, transpiration, rainInterception) => begin
-        evapotranspiration / (transpiration + rainInterception) # actual / potential
+    transpScaleFactor(evapotranspiration, potential_evapotranspiration) => begin
+        evapotranspiration / potential_evapotranspiration
     end ~ track(when=flag_transpiration, init=1)
 
     SW(dSW) ~ accumulate(u"mm", init=iSW, min=minSW, max=soil_saturation)