Changeset 930 for inundation/ga/storm_surge/pyvolution/data_manager.py

Timestamp:

Feb 18, 2005, 6:12:32 PM (20 years ago)

Author:

ole

Message:

Tested ferret2sww and fixed swapping of axes.

File:

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

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1096 +1096 @@
                minlon = None, maxlon =None,
                mint = None, maxt = None, mean_stage = 0,
-               origin = (0,0,0,0,0)):
+               origin = None):
     """Convert 'Ferret' NetCDF format for wave propagation to
     sww format native to pyvolution.
@@ -1110 +1110 @@
     To include a value min may equal it, while max must exceed it.
 
-    origin is a 3-tuple with geo referenced
-    UTM coordinates (zone, easting, northing)  
+    origin is a 5-tuple with geo referenced
+    UTM coordinates (zone, easting, northing, false_easting, false_northing)
+
+    nc format has values organised as HA[TIME, LATITUDE, LONGITUDE]
+    which means that longitude is the fastest
+    varying dimension (row major order, so to speak)
+
+    ferret2sww uses grid points as vertices in a triangular grid
+    counting vertices from lower left corner upwards, then right
     """ 
 
@@ -1161 +1168 @@
     else:
         lmax = searchsorted(longitudes, maxlon)            
-        
+
+    times = times[jmin:jmax]        
     latitudes = latitudes[kmin:kmax]
     longitudes = longitudes[lmin:lmax]
-    times = times[jmin:jmax]
+
 
     if verbose: print 'cropping'
@@ -1171 +1179 @@
     yspeed = file_v.variables['VA'][jmin:jmax, kmin:kmax, lmin:lmax]    
 
+    number_of_times = times.shape[0]
     number_of_latitudes = latitudes.shape[0]
     number_of_longitudes = longitudes.shape[0]
 
+    assert amplitudes.shape[0] == number_of_times
+    assert amplitudes.shape[1] == number_of_latitudes
+    assert amplitudes.shape[2] == number_of_longitudes          
 
     #print times
@@ -1254 +1266 @@
 
     #Check zone boundaries
-    refzone, _, _ = redfearn(latitudes[0],longitudes[0],
-                             false_easting=origin[3],
-                             false_northing=origin[4])
-    
+    if origin is None:
+        refzone, _, _ = redfearn(latitudes[0],longitudes[0])
+    else:    
+        refzone, _, _ = redfearn(latitudes[0],longitudes[0],
+                                 false_easting=origin[3],
+                                 false_northing=origin[4])
+        
                              
 
     vertices = {}
-    for l, lon in enumerate(longitudes):    
-        for k, lat in enumerate(latitudes):
+    for k, lat in enumerate(latitudes):    
+        for l, lon in enumerate(longitudes):    
+
             vertices[l,k] = i
-            
-            zone, easting, northing = redfearn(lat,lon,
-                                               false_easting=origin[3],
-                                               false_northing=origin[4])
+
+            if origin is None:
+                zone, easting, northing = redfearn(lat,lon)                
+            else:    
+                zone, easting, northing = redfearn(lat,lon,
+                                                   false_easting=origin[3],
+                                                   false_northing=origin[4])
 
             msg = 'Zone boundary crossed at longitude =', lon
@@ -1319 +1338 @@
     for j in range(len(times)):
         i = 0
-        for l in range(number_of_longitudes):    
-            for k in range(number_of_latitudes):
+        for k in range(number_of_latitudes):
+            for l in range(number_of_longitudes):                    
                 h = amplitudes[j,k,l]/100 + mean_stage
                 stage[j,i] = h