Changeset 9337 for trunk

Timestamp:

Sep 17, 2014, 4:28:53 PM (11 years ago)

Author:

davies

Message:

Adding code for patong bounding polygon + bug fixes

Location:

trunk/anuga_work/development/gareth/template_scenarios/tsunami/tsunami2

Files:

• anuga (added)
• anuga/boundaries (added)
• anuga/boundaries/Patong_bounding_polygon (added)
• anuga/boundaries/Patong_bounding_polygon/Patong_bounding_polygon.dbf (added)
• anuga/boundaries/Patong_bounding_polygon/Patong_bounding_polygon.prj (added)
• anuga/boundaries/Patong_bounding_polygon/Patong_bounding_polygon.qpj (added)
• anuga/boundaries/Patong_bounding_polygon/Patong_bounding_polygon.shp (added)
• anuga/boundaries/Patong_bounding_polygon/Patong_bounding_polygon.shx (added)
• scripts/project.py (modified) (5 diffs)
• scripts/raster_outputs.py (modified) (6 diffs)
• scripts/setup_initial_conditions.py (modified) (1 diff)

trunk/anuga_work/development/gareth/template_scenarios/tsunami/tsunami2/scripts/project.py

@@ -19 +19 @@
 import numpy
 from anuga.utilities import spatialInputUtil as su
-import anuga
 from anuga_parallel import myid, barrier, send, receive, numprocs
 
@@ -45 +44 @@
 #
 
-finaltime = 0.05 * 3600.0
+finaltime = 10.  # 0.05 * 3600.0
 
 # Model time between output file timesteps in seconds
@@ -243 +242 @@
 
 if pt_areas is not None:
-    region_point_areas = su.readregion_point_areas(
+    region_point_areas = su.readRegionPointAreas(
         pt_areas,
         convert_length_to_area=True)
@@ -336 +335 @@
 
 def setup_directory_structure():
-    """
-    Make output directories, send important data to files
+    """Make output directories, send important data to files
+
+    This has no arguments, and returns nothing, but has lots of important side
+    effects
     """
 
@@ -378 +379 @@
 
     def sav_lines(lines, filename='check.txt'):
+        """quick convenience function
+        """
         new_a = numpy.array(lines)
         numpy.savetxt(filename, new_a)

trunk/anuga_work/development/gareth/template_scenarios/tsunami/tsunami2/scripts/raster_outputs.py

@@ -145 +145 @@
       the rasters to
     - proj4string defining the coordinate system
-    - myTimeStep -- option from util.Make_Geotif
+    - my_time_step -- option from util.Make_Geotif
       use 'max' to plot the maxima
       use [0, 5, 10] to plot the
@@ -210 +210 @@
                 tmp_arr,
                 output_quantities=[quant + '_MAX'],
-                cell_size=cell_size,
+                CellSize=cell_size,
                 proj4string=proj4string,
                 verbose=True,
@@ -221 +221 @@
         util.Make_Geotif(
             sww_file,
-            my_time_step=[0],
+            myTimeStep=[0],
             output_quantities=['elevation', 'friction'],
-            cell_size=cell_size,
+            CellSize=cell_size,
             proj4string=proj4string,
             verbose=True,
@@ -232 +232 @@
         util.Make_Geotif(
             sww_file,
-            my_time_step=my_time_step,
+            myTimeStep=my_time_step,
             output_quantities=[
                 'depth',
@@ -241 +241 @@
                 'friction',
             ],
-            cell_size=cell_size,
+            CellSize=cell_size,
             proj4string=proj4string,
             verbose=True,
@@ -263 +263 @@
         elevation_raster,
         raster_extent,
-        cell_size,
+        CellSize,
         clip_polygon,
         clip_polygon_layer,

trunk/anuga_work/development/gareth/template_scenarios/tsunami/tsunami2/scripts/setup_initial_conditions.py

@@ -120 +120 @@
     # The 'saddle 10m' dataset
 
-    sf = '../anuga/topographies/patong_10m_small_grid_for_anuga_sub_Project.txt'
+    sf =\
+        '../anuga/topographies/patong_10m_small_grid_for_anuga_sub_Project.txt'
     elevation_saddle_10m = \
         numpy.genfromtxt(sf, delimiter=',', skip_header=1)