Changeset 263 for inundation/ga/storm_surge

Timestamp:

Sep 1, 2004, 5:56:05 AM (20 years ago)

Author:

ole

Message:

Optimised reflective boundary

Location:

inundation/ga/storm_surge/pyvolution

Files:

• domain.py (modified) (1 diff)
• shallow_water.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/domain.py

@@ -493 +493 @@
             #Clean up
             Q.semi_implicit_update[:] = 0.0
-            Q.explicit_update[:] = 0.0 #Not necessary as fluxes will set it
+            Q.explicit_update[:] = 0.0 #Unnecessary as fluxes will set it
             
 

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -574 +574 @@
             raise msg
         
-        self.domain = domain
-        
+        #Handy shorthands
+        self.level = domain.quantities['level'].edge_values
+        self.xmom = domain.quantities['xmomentum'].edge_values
+        self.ymom = domain.quantities['ymomentum'].edge_values          
+        self.normals = domain.normals
+        
+        from Numeric import zeros, Float        
+        self.conserved_quantities = zeros(3, Float) 
         
     def __repr__(self):
@@ -585 +591 @@
         of the volume they serve.
         """
-        
-        q = self.domain.get_conserved_quantities(vol_id, edge = edge_id)
-        normal = self.domain.get_normal(vol_id, edge_id)
+
+        q = self.conserved_quantities
+        q[0] = self.level[vol_id, edge_id]
+        q[1] = self.xmom[vol_id, edge_id] 
+        q[2] = self.ymom[vol_id, edge_id] 
+        
+        normal = self.normals[vol_id, 2*edge_id:2*edge_id+2]     
+
         
         r = rotate(q, normal, direction = 1)
@@ -685 +696 @@
 
 
+    xmom = domain.quantities['xmomentum']
+    ymom = domain.quantities['ymomentum']    
+        
     w = domain.quantities['level'].centroid_values
-    uh = domain.quantities['xmomentum'].centroid_values
-    vh = domain.quantities['ymomentum'].centroid_values
+    uh = xmom.centroid_values
+    vh = ymom.centroid_values
     eta = domain.quantities['friction'].centroid_values    
     
-    xmom_update = domain.quantities['xmomentum'].semi_implicit_update
-    ymom_update = domain.quantities['ymomentum'].semi_implicit_update    
+    xmom_update = xmom.semi_implicit_update
+    ymom_update = ymom.semi_implicit_update    
     
     N = domain.number_of_elements