Changeset 1392

Timestamp:

May 14, 2005, 5:57:37 PM (19 years ago)

Author:

steve

Message:

Reapplied Matt's inscribed circle correction

Location:

inundation/ga/storm_surge

Files:

• pyvolution/mesh.py (modified) (1 diff)
• pyvolution/netherlands.py (modified) (4 diffs)
• pyvolution/test_mesh.py (modified) (2 diffs)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/pyvolution/mesh.py

@@ -130 +130 @@
                 c = sqrt((x2-x0)**2+(y2-y0)**2)
 
-                self.radii[i]=self.areas[i]/(a+b+c)
+                self.radii[i]=2.0*self.areas[i]/(a+b+c)
 
 

inundation/ga/storm_surge/pyvolution/netherlands.py

@@ -65 +65 @@
 
             #Wall
-            if x[i] > 0.995:
-                z[i] = -x[i]/20+0.3
+            #if x[i] > 0.995:
+            #    z[i] = -x[i]/20+0.3
 
         return z/2
@@ -80 +80 @@
 N = 130 #size = 33800
 N = 600 #Size = 720000
-N = 50
-M = 40
+N = 30
+
 
 #N = 15
@@ -87 +87 @@
 print 'Creating domain'
 #Create basic mesh
-points, vertices, boundary = rectangular(N, M)
+points, vertices, boundary = rectangular(N, N)
 
 #Create shallow water domain
@@ -156 +156 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 0.01, finaltime = 5.0):
+for t in domain.evolve(yieldstep = 1.0, finaltime = 100.0):
     domain.write_time()
     #domain.visualiser.scale_z = 1.0

inundation/ga/storm_surge/pyvolution/test_mesh.py

@@ -370 +370 @@
                       [5, 2, 3]]
         try:
-            mesh = Mesh(points, triangles) 
+            mesh = Mesh(points, triangles)
         except:
             pass
         else:
             raise "triangle edge duplicates not caught"
-                
+
     def test_rectangular_mesh_basic(self):
         M=1
@@ -805 +805 @@
 
 
-