Changeset 2093

Timestamp:

Nov 29, 2005, 2:43:38 PM (18 years ago)

Author:

duncan

Message:

adding # of triangles to file names

Location:

production/gippsland_2005

Files:

• create_mesh.py (modified) (1 diff)
• project.py (modified) (1 diff)
• run_gippsland.py (modified) (2 diffs)

production/gippsland_2005/create_mesh.py

@@ -61 +61 @@
                         + mesh_file[-4:]
         m.export_mesh_file(mesh_file)
-        return triangle_count
+        return mesh_file, triangle_count
 
 

production/gippsland_2005/project.py

@@ -10 +10 @@
 #Making assumptions about the location of scenario data
 # Assumes the INUNDATIONHOME environ variable exists
-def Project():
-    def __init__(self):
-        scenario_dir_name = 'gippsland_storm_surge_scenario_2005'
-        basename = 'lakes_100'
-        boundary_basename = 'csiro_bondary'
 
-        if sys.platform == 'win32':
-            home = environ["INUNDATIONHOME"]     #Sandpit's parent dir
-        else:    
-            home = expanduser('~')
+scenario_dir_name = 'gippsland_storm_surge_scenario_2005'
+basename = 'lakes_100'
+boundary_basename = 'csiro_bondary'
+
+if sys.platform == 'win32':
+    home = environ["INUNDATIONHOME"]     #Sandpit's parent dir
+else:    
+    home = expanduser('~')
 
 
-        #Derive subdirectories and filenames
-        meshdir = home+sep+scenario_dir_name+sep+'meshes'+sep
-        datadir = home+sep+scenario_dir_name+sep+'topographies'+sep
-        outputdir = home+sep+scenario_dir_name+sep+'output'+sep
-        boundarydir = home+sep+scenario_dir_name+sep+'boundaries'+sep
-        bath_dir = boundarydir + 'bathymetry_expanded'
-        elevation_dir =  boundarydir + 'elev_expanded'
-        ucur_dir =  boundarydir + 'ucur_expanded'
-        vcur_dir =  boundarydir + 'vcur_expanded'
+#Derive subdirectories and filenames
+meshdir = home+sep+scenario_dir_name+sep+'meshes'+sep
+datadir = home+sep+scenario_dir_name+sep+'topographies'+sep
+outputdir = home+sep+scenario_dir_name+sep+'output'+sep
+boundarydir = home+sep+scenario_dir_name+sep+'boundaries'+sep
+bath_dir = boundarydir + 'bathymetry_expanded'
+elevation_dir =  boundarydir + 'elev_expanded'
+ucur_dir =  boundarydir + 'ucur_expanded'
+vcur_dir =  boundarydir + 'vcur_expanded'
 
-        meshname = meshdir + basename + '.msh'
-        mesh_elevname = meshdir + basename + '_elev' + '.msh'
-        demname = datadir + basename + '.dem'
-        pointname = datadir + basename + '.pts'
-        boundaryname = boundarydir + boundary_basename + '.sww'
-        outputname = outputdir + basename  + '.sww' #Used by post processing
+meshname = meshdir + basename + '.msh'
+mesh_elevname = meshdir + basename + '_elev' + '.msh'
+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'
+gauge_filename = 'all_bld_ind.csv'
 
-        tide = 0.0
+tide = 0.0
 
-
-    def update_names(new_info):
-        """
-        Update the mesh_elevname and outputname, based on the string passed in.
-        Used to add the number of triangles to names. 
-
-        """
-        self.mesh_elevname = self.mesh_elevname[:-9] + '_' + \
-                             str(new_info) +  \
-                             self.mesh_elevname[-9:]
-        self.outputname = self.outputname[:-4] + '_' + str(new_info) \
-                          + self.outputname[-4:]
 
 #-------------------------------------------------------------

production/gippsland_2005/run_gippsland.py

@@ -49 +49 @@
       )
 
+meshname = project.meshname
+pointname = project.pointname
+mesh_elevname = project.mesh_elevname
+outputname = project.outputname
 
 #Create the mesh without elevation data
 # 100000 very course
-triagle_count = cache(create_mesh,(5000),
-                      {'mesh_file':project.meshname,
+meshname, triagle_count = cache(create_mesh,(5000),
+                      {'mesh_file':meshname,
                        'triangles_in_name':True}
                       ,dependencies = ['create_mesh.py']
                       #,evaluate = True      
                       )
-print "project.meshname",project.meshname 
-project.update_names(triagle_count)
-print "project.meshname",project.meshname 
+
+mesh_elevname = mesh_elevname[:-9] + '_' + str(triagle_count) +  \
+                mesh_elevname[-9:]
+outputname = outputname[:-4] + '_' + str(triagle_count) + outputname[-4:]
+
 
 #Add elevation data to the mesh
 #fit_to_mesh_file(mesh_file, point_file, mesh_output_file, DEFAULT_ALPHA,
 #                 verbose=True, expand_search=True, precrop=True)      
-cache(fit_to_mesh_file,(project.meshname,
-                 project.pointname,
-                 project.mesh_elevname,
+cache(fit_to_mesh_file,(meshname,
+                 pointname,
+                 mesh_elevname,
                  DEFAULT_ALPHA),
       {'verbose': True,
        'expand_search': True,
        'precrop': True}
-      ,dependencies = [project.meshname, project.pointname]
+      ,dependencies = [meshname, pointname]
       ,evaluate = True      
       ,verbose = False
@@ -79 +85 @@
 
 #Setup domain
-domain = cache(pmesh_to_domain_instance, (project.mesh_elevname, Domain),
-               dependencies = [project.mesh_elevname]                    
+domain = cache(pmesh_to_domain_instance, (mesh_elevname, Domain),
+               dependencies = [mesh_elevname]                    
                ,verbose = False
                )