Changeset 221 for inundation/ga/storm_surge/pyvolution/quantity.py

Timestamp:

Aug 25, 2004, 5:26:37 PM (21 years ago)

Author:

ole

Message:

Painful testing of second order extrapolation.
One bug found: The protection against infinitesimal heighs at centroid. This was not done in the previous version
and was consequently removed.

File:

• inundation/ga/storm_surge/pyvolution/quantity.py (modified) (4 diffs)

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -78 +78 @@
             v2 = self.vertex_values[i, 2]
             
-            self.centroid_values[i] = (v0 + v1 + v2)/3
+            self.centroid_values[i] = (v0 + v1 + v2)/3.0
             
             self.edge_values[i, 0] = 0.5*(v1 + v2)
@@ -139 +139 @@
                 #Special case where we have only one neighbouring volume.
 
-                k0 = k  #Self
                 #Find index of the one neighbour
-                for k1 in self.domain.neighbours[k,:]:
-                    if k1 >= 0:
+                for k0 in self.domain.neighbours[k,:]:
+                    if k0 >= 0:
                         break
-                assert k1 != k0
-                assert k1 >= 0
+
+                assert k0 != k
+                assert k0 >= 0
+
+                k1 = k  #Self
 
                 #Get data
@@ -180 +182 @@
                 x2, y2 = self.domain.centroids[k2] #V2 centroid
 
+                #if k < 4:
+                #    print 'k, k0, k1, k2 = %d, %d, %d, %d' %(k, k0, k1, k2)
+                #    #print 'k = %d: (%f, %f), (%f, %f), (%f, %f)'\
+                #    #      %(k, x0, y0, x1, y1, x2, y2)
+                #    print 'k = %d: (%f, %f, %f)' %(k, q0, q1, q2)   
+                
                 #Gradient
                 a[k], b[k] = gradient(x0, y0, x1, y1, x2, y2, q0, q1, q2)
@@ -266 +274 @@
         
         a, b = self.compute_gradients()
+        ##for k in range(4):
+        ##    print 'Gradients %d: %16.12f, %16.12f' %(k, a[k], b[k])
 
         V = self.domain.get_vertex_coordinates()