Changeset 4633


Ignore:
Timestamp:
Jul 23, 2007, 2:23:20 PM (10 years ago)
Author:
ole
Message:

Added comments about blocking and deprecated xya format.
Also a small bug fix in sww2timeseries.

Location:
anuga_core/source/anuga
Files:
3 edited

Legend:

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

    r4627 r4633  
    11311131    min_stages = []
    11321132    max_stages = []
     1133    min_momentums = []   
    11331134    max_momentums = []
    11341135    max_xmomentums = []
     
    11371138    min_ymomentums = []
    11381139    max_speeds = []
     1140    min_speeds = []   
    11391141    max_depths = []
    11401142    model_time_plot3d = zeros((n0,m), Float)
     
    11581160            max_stage = 0
    11591161            max_momentum = max_xmomentum = max_ymomentum = 0
    1160             min_xmomentum = min_ymomentum = 100
     1162            min_momentum = min_xmomentum = min_ymomentum = 100
    11611163            max_speed = 0
    1162             max_depth = 0
     1164            min_speed = 0           
     1165            max_depth = 0           
    11631166            gaugeloc = str(locations[k])
    11641167            thisfile = file_loc[j]+sep+'gauges_time_series'+'_'\
     
    12011204                    if w < min_stage: min_stage = w
    12021205                    if m > max_momentum: max_momentum = m
     1206                    if m < min_momentum: min_momentum = m                   
    12031207                    if uh > max_xmomentum: max_xmomentum = uh
    12041208                    if vh > max_ymomentum: max_ymomentum = vh
     
    12061210                    if vh < min_ymomentum: min_ymomentum = vh
    12071211                    if vel > max_speed: max_speed = vel
     1212                    if vel < min_speed: min_speed = vel                   
    12081213                    if z > 0 and depth > max_depth: max_depth = depth
    12091214                   
     
    12181223            min_xmomentums.append(min_xmomentum)
    12191224            min_ymomentums.append(min_ymomentum)
     1225            min_momentums.append(min_momentum)           
    12201226            max_depths.append(max_depth)
    12211227            max_speeds.append(max_speed)
     1228            min_speeds.append(min_speed)           
    12221229            #### finished generating quantities for each swwfile #####
    12231230       
  • anuga_core/source/anuga/fit_interpolate/fit.py

    r4614 r4633  
    330330                                     load_file_now=False,
    331331                                     verbose=verbose)
     332
    332333            for i, geo_block in enumerate(G_data):
    333334                if verbose is True and 0 == i%200: # round every 5 minutes
  • anuga_core/source/anuga/geospatial_data/geospatial_data.py

    r4591 r4633  
    166166            # if file name then all provided info will be removed!
    167167
    168             #if verbose is True:
    169             #    if file_name is not None:
    170             #        print 'Loading Geospatial data from file: %s' %file_name
     168            if verbose is True:
     169                if file_name is not None:
     170                    print 'Loading Geospatial data from file: %s' %file_name
    171171           
    172172            self.import_points_file(file_name, delimiter, verbose)
     
    782782            # FIXME (Ole): shouldn't the xya format be replaced by txt/csv?
    783783            #  Currently both file formats are used.
     784
     785            # FIXME (Ole): This has to go - it caused Ted Rigby to waste
     786            # time trying to read in his data in xya format with an
     787            # inevitable memory error appearing.
    784788           
    785789            #let's just read it all
    786             pass
     790            msg = 'The xya format is deprecated. Use csv or pts.'
     791            warn(msg, DeprecationWarning)             
     792           
    787793        elif self.file_name[-4:] == ".pts":
    788794           
     
    929935Error_message = {}
    930936Em = Error_message
    931 Em['IOError'] = "NOTE: The format for a comma seperated .txt/.csv file is:\n"
     937Em['IOError'] = "NOTE: The format for a comma separated .txt/.csv file is:\n"
    932938Em['IOError'] += "        1st line:     [column names]\n"
    933939Em['IOError'] += "        other lines:  [x value], [y value], [attributes]\n"
Note: See TracChangeset for help on using the changeset viewer.