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

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 12:29:17 +0200 (Tue, 26 Jul 2011)
New Revision: 3691

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

........
  r321 | aheinecke | 2011-06-30 11:46:17 +0200 (Thu, 30 Jun 2011) | 2 lines
  
  Use numpy instead of deprecated numeric module
........



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

Modified: branches/3.0.0-all-models/GREAT-ERModel/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ERModel/ChangeLog	2011-07-26 10:24:30 UTC (rev 3690)
+++ branches/3.0.0-all-models/GREAT-ERModel/ChangeLog	2011-07-26 10:29:17 UTC (rev 3691)
@@ -1,3 +1,7 @@
+2011-07-26  Andre Heinecke <aheinecke at intevation.de>
+
+	* Worker/simpletreatmodel.py: Use numpy instead of Numeric
+
 2007-06-20  Frank Koormann <frank.koormann at intevation.de>
 
 	* stop.py (main): Added socket.error exception handling and 

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:24:30 UTC (rev 3690)
+++ branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/simpletreatmodel.py	2011-07-26 10:29:17 UTC (rev 3691)
@@ -15,8 +15,8 @@
 from string import upper, lower, atof, split
 from math import exp, sqrt
 
-from Numeric import *
-from LinearAlgebra import *
+from numpy import *
+from numpy.linalg import *
 
 from stochasticresult import StochasticResult
 from parameter import Parameter