Changeset 7831

Timestamp:

Jun 14, 2010, 9:25:27 PM (15 years ago)

Author:

steve

Message:

 

Location:

anuga_work/development/flow_1d

Files:

• . (modified) (1 prop)
• channel_flow/test_all.py (added)
• generic_1d/test_all.py (added)
• generic_1d/test_generic_domain.py (modified) (1 diff)
• pipe_flow/test_all.py (added)
• sww_flow/sww_domain.py (modified) (2 diffs)
• sww_flow/sww_python.py (modified) (1 diff)
• sww_flow/sww_vel_domain.py (modified) (5 diffs)
• sww_flow/test_all.py (added)
• test_all.py (added)
• utilities/test_all.py (added)

anuga_work/development/flow_1d/generic_1d/test_generic_domain.py

@@ -5 +5 @@
 
 
-from generic_domain import *
+from flow_1d.generic_1d.generic_domain import *
 import numpy
 

anuga_work/development/flow_1d/sww_flow/sww_domain.py

@@ -152 +152 @@
 
 
-        from sww_comp_flux_ext import compute_fluxes_ext_short
+        from flow_1d.sww_flow.sww_comp_flux_ext import compute_fluxes_ext_short
 
         #self.flux_timestep = compute_fluxes_ext(timestep,self,stage,xmom,bed,height,velocity)
@@ -235 +235 @@
 
     import sys
-    from config import epsilon, h0
+    from flow_1d.config import epsilon, h0
         
     N = domain.number_of_elements

anuga_work/development/flow_1d/sww_flow/sww_python.py

@@ -132 +132 @@
     """
 
-    from config import g, epsilon, h0
+    from flow_1d.config import g, epsilon, h0
     from math import sqrt
     import numpy

anuga_work/development/flow_1d/sww_flow/sww_vel_domain.py

@@ -149 +149 @@
 
 
-    from sww_vel_comp_flux_ext import compute_fluxes_ext
+    from flow_1d.sww_flow.sww_vel_comp_flux_ext import compute_fluxes_ext
 
     domain.flux_timestep = compute_fluxes_ext(timestep,domain,stage,xmom,bed)
@@ -171 +171 @@
 
 
-    from sww_vel_comp_flux_ext import compute_fluxes_vel_ext
+    from flow_1d.sww_flow.sww_vel_comp_flux_ext import compute_fluxes_vel_ext
 
     domain.flux_timestep = compute_fluxes_vel_ext(timestep,domain,stage,xmom,bed,height,velocity)
@@ -201 +201 @@
     """
 
-    #from config import optimised_gradient_limiter
 
     #Remove very thin layers of water
@@ -208 +207 @@
     import sys
     from numpy import zeros
-    from config import epsilon, h0
+    from flow_1d.config import epsilon, h0
         
     N = domain.number_of_elements
@@ -302 +301 @@
 
     import sys
-    from Numeric import zeros, Float
-    from config import epsilon, h0
+    from numpy import zeros
+    from flow_1d.config import epsilon, h0
         
     N = domain.number_of_elements