Changeset 3514 for development/euler

Timestamp:

Aug 21, 2006, 4:10:14 PM (19 years ago)

Author:

duncan

Message:

Hi all,
I'm doing a change in the anuga structure, moving the code to

\anuga_core\source\anuga

After you have done an svn update, the PYTHONPATH has to be changed to;
PYTHONPATH = anuga_core/source/

This is part of changes required to make installation of anuga quicker and reducing the size of our sandpits.

If any imports are broken, try fixing them. With adding anuga. to them for example. If this seems to have really broken things, email/phone me.

Cheers
Duncan

Location:

development/euler

Files:

• euler.py (modified) (5 diffs)
• test_euler.py (modified) (6 diffs)

development/euler/euler.py

@@ -88 +88 @@
 
         #Reduction operation for get_vertex_values
-        from util import mean
+        from anuga.pyvolution.util import mean
         self.reduction = mean
         #self.reduction = min  #Looks better near steep slopes
@@ -204 +204 @@
         """
 
-        import data_manager
+        import anuga.pyvolution.data_manager
 
         #Initialise writer
@@ -305 +305 @@
     """
 
-    from pyvolution.config import g, epsilon
+    from anuga.pyvolution.config import g, epsilon
     from math import sqrt
     from Numeric import array
@@ -1036 +1036 @@
     """
 
-    from util import gradient
+    from anuga.pyvolution.util import gradient
     from Numeric import zeros, Float, array, sum
 
@@ -1716 +1716 @@
 
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('shallow_water_ext.c'):
     #Replace python version with c implementations

development/euler/test_euler.py

@@ -4 +4 @@
 from math import sqrt, pi
 
-from pyvolution.config import g, epsilon
+from anuga.pyvolution.config import g, epsilon
 from Numeric import allclose, array, zeros, ones, Float, take
 from shallow_water import *
@@ -964 +964 @@
         from math import pi, cos, sin, sqrt
         from config import time_format
-        from util import file_function
+        from anuga.pyvolution.util import file_function
         import time
 
@@ -1011 +1011 @@
 
         #Convert ASCII file to NetCDF (Which is what we really like!)
-        from data_manager import timefile2netcdf        
+        from anuga.pyvolution.data_manager import timefile2netcdf        
         timefile2netcdf(filename)
 
@@ -2151 +2151 @@
 
     def test_flatbed_second_order_distribute(self):
-        #Use real data from pyvolution 2
+        #Use real data from anuga.pyvolution 2
         #painfully setup and extracted.
         from mesh_factory import rectangular
@@ -2924 +2924 @@
         domain1 = Domain(points, vertices, boundary)
 
-        from util import mean
+        from anuga.pyvolution.util import mean
         domain1.reduction = mean
         domain1.smooth = False  #Exact result
@@ -3042 +3042 @@
         domain1 = Domain(points, vertices, boundary)
 
-        from util import mean
+        from anuga.pyvolution.util import mean
         domain1.reduction = mean
         domain1.smooth = True #To mimic MOST output