Changeset 1575 for inundation/ga/storm_surge/parallel/parallel_shallow_water.py

Timestamp:

Jul 4, 2005, 5:57:46 PM (19 years ago)

Author:

steve

Message:

In the process of copying stage from full domain to sub domains

File:

• inundation/ga/storm_surge/parallel/parallel_shallow_water.py (modified) (6 diffs)

inundation/ga/storm_surge/parallel/parallel_shallow_water.py

@@ -25 +25 @@
 
 from shallow_water import *
-Shallow_Water_Domain = Domain
 from Numeric import zeros, Float, Int, ones, allclose, array
 import pypar
 
 
-class Parallel_Shallow_Water_Domain(Shallow_Water_Domain):
+class Parallel_Domain(Domain):
 
     def __init__(self, coordinates, vertices, boundary = None,
@@ -38 +37 @@
         self.numproc   = pypar.size()
 
-        Shallow_Water_Domain.__init__(self, coordinates, vertices, boundary)
+        Domain.__init__(self, coordinates, vertices, boundary)
 
         N = self.number_of_elements
@@ -66 +65 @@
 
     def check_integrity(self):
-        Shallow_Water_Domain.check_integrity(self)
+        Domain.check_integrity(self)
 
         msg = 'Will need to check global and local numbering'
@@ -78 +77 @@
 
         # Calculate local timestep
-        Shallow_Water_Domain.update_timestep(self, yieldstep, finaltime)
+        Domain.update_timestep(self, yieldstep, finaltime)
 
         import time
@@ -108 +107 @@
         # the separate processors
 
-        import weave
-        from weave import converters
 
         import time
@@ -202 +199 @@
 
         #Call basic machinery from parent class
-        for t in Shallow_Water_Domain.evolve(self, yieldstep, finaltime):
+        for t in Domain.evolve(self, yieldstep, finaltime):
 
             #Pass control on to outer loop for more specific actions
             yield(t)
 
-