[Greater-commits] r3865 - in trunk/GREAT-ERModel: . test

[scm-commit@wald.intevation.org]

Author: frank
Date: 2011-12-06 15:43:46 +0100 (Tue, 06 Dec 2011)
New Revision: 3865

Modified:
   trunk/GREAT-ERModel/ChangeLog
   trunk/GREAT-ERModel/test/test_lake.py
   trunk/GREAT-ERModel/test/test_lake3.py
Log:
Set test values back to revision 3514: 
The values introduced with revision 3546 are relevant
for newer emission scenarios like roots or streets, aka "USF mode". 
These are not implemented in this variant of the model suite.


Modified: trunk/GREAT-ERModel/ChangeLog
===================================================================
--- trunk/GREAT-ERModel/ChangeLog	2011-12-06 10:42:35 UTC (rev 3864)
+++ trunk/GREAT-ERModel/ChangeLog	2011-12-06 14:43:46 UTC (rev 3865)
@@ -1,3 +1,10 @@
+2011-12-06  Frank Koormann <frank.koormann at intevation.de>
+
+	* test/test_lake.py, test/test_lake3.py: Set test values back to 
+	revision 3514: The values introduced with revision 3546 are relevant 
+	for newer emission scenarios like roots or streets, aka "USF mode". 
+	These are not implemented in this variant of the model suite.
+
 2011-07-26  Andre Heinecke <aheinecke at intevation.de>
 
 	* GreaterModel/Worker/simpletreatmodel.py: Use numpy instead of Numeric.

Modified: trunk/GREAT-ERModel/test/test_lake.py
===================================================================
--- trunk/GREAT-ERModel/test/test_lake.py	2011-12-06 10:42:35 UTC (rev 3864)
+++ trunk/GREAT-ERModel/test/test_lake.py	2011-12-06 14:43:46 UTC (rev 3865)
@@ -119,9 +119,9 @@
                 self.failUnless(k[0] in "RD", "invalid result type %s" % k[0])
 
         # Compare the values to the expected ones
-        for id, csim_mean in [('R_6',  0.00231131), 
-                                  ('R_11', 0.00146096),
-                                  ('R_18', 0.00254752)]:
+            for id, csim_mean in [('R_6',  2.88913656651e-05),
+                                   ('R_11', 1.82619518997e-05),
+                                   ('R_18', 3.18440587e-05)]:
 
             self.assertFloatEqual(
                            csim_mean,

Modified: trunk/GREAT-ERModel/test/test_lake3.py
===================================================================
--- trunk/GREAT-ERModel/test/test_lake3.py	2011-12-06 10:42:35 UTC (rev 3864)
+++ trunk/GREAT-ERModel/test/test_lake3.py	2011-12-06 14:43:46 UTC (rev 3865)
@@ -156,9 +156,9 @@
                 self.failUnless(k[0] in "RD", "invalid result type %s" % k[0])
 
         # Compare the values to the expected ones
-            for id, csim_mean in [('R_6',  0.00167233), 
-                                  ('R_11', 0.00102829),
-                                  ('R_18', 0.00189044)]:
+            for id, csim_mean in [('R_6',  2.0904134e-5),
+                                   ('R_11', 1.28535886e-5),
+                                   ('R_18', 2.36304694207e-05)]:
 
                 self.assertFloatEqual(
                             csim_mean,