Changeset 3421

Timestamp:

Jul 25, 2006, 4:17:37 PM (18 years ago)

Author:

duncan

Message:

sync scenario files

Location:

development/dam_2006

Files:

• create_mesh.py (modified) (6 diffs)
• project.py (modified) (1 diff)
• run_dam.py (modified) (3 diffs)

development/dam_2006/create_mesh.py

@@ -9 +9 @@
 from coordinate_transforms.geo_reference import Geo_reference
 
-import project
-def generate(gate_position, is_course = False):
+
+def generate(mesh_filename, gate_position, is_course = False):
     #Basic geometry
     
-    xleft   = - gate_position
+    xedge   = - gate_position
     xright  = 3.0 - gate_position
     ybottom = 0
     ytop    = 0.4
-    xdam = 0.0 
+    xdam = 0.0
+    xleft = -5.0
 
     #Outline 
@@ -29 +30 @@
     point_dam_bottom = [xdam, ybottom]
 
+    # Catchment seperation
+    point_edge_top = [xedge, ytop]    
+    point_edge_bottom = [xedge, ybottom]
+    
 
     m = Mesh()
@@ -38 +43 @@
                       point_ne,
                       point_dam_top,
+                      point_edge_top,
                       point_nw,
                       point_sw,
+                      point_edge_bottom,
                       point_dam_bottom]
 
     dict['segments'] = [[0,1], [1,2], [2,3], [3,4],
-                        [4,5], [5,0],  #The outer border
-                        [2,5]]         #Separator
+                        [4,5], [5,6], [6,7 ],[7,0],  #The outer border
+                        [2,7],         #dam Separator
+                        [3,6]]         #edge Separator
     
     dict['segment_tags'] = ['wall',
@@ -52 +60 @@
                             'wall',
                             'wall',
+                            'wall',
+                            'wall',
+                            '',
                             '']           #Interior
 
@@ -59 +70 @@
     dam = m.add_region(0.0000001,(ytop - ybottom)/2)
     # this is the location of the region.
+    dam.setTag("dam")
 
-    dam.setTag("dam")
+    
+    dam = m.add_region(- gate_position - 0.0000001,(ytop - ybottom)/2)
+    # this is the location of the region.
+    dam.setTag("catchment")
+
+    
     if is_course:
         m.generate_mesh(maximum_triangle_area=0.01)
@@ -66 +83 @@
         m.generate_mesh(maximum_triangle_area=0.0001)
 
-    m.export_mesh_file(project.mesh_filename)
+    m.export_mesh_file(mesh_filename)
     print "mesh created"
 
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    pass
+    generate("aa.tsh", 0.75, is_course = True)

development/dam_2006/project.py

@@ -38 +38 @@
 #community_scenario = gaugedir + 'community_onslow.csv'
 #gaugetimeseries = gaugedir + 'onslow'
+depth_filename = 
 
 

development/dam_2006/run_dam.py

@@ -51 +51 @@
     #-------------------------------------------------------------------------
 
-    create_mesh.generate(0.75, is_course=False) # this creates the mesh
+    create_mesh.generate(project.mesh_filename,
+                         0.75,
+                         is_course=True) # this creates the mesh
+                         #is_course=False) # this creates the mesh
 
     head,tail = path.split(project.mesh_filename)
@@ -87 +90 @@
 
     domain.set_region(Set_region('dam','stage',0.2,
+                                 location = 'unique vertices'))    
+    domain.set_region(Set_region('catchment','elevation',-1,
+                                 location = 'unique vertices'))   
+    domain.set_region(Set_region('catchment','stage',-1,
                                  location = 'unique vertices'))
 
@@ -105 +112 @@
         print 'finished'
 
+    points = [[-0.1,0.2],
+              [-0.2,0.2],
+              [-0.3,0.2],
+              [-0.4,0.2],
+              [-0.5,0.2],
+              ]
+
+    #-------------------------------------------------------------------------
+    # Calc gauge info
+    #-------------------------------------------------------------------------
+    #interpolate_sww2csv(project.basename +".sww",
+    #                    points,
+    #                    "depth.csv",
+    #                    "velocity.csv")
+
 #-------------------------------------------------------------
 if __name__ == "__main__":