Changeset 3514 for anuga_core/source/anuga/utilities

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:

anuga_core/source/anuga/utilities

Files:

• compile.py (modified) (2 diffs)
• numerical_tools.py (modified) (1 diff)
• polygon.py (modified) (2 diffs)
• sparse.py (modified) (1 diff)
• test_cg_solve.py (modified) (1 diff)
• test_numerical_tools.py (modified) (1 diff)
• test_polygon.py (modified) (2 diffs)

anuga_core/source/anuga/utilities/compile.py

@@ -176 +176 @@
   #Add Python path + utilities to includelist (see ticket:31)
   #Assume there is only one 'utilities' dir under path dirs
-
+  
   utilities_include_dir = None
   for pathdir in sys.path:
@@ -190 +190 @@
       #print 'Found %s to be used as include dir' %utilities_include_dir
       break
-     
-
-      
+
+  utilities_include_dir = buildroot + os.sep + "source" + os.sep + "anuga" \
+                          + os.sep + 'utilities'
+ 
 
   

anuga_core/source/anuga/utilities/numerical_tools.py

@@ -290 +290 @@
 #Initialise module
 
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('util_ext.c'):
     from util_ext import gradient, gradient2

anuga_core/source/anuga/utilities/polygon.py

@@ -13 +13 @@
 
 from math import sqrt
-from utilities.numerical_tools import ensure_numeric
-from geospatial_data.geospatial_data import ensure_absolute
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.geospatial_data.geospatial_data import ensure_absolute
 
 def point_on_line(x, y, x0, y0, x1, y1):
@@ -563 +563 @@
 
         if geo_reference is None:
-            from coordinate_transforms.geo_reference import Geo_reference
+            from anuga.coordinate_transforms.geo_reference import Geo_reference
             geo_reference = Geo_reference()
 

anuga_core/source/anuga/utilities/sparse.py

@@ -370 +370 @@
 
 #Setup for C extensions
-from utilities import compile
+from anuga.utilities import compile
 if compile.can_use_C_extension('sparse_ext.c'):
     #Replace python version with c implementation

anuga_core/source/anuga/utilities/test_cg_solve.py

@@ -7 +7 @@
 
 from Numeric import dot, allclose, array, transpose, arange, ones, Float
-from utilities.cg_solve import *
-from utilities.cg_solve import _conjugate_gradient
-from utilities.sparse import Sparse, Sparse_CSR
+from anuga.utilities.cg_solve import *
+from anuga.utilities.cg_solve import _conjugate_gradient
+from anuga.utilities.sparse import Sparse, Sparse_CSR
 
 

anuga_core/source/anuga/utilities/test_numerical_tools.py

@@ -5 +5 @@
 from Numeric import zeros, array, allclose
 from math import sqrt, pi
-from config import epsilon
+from anuga.config import epsilon
 
 from numerical_tools import *

anuga_core/source/anuga/utilities/test_polygon.py

@@ -5 +5 @@
 from Numeric import zeros, array, allclose
 from math import sqrt, pi
-from utilities.numerical_tools import ensure_numeric
+from anuga.utilities.numerical_tools import ensure_numeric
 
 from polygon import *
-from coordinate_transforms.geo_reference import Geo_reference
-from geospatial_data.geospatial_data import Geospatial_data
+from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.geospatial_data.geospatial_data import Geospatial_data
 
 def test_function(x, y):
@@ -62 +62 @@
         """
 
-        from coordinate_transforms.geo_reference import Geo_reference
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
 
         geo = Geo_reference(56, 200, 1000)