Changeset 2076

Timestamp:

Nov 25, 2005, 2:47:32 PM (19 years ago)

Author:

duncan

Message:

update

Location:

production/gippsland_2005

Files:

• create_mesh.py (modified) (2 diffs)
• project.py (modified) (2 diffs)
• run_gippsland.py (added)
• run_small_gippsland.py (modified) (4 diffs)

production/gippsland_2005/create_mesh.py

@@ -10 +10 @@
 from coordinate_transforms.geo_reference import Geo_reference
 
-def create_mesh(max_area):
+def create_mesh(max_area, mesh_file=None):
     #Lower left corner
     xllcorner = 570066
@@ -53 +53 @@
 
     m.generateMesh('q28.0z', maxArea = max_area) 
-    #m.export_mesh_file('lakes_small_100_test.tsh')
-    return m, len(m.getTriangulation())
+    if mesh_file is None:    
+        return m, len(m.getTriangulation())
+    else:
+        m.export_mesh_file(mesh_file)
+        return len(m.getTriangulation())
+
 
 #-------------------------------------------------------------

production/gippsland_2005/project.py

@@ -10 +10 @@
 #Making assumptions about the location of scenario data
 # Assumes the INUNDATIONHOME environ variable exists
+
 scenario_dir_name = 'gippsland_storm_surge_scenario_2005'
-
-basename = 'test'
-
+basename = 'lakes_100'
 boundary_basename = 'csiro_bondary'
 
@@ -32 +31 @@
 vcur_dir =  boundarydir + 'vcur_expanded'
 
-meshname = meshdir + basename
-demname = datadir + basename
-boundaryname = boundarydir + boundary_basename
-outputname = outputdir + basename  #Used by post processing
+meshname = meshdir + basename + '.tsh'
+mesh_elevname = meshdir + basename + '_elev' + '.tsh'
+demname = datadir + basename + '.dem'
+#demname = datadir + 'lakes_100'
+pointname = datadir + basename + '.pts'
+boundaryname = boundarydir + boundary_basename + '.sww'
+outputname = outputdir + basename  + '.sww' #Used by post processing
 
 gauge_filename = 'all_bld_ind.csv'

production/gippsland_2005/run_small_gippsland.py

@@ -44 +44 @@
 # NOTE: This function is dependent on a lot of files, and I haven't listed
 # them, since there is so many and I don't think they will be changing.
+
+print "project.boundaryname + '.sww'",project.boundaryname + '.sww'
 cache(asc_csiro2sww,
       (project.bath_dir,
@@ -58 +60 @@
        'zscale': 1,                 #Enhance tsunami
        'fail_on_NaN': False},
-       #evaluate = True,
+       #evaluate = True,                  
       verbose = True)
-
 
 #Create the mesh ..
 
 #cache this, with dependancy on create_mesh.py
-mesh, triagle_count = create_mesh(10000000)
-
+mesh, triagle_count = create_mesh(100000)
+#mesh..export_mesh_file(meshname + '.tsh')
 
 #meshname = project.meshname + '_%d.msh' %resolution
@@ -74 +75 @@
 #Setup domain
 
-domain = cache(pmesh_instance_to_domain_instance, (mesh, Domain),
-               #dependencies = [meshname],                     
-               verbose = True)               
+domain = pmesh_instance_to_domain_instance(mesh, Domain)
+
+# this was crashing outside of python
+#domain = cache(pmesh_instance_to_domain_instance, (mesh, Domain),
+#               #dependencies = [meshname],     
+#               evaluate = True,                      
+#               verbose = True)               
 
 
@@ -116 +121 @@
 Br = Reflective_boundary(domain)
 Bt = Transmissive_boundary(domain)
-Bd = Dirichlet_boundary([tide,0,0])
+Bd = Dirichlet_boundary([project.tide,0,0])
 Bw = Time_boundary(domain=domain,
                    f=lambda t: [(60<t<660)*4, 0, 0])