Changeset 2324


Ignore:
Timestamp:
Feb 2, 2006, 3:18:01 PM (18 years ago)
Author:
duncan
Message:

comments, removing dead code, variable name changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • inundation/pyvolution/pmesh2domain.py

    r2319 r2324  
    77"""
    88
    9 # FXME (DSG-DSG): Combine with function pmesh_to_domain_instance
    109def pmesh_instance_to_domain_instance(mesh,
    11                                       DomainClass,
    12                                       setting_function=None):
     10                                      DomainClass):
    1311    """
    1412    """
     
    1816    vertex_coordinates, vertices, tag_dict, vertex_quantity_dict \
    1917                        ,tagged_elements_dict, geo_reference = \
    20                 pmesh_to_domain(mesh_instance=mesh,
    21                                 setting_function=setting_function)
     18                _pmesh_to_domain(mesh_instance=mesh)
    2219
    2320
     
    3936    return domain
    4037
    41 def pmesh_to_domain_instance(fileName, DomainClass, setting_function = None):
     38def pmesh_to_domain_instance(file_name, DomainClass):
    4239    """
     40    Converts a mesh file(.tsh or .msh), to a Domain instance.
     41
     42    file_name is the name of the mesh file to convert, including the extension
     43
     44    DomainClass is the Class that will be returned.
     45    It must be a subclass of Domain, with the same interface as domain.
     46   
    4347    """
    4448    #FIXME: If this is part of the public interface it needs a good docstring!
     
    4953    vertex_coordinates, vertices, tag_dict, vertex_quantity_dict \
    5054                        ,tagged_elements_dict, geo_reference = \
    51                 pmesh_to_domain(fileName=fileName,
    52                                 setting_function=setting_function)
     55                _pmesh_to_domain(file_name=file_name)
    5356
    5457
     
    8689
    8790
    88 def pmesh_to_domain(fileName=None,
    89                     mesh_instance=None,
    90                     setting_function=None):
     91def _pmesh_to_domain(file_name=None,
     92                    mesh_instance=None):
    9193    """
    9294    convert a pmesh dictionary to a list of Volumes.
     
    105107    from load_mesh.loadASCII import import_mesh_file
    106108
    107     if fileName is None:
     109    if file_name is None:
    108110        mesh_dict = mesh_instance.Mesh2IODict()
    109111    else:
    110         mesh_dict = import_mesh_file(fileName)
     112        mesh_dict = import_mesh_file(file_name)
    111113    #print "mesh_dict",mesh_dict
    112114    vertex_coordinates = mesh_dict['vertices']
Note: See TracChangeset for help on using the changeset viewer.