Changeset 7830

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

Files:

• __init__.py (added)
• channel_flow/__init__.py (added)
• channel_flow/channel_domain_ext.pyd (deleted)
• channel_flow/channel_domain_ext_backup.pyd (deleted)
• compile_all.py (added)
• config.py (added)
• generic_1d/__init__.py (added)
• generic_1d/compile_all.py (deleted)
• generic_1d/quantity.py (modified) (1 diff)
• generic_1d/test_quantity.py (modified) (1 diff)
• generic_1d/util.py (deleted)
• generic_1d/util_ext.h (deleted)
• pipe_flow/__init__.py (added)
• sww_flow (modified) (1 prop)
• sww_flow/__init__.py (added)
• sww_flow/compile_all.py (deleted)
• sww_flow/config.py (deleted)
• sww_flow/sww_boundary_conditions.py (modified) (1 diff)
• sww_flow/sww_domain.py (modified) (3 diffs)
• sww_flow/sww_forcing_terms.py (modified) (3 diffs)
• sww_flow/sww_vel_comp_flux_ext.c (added)
• sww_flow/sww_vel_domain.py (added)
• utilities (added)
• utilities/__init__.py (added)
• utilities/compile.py (added)
• utilities/util.py (added)
• utilities/util_ext.c (added)
• utilities/util_ext.h (added)

anuga_work/development/flow_1d/generic_1d/quantity.py

@@ -1126 +1126 @@
 if __name__ == "__main__":
     #from domain import Domain
-    from sww_domain import Domain
+    from generic_domain import Generic_domain as Domain
     
     points1 = [0.0, 1.0, 2.0, 3.0]

anuga_work/development/flow_1d/generic_1d/test_quantity.py

@@ -473 +473 @@
 
         #Assert that quantities are conserved
-        from Numeric import sum
         for k in range(quantity.centroid_values.shape[0]):
             assert allclose (quantity.centroid_values[k],
-                             sum(quantity.vertex_values[k,:])/2.0)
+                             numpy.sum(quantity.vertex_values[k,:])/2.0)
 
 

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";