Changeset 5606

Timestamp:

Aug 5, 2008, 1:15:42 PM (16 years ago)

Author:

kristy

Message:

Converting quantities: changing NODATA to 0.0 for ha, ua and va (stage, xmomentum, ymomentum)

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -5026 +5026 @@
         basename_in=[basename_in]
 
+    # This is the value used in the mux file format to indicate NAN data
+    # FIXME (Ole): This should be changed everywhere to IEEE NAN when we upgrade to Numpy
+    NODATA = 99    
+
     # Check that basename is a list of strings
     if not reduce(__and__, map(lambda z:isinstance(z,StringType), basename_in)):
@@ -5217 +5221 @@
     for j in range(len(times)):
         for i in range(number_of_points):
-            w = zscale*mux['HA'][i,j] + mean_stage
+            ha = mux['HA'][i,j]
+            ua = mux['UA'][i,j]
+            va = mux['VA'][i,j]
+            if ha == NODATA:
+                if verbose:
+                    msg = 'Setting nodata value %d to 0 at time = %f, point = %d'\
+                          %(ha, times[j], i)
+                    print msg
+                ha = 0.0
+                ua = 0.0
+                va = 0.0
+                
+            w = zscale*ha + mean_stage
             h=w-elevation[i]
             stage[j,i] = w
 
-            xmomentum[j,i] = mux['UA'][i,j]*h
-            ymomentum[j,i] = mux['VA'][i,j]*h
+            xmomentum[j,i] = ua*h
+            ymomentum[j,i] = va*h
 
     outfile.close()