Changeset 7830 for anuga_work/development/flow_1d/sww_flow

Timestamp:

Jun 14, 2010, 8:56:00 PM (15 years ago)

Author:

steve

Message:

Moving channel code to numpy

Location:

anuga_work/development/flow_1d/sww_flow

Files:

• . (modified) (1 prop)
• __init__.py (added)
• compile_all.py (deleted)
• config.py (deleted)
• sww_boundary_conditions.py (modified) (1 diff)
• sww_domain.py (modified) (3 diffs)
• sww_forcing_terms.py (modified) (3 diffs)
• sww_vel_comp_flux_ext.c (added)
• sww_vel_domain.py (added)

anuga_work/development/flow_1d/sww_flow/sww_boundary_conditions.py

@@ -7 +7 @@
 __date__ ="$05/06/2010 5:44:05 PM$"
 
-from generic_domain import *
+from flow_1d.generic_1d.generic_domain import *
 
 class Dirichlet_boundary(Boundary):

anuga_work/development/flow_1d/sww_flow/sww_domain.py

@@ -45 +45 @@
 import numpy
 
-from generic_domain import *
+from flow_1d.generic_1d.generic_domain import Generic_domain
 from sww_boundary_conditions import *
 from sww_forcing_terms import *
@@ -65 +65 @@
                                 tagged_elements      = tagged_elements)
         
-        from config import minimum_allowed_height, g, h0
+        from flow_1d.config import minimum_allowed_height, g, h0
         self.minimum_allowed_height = minimum_allowed_height
         self.g = g
@@ -84 +84 @@
         
         #Reduction operation for get_vertex_values
-        from util import mean
+        from flow_1d.utilities.util import mean
         self.reduction = mean
         #self.reduction = min  #Looks better near steep slopes

anuga_work/development/flow_1d/sww_flow/sww_forcing_terms.py

@@ -14 +14 @@
     """
 
-    from util import gradient
+    from flow_1d.utilities.util import gradient
 
     xmom  = domain.quantities['xmomentum'].explicit_update
@@ -158 +158 @@
     else:
         try:
-            f = numpy.float(f)
+            f = float(f)
         except:
             msg = 'Force field %s must be either a scalar' %f
@@ -166 +166 @@
 
 
-if __name__ == "__main__":
-    print "Hello World";