[Greater-commits] r3698 - in branches/3.0.0-all-models/GREAT-ERModel: . GreaterModel/Worker

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 12:42:45 +0200 (Tue, 26 Jul 2011)
New Revision: 3698

Modified:
   branches/3.0.0-all-models/GREAT-ERModel/
   branches/3.0.0-all-models/GREAT-ERModel/ChangeLog
   branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py
Log:
Merged revisions 3603 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ERModel

........
  r3603 | aheinecke | 2011-07-15 11:06:01 +0200 (Fri, 15 Jul 2011) | 2 lines
  
  Revert commit 3600 because it is an uneccerssary loss of accuracy
........



Property changes on: branches/3.0.0-all-models/GREAT-ERModel
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ERModel:1-216,321,3583-3584,3587,3601-3602
   + /trunk/GREAT-ERModel:1-216,321,3583-3584,3587,3601-3603

Modified: branches/3.0.0-all-models/GREAT-ERModel/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ERModel/ChangeLog	2011-07-26 10:41:37 UTC (rev 3697)
+++ branches/3.0.0-all-models/GREAT-ERModel/ChangeLog	2011-07-26 10:42:45 UTC (rev 3698)
@@ -1,7 +1,6 @@
 2011-07-26  Andre Heinecke <aheinecke at intevation.de>
 
 	* GreaterModel/Worker/simpletreatmodel.py: Use numpy instead of Numeric.
-	Use the default python float type instead of the Numeric Float.
 	* GreaterModel/Worker/worker.py: Correct Type error by using string representation
 	of a Tuple.
 	Convert Numpy floats to regular python floats for jelling

Modified: branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py	2011-07-26 10:41:37 UTC (rev 3697)
+++ branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py	2011-07-26 10:42:45 UTC (rev 3698)
@@ -17,6 +17,7 @@
 
 from numpy import *
 from numpy.linalg import *
+from numpy import float64 as Float
 from numpy.linalg import solve as solve_linear_equations
 
 from stochasticresult import StochasticResult
@@ -232,13 +233,13 @@
         ID = self.ID
 
         # Matrices and vectors
-        V    = zeros((5), float)
-        k    = zeros((5), float)
-        conc = zeros((5), float)
-        PHI  = zeros((5), float)
-        ADV  = zeros((5,5), float)
-        XCH  = zeros((5,5), float)
-        COEF = zeros((5,5), float)
+        V    = zeros((5), Float)
+        k    = zeros((5), Float)
+        conc = zeros((5), Float)
+        PHI  = zeros((5), Float)
+        ADV  = zeros((5,5), Float)
+        XCH  = zeros((5,5), Float)
+        COEF = zeros((5,5), Float)
 
         # Settler Efficiency
         fraction_treated = self.FractionTreated(
@@ -328,8 +329,8 @@
         # is not considered. 
         # See GREAT-ER, Technical Documentation, G. Boeije, 1999 for Details.
 
-        PHI_  = zeros((4), float)
-        COEF_ = zeros((4,4), float)
+        PHI_  = zeros((4), Float)
+        COEF_ = zeros((4,4), Float)
         
         for i in range(1,5):
             for j in range(1,5):
@@ -710,12 +711,12 @@
         ID = self.ID
 
         # Matrices and vectors
-        V    = zeros((7), float)
-        k    = zeros((7), float)
-        conc = zeros((7), float)
-        PHI  = zeros((7), float)
-        ADV  = zeros((7,7), float)
-        XCH  = zeros((7,7), float)
+        V    = zeros((7), Float)
+        k    = zeros((7), Float)
+        conc = zeros((7), Float)
+        PHI  = zeros((7), Float)
+        ADV  = zeros((7,7), Float)
+        XCH  = zeros((7,7), Float)
 
         # Secondary Settler Efficiency
         fraction_treated = self.FractionTreated(
@@ -990,8 +991,8 @@
         # is not considered. 
         # See GREAT-ER, Technical Documentation, G. Boeije, 1999 for Details.
 
-        PHI_  = zeros((6), float)
-        COEF_ = zeros((6,6), float)
+        PHI_  = zeros((6), Float)
+        COEF_ = zeros((6,6), Float)
         
         for i in range(1,7):
             for j in range(1,7):