[Greater-commits] r3811 - branches/cefic-approved/GREAT-ERModel/GreaterModel/Worker

[scm-commit@wald.intevation.org]

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

Modified:
   branches/cefic-approved/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py
Log:
Correct valueerrors under some parameter conditions


Modified: branches/cefic-approved/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py
===================================================================
--- branches/cefic-approved/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py	2011-10-13 20:41:46 UTC (rev 3810)
+++ branches/cefic-approved/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py	2011-10-13 20:44:46 UTC (rev 3811)
@@ -8,8 +8,6 @@
 """GREAT-ER Model Worker: WWTP SimpleTreat Model implementation."""
 
 __version__ = "$Revision: 1.10 $"
-# $Source: /home/greater/jail/greaterrepository/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py,v $
-# $Id: simpletreatmodel.py,v 1.10 2003/09/23 07:41:01 frank Exp $
 
 from types import ListType, TupleType
 from string import upper, lower, atof, split
@@ -258,11 +256,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 +700,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 +733,7 @@
         if Q:
             c_influent = PHIin / Q
         else:
-            return 1.0, 0.0
+            return 0.0
 
         #
         # AS tank