Changeset 9722

Timestamp:

Apr 23, 2015, 8:21:24 PM (9 years ago)

Author:

steve

Message:

Added Gareths updates

Location:

trunk/anuga_core/anuga

Files:

• __init__.py (modified) (1 diff, 1 prop)
• geometry/tests/test_polygon.py (modified) (2 diffs)
• utilities/quantity_setting_functions.py (modified) (3 diffs)
• utilities/tests/test_quantity_setting_functions.py (modified) (6 diffs)

trunk/anuga_core/anuga/__init__.py

@@ -25 +25 @@
 __svn_revision__ = filter(str.isdigit, "$Revision$")
 
+__svn_revision_date__ = "$Date$")
 
 

trunk/anuga_core/anuga/geometry/tests/test_polygon.py

@@ -1174 +1174 @@
         self.assertFalse(status!=2, 'Expected status 2, got status=%s, value=%s' %
                                (str(status), str(value)))
-        print line0, line1, value
-        print type(line0), type(value)
+        #print line0, line1, value
+        #print type(line0), type(value)
         self.assertTrue(num.allclose(value, line0))
 
@@ -1992 +1992 @@
 
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Polygon,'test_intersection_bug_20081110_TR_BL')
+    suite = unittest.makeSuite(Test_Polygon,'test') #_intersection_bug_20081110_TR_BL')
     runner = unittest.TextTestRunner()
     runner.run(suite)

trunk/anuga_core/anuga/utilities/quantity_setting_functions.py

@@ -342 +342 @@
                     pi_path = su.getRasterExtent(fi,asPolygon=True)
 
+                    if verbose:
+                        print 'Extracting extent from raster: ', fi
+                        print 'Extent: ', pi_path
+
                 elif( (type(pi) == str) and os.path.isfile(pi) ): 
                     # pi is a file
@@ -504 +508 @@
                       ' nan_interpolation_region_polygon'
 
+            if len(points_to_reinterpolate) > 0:
+                msg = 'WARNING: nan interpolation is being applied. This ',\
+                      'should be done in serial prior to distributing the ',\
+                      'domain, as there is no parallel communication ',\
+                      'implemented yet [so parallel results might depend on ',\
+                      'the number of processes]'
+                if verbose:
+                    print msg
+                    
+
             # Find the interpolation points = points not needing reinterpolation
             ip = x*0 + 1
@@ -514 +528 @@
 
             if len(nan_ip) > 0:
-                print len(nan_ip), ' points outside the nan_interpolation_region_polygon have nan values'
-                print 'This should not happen'
+                print 'There are ', len(nan_ip), ' points outside the ',\
+                      'nan_interpolation_region_polygon have nan values.'
+                print 'The user should ensure this does not happen.'
                 print 'The points have the following coordinates:'
-                print xy_array_trans[ip,:]
-                msg = "There are nan points outside of nan_interpolation_region_polygon, even after all fall-through's"
+                print xy_array_trans[ip[nan_ip],:]
+                msg = "There are nan points outside of " +\
+                      "nan_interpolation_region_polygon, even after all " +\
+                      "fall-through's"
                 raise Exception(msg)
          

trunk/anuga_core/anuga/utilities/tests/test_quantity_setting_functions.py

@@ -192 +192 @@
         F=qs.composite_quantity_setting_function(
             [[trenchPoly, -1000.], ['Extent', 'PointData_ElevTest.tif']],
-            domain)
+            domain,
+            verbose=False)
 
         # Points where we test the function
@@ -216 +217 @@
             [[trenchPoly, -1000.], ['Extent', 'PointData_ElevTest.tif']],
             domain,
-            clip_range = [[-500., 1.0e+100], [-1.0e+100, 1.0e+100]]) 
+            clip_range = [[-500., 1.0e+100], [-1.0e+100, 1.0e+100]],
+            verbose=False) 
 
         # Points where we test the function
@@ -241 +243 @@
         F = qs.composite_quantity_setting_function(
             [[trenchPoly, f0], ['Extent', 'PointData_ElevTest.tif']],
-            domain) 
+            domain,
+            verbose=False) 
         fitted = F(testPts_X,testPts_Y)
         # Now the fitted value in the trench should be determined by f0
@@ -256 +259 @@
         F = qs.composite_quantity_setting_function(
             [['All', f0 ], [None, 'PointData_ElevTest.tif']],
-            domain) 
+            domain,
+            verbose=False) 
         fitted=F(testPts_X,testPts_Y)
         # Now the fitted value in the trench should be determined by f0
@@ -267 +271 @@
             F=qs.composite_quantity_setting_function(
                 [['All', f0], ['All', 'PointData_ElevTest.tif']],
-                domain)
+                domain,
+                verbose=False)
             # Need to call it to get the error
             F(numpy.array([3.]), numpy.array([3.]))
@@ -279 +284 @@
                 [[trenchPoly, f0], ['All', 'PointData_ElevTest.tif']],
                 domain,
-                clip_range = [[ -500., -1000.], [-1.0e+100, 1.0e+100]]) 
+                clip_range = [[ -500., -1000.], [-1.0e+100, 1.0e+100]],
+                verbose=False) 
             return
         self.assertRaises(Exception, lambda: should_fail_1())