Changeset 1392


Ignore:
Timestamp:
May 14, 2005, 5:57:37 PM (20 years ago)
Author:
steve
Message:

Reapplied Matt's inscribed circle correction

Location:
inundation/ga/storm_surge
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • inundation/ga/storm_surge/pyvolution/mesh.py

    r1387 r1392  
    130130                c = sqrt((x2-x0)**2+(y2-y0)**2)
    131131
    132                 self.radii[i]=self.areas[i]/(a+b+c)
     132                self.radii[i]=2.0*self.areas[i]/(a+b+c)
    133133
    134134
  • inundation/ga/storm_surge/pyvolution/netherlands.py

    r1387 r1392  
    6565
    6666            #Wall
    67             if x[i] > 0.995:
    68                 z[i] = -x[i]/20+0.3
     67            #if x[i] > 0.995:
     68            #    z[i] = -x[i]/20+0.3
    6969
    7070        return z/2
     
    8080N = 130 #size = 33800
    8181N = 600 #Size = 720000
    82 N = 50
    83 M = 40
     82N = 30
     83
    8484
    8585#N = 15
     
    8787print 'Creating domain'
    8888#Create basic mesh
    89 points, vertices, boundary = rectangular(N, M)
     89points, vertices, boundary = rectangular(N, N)
    9090
    9191#Create shallow water domain
     
    156156t0 = time.time()
    157157
    158 for t in domain.evolve(yieldstep = 0.01, finaltime = 5.0):
     158for t in domain.evolve(yieldstep = 1.0, finaltime = 100.0):
    159159    domain.write_time()
    160160    #domain.visualiser.scale_z = 1.0
  • inundation/ga/storm_surge/pyvolution/test_mesh.py

    r1366 r1392  
    370370                      [5, 2, 3]]
    371371        try:
    372             mesh = Mesh(points, triangles) 
     372            mesh = Mesh(points, triangles)
    373373        except:
    374374            pass
    375375        else:
    376376            raise "triangle edge duplicates not caught"
    377                
     377
    378378    def test_rectangular_mesh_basic(self):
    379379        M=1
     
    805805
    806806
    807 
Note: See TracChangeset for help on using the changeset viewer.