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

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 12:38:18 +0200 (Tue, 26 Jul 2011)
New Revision: 3695

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 3587 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ERModel

........
  r3587 | aheinecke | 2011-07-14 16:58:56 +0200 (Thu, 14 Jul 2011) | 5 lines
  
  Sum Numpy updates:
      use float64 now instead of Float
      use linalg.solve instead of solve_linear_equations which is equivalent
      according to http://mathesaurus.sourceforge.net/numeric-numpy.html
........



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

Modified: branches/3.0.0-all-models/GREAT-ERModel/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ERModel/ChangeLog	2011-07-26 10:37:02 UTC (rev 3694)
+++ branches/3.0.0-all-models/GREAT-ERModel/ChangeLog	2011-07-26 10:38:18 UTC (rev 3695)
@@ -1,7 +1,7 @@
 2011-07-26  Andre Heinecke <aheinecke at intevation.de>
 
-	* Worker/simpletreatmodel.py: Use numpy instead of Numeric
-	* Worker/worker.py: Correct Type error by using string representation
+	* GreaterModel/Worker/simpletreatmodel.py: Use numpy instead of Numeric
+	* GreaterModel/Worker/worker.py: Correct Type error by using string representation
 	of a Tuple.
 
 2007-06-20  Frank Koormann <frank.koormann at intevation.de>

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:37:02 UTC (rev 3694)
+++ branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py	2011-07-26 10:38:18 UTC (rev 3695)
@@ -17,6 +17,8 @@
 
 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
 from parameter import Parameter