Changeset 1114


Ignore:
Timestamp:
Mar 22, 2005, 11:06:52 AM (19 years ago)
Author:
prow
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • inundation/ga/storm_surge/pyvolution/data_manager.py

    r1113 r1114  
    11861186               fail_on_NaN = True,
    11871187               NaN_filler = 0,
    1188                elevation = -100): #FIXME: Bathymetry should be obtained
     1188               elevation = -100
     1189               ): #FIXME: Bathymetry should be obtained
    11891190                                  #from MOST somehow.
    11901191                                  #Alternatively from elsewhere
     
    14951496
    14961497
    1497     if elevations is not None:
    1498         z = elevations
     1498    if elevation is not None:
     1499        z = elevation
    14991500    else:
    1500         pass
     1501        if inverted_bathymetry:
     1502            z = -1*elevations
     1503        else:
     1504            z = elevations
    15011505        #FIXME: z should be obtained from MOST and passed in here
    15021506       
     
    15131517    stage = outfile.variables['stage']
    15141518    xmomentum = outfile.variables['xmomentum']
    1515     ymomentum = outfile.variables['ymomentum']       
     1519    ymomentum = outfile.variables['ymomentum']
     1520    z = outfile.variables['elevation']         
    15161521
    15171522
     
    15251530                w = zscale*amplitudes[j,k,l]/100 + mean_stage
    15261531                stage[j,i] = w
    1527                 h = w - z
     1532                h = w - z[j,i]
    15281533                xmomentum[j,i] = uspeed[j,k,l]/100*h
    15291534                ymomentum[j,i] = vspeed[j,k,l]/100*h
     
    15341539        x = outfile.variables['x'][:]
    15351540        y = outfile.variables['y'][:]       
    1536        
    15371541        print '------------------------------------------------'
    15381542        print 'Statistics of output file:'
Note: See TracChangeset for help on using the changeset viewer.