Changeset 3514 for production/onslow_2006

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:

production/onslow_2006

Files:

• MOST_timeseries.py (modified) (1 diff)
• compare_timeseries_data.py (modified) (1 diff)
• export_results.py (modified) (1 diff)
• get_timeseries.py (modified) (1 diff)
• make_gauges.py (modified) (1 diff)
• make_report.py (modified) (1 diff)
• plot_data_extent.py (modified) (2 diffs)
• project.py (modified) (1 diff)
• project_new.py (modified) (1 diff)
• project_old.py (modified) (1 diff)
• run_onslow.py (modified) (2 diffs)
• run_onslow_new.py (modified) (3 diffs)
• run_onslow_old.py (modified) (2 diffs)
• run_timeseries.py (modified) (1 diff)

production/onslow_2006/MOST_timeseries.py

@@ -21 +21 @@
 from os import sep, getcwd, F_OK, access, mkdir
 import project
-from pyvolution.util import sww2timeseries, get_gauges_from_file
+from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
 
 # User defined inputs

production/onslow_2006/compare_timeseries_data.py

@@ -19 +19 @@
 from os import sep
 import project
-from pyvolution.util import sww2timeseries, get_gauges_from_file
+from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
 
 # User defined inputs

production/onslow_2006/export_results.py

@@ -2 +2 @@
 import sys
 
-from pyvolution.data_manager import sww2dem
-from pyvolution.ermapper_grids import read_ermapper_grid
-from pyvolution.util import Screen_Catcher
+from anuga.pyvolution.data_manager import sww2dem
+from anuga.pyvolution.ermapper_grids import read_ermapper_grid
+from anuga.pyvolution.util import Screen_Catcher
 from os import sep
 

production/onslow_2006/get_timeseries.py

@@ -4 +4 @@
 
 import project
-from pyvolution.util import file_function
+from anuga.pyvolution.util import file_function
 from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *

production/onslow_2006/make_gauges.py

@@ -5 +5 @@
 import project
 from pylab import plot, xlabel, ylabel, title, ion, axis, savefig, close, text
-from utilities.polygon import poly_xy, is_inside_polygon
+from anuga.utilities.polygon import poly_xy, is_inside_polygon
 from Numeric import arange
 from pmesh.create_mesh import convert_points_from_latlon_to_utm

production/onslow_2006/make_report.py

@@ -53 +53 @@
 from os import getcwd, sep, altsep, mkdir, access, F_OK
 import project
-from pyvolution.util import sww2timeseries, get_gauges_from_file
+from anuga.pyvolution.util import sww2timeseries, get_gauges_from_file
 
 # Derive scenario name

production/onslow_2006/plot_data_extent.py

@@ -1 +1 @@
 from pylab import *
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 from pmesh.create_mesh import convert_points_from_latlon_to_utm
 from coordinate_transforms.redfearn import degminsec2decimal_degrees
 from os import sep
-from utilities.polygon import inside_polygon
+from anuga.utilities.polygon import inside_polygon
 import project
-from utilities.polygon import plot_polygons, poly_xy, polygon_area
+from anuga.utilities.polygon import plot_polygons, poly_xy, polygon_area
 
 datadir = project.datadir
@@ -18 +18 @@
 def read_community_file(filename1, filename2, polygon):
     from coordinate_transforms.redfearn import redfearn
-    from utilities.polygon import inside_polygon
+    from anuga.utilities.polygon import inside_polygon
     fid1 = open(filename1)
     lines = fid1.readlines()

production/onslow_2006/project.py

@@ -5 +5 @@
 from os import sep, environ, getenv, getcwd
 from os.path import expanduser
-#from utilities.polygon import read_polygon
+#from anuga.utilities.polygon import read_polygon
 import sys
 

production/onslow_2006/project_new.py

@@ -5 +5 @@
 from os import sep, environ
 from os.path import expanduser
-from utilities.polygon import read_polygon
+from anuga.utilities.polygon import read_polygon
 import sys
 

production/onslow_2006/project_old.py

@@ -5 +5 @@
 from os import sep, environ
 from os.path import expanduser
-from utilities.polygon import read_polygon
+from anuga.utilities.polygon import read_polygon
 import sys
 

production/onslow_2006/run_onslow.py

@@ -23 +23 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, \
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from geospatial_data import *
-from pyvolution.util import Screen_Catcher
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.geospatial_data.geospatial_data import *
+from anuga.pyvolution.util import Screen_Catcher
 
 # Application specific imports
@@ -183 +183 @@
 #-------------------------------------------------------------------------------
 print 'start ferret2sww'
-from pyvolution.data_manager import ferret2sww
+from anuga.pyvolution.data_manager import ferret2sww
 
 south = project.south 

production/onslow_2006/run_onslow_new.py

@@ -20 +20 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, \
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-from geospatial_data import add_points_files
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+from anuga.geospatial_data.geospatial_data import add_points_files
 
 # Application specific imports
@@ -34 +34 @@
 from os import mkdir, access, F_OK
 
-from geospatial_data import *
+from anuga.geospatial_data.geospatial_data import *
 
 #-------------------------------------------------------------------------------
@@ -182 +182 @@
 #-------------------------------------------------------------------------------
 
-from pyvolution.data_manager import ferret2sww
+from anuga.pyvolution.data_manager import ferret2sww
 
 south = project.south 

production/onslow_2006/run_onslow_old.py

@@ -21 +21 @@
 
 # Related major packages
-from pyvolution.shallow_water import Domain, Reflective_boundary, \
+from anuga.pyvolution.shallow_water import Domain, Reflective_boundary, \
                             Dirichlet_boundary, Time_boundary, File_boundary
-from pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pyvolution.combine_pts import combine_rectangular_points_files 
-from pyvolution.pmesh2domain import pmesh_to_domain_instance
-#from geospatial_data import *
+from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.pyvolution.combine_pts import combine_rectangular_points_files 
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
+#from anuga.geospatial_data.geospatial_data import *
 
 # Application specific imports
@@ -206 +206 @@
 #------------------------------------------------------------------------------
 '''
-from pyvolution.data_manager import ferret2sww
+from anuga.pyvolution.data_manager import ferret2sww
 
 south = project.south 

production/onslow_2006/run_timeseries.py

@@ -1 +1 @@
 """ Script for generating figures, see sww2timeseries for documentation"""
 
-from pyvolution.util import sww2timeseries
+from anuga.pyvolution.util import sww2timeseries
 import project
 from os import sep