Changeset 2084


Ignore:
Timestamp:
Nov 29, 2005, 10:13:34 AM (18 years ago)
Author:
duncan
Message:

scenario

Location:
production/gippsland_2005
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • production/gippsland_2005/create_mesh.py

    r2076 r2084  
    1010from coordinate_transforms.geo_reference import Geo_reference
    1111
    12 def create_mesh(max_area, mesh_file=None):
     12def create_mesh(max_area, mesh_file=None, triangles_in_name = False):
    1313    #Lower left corner
    1414    xllcorner = 570066
     
    5252    m.addVertsSegs(dict)
    5353
    54     m.generateMesh('q28.0z', maxArea = max_area)
     54    m.generateMesh('q28.0z', maxArea = max_area)
     55    triangle_count = len(m.getTriangulation())
    5556    if mesh_file is None:   
    56         return m, len(m.getTriangulation())
     57        return m, triangle_count
    5758    else:
     59        if triangles_in_name is True:
     60            mesh_file = mesh_file[:-4] + '_' + str(triangle_count) \
     61                        + mesh_file[-4:]
    5862        m.export_mesh_file(mesh_file)
    59         return len(m.getTriangulation())
     63        return triangle_count
    6064
    6165
  • production/gippsland_2005/project.py

    r2076 r2084  
    3131vcur_dir =  boundarydir + 'vcur_expanded'
    3232
    33 meshname = meshdir + basename + '.tsh'
    34 mesh_elevname = meshdir + basename + '_elev' + '.tsh'
     33meshname = meshdir + basename + '.msh'
     34mesh_elevname = meshdir + basename + '_elev' + '.msh'
    3535demname = datadir + basename + '.dem'
    3636#demname = datadir + 'lakes_100'
     
    7070refzone = 50
    7171
     72def update_names(new_info):
     73    """
     74    Update the mesh_elevname and outputname, based on the string passed in.
     75    Used to add the number of triangles to names.
     76
     77    """
     78   
     79    global mesh_elevname
     80    global outputname
     81   
     82    mesh_elevname = mesh_elevname[:-9] + '_' + str(new_info) +  \
     83                    mesh_elevname[-9:]
     84    outputname = outputname[:-4] + '_' + str(new_info) + outputname[-4:]
     85
     86#-------------------------------------------------------------
     87if __name__ == "__main__":
     88    print "mesh_elevname",mesh_elevname
     89    update_names(999)
     90    print "mesh_elevname",mesh_elevname
  • production/gippsland_2005/run_gippsland.py

    r2082 r2084  
    5151
    5252#Create the mesh without elevation data
    53 triagle_count = cache(create_mesh,(100000), {'mesh_file':project.meshname}
    54                            ,dependencies = ['create_mesh.py'])
     53# 100000 very course
     54triagle_count = cache(create_mesh,(5000),
     55                      {'mesh_file':project.meshname,
     56                       'triangles_in_name':True}
     57                      ,dependencies = ['create_mesh.py']
     58                      #,evaluate = True     
     59                      )
     60print "project.meshname",project.meshname
     61project.update_names(triagle_count)
     62print "project.meshname",project.meshname
    5563
    5664#Add elevation data to the mesh
     
    6573       'precrop': True}
    6674      ,dependencies = [project.meshname, project.pointname]
     75      ,evaluate = True     
    6776      ,verbose = False
    6877      )
     
    7685
    7786
    78 domain.set_name(project.basename) # + '_%d' %resolution)
     87domain.set_name(project.basename + '_%d' %triagle_count)
    7988domain.set_datadir(project.outputdir)
    8089domain.store = True
Note: See TracChangeset for help on using the changeset viewer.