Changeset 1102

Timestamp:

Mar 17, 2005, 7:12:46 PM (20 years ago)

Author:

ole

Message:

Work on file boundary (cyclone)

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (7 diffs)
• domain.py (modified) (1 diff)
• generic_boundary_conditions.py (modified) (1 diff)
• util.py (modified) (6 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1183 +1183 @@
                minlon = None, maxlon = None,
                mint = None, maxt = None, mean_stage = 0,
-               origin = None, zscale = 1, 
+               origin = None, zscale = 1,
+               fail_on_NaN = True,
+               NaN_filler = 0,
                elevation = -100): #FIXME: Bathymetry should be obtained
                                   #from MOST somehow.
@@ -1277 +1279 @@
     uspeed = file_u.variables['UA'][jmin:jmax, kmin:kmax, lmin:lmax] #Lon
     vspeed = file_v.variables['VA'][jmin:jmax, kmin:kmax, lmin:lmax] #Lat
+
+    #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]
+
+    
+    #Cleanup
+    from Numeric import sometrue
+    
+    missing = (amplitudes == nan_ha)
+    if sometrue (missing):
+        if fail_on_NaN:
+            msg = 'NetCDFFile %s contains missing values'\
+                  %(basename_in+'_ha.nc')
+            raise msg
+        else:
+            amplitudes = amplitudes*(missing==0) + missing*NaN_filler
+
+    missing = (uspeed == nan_ua)
+    if sometrue (missing):
+        if fail_on_NaN:
+            msg = 'NetCDFFile %s contains missing values'\
+                  %(basename_in+'_ua.nc')
+            raise msg
+        else:
+            uspeed = uspeed*(missing==0) + missing*NaN_filler
+
+    missing = (vspeed == nan_va)
+    if sometrue (missing):
+        if fail_on_NaN:
+            msg = 'NetCDFFile %s contains missing values'\
+                  %(basename_in+'_va.nc')
+            raise msg
+        else:
+            vspeed = vspeed*(missing==0) + missing*NaN_filler
+
+
+
+    #######
+
+                
 
     number_of_times = times.shape[0]
@@ -1322 +1366 @@
 
 
-    if verbose: print 'Store to SWW file %s' %swwname
     # NetCDF file definition
     outfile = NetCDFFile(swwname, 'w')
@@ -1385 +1428 @@
 
 
+    if verbose: print 'Making triangular grid'
     #Check zone boundaries
     refzone, _, _ = redfearn(latitudes[0],longitudes[0])    
@@ -1444 +1488 @@
     outfile.variables['z'][:] = z
     outfile.variables['elevation'][:] = z  #FIXME HACK
-    outfile.variables['time'][:] = times
+    outfile.variables['time'][:] = times - times[0] #Store time relative
     outfile.variables['volumes'][:] = volumes.astype(Int32) #On Opteron 64
     
@@ -1455 +1499 @@
 
 
-    
-    for j in range(len(times)):
+    if verbose: print 'Converting quantities'
+    n = len(times)
+    for j in range(n):
+        if verbose and j%((n+10)/10)==0: print '  Doing %d of %d' %(j, n)
         i = 0
         for k in range(number_of_latitudes):      #Y direction
@@ -1478 +1524 @@
         print '    Lower left corner: [%f, %f]'\
               %(xllcorner, yllcorner)
+        print '    Start time: %f' %times[0]
         print '  Extent:'
         print '    x [m] in [%f, %f], len(x) == %d'\

inundation/ga/storm_surge/pyvolution/domain.py

@@ -72 +72 @@
         self.starttime = 0 #Physical starttime if any (0 is 1 Jan 1970 00:00:00)
         #Origin in UTM coordinates
+        #FIXME: This should be set if read by a msh file
         self.zone = zone
         self.xllcorner = xllcorner

inundation/ga/storm_surge/pyvolution/generic_boundary_conditions.py

@@ -245 +245 @@
             return self.F(t, point_id = i)
         else:
-            return self.F(t) #FIXME: What should the semantics be?
+            #raise 'Boundary call without point_id not implemented'
+            #FIXME: What should the semantics be?        
+            return self.F(t)
 
 

inundation/ga/storm_surge/pyvolution/util.py

@@ -209 +209 @@
 
         if domain is not None:
-            msg = 'WARNING: Start time as specified in domain (%s)'\
+            msg = 'WARNING: Start time as specified in domain (%f)'\
                   %domain.starttime
-            msg += ' is earlier than the starttime of file %s: %s.'\
+            msg += ' is earlier than the starttime of file %s (%f).'\
                      %(self.filename, self.starttime)
-            msg += 'Modifying starttime accordingly.'
+            msg += ' Modifying domain starttime accordingly.'
             if self.starttime > domain.starttime:
-                #FIXME: Print depending on some verbosity setting
-                #print msg
+                if verbose: print msg
                 domain.starttime = self.starttime #Modifying model time
+                if verbose: print 'Domain starttime is now set to %f' %domain.starttime
 
         #Read all data in and produce values for desired data points at each timestep 
@@ -237 +237 @@
 
         #Get variables
-        if verbose: print 'Get varibles'
+        if verbose: print 'Get variables'
         x = fid.variables['x'][:]
         y = fid.variables['y'][:]
@@ -298 +298 @@
                 print '    Lower left corner: [%f, %f]'\
                       %(self.xllcorner, self.yllcorner) 
-                print '    Start time: %f' %self.starttime
+                print '    Start time (file):   %f' %self.starttime
+                #print '    Start time (domain): %f' %domain.starttime
                 print '  Extent:'
                 print '    x in [%f, %f], len(x) == %d'\
@@ -366 +367 @@
             tau = self.domain.starttime-self.starttime+t
         else:
+            #print 'DOMAIN IS NONE!!!!!!!!!'
             tau = t
 
@@ -375 +377 @@
         msg = 'Time interval derived from file %s [%s:%s]'\
               %(self.filename, self.T[0], self.T[1])
-        msg += ' does not match model time: %s' %tau
+        msg += ' does not match model time: %s\n' %tau
+        msg += 'Domain says its starttime == %f' %(self.domain.starttime)
 
         if tau < self.T[0]: raise msg
@@ -514 +517 @@
             if self.starttime > domain.starttime:
                 #FIXME: Print depending on some verbosity setting
-                #print msg
+                ##if verbose: print msg
                 domain.starttime = self.starttime #Modifying model time