Changeset 3584

Timestamp:

Sep 13, 2006, 4:57:18 PM (19 years ago)

Author:

ole

Message:

Parallel work

Location:

anuga_work/production/wollongong_2006

Files:

• parallel_api.py (added)
• run_flagstaff.py (modified) (6 diffs)
• run_flagstaff_parallel_api.py (added)
• run_flagstaff_sequential.py (added)

anuga_work/production/wollongong_2006/run_flagstaff.py

@@ -24 +24 @@
 
 # Related major packages
-from anuga.pyvolution.shallow_water import Domain
-from anuga.pyvolution.shallow_water import Dirichlet_boundary
-from anuga.pyvolution.shallow_water import Time_boundary
-from anuga.pyvolution.shallow_water import Reflective_boundary
-from anuga.pyvolution.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.shallow_water import Domain
+from anuga.shallow_water import Dirichlet_boundary
+from anuga.shallow_water import Time_boundary
+from anuga.shallow_water import Reflective_boundary
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from anuga.pmesh.mesh import importUngenerateFile, Segment
@@ -34 +33 @@
 # Parallelism
 import pypar   # The Python-MPI interface
-from parallel.pmesh_divide import pmesh_divide_metis
-from parallel.build_submesh import build_submesh
-from parallel.build_local   import build_local_mesh
-from parallel.build_commun  import send_submesh, rec_submesh, extract_hostmesh
-from parallel.parallel_shallow_water import Parallel_Domain
+from anuga_parallel.pmesh_divide  import pmesh_divide_metis
+from anuga_parallel.build_submesh import build_submesh
+from anuga_parallel.build_local   import build_local_mesh
+from anuga_parallel.build_commun  import send_submesh, rec_submesh, extract_hostmesh
+from anuga_parallel.parallel_shallow_water import Parallel_Domain
 
 
@@ -64 +63 @@
 if myid == 0:
     
-    # Create DEM from asc data 
-    #convert_dem_from_ascii2netcdf(project.demname,
-    #                              use_cache=True,
-    #                              verbose=True)
-
-    # Create pts file from DEM
-    #dem2pts(project.demname,
-    #        easting_min=project.xllcorner,
-    #        easting_max=project.xurcorner,
-    #        northing_min=project.yllcorner,
-    #        northing_max= project.yurcorner,
-    #        use_cache=True, 
-    #        verbose=True)
-
-
     #--------------------------------------------------------------------------
     # Create the triangular mesh based on overall clipping polygon with a
@@ -87 +71 @@
 
     print 'Generate mesh'
-    ## Generate basic mesh
+    # Generate basic mesh
     mesh = create_mesh_from_regions(project.bounding_polygon,
                                     boundary_tags=project.boundary_tags,
@@ -93 +77 @@
                                     interior_regions=project.interior_regions)
     
-    # Add buildings
-    # This should bind to a Reflective boundary
+    # Add buildings that will bind to a Reflective boundary
     mesh.import_ungenerate_file(project.buildings_filename, tag='wall')
 
@@ -100 +83 @@
     mesh.generate_mesh(maximum_triangle_area=max_area,
                        verbose=True)
+    
     mesh.export_mesh_file(project.mesh_filename)