Changeset 9734 for trunk/anuga_core/anuga/operators

Timestamp:

Sep 5, 2015, 4:03:54 PM (10 years ago)

Author:

steve

Message:

Adding in multiple git commit

Location:

trunk/anuga_core/anuga/operators

Files:

• boundary_flux_integral_operator.py (modified) (1 diff)
• collect_max_quantities_operator.py (modified) (2 diffs)
• erosion_operators.py (modified) (2 diffs)
• tests/test_boundary_flux_integral_operator.py (modified) (3 diffs)

trunk/anuga_core/anuga/operators/boundary_flux_integral_operator.py

@@ -54 +54 @@
         elif(ts_method=='rk2'):
             self.boundary_flux_integral = self.boundary_flux_integral + 0.5*dt*self.domain.boundary_flux_sum[0:2].sum()
+        elif(ts_method=='rk3'):
+            self.boundary_flux_integral = self.boundary_flux_integral + 1.0/6.0*dt*(self.domain.boundary_flux_sum[0] + self.domain.boundary_flux_sum[1] + 4.0*self.domain.boundary_flux_sum[2])
         else:
             raise Exception, 'Cannot compute boundary flux integral with this timestepping method'
      
         # Zero the boundary_flux_sum 
-        self.domain.boundary_flux_sum=self.domain.boundary_flux_sum*0.
+        self.domain.boundary_flux_sum[:]=0.
 
     def parallel_safe(self):

trunk/anuga_core/anuga/operators/collect_max_quantities_operator.py

@@ -16 +16 @@
 from anuga.parallel import myid
 from anuga.config import velocity_protection
+from anuga.config import max_float
 
 
@@ -48 +49 @@
         # Setup a quantity to store max_stage
         #------------------------------------------
-        self.max_stage = num.zeros(len(domain.centroid_coordinates[:,0]))
+        self.max_stage = num.zeros(len(domain.centroid_coordinates[:,0])) - max_float
         self.max_depth = num.zeros(len(domain.centroid_coordinates[:,0]))
         self.max_speed = num.zeros(len(domain.centroid_coordinates[:,0]))

trunk/anuga_core/anuga/operators/erosion_operators.py

@@ -74 +74 @@
         # bed and stage vertex values in dry region
         #------------------------------------------
-        self.domain.optimise_dry_cells = 0
+        if not self.domain.get_using_discontinuous_elevation():
+            self.domain.optimise_dry_cells = 0
 
         #-----------------------------------------
@@ -80 +81 @@
         # continuity of elevation
         #-----------------------------------------
-        self.setup_node_structures()
+        if not self.domain.get_using_discontinuous_elevation():
+            self.setup_node_structures()
 
         #-----------------------------------------

trunk/anuga_core/anuga/operators/tests/test_boundary_flux_integral_operator.py

@@ -28 +28 @@
 
         # Make the domain
-        anuga.create_mesh_from_regions(boundaryPolygon, 
+        domain = anuga.create_domain_from_regions(boundaryPolygon, 
                                  boundary_tags={'left': [0],
                                                 'top': [1],
                                                 'right': [2],
                                                 'bottom': [3]},
+                                   mesh_filename='test_boundaryfluxintegral.msh',
                                    maximum_triangle_area = 200.,
                                    minimum_triangle_angle = 28.0,
-                                   filename = 'test_boundaryfluxintegral.msh',
                                    use_cache=False,
                                    verbose=verbose)
 
-        domain=anuga.create_domain_from_file('test_boundaryfluxintegral.msh')
 
         # 05/05/2014 -- riverwalls only work with DE0 and DE1
@@ -67 +66 @@
         This tests the calculation for euler timestepping 
         """
-        
-        domain=self.create_domain('DE0')
-        for t in domain.evolve(yieldstep=0.1,finaltime=1.0):
+  
+        flowalg = 'DE0'
+          
+        domain=self.create_domain(flowalg)
+  
+        #domain.print_statistics()
+        for t in domain.evolve(yieldstep=1.0,finaltime=5.0):
+            if verbose: domain.print_timestepping_statistics()
+            if verbose: print domain.get_water_volume()
             pass
         # The domain was initially dry
         vol=domain.get_water_volume()
         boundaryFluxInt=domain.get_boundary_flux_integral()
+  
+        if verbose: print flowalg, vol, boundaryFluxInt        
+        assert(numpy.allclose(vol,boundaryFluxInt))
+         
 
-        assert(numpy.allclose(vol,boundaryFluxInt))
-    
+        
     def test_boundary_flux_operator_DE1(self):
         """
@@ -82 +90 @@
         This tests the calculation for rk2 timestepping 
         """
-        
-        domain=self.create_domain('DE1')
-        for t in domain.evolve(yieldstep=0.1,finaltime=1.0):
+        flowalg = 'DE1'
+                 
+        domain=self.create_domain(flowalg)
+        #domain.print_statistics()
+        for t in domain.evolve(yieldstep=1.0,finaltime=5.0):
+            if verbose: domain.print_timestepping_statistics()
+            if verbose: print domain.get_water_volume()
             pass
         # The domain was initially dry
         vol=domain.get_water_volume()
         boundaryFluxInt=domain.get_boundary_flux_integral()
+         
+        if verbose: print flowalg, vol, boundaryFluxInt
+        assert(numpy.allclose(vol,boundaryFluxInt))
+        
+        
 
-        assert(numpy.allclose(vol,boundaryFluxInt))
-
+    def test_boundary_flux_operator_DE2(self):
+        """
+        A (the) boundary flux operator is instantiated when a domain is created.
+        This tests the calculation for rk3 timestepping 
+        """
+ 
+        flowalg = 'DE2'
+ 
+        domain=self.create_domain(flowalg)
+        #domain.print_statistics()
+        for t in domain.evolve(yieldstep=1.0,finaltime=5.0):
+            if verbose: domain.print_timestepping_statistics()
+            if verbose: print domain.get_water_volume(), domain.get_boundary_flux_integral()
+            pass
+        # The domain was initially dry
+        vol=domain.get_water_volume()
+        boundaryFluxInt=domain.get_boundary_flux_integral()
+ 
+        if verbose: print flowalg, vol, boundaryFluxInt
+        assert(numpy.allclose(vol,boundaryFluxInt))        
+         
+        
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_boundary_flux_integral_operator, 'test')