Changeset 7684

Timestamp:

Apr 13, 2010, 4:31:20 PM (15 years ago)

Author:

fountain

Message:

 

File:

• branches/anuga_1_1/anuga_work/production/bunbury_storm_surge_2009/process_gems_grids.py (modified) (2 diffs)

branches/anuga_1_1/anuga_work/production/bunbury_storm_surge_2009/process_gems_grids.py

@@ -139 +139 @@
 number_of_points = ncols * nrows
 
+# insert nodata test here
+
 for i in xrange(number_of_timesteps):
     j = number_of_points * i
     k = j + number_of_points
     d = stage[j:k] - elevation     # Assumes elevations below sea level are negative
-    depth[j:k] = [0 if x<-500 else x for x in d]   # sets stage to zero for no-data values of stage
+    depth[j:k] = [0 if x<-9000 else x for x in d]   # sets stage to zero for no-data values of stage
     
     # depth[j:k] = [x if x>=0 and elevation>0 else 0 for x in d] # This is to correct for GEMS data which assumes stage=0 onshore when dry but should = elevation
@@ -162 +164 @@
         mx = momentum[i]*math.sin(math.radians(t)) #Assuming t is in the "to" direction and 0 degrees is north
         my = momentum[i]*math.cos(math.radians(t))
-        assert mx >= 0 and my >= 0
-    if t > 90.0 and t < 180.0:
+        assert mx > 0 and my > 0
+    elif t > 90.0 and t < 180.0:
         mx = momentum[i]*math.sin(math.radians(t))
         my = momentum[i]*math.cos(math.radians(t))
-        assert mx >= 0 and my <= 0
-    if t > 180.0 and t < 270.0:
+        assert mx > 0 and my < 0
+    elif t > 180.0 and t < 270.0:
         mx = momentum[i]*math.cos(math.radians(t))
         my = momentum[i]*math.sin(math.radians(t))
-        assert mx <= 0 and my <= 0
-    if t > 270.0 and t < 360.0:
+        assert mx < 0 and my < 0
+    elif t > 270.0 and t < 360.0:
         mx = momentum[i]*math.sin(math.radians(t))
         my = momentum[i]*math.cos(math.radians(t))
-        assert mx <= 0 and my >= 0
-    if t == 0.0 or t == 360.0:
+        assert mx < 0 and my > 0
+    elif t == 0.0 or t == 360.0:
         mx = 0
         my = momentum[i]
         assert my >= 0
-    if t == 90.0:
+    elif t == 90.0:
         mx = momentum[i]
         my = 0
         assert mx >= 0
-    if t == 180.0:
+    elif t == 180.0:
         mx = 0
         my = -momentum[i]
         assert my <= 0
-    if t == 270.0:
+    elif t == 270.0:
         mx = -momentum[i]
         my = 0
         assert mx <= 0
-    if t == -9999:
+    elif t == -9999:
         mx = 0
         my = 0
+    else:
+        print "Unexpected value of theta"
+        exit()
         
     xmomentum[i] = mx