Changeset 9277

Timestamp:

Aug 1, 2014, 3:27:28 PM (11 years ago)

Author:

davies

Message:

Editing some breakLine functionality

Location:

trunk/anuga_core

Files:

• source/anuga/utilities/spatialInputUtil.py (modified) (4 diffs)
• validation_tests/case_studies/towradgi/project.py (modified) (1 diff)

trunk/anuga_core/source/anuga/utilities/spatialInputUtil.py

@@ -32 +32 @@
     readListOfBreakLines -- takes a list of shapefile names, each containing a single line geometry, and reads
                             it in as a dictionary of breaklines. 
+    
+    readListOfRiverWalls -- takes a list of csv names, each containing a xyz polylines defining riverwalls, with
+                            an optional first line defining the non-default riverwall par, and returns a dictionary
+                            of the riverwalls and the riverwall_Par
 
     polygon_from_matching_breaklines -- given a pattern (string) matching exactly 2 breaklines in a directory,
@@ -921 +925 @@
             Take a list with the names of riverwall input files [should be comma-separated x,y,elevation files]
 
-            The input file can optionally have a first line defining some hydraulic parameters. A valid example 
+            The input file can OPTIONALLY have a first line defining some hydraulic parameters. A valid example 
             is
 
@@ -961 +965 @@
         
         return allRiverWalls, allRiverWallPar
+
+    ############################################################################
+
+    def combine_breakLines_and_riverWalls_for_mesh(breakLines, riverWalls):
+        """
+        Combine breaklines and riverwalls for input in mesh generation, ensuring both have 2 coordinates only
+        """
+        mesh_breakLines=riverWalls.values()+breakLines.values()
+        for i in range(len(mesh_breakLines)):
+            mesh_breakLines[i] = [mesh_breakLines[i][j][0:2] for j in range(len(mesh_breakLines[i]))]
+        return mesh_breakLines
     
     ############################################################################
@@ -1011 +1026 @@
         polyOut=breakLines[bk[matchers[0]]] +  breakLines[bk[matchers[1]]]
         #polyOut=polyOut+[polyOut[0]]
+
+        # If the breakLines values have > 2 entries (i.e. like for riverwalls), remove the third
+        if(len(polyOut[0])>2):
+            polyOut=[polyOut[i][0:2] for i in range(len(polyOut))]
+
         return polyOut
     ###################

trunk/anuga_core/validation_tests/case_studies/towradgi/project.py

@@ -5 +5 @@
 partition_dir = 'PARTITIONS'
 checkpoint_dir = 'CHECKPOINTS'
-checkpoint_time = 30
+checkpoint_time = 30*60 # 30 minutes
 checkpoint = True