Changeset 8662 for trunk

Timestamp:

Dec 5, 2012, 6:49:46 PM (12 years ago)

Author:

steve

Message:

Dealing with error message for enquiry point in a hole

Location:

trunk/anuga_core/source

Files:

• anuga/file/sww.py (modified) (1 diff)
• anuga/fit_interpolate/interpolate.py (modified) (3 diffs)
• anuga/structures/inlet_enquiry.py (modified) (1 diff)
• anuga_parallel/parallel_operator_factory.py (modified) (1 diff)

trunk/anuga_core/source/anuga/file/sww.py

@@ -103 +103 @@
         fid = NetCDFFile(self.filename, mode)
         if mode[0] == 'w':
-            description = 'Output from anuga.abstract_2d_finite_volumes ' \
+            description = 'Output from anuga.file.sww' \
                           'suitable for plotting'
                           

trunk/anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -46 +46 @@
 from anuga.geometry.polygon import interpolate_polyline, in_and_outside_polygon
 import anuga.utilities.log as log
+
 
 import numpy as num
@@ -539 +540 @@
                         froude_file=None,
                         time_thinning=1,
+                        g = 9.80665,
                         verbose=True,
                         use_cache = True):
@@ -633 +635 @@
                 froude = NAN
             else:
+
                 froude = sqrt(velocity_x*velocity_x + velocity_y*velocity_y)/ \
-                         sqrt(depth * 9.8066) # gravity m/s/s
+                         sqrt(depth * g) # gravity m/s/s
 
             depths.append(depth)

trunk/anuga_core/source/anuga/structures/inlet_enquiry.py

@@ -37 +37 @@
         msg += ' did not fall within the domain boundary.'
         assert is_inside_polygon(point, bounding_polygon), msg
-            
-        self.enquiry_index = self.domain.get_triangle_containing_point(self.enquiry_pt)
 
+        try:
+            self.enquiry_index = self.domain.get_triangle_containing_point(self.enquiry_pt)
+        except:
+            msg = "Enquiry point %s doesn't intersect mesh, maybe inside a building, try reducing enquiry_gap" % str(self.enquiry_pt)
+            raise Exception(msg)
+
+        
         if self.enquiry_index in self.triangle_indices:
             msg = 'Enquiry point %s' % (self.enquiry_pt)

trunk/anuga_core/source/anuga_parallel/parallel_operator_factory.py

@@ -384 +384 @@
         assert len(inlet_procs) > 0, "Line does not intersect any domain"
         assert inlet_master_proc >= 0, "No master processor assigned"
-        if enquiry_point is not None: assert inlet_enq_proc >= 0, "Enquiry point %s not assigned to a processor" % str(enquiry_point)
+
+        if enquiry_point is not None:
+            msg = "Enquiry point %s doesn't intersect mesh, maybe inside a building, try reducing enquiry_gap" % str(enquiry_point)
+            if inlet_enq_proc < 0:
+                raise Exception(msg)
 
         # Send inlet_master_proc and inlet_procs to all processors in inlet_procs