Changeset 1117

Timestamp:

Mar 22, 2005, 2:26:55 PM (20 years ago)

Author:

prow

Message:

 

File:

• inundation/ga/storm_surge/pyvolution/data_manager.py (modified) (10 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1186 +1186 @@
                fail_on_NaN = True,
                NaN_filler = 0,
-               elevation = -100
+               elevation = -100,
+               inverted_bathymetry = False
                ): #FIXME: Bathymetry should be obtained
                                   #from MOST somehow.
@@ -1231 +1232 @@
     file_u = NetCDFFile(basename_in + '_ua.nc', 'r') #Velocity (x) (cm/s)
     file_v = NetCDFFile(basename_in + '_va.nc', 'r') #Velocity (y) (cm/s)   
-    file_e = NetCDFFile(basename_in + '_va.nc', 'r') #Elevation (z) (m)   
+    file_e = NetCDFFile(basename_in + '_e.nc', 'r') #Elevation (z) (m)   
 
     if basename_out is None:
@@ -1272 +1273 @@
         lmax = searchsorted(longitudes, maxlon)            
 
+
+
     times = times[jmin:jmax]        
     latitudes = latitudes[kmin:kmax]
@@ -1282 +1285 @@
     vspeed = file_v.variables['VA'][jmin:jmax, kmin:kmax, lmin:lmax] #Lat
     elevations = file_e.variables['ELEVATION'][kmin:kmax, lmin:lmax]
+
+#    if latitudes2[0]==latitudes[0] and latitudes2[-1]==latitudes[-1]:
+#        elevations = file_e.variables['ELEVATION'][kmin:kmax, lmin:lmax]
+#    elif latitudes2[0]==latitudes[-1] and latitudes2[-1]==latitudes[0]:
+#        from Numeric import asarray
+#        elevations=elevations.tolist()
+#        elevations.reverse()
+#        elevations=asarray(elevations)
+#    else:
+#        from Numeric import asarray
+#        elevations=elevations.tolist()
+#        elevations.reverse()
+#        elevations=asarray(elevations)
+#        'print hmmm'
+
+
+
     #Get missing values
     nan_ha = file_h.variables['HA'].missing_value[0]
     nan_ua = file_u.variables['UA'].missing_value[0]
     nan_va = file_v.variables['VA'].missing_value[0]
-    nan_e  = file_e.variables['ELEVATION'].missing_value[0]
-
+    if hasattr(file_e.variables['ELEVATION'],'missing_value'):
+        nan_e  = file_e.variables['ELEVATION'].missing_value[0]
+    else:
+        nan_e = None
     
     #Cleanup
@@ -1390 +1412 @@
                           %(basename_in + '_ha.nc',
                             basename_in + '_ua.nc',
-                            basename_in + '_va.nc'
+                            basename_in + '_va.nc',
                             basename_in + '_e.nc')
 
@@ -1460 +1482 @@
 
             msg = 'Zone boundary crossed at longitude =', lon
-            assert zone == refzone, msg
+            #assert zone == refzone, msg
             #print '%7.2f %7.2f %8.2f %8.2f' %(lon, lat, easting, northing)
             x[i] = easting
@@ -1504 +1526 @@
             z = elevations
         #FIXME: z should be obtained from MOST and passed in here
-        
+  
+    from Numeric import resize
+    z = resize(z,outfile.variables['z'][:].shape)
     outfile.variables['x'][:] = x - xllcorner
     outfile.variables['y'][:] = y - yllcorner
@@ -1518 +1542 @@
     xmomentum = outfile.variables['xmomentum']
     ymomentum = outfile.variables['ymomentum'] 
-    z = outfile.variables['elevation']         
-
 
     if verbose: print 'Converting quantities'
@@ -1530 +1552 @@
                 w = zscale*amplitudes[j,k,l]/100 + mean_stage
                 stage[j,i] = w
-                h = w - z[j,i]
+                h = w - z[i]
                 xmomentum[j,i] = uspeed[j,k,l]/100*h
                 ymomentum[j,i] = vspeed[j,k,l]/100*h
@@ -1555 +1577 @@
         print '  Quantities [SI units]:'
         for name in ['stage', 'xmomentum', 'ymomentum']:
-            q = outfile.variables[name][:].flat
+            q = outfile.variables[name][:].flferret2swwat
             print '    %s in [%f, %f]' %(name, min(q), max(q))