Index: wflow/reservoir_Sw.py
===================================================================
diff -u -rfbd077ecd824c16e9e207b542e5ee2f9f9ff92dd -rf215675cc1a3820198cc622db77b70668f4e83b9
--- wflow/reservoir_Sw.py	(.../reservoir_Sw.py)	(revision fbd077ecd824c16e9e207b542e5ee2f9f9ff92dd)
+++ wflow/reservoir_Sw.py	(.../reservoir_Sw.py)	(revision f215675cc1a3820198cc622db77b70668f4e83b9)
@@ -44,7 +44,7 @@
     except:
         JarvisCoefficients.calcEpSnowHour(self, k)
     self.PotEvaporation = self.EpHour
-    self.PotEvaporation = cover(ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
+    self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
 
     self.Qw_[k] = max(self.PrecipitationSnow, 0)
     self.Ew_[k] = 0.0
@@ -62,7 +62,7 @@
     """
     JarvisCoefficients.calcEpSnow(self, k)
     self.PotEvaporation = self.EpHour
-    self.PotEvaporation = cover(ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
+    self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow
 
@@ -71,20 +71,20 @@
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew1 - self.Qw1
 
-    self.Sw_diff = ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
+    self.Sw_diff = pcr.ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
     self.Ew = (
         self.Ew1
-        + (self.Ew1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Ew1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Qw = (
         self.Qw1
-        + (self.Qw1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Qw1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew - self.Qw
-    self.Sw[k] = ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
-    self.Sw_diff2 = ifthen(self.Sw[k] < 0, self.Sw[k])
+    self.Sw[k] = pcr.ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
+    self.Sw_diff2 = pcr.ifthen(self.Sw[k] < 0, self.Sw[k])
 
     self.wbSw_[k] = (
         self.PrecipitationSnow - self.Ew - self.Qw - self.Sw[k] + self.Sw_t[k]
@@ -104,7 +104,7 @@
 
     JarvisCoefficients.calcEpSnow(self, k)
     # self.PotEvaporation = self.EpHour
-    self.PotEvaporation = cover(ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
+    self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow
 
@@ -114,20 +114,20 @@
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew1 - self.Qw1
 
-    self.Sw_diff = ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
+    self.Sw_diff = pcr.ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
     self.Ew = (
         self.Ew1
-        + (self.Ew1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Ew1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Qw = (
         self.Qw1
-        + (self.Qw1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Qw1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew - self.Qw
-    self.Sw[k] = ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
-    self.Sw_diff2 = ifthen(self.Sw[k] < 0, self.Sw[k])
+    self.Sw[k] = pcr.ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
+    self.Sw_diff2 = pcr.ifthen(self.Sw[k] < 0, self.Sw[k])
 
     self.wbSw_[k] = (
         self.PrecipitationSnow - self.Ew - self.Qw - self.Sw[k] + self.Sw_t[k]
@@ -146,7 +146,7 @@
     """
 
     JarvisCoefficients.calcEpSnowHour(self, k)
-    self.PotEvaporation = cover(ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
+    self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow
 
@@ -156,20 +156,20 @@
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew1 - self.Qw1
 
-    self.Sw_diff = ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
+    self.Sw_diff = pcr.ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
     self.Ew = (
         self.Ew1
-        + (self.Ew1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Ew1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Qw = (
         self.Qw1
-        + (self.Qw1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Qw1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew - self.Qw
-    self.Sw[k] = ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
-    self.Sw_diff2 = ifthen(self.Sw[k] < 0, self.Sw[k])
+    self.Sw[k] = pcr.ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
+    self.Sw_diff2 = pcr.ifthen(self.Sw[k] < 0, self.Sw[k])
 
     self.wbSw_[k] = (
         self.PrecipitationSnow - self.Ew - self.Qw - self.Sw[k] + self.Sw_t[k]
@@ -189,7 +189,7 @@
 
     JarvisCoefficients.calcEpSnow(self, k)
     # self.PotEvaporation = self.EpHour
-    self.PotEvaporation = cover(ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
+    self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow
 
@@ -199,20 +199,20 @@
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew1 - self.Qw1
 
-    self.Sw_diff = ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
+    self.Sw_diff = pcr.ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
     self.Ew = (
         self.Ew1
-        + (self.Ew1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Ew1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Qw = (
         self.Qw1
-        + (self.Qw1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Qw1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew - self.Qw
-    self.Sw[k] = ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
-    self.Sw_diff2 = ifthen(self.Sw[k] < 0, self.Sw[k])
+    self.Sw[k] = pcr.ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
+    self.Sw_diff2 = pcr.ifthen(self.Sw[k] < 0, self.Sw[k])
 
     self.wbSw_[k] = (
         self.PrecipitationSnow - self.Ew - self.Qw - self.Sw[k] + self.Sw_t[k]
@@ -231,7 +231,7 @@
     """
     JarvisCoefficients.calcEpSnow(self, k)
     # self.PotEvaporation = self.EpHour
-    self.PotEvaporation = cover(ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
+    self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow
     self.Temp = (self.TempSurf + self.Temperature) / 2
@@ -242,20 +242,20 @@
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew1 - self.Qw1
 
-    self.Sw_diff = ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
+    self.Sw_diff = pcr.ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
     self.Ew = (
         self.Ew1
-        + (self.Ew1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Ew1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Qw = (
         self.Qw1
-        + (self.Qw1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Qw1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew - self.Qw
-    self.Sw[k] = ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
-    self.Sw_diff2 = ifthen(self.Sw[k] < 0, self.Sw[k])
+    self.Sw[k] = pcr.ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
+    self.Sw_diff2 = pcr.ifthen(self.Sw[k] < 0, self.Sw[k])
 
     self.wbSw_[k] = (
         self.PrecipitationSnow - self.Ew - self.Qw - self.Sw[k] + self.Sw_t[k]
@@ -274,7 +274,7 @@
     """
     JarvisCoefficients.calcEpSnow(self, k)
     # self.PotEvaporation = self.EpHour
-    self.PotEvaporation = cover(ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
+    self.PotEvaporation = pcr.cover(pcr.ifthenelse(self.EpHour > 0, self.EpHour, 0), 0)
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow
 
@@ -284,20 +284,20 @@
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew1 - self.Qw1
 
-    self.Sw_diff = ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
+    self.Sw_diff = pcr.ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
     self.Ew = (
         self.Ew1
-        + (self.Ew1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Ew1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Qw = (
         self.Qw1
-        + (self.Qw1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Qw1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew - self.Qw
-    self.Sw[k] = ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
-    self.Sw_diff2 = ifthen(self.Sw[k] < 0, self.Sw[k])
+    self.Sw[k] = pcr.ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
+    self.Sw_diff2 = pcr.ifthen(self.Sw[k] < 0, self.Sw[k])
 
     self.wbSw_[k] = (
         self.PrecipitationSnow - self.Ew - self.Qw - self.Sw[k] + self.Sw_t[k]
@@ -315,7 +315,7 @@
     """
     #    JarvisCoefficients.calcEpSnowHour(self,k)
     #    self.PotEvaporation = self.EpHour
-    #    self.PotEvaporation = ifthenelse(self.EpHour > 0, self.EpHour, 0)
+    #    self.PotEvaporation = pcr.ifthenelse(self.EpHour > 0, self.EpHour, 0)
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow
 
@@ -325,22 +325,22 @@
 
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew1 - self.Qw1
 
-    self.Sw_diff = ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
+    self.Sw_diff = pcr.ifthenelse(self.Sw[k] < 0, self.Sw[k], 0)
     self.Ew = (
         self.Ew1
-        + (self.Ew1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Ew1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Qw = (
         self.Qw1
-        + (self.Qw1 / ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
+        + (self.Qw1 / pcr.ifthenelse(self.Ew1 + self.Qw1 > 0, self.Ew1 + self.Qw1, 1))
         * self.Sw_diff
     )
     self.Sw[k] = self.Sw_t[k] + self.PrecipitationSnow - self.Ew - self.Qw
-    self.Sw[k] = ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
-    self.Sw_diff2 = ifthen(self.Sw[k] < 0, self.Sw[k])
+    self.Sw[k] = pcr.ifthenelse(self.Sw[k] < 0, 0, self.Sw[k])
+    self.Sw_diff2 = pcr.ifthen(self.Sw[k] < 0, self.Sw[k])
 
-    #    if any(pcr2numpy(self.Sw[k],nan) > 0):
+    #    if any(pcr.pcr2numpy(self.Sw[k],nan) > 0):
     #        pdb.set_trace()
     self.wbSw_[k] = (
         self.PrecipitationSnow - self.Ew - self.Qw - self.Sw[k] + self.Sw_t[k]
@@ -350,5 +350,5 @@
     self.Qw_[k] = self.Qw
 
 
-#    if any(pcr2numpy(self.Qw,nan) > 0):
+#    if any(pcr.pcr2numpy(self.Qw,nan) > 0):
 #        pdb.set_trace()