[Greater-commits] r3810 - trunk/GREAT-ERModel/GreaterModel/Worker

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-10-13 22:41:46 +0200 (Thu, 13 Oct 2011)
New Revision: 3810

Modified:
   trunk/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py
Log:
Don't return to many values in case of strange values.

If the input is 0 return 0



Modified: trunk/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py
===================================================================
--- trunk/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py	2011-10-13 18:57:44 UTC (rev 3809)
+++ trunk/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py	2011-10-13 20:41:46 UTC (rev 3810)
@@ -258,11 +258,11 @@
         if Q:
             c_influent = PHIin / Q
         else:
-            return 1.0, Q, 0.0, 0.0
+            return 1.0, Q, 0.0
 
         # if the influent load is zero, the outcome will as well
         if not PHIin:
-            return 1.0, Q, 0.0, 0.0
+            return 1.0, Q, 0.0
 
         # Influent partitioning 
         f_d = 1.0 / ( 1.0 + 1e-6 * self.SS_sewage * self.Kd ) 
@@ -702,7 +702,7 @@
 
         # if the influent load is zero, the outcome will as well
         if not PHIin:
-            return 1.0, 0.0
+            return 0.0
 
         #
         # Initialize
@@ -735,7 +735,7 @@
         if Q:
             c_influent = PHIin / Q
         else:
-            return 1.0, 0.0
+            return 0.0
 
         #
         # AS tank