Changeset 3535

Timestamp:

Aug 29, 2006, 11:30:14 AM (19 years ago)

Author:

duncan

Message:

change imports so reflect the new structure

Files:

• anuga_core/source/anuga/examples/run_gong.py (modified) (1 diff)
• anuga_core/source/anuga/examples/run_tsh.py (modified) (1 diff)
• anuga_core/source/anuga/examples/runup_convergence.py (modified) (1 diff)
• anuga_core/source/anuga/pmesh/timing.py (modified) (1 diff)
• anuga_core/source/anuga/pyvolution/check_sww_tsh.py (modified) (1 diff)
• anuga_core/source/anuga/pyvolution/data_manager.py (modified) (2 diffs)
• anuga_core/source/anuga/pyvolution/run_tsh_weir.py (modified) (1 diff)
• anuga_core/source/anuga/pyvolution/test_pmesh2domain.py (modified) (2 diffs)
• anuga_core/source/anuga/pyvolution/test_shallow_water.py (modified) (1 diff)
• anuga_core/source/anuga/pyvolution/tsh2sww.py (modified) (1 diff)
• anuga_core/source/anuga/pyvolution/view_tsh.py (modified) (1 diff)
• development/cairns_2006/create_mesh.py (modified) (1 diff)
• development/dam_2006/create_mesh.py (modified) (1 diff)
• development/dam_2006/run_dam.py (modified) (4 diffs)
• development/momentum_sink/scripts/building_generator.py (modified) (1 diff)
• development/momentum_sink/scripts/create_buildings.py (modified) (1 diff)
• development/momentum_sink/scripts/create_two_buildings.py (modified) (1 diff)
• development/momentum_sink/scripts/friction_block.py (modified) (1 diff)
• development/momentum_sink/scripts/loop_buildings.py (modified) (1 diff)
• development/momentum_sink/scripts/loop_friction.py (modified) (1 diff)
• development/momentum_sink/scripts/plot_cross_section.py (modified) (1 diff)
• development/momentum_sink/scripts/run_buildings.py (modified) (1 diff)
• development/momentum_sink/scripts/run_friction.py (modified) (1 diff)
• development/momentum_sink/scripts/two_friction_block.py (modified) (1 diff)
• development/okushiri_2005/create_mesh.py (modified) (1 diff)
• development/pyvolution-1d/data_manager.py (modified) (5 diffs)
• development/pyvolution-1d/domain.py (modified) (1 diff)
• development/stochastic_study/create_mesh.py (modified) (1 diff)
• production/broome_2006/project.py (modified) (2 diffs)
• production/broome_2006/run_broome.py (modified) (1 diff)
• production/gippsland_2005/create_mesh2.py (modified) (1 diff)
• production/gippsland_2005/get_timeseries.py (modified) (1 diff)
• production/karratha_2005/project.py (modified) (1 diff)
• production/karratha_2005/run_karratha.py (modified) (1 diff)
• production/onslow_2006/get_timeseries.py (modified) (1 diff)
• production/onslow_2006/make_gauges.py (modified) (1 diff)
• production/onslow_2006/plot_data_extent.py (modified) (2 diffs)
• production/onslow_2006/project.py (modified) (2 diffs)
• production/onslow_2006/project_new.py (modified) (2 diffs)
• production/onslow_2006/project_old.py (modified) (2 diffs)
• production/onslow_2006/run_onslow.py (modified) (1 diff)
• production/onslow_2006/run_onslow_new.py (modified) (1 diff)
• production/onslow_2006/run_onslow_old.py (modified) (1 diff)
• production/pt_hedland_2006/project.py (modified) (2 diffs)
• production/pt_hedland_2006/run_pt_hedland.py (modified) (1 diff)
• production/swan_river_tin_2005/thin_generate_alpha.py (modified) (1 diff)
• production/sydney_2006/get_timeseries.py (modified) (1 diff)
• production/sydney_2006/project.py (modified) (2 diffs)
• production/sydney_2006/run_sydney.py (modified) (1 diff)
• production/sydney_2006/run_sydney_smf.py (modified) (1 diff)
• production/sydney_2006/run_sydney_smf_polyingo.py (modified) (1 diff)
• production/wollongong_2006/run_flagstaff.py (modified) (1 diff)

anuga_core/source/anuga/examples/run_gong.py

@@ -20 +20 @@
      Transmissive_boundary, Time_boundary, Add_value_to_region, File_boundary
 from mesh_factory import rectangular
-from pmesh2domain import pmesh_to_domain, pmesh_to_domain_instance
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain, pmesh_to_domain_instance
 
 from Numeric import array

anuga_core/source/anuga/examples/run_tsh.py

@@ -21 +21 @@
 from region import Add_value_to_region, Set_region
 from mesh_factory import rectangular
-from pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 
 from Numeric import array

anuga_core/source/anuga/examples/runup_convergence.py

@@ -14 +14 @@
 import sys
 
-from pmesh.mesh_interface import create_mesh_from_regions
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from pyvolution.mesh_factory import rectangular_cross
 from pyvolution.shallow_water import Domain

anuga_core/source/anuga/pmesh/timing.py

@@ -3 +3 @@
 """
 from mesh import *
-from pmesh import *
+from anuga.pmesh import *
 import time
 

anuga_core/source/anuga/pyvolution/check_sww_tsh.py

@@ -8 +8 @@
 from load_mesh.loadASCII import import_mesh_file
 from shallow_water import Domain
-from pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 
 def check_sww_tsh(sww_file, tsh_file, verbose = False):

anuga_core/source/anuga/pyvolution/data_manager.py

@@ -31 +31 @@
 Manually created files:
 ASC, PRJ:     Digital elevation models (gridded)
-TSH:          Triangular meshes (e.g. created from pmesh)
+TSH:          Triangular meshes (e.g. created from anuga.pmesh)
 NC            Model outputs for use as boundary conditions (e.g from MOST)
 
@@ -3545 +3545 @@
 
     from shallow_water import Domain
-    from pmesh2domain import pmesh_to_domain_instance
+    from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
     import time, os
     from anuga.pyvolution.data_manager import get_dataobject

anuga_core/source/anuga/pyvolution/run_tsh_weir.py

@@ -16 +16 @@
 
 from mesh_factory import rectangular
-from pmesh2domain import pmesh_to_domain
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain
 
 from Numeric import array

anuga_core/source/anuga/pyvolution/test_pmesh2domain.py

@@ -8 +8 @@
 from shallow_water import Domain
 
+#from anuga.pyvolution.pmesh2domain import *
+
 from pmesh2domain import *
 
@@ -14 +16 @@
 
 from anuga.coordinate_transforms.geo_reference import Geo_reference
-
-#This is making pyvolution dependent on pmesh.
-# not good.  this should be in a seperate package.(directory)
 from anuga.pmesh.mesh import importMeshFromFile
 

anuga_core/source/anuga/pyvolution/test_shallow_water.py

@@ -3341 +3341 @@
          tags["3"] = b3
 
-         #from pmesh2domain import pmesh_to_domain_instance
+         #from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
          #domain = pmesh_to_domain_instance(fileName, Domain)
 

anuga_core/source/anuga/pyvolution/tsh2sww.py

@@ -11 +11 @@
 
 from shallow_water import Domain
-from pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 import time, os 
 from anuga.pyvolution.data_manager import get_dataobject   

anuga_core/source/anuga/pyvolution/view_tsh.py

@@ -8 +8 @@
 
 from shallow_water import Domain
-from pmesh2domain import pmesh_to_domain_instance
+from anuga.pyvolution.pmesh2domain import pmesh_to_domain_instance
 from anuga.pyvolution.util import file_function
 from anuga.utilities.polygon import Polygon_function, read_polygon

development/cairns_2006/create_mesh.py

@@ -6 +6 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-from pmesh.mesh import *
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import *
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 from conversion import convert_latlon_to_xycoords
 

development/dam_2006/create_mesh.py

@@ -2 +2 @@
 """
 
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Assume that the root AnuGA dir is included in your pythonpath
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-from pmesh.mesh import *
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import *
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 

development/dam_2006/run_dam.py

@@ -26 +26 @@
 # Application specific imports
 import project                 # Definition of file names and polygons
+
 
 def main():
@@ -71 +72 @@
     domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
     domain.set_minimum_sww_depth(0.01)
+    domain.set_store_vertices_uniquely(True)  # for writting to sww
 
     #-------------------------------------------------------------------------
@@ -88 +90 @@
     domain.set_region('dam','stage',0.2,
                                  location = 'unique vertices') 
-    domain.set_region(Set_region('dam','stage',0.2,
-                                 location = 'unique vertices'))
-    domain.set_store_vertices_uniquely(True)  # for writting to sww
+    #domain.set_region(Set_region('dam','stage',0.2,
+    #                             location = 'unique vertices'))
 
     Br = Reflective_boundary(domain)
-    Bd = Dirichlet_boundary([0,0,0])
+    Bd = Dirichlet_boundary([0,0,0])  # to drain the water out.
     domain.set_boundary( {'wall': Br, 'edge': Bd} )
 
@@ -116 +117 @@
 
     #-------------------------------------------------------------------------
-    # Calc gauge info
+    # Calculate gauge info
     #-------------------------------------------------------------------------
     interpolate_sww2csv(project.outputtimedir + project.basename +".sww",

development/momentum_sink/scripts/building_generator.py

@@ -3 +3 @@
 
 # add inundation dir to your pythonpath
-from pmesh.mesh import Mesh
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import Mesh
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 

development/momentum_sink/scripts/create_buildings.py

@@ -6 +6 @@
 import array
 # add inundation dir to your pythonpath
-from pmesh.mesh import Mesh
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import Mesh
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 WidtH = 200 # width of boudary in metres

development/momentum_sink/scripts/create_two_buildings.py

@@ -4 +4 @@
 import random
 # add inundation dir to your pythonpath
-from pmesh.mesh import Mesh
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import Mesh
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 WidtH = 200 # width of boudary in metres

development/momentum_sink/scripts/friction_block.py

@@ -3 +3 @@
 
 # add inundation dir to your pythonpath
-from pmesh.mesh import Mesh
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import Mesh
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 

development/momentum_sink/scripts/loop_buildings.py

@@ -15 +15 @@
 import project
 from create_buildings import create_mesh
-from pmesh.mesh import importMeshFromFile
+from anuga.pmesh.mesh import importMeshFromFile
 import Numeric
 

development/momentum_sink/scripts/loop_friction.py

@@ -18 +18 @@
 from anuga.pyvolution.least_squares import fit_to_mesh_file, DEFAULT_ALPHA 
 from friction_block import create_mesh
-from pmesh.mesh import importMeshFromFile
+from anuga.pmesh.mesh import importMeshFromFile
 
 # generation of friction value list

development/momentum_sink/scripts/plot_cross_section.py

@@ -7 +7 @@
 from anuga.pyvolution.util import file_function
 #from anuga.pyvolution.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
-#from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+#from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
 #from compare_sww import gauge_locations

development/momentum_sink/scripts/run_buildings.py

@@ -18 +18 @@
 #from building_generator import create_mesh
 
-from pmesh.mesh import importMeshFromFile
+from anuga.pmesh.mesh import importMeshFromFile
 
 depth = 3.5 # depth of building side to oncoming wave

development/momentum_sink/scripts/run_friction.py

@@ -25 +25 @@
 #from building_generator import create_mesh
 
-from pmesh.mesh import importMeshFromFile
+from anuga.pmesh.mesh import importMeshFromFile
 
 meshname = project_friction.meshname

development/momentum_sink/scripts/two_friction_block.py

@@ -3 +3 @@
 
 # add inundation dir to your pythonpath
-from pmesh.mesh import Mesh
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import Mesh
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 

development/okushiri_2005/create_mesh.py

@@ -6 +6 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-from pmesh.mesh import *
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import *
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 #-------------------------------------------------------------

development/pyvolution-1d/data_manager.py

@@ -54 +54 @@
 
 
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 def make_filename(s):
@@ -1053 +1053 @@
 
     #Georeferencing
-    from coordinate_transforms.geo_reference import Geo_reference
+    from anuga.coordinate_transforms.geo_reference import Geo_reference
     if zone is None:
         assert xllcorner is None, 'xllcorner must be None'
@@ -2309 +2309 @@
 
     #Store
-    from coordinate_transforms.redfearn import redfearn
+    from anuga.coordinate_transforms.redfearn import redfearn
     x = zeros(number_of_points, Float)  #Easting
     y = zeros(number_of_points, Float)  #Northing
@@ -3439 +3439 @@
     from Scientific.IO.NetCDF import NetCDFFile
 
-    from coordinate_transforms.redfearn import redfearn
+    from anuga.coordinate_transforms.redfearn import redfearn
 
     precision = Float # So if we want to change the precision its done here
@@ -3591 +3591 @@
 
     #Store
-    from coordinate_transforms.redfearn import redfearn
+    from anuga.coordinate_transforms.redfearn import redfearn
     x = zeros(number_of_points, Float)  #Easting
     y = zeros(number_of_points, Float)  #Northing

development/pyvolution-1d/domain.py

@@ -8 +8 @@
 """
 from generic_boundary_conditions import *
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 class Domain:

development/stochastic_study/create_mesh.py

@@ -6 +6 @@
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-from pmesh.mesh import *
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import *
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 #-------------------------------------------------------------

production/broome_2006/project.py

@@ -6 +6 @@
 #from anuga.utilities.polygon import read_polygon
 import sys
-from pmesh.create_mesh import convert_points_from_latlon_to_utm
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 from time import localtime, strftime
 from anuga.geospatial_data.geospatial_data import *
@@ -87 +87 @@
 refzone = 50 
 
-from coordinate_transforms.redfearn import redfearn
+from anuga.coordinate_transforms.redfearn import redfearn
 # boundary up to 50 m contour
 lat1_50 = degminsec2decimal_degrees(-19,20,0)

production/broome_2006/run_broome.py

@@ -97 +97 @@
 #-------------------------------------------------------------------------------
 
-from pmesh.mesh_interface import create_mesh_from_regions
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
 region_res = 500000

production/gippsland_2005/create_mesh2.py

@@ -4 +4 @@
 
 # add inundation dir to your pythonpath
-from pmesh.mesh import *
-from coordinate_transforms.geo_reference import Geo_reference
+from anuga.pmesh.mesh import *
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
     

production/gippsland_2005/get_timeseries.py

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

production/karratha_2005/project.py

@@ -38 +38 @@
 
 #Georeferencing
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 
 #Origin of existing dem (FIXME: Temporary measure)

production/karratha_2005/run_karratha.py

@@ -84 +84 @@
 
 #Create Triangular Mesh
-from pmesh.create_mesh import create_mesh_from_regions
+from anuga.pmesh.create_mesh import create_mesh_from_regions
 
 resolution = 4000

production/onslow_2006/get_timeseries.py

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

production/onslow_2006/make_gauges.py

@@ -7 +7 @@
 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
+from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
 
 x_bound, y_bound = poly_xy(project.polyAll)

production/onslow_2006/plot_data_extent.py

@@ -1 +1 @@
 from pylab 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 anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 from os import sep
 from anuga.utilities.polygon import inside_polygon
@@ -17 +17 @@
 
 def read_community_file(filename1, filename2, polygon):
-    from coordinate_transforms.redfearn import redfearn
+    from anuga.coordinate_transforms.redfearn import redfearn
     from anuga.utilities.polygon import inside_polygon
     fid1 = open(filename1)

production/onslow_2006/project.py

@@ -8 +8 @@
 import sys
 
-from pmesh.create_mesh import convert_points_from_latlon_to_utm
-
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
+
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 
 from time import localtime, strftime, gmtime
@@ -135 +135 @@
 
 #Georeferencing
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 
 refzone = 50

production/onslow_2006/project_new.py

@@ -8 +8 @@
 import sys
 
-from pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
 
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 
 from time import localtime, strftime
@@ -85 +85 @@
 
 #Georeferencing
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 
 refzone = 50

production/onslow_2006/project_old.py

@@ -8 +8 @@
 import sys
 
-from pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
 
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 
 from time import localtime, strftime
@@ -87 +87 @@
 
 #Georeferencing
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 
 refzone = 50

production/onslow_2006/run_onslow.py

@@ -115 +115 @@
 #-------------------------------------------------------------------------------
 
-from pmesh.mesh_interface import create_mesh_from_regions
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
 #new

production/onslow_2006/run_onslow_new.py

@@ -103 +103 @@
 #-------------------------------------------------------------------------------
 
-from pmesh.mesh_interface import create_mesh_from_regions
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
 # original

production/onslow_2006/run_onslow_old.py

@@ -128 +128 @@
 # resolutions (maximal area of per triangle) for each polygon
 #------------------------------------------------------------------------------
-from pmesh.mesh_interface import create_mesh_from_regions
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
 # original

production/pt_hedland_2006/project.py

@@ -7 +7 @@
 #from anuga.utilities.polygon import read_polygon
 import sys
-from pmesh.create_mesh import convert_points_from_latlon_to_utm
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 from time import localtime, strftime
 from anuga.geospatial_data.geospatial_data import *
@@ -111 +111 @@
 refzone = 50 
 
-from coordinate_transforms.redfearn import redfearn
+from anuga.coordinate_transforms.redfearn import redfearn
 # boundary up to 50 m contour
 lat1_50 = degminsec2decimal_degrees(-19,20,0)

production/pt_hedland_2006/run_pt_hedland.py

@@ -99 +99 @@
 #-------------------------------------------------------------------------------
 
-from pmesh.mesh_interface import create_mesh_from_regions
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
 region_res = 500000

production/swan_river_tin_2005/thin_generate_alpha.py

@@ -4 +4 @@
 
 from anuga.pyvolution.load_mesh.loadASCII import reduce_pts
-from pmesh.mesh import importMeshFromFile
+from anuga.pmesh.mesh import importMeshFromFile
 
 thin_points_file = 'thinned_cross_sections.pts'

production/sydney_2006/get_timeseries.py

@@ -5 +5 @@
 import project
 from anuga.pyvolution.util import file_function
-#from coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
+#from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, redfearn
 from pylab import *
 from matplotlib.ticker import MultipleLocator, FormatStrFormatter

production/sydney_2006/project.py

@@ -8 +8 @@
 import sys
 
-from pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
                 
 
@@ -77 +77 @@
 
 #Georeferencing
-from coordinate_transforms.redfearn import degminsec2decimal_degrees
+from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
 
 # define clipping polygon

production/sydney_2006/run_sydney.py

@@ -45 +45 @@
 
 #Create Triangular Mesh
-from pmesh.create_mesh import create_mesh_from_regions
+from anuga.pmesh.create_mesh import create_mesh_from_regions
 
 if mytest == 0:

production/sydney_2006/run_sydney_smf.py

@@ -66 +66 @@
                                  project.combineddemname + '.pts')
 
-#from pmesh.create_mesh import create_mesh_from_regions
+#from anuga.pmesh.create_mesh import create_mesh_from_regions
 #new interface
-from pmesh.mesh_interface import create_mesh_from_regions
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
 # original issue to Benfield

production/sydney_2006/run_sydney_smf_polyingo.py

@@ -78 +78 @@
 # resolutions (maximal area of per triangle) for each polygon
 #-------------------------------------------------------------------------------
-#from pmesh.create_mesh import create_mesh_from_regions
-from pmesh.mesh_interface import create_mesh_from_regions
+#from anuga.pmesh.create_mesh import create_mesh_from_regions
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
 meshname = project.meshname4+'.msh'

production/wollongong_2006/run_flagstaff.py

@@ -29 +29 @@
 from anuga.pyvolution.shallow_water import Reflective_boundary
 from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from pmesh.mesh_interface import create_mesh_from_regions
-from pmesh.mesh import importUngenerateFile, Segment
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
+from anuga.pmesh.mesh import importUngenerateFile, Segment
 
 # Parallelism