Changeset 7741

Timestamp:

May 24, 2010, 2:41:35 PM (15 years ago)

Author:

mungkasi

Message:

Changing to be consistent with old anuga_1_1 code

Location:

anuga_work/development/sudi/sw_2d

Files:

• swb_domain.py (modified) (3 diffs)
• test_swb_balance.py (modified) (1 diff)
• test_swb_boundary_condition.py (modified) (1 diff)
• test_swb_conservation.py (modified) (2 diffs)
• test_swb_forcing_terms.py (modified) (1 diff)

anuga_work/development/sudi/sw_2d/swb_domain.py

@@ -116 +116 @@
         #Call correct module function (either from this module or C-extension)
 
-        #compute_fluxes(self)
-
-        #return
+        compute_fluxes(self)
+
+        return
+
+
+    
         from swb_domain_ext import compute_fluxes_c
 
@@ -157 +160 @@
         """
 
-        #Sww_domain.distribute_to_vertices_and_edges(self)
-        #return
+        Sww_domain.distribute_to_vertices_and_edges(self)
+        return
+
     
         #Shortcuts
@@ -266 +270 @@
 
 
-    ##
-    # @brief 
-    def distribute_to_vertices_and_edges_h(self):
-        """Distribution from centroids to edges specific to the SWW eqn.
-
-        It will ensure that h (w-z) is always non-negative even in the
-        presence of steep bed-slopes by taking a weighted average between shallow
-        and deep cases.
-
-        In addition, all conserved quantities get distributed as per either a
-        constant (order==1) or a piecewise linear function (order==2).
-        
-
-        Precondition:
-        All conserved quantities defined at centroids and bed elevation defined at
-        edges.
-        
-        Postcondition
-        Evolved quantities defined at vertices and edges
-        """
-
-
-        #Shortcuts
-        W  = self.quantities['stage']
-        UH = self.quantities['xmomentum']
-        VH = self.quantities['ymomentum']
-        H  = self.quantities['height']
-        Z  = self.quantities['elevation']
-        U  = self.quantities['xvelocity']
-        V  = self.quantities['yvelocity']
-
-        #Arrays   
-        w_C   = W.centroid_values    
-        uh_C  = UH.centroid_values
-        vh_C  = VH.centroid_values    
-        z_C   = Z.centroid_values
-        h_C   = H.centroid_values
-        u_C   = U.centroid_values
-        v_C   = V.centroid_values
-
-        w_C[:] = num.maximum(w_C, z_C)
-        
-        h_C[:] = w_C - z_C
-
-
-        assert num.min(h_C) >= 0
-                
-        num.putmask(uh_C, h_C < 1.0e-15, 0.0)
-        num.putmask(vh_C, h_C < 1.0e-15, 0.0)
-        num.putmask(h_C, h_C < 1.0e-15, 1.0e-16)        
-        
-        u_C[:]  = uh_C/h_C
-        v_C[:]  = vh_C/h_C
-
-        num.putmask(h_C, h_C < 1.0e-15, 0.0)
-        
-        for name in [ 'stage', 'height', 'xvelocity', 'yvelocity' ]:
-            Q = self.quantities[name]
-            if self._order_ == 1:
-                Q.extrapolate_first_order()
-            elif self._order_ == 2:
-                Q.extrapolate_second_order_and_limit_by_edge()
-                #Q.extrapolate_second_order_and_limit_by_vertex()
-            else:
-                raise 'Unknown order'
-
-
-        w_E     = W.edge_values
-        uh_E    = UH.edge_values
-        vh_E    = VH.edge_values        
-        h_E     = H.edge_values
-        z_E     = Z.edge_values 
-        u_E     = U.edge_values
-        v_E     = V.edge_values         
-
-
-        #minh_E = num.min(h_E)
-        #msg = 'min h_E = %g ' % minh_E
-        #assert minh_E >= -1.0e-15, msg
-
-        z_E[:]   = w_E - h_E
-
-        num.putmask(h_E, h_E <= 1.0e-8, 0.0)
-        num.putmask(u_E, h_E <= 1.0e-8, 0.0)
-        num.putmask(v_E, h_E <= 1.0e-8, 0.0)
-        num.putmask(w_E, h_E <= 1.0e-8, z_E)
-        #num.putmask(h_E, h_E <= 0.0, 0.0)
-        
-        uh_E[:] = u_E * h_E
-        vh_E[:] = v_E * h_E
-
-        """
-        print '=========================================================='
-        print 'Time ', self.get_time()
-        print h_E
-        print uh_E
-        print vh_E
-        """
-        
-        # Compute vertex values by interpolation
-        for name in self.evolved_quantities:
-            Q = self.quantities[name]
-            Q.interpolate_from_edges_to_vertices()
-
-
-        w_V     = W.vertex_values
-        uh_V    = UH.vertex_values
-        vh_V    = VH.vertex_values      
-        z_V     = Z.vertex_values       
-        h_V     = H.vertex_values
-        u_V     = U.vertex_values
-        v_V     = V.vertex_values               
-
-
-        #w_V[:]    = z_V + h_V
-
-        #num.putmask(u_V, h_V <= 0.0, 0.0)
-        #num.putmask(v_V, h_V <= 0.0, 0.0)
-        #num.putmask(w_V, h_V <= 0.0, z_V)        
-        #num.putmask(h_V, h_V <= 0.0, 0.0)
-        
-        uh_V[:] = u_V * h_V
-        vh_V[:] = v_V * h_V
-
-
-
 
     ##

anuga_work/development/sudi/sw_2d/test_swb_balance.py

@@ -9 +9 @@
 from anuga.config import netcdf_mode_r, netcdf_mode_w, netcdf_mode_a
 from anuga.utilities.numerical_tools import mean
-from anuga.geometry.polygon import is_inside_polygon
+from anuga.utilities.polygon import is_inside_polygon
 from anuga.coordinate_transforms.geo_reference import Geo_reference
 from anuga.abstract_2d_finite_volumes.quantity import Quantity

anuga_work/development/sudi/sw_2d/test_swb_boundary_condition.py

@@ -9 +9 @@
 from anuga.config import netcdf_mode_r, netcdf_mode_w, netcdf_mode_a
 from anuga.utilities.numerical_tools import mean
-from anuga.geometry.polygon import is_inside_polygon
+from anuga.utilities.polygon import is_inside_polygon
 from anuga.coordinate_transforms.geo_reference import Geo_reference
 from anuga.abstract_2d_finite_volumes.quantity import Quantity

anuga_work/development/sudi/sw_2d/test_swb_conservation.py

@@ -458 +458 @@
         from anuga.shallow_water.shallow_water_domain import Reflective_boundary
         from anuga.shallow_water.shallow_water_domain import Dirichlet_boundary
-        from anuga.shallow_water.forcing import Inflow
+        from anuga.shallow_water.shallow_water_domain import Inflow
         from anuga.shallow_water.data_manager \
                 import get_flow_through_cross_section
@@ -551 +551 @@
         from anuga.shallow_water.shallow_water_domain import Reflective_boundary
         from anuga.shallow_water.shallow_water_domain import Dirichlet_boundary
-        from anuga.shallow_water.forcing import Inflow
+        from anuga.shallow_water.shallow_water_domain import Inflow
         from anuga.shallow_water.data_manager import get_flow_through_cross_section
 

anuga_work/development/sudi/sw_2d/test_swb_forcing_terms.py

@@ -1362 +1362 @@
         from anuga.shallow_water.shallow_water_domain import Reflective_boundary
         from anuga.shallow_water.shallow_water_domain import Dirichlet_boundary
-        from anuga.shallow_water.forcing import Inflow
+        from anuga.shallow_water.shallow_water_domain import Inflow
         from anuga.shallow_water.data_manager \
                 import get_flow_through_cross_section