Changeset 5466


Ignore:
Timestamp:
Jul 4, 2008, 2:51:12 PM (14 years ago)
Author:
ole
Message:

Changed file name conventions for mux files.

Location:
anuga_core/source/anuga
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

    r5374 r5466  
    397397            #removes sts points that do not lie on boundary
    398398            quantities[name] = take(quantities[name],gauge_id,1)
     399           
     400    # Close sww, tms or sts netcdf file         
    399401    fid.close()
    400402
  • anuga_core/source/anuga/shallow_water/data_manager.py

    r5463 r5466  
    41214121
    41224122    Specify only basename_in and read files of the form
    4123     basefilename_velocity-z-mux, basefilename_velocity-e-mux and
    4124     basefilename_waveheight-n-mux containing relative height,
     4123    basefilename-z-mux2, basefilename-e-mux2 and
     4124    basefilename-n-mux2 containing relative height,
    41254125    x-velocity and y-velocity, respectively.
    41264126
     
    41734173
    41744174    The name of the urs file names must be;
    4175     [basename_in]_velocity-z-mux
    4176     [basename_in]_velocity-e-mux
    4177     [basename_in]_waveheight-n-mux
     4175    [basename_in]-z-mux
     4176    [basename_in]-e-mux
     4177    [basename_in]-n-mux
    41784178   
    41794179    """
     
    46464646    #### CONVERTING UNGRIDDED URS DATA TO AN SWW FILE ####
    46474647   
    4648 WAVEHEIGHT_MUX_LABEL = '_waveheight-z-mux'
    4649 EAST_VELOCITY_LABEL =  '_velocity-e-mux'
    4650 NORTH_VELOCITY_LABEL =  '_velocity-n-mux'
     4648WAVEHEIGHT_MUX_LABEL = '-z-mux'
     4649EAST_VELOCITY_LABEL =  '-e-mux'
     4650NORTH_VELOCITY_LABEL =  '-n-mux'
    46514651def urs_ungridded2sww(basename_in='o', basename_out=None, verbose=False,
    46524652                      mint=None, maxt=None,
     
    46614661
    46624662    Specify only basename_in and read files of the form
    4663     basefilename_velocity-z-mux, basefilename_velocity-e-mux and
    4664     basefilename_waveheight-n-mux containing relative height,
     4663    basefilename-z-mux, basefilename-e-mux and
     4664    basefilename-n-mux containing relative height,
    46654665    x-velocity and y-velocity, respectively.
    46664666
     
    48344834    ##################################
    48354835
    4836 WAVEHEIGHT_MUX2_LABEL = '_waveheight-z-mux2'
    4837 EAST_VELOCITY_MUX2_LABEL =  '_velocity-e-mux2'
    4838 NORTH_VELOCITY_MUX2_LABEL =  '_velocity-n-mux2'   
     4836WAVEHEIGHT_MUX2_LABEL = '-z-mux2'
     4837EAST_VELOCITY_MUX2_LABEL =  '-e-mux2'
     4838NORTH_VELOCITY_MUX2_LABEL =  '-n-mux2'   
    48394839
    48404840def read_mux2_py(filenames,weights):
     
    49194919   
    49204920    These are combined with the extensions:
    4921     WAVEHEIGHT_MUX2_LABEL = '_waveheight-z-mux2' for stage
    4922     EAST_VELOCITY_MUX2_LABEL =  '_velocity-e-mux2' xmomentum
    4923     NORTH_VELOCITY_MUX2_LABEL =  '_velocity-n-mux2' and ymomentum
     4921    WAVEHEIGHT_MUX2_LABEL = '-z-mux2' for stage
     4922    EAST_VELOCITY_MUX2_LABEL =  '-e-mux2' xmomentum
     4923    NORTH_VELOCITY_MUX2_LABEL =  '-n-mux2' and ymomentum
    49244924   
    49254925    to create a 2D list of mux2 file. The rows are associated with each quantity and must have the above extensions
  • anuga_core/source/anuga/shallow_water/test_data_manager.py

    r5463 r5466  
    70187018
    70197019        assert allclose(temp_fbound,temp_drchlt)
    7020         os.remove(sts_file+'.sts')
     7020
     7021        try:
     7022            os.remove(sts_file+'.sts')
     7023        except:
     7024            # Windoze can't remove this file for some reason
     7025            pass
     7026       
    70217027        os.remove(meshname)
    70227028
Note: See TracChangeset for help on using the changeset viewer.