Changeset 1593

Timestamp:

Jul 11, 2005, 12:15:13 PM (19 years ago)

Author:

chris

Message:

 

File:

• inundation/ga/storm_surge/pyvolution/shallow_water.py (modified) (14 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -56 +56 @@
 
 from domain import *
-from region import *#
-
+from region import *
 Generic_domain = Domain #Rename
 
@@ -81 +80 @@
 
         #Realtime visualisation
-        self.visualiser = None
-        self.visualise  = False
+        self.visualise = False
         self.visualise_color_stage = False
         self.visualise_stage_range = 1.0
@@ -108 +106 @@
         #self.eta = self.quantities['friction']
 
-    def initialise_visualiser(self,scale_z=1.0,rect=None):
-        #Realtime visualisation
-        if self.visualiser is None:
-            from realtime_visualisation_new import Visualiser
-            self.visualiser = Visualiser(self,scale_z,rect)
-        self.visualise = True
-
     def check_integrity(self):
         Generic_domain.check_integrity(self)
@@ -127 +118 @@
         assert self.conserved_quantities[2] == 'ymomentum', msg
 
-    def extrapolate_second_order_sw(self):
-        #Call correct module function
-        #(either from this module or C-extension)
-        extrapolate_second_order_sw(self)
 
     def compute_fluxes(self):
@@ -204 +191 @@
         if self.visualise is True and self.time == 0.0:
             import realtime_visualisation_new as visualise
-            #import realtime_visualisation as visualise
             visualise.create_surface(self)
 
@@ -257 +243 @@
         self.writer.store_timestep(name)
 
-####################MH 090605 new extrapolation function belonging to domain class
-def extrapolate_second_order_sw(domain):
-    """extrapolate conserved quntities to the vertices of the triangles
-    Python version to be written after the C version
-    """
-    msg = 'Method extrapolate_second_order_sw should be implemented in C'
-    raise msg
-####################MH 090605 ###########################################
 
 #Rotation of momentum vector
@@ -438 +416 @@
 
     flux = zeros(3, Float) #Work array for summing up fluxes
-
 
     #Loop
@@ -485 +462 @@
     domain.timestep = timestep
 
-#MH090605 The following method belongs to the shallow_water domain class
-#see comments in the corresponding method in shallow_water_ext.c
-def extrapolate_second_order_sw_c(domain):
-    """Wrapper calling C version of extrapolate_second_order_sw
-    """
-    import sys
-    from Numeric import zeros, Float
-
-    N = domain.number_of_elements
-
-    #Shortcuts
-    Stage = domain.quantities['stage']
-    Xmom = domain.quantities['xmomentum']
-    Ymom = domain.quantities['ymomentum']
-    from shallow_water_ext import extrapolate_second_order_sw
-    extrapolate_second_order_sw(domain,domain.surrogate_neighbours,
-                                domain.number_of_boundaries,
-                                domain.centroid_coordinates,
-                                Stage.centroid_values,
-                                Xmom.centroid_values,
-                                Ymom.centroid_values,
-                                domain.vertex_coordinates,
-                                Stage.vertex_values,
-                                Xmom.vertex_values,
-                                Ymom.vertex_values)
 
 def compute_fluxes_c(domain):
@@ -544 +496 @@
                                      Stage.explicit_update,
                                      Xmom.explicit_update,
-                                     Ymom.explicit_update,
-                                     domain.already_computed_flux)
+                                     Ymom.explicit_update)
 
 
@@ -574 +525 @@
     """
 
-    from config import optimised_gradient_limiter
-
     #Remove very thin layers of water
     protect_against_infinitesimal_and_negative_heights(domain)
 
     #Extrapolate all conserved quantities
-    if optimised_gradient_limiter:
-        #MH090605 if second order,
-        #perform the extrapolation and limiting on
-        #all of the conserved quantitie
-        
-        if (domain.order == 1):
-            for name in domain.conserved_quantities:
-                Q = domain.quantities[name]
-                Q.extrapolate_first_order()
+    for name in domain.conserved_quantities:
+        Q = domain.quantities[name]
+        if domain.order == 1:
+            Q.extrapolate_first_order()
         elif domain.order == 2:
-            domain.extrapolate_second_order_sw()
+            Q.extrapolate_second_order()
+            Q.limit()
         else:
             raise 'Unknown order'
-    else:    
-        #old code:
-        for name in domain.conserved_quantities:
-            Q = domain.quantities[name]
-            if domain.order == 1:
-                Q.extrapolate_first_order()
-            elif domain.order == 2:
-                Q.extrapolate_second_order()
-                Q.limit()
-            else:
-                raise 'Unknown order'
-            
 
     #Take bed elevation into account when water heights are small
@@ -783 +716 @@
 
     #Call C-extension
-    from shallow_water_ext import h_limiter_sw as h_limiter
+    from shallow_water_ext import h_limiter
     hvbar = h_limiter(domain, hc, hv)
 
@@ -954 +887 @@
             raise msg
 
-        #Handy shorthands
-        self.stage   = domain.quantities['stage'].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)
+        #Handy shorthands
+        self.stage = domain.quantities['stage'].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):
@@ -972 +905 @@
         """
 
-        q = self.conserved_quantities
-        q[0] = self.stage[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]
+        q = self.conserved_quantities
+        q[0] = self.stage[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]
 
 
@@ -1692 +1625 @@
     from shallow_water_ext import rotate, assign_windfield_values
     compute_fluxes = compute_fluxes_c
-    extrapolate_second_order_sw=extrapolate_second_order_sw_c
     gravity = gravity_c
     manning_friction = manning_friction_c