Changeset 6150 for anuga_core/source/anuga/culvert_flows/culvert_class.py

Timestamp:

Jan 13, 2009, 1:42:28 PM (15 years ago)

Author:

rwilson

Message:

Change Numeric imports to general form - ready to change to NumPy?.

File:

• anuga_core/source/anuga/culvert_flows/culvert_class.py (modified) (5 diffs)

anuga_core/source/anuga/culvert_flows/culvert_class.py

@@ +1 @@
+import sys
+
 from anuga.shallow_water.shallow_water_domain import Inflow, General_forcing
 from anuga.culvert_flows.culvert_polygons import create_culvert_polygons
@@ -10 +12 @@
         
 from anuga.config import g, epsilon
-from Numeric import take, sqrt
 from anuga.config import minimum_allowed_height, velocity_protection        
 
-        
-
-
-from Numeric import allclose
-from Numeric import sqrt, sum
-
-
-
-import sys
+import Numeric as num
+
 
 class Below_interval(Exception): pass 
@@ -284 +278 @@
         self.length = P['length']; assert self.length > 0.0
         if culvert_description_filename is not None:
-            if not allclose(self.length, length, rtol=1.0e-2, atol=1.0e-2):
+            if not num.allclose(self.length, length, rtol=1.0e-2, atol=1.0e-2):
                 msg = 'WARNING: barrel length specified in "%s" (%.2f m)'\
                     % (culvert_description_filename, 
@@ -770 +764 @@
         self.vector = P['vector']
         self.length = P['length']; assert self.length > 0.0
-        if not allclose(self.length, length, rtol=1.0e-2, atol=1.0e-2):
+        if not num.allclose(self.length, length, rtol=1.0e-2, atol=1.0e-2):
             msg = 'WARNING: barrel length specified in "%s" (%.2f m)' %(culvert_description_filename, length)
             msg += ' does not match distance between specified'
@@ -1002 +996 @@
                  verbose=False):
         
-        from Numeric import sqrt, sum
-
         # Input check
         if diameter is not None: