Changeset 8874

Timestamp:

May 24, 2013, 12:06:00 PM (12 years ago)

Author:

steve

Message:

Added in get_enquiry_water_depth

Location:

trunk/anuga_core/source/anuga/structures

Files:

• inlet_enquiry.py (modified) (3 diffs)
• inlet_operator.py (modified) (3 diffs)
• run_inlet_operator.py (modified) (2 diffs)
• structure_operator.py (modified) (1 diff)
• test_inlet_operator.py (modified) (9 diffs)

trunk/anuga_core/source/anuga/structures/inlet_enquiry.py

@@ -83 +83 @@
     def get_enquiry_depth(self):
 
+        return max(self.get_enquiry_stage() - self.get_enquiry_invert_elevation(), 0.0)
+
+
+    def get_enquiry_water_depth(self):
+
         return self.get_enquiry_stage() - self.get_enquiry_elevation()
 
@@ -96 +101 @@
     def get_enquiry_velocity(self):
 
-            depth = self.get_enquiry_depth()
+            depth = self.get_enquiry_water_depth()
             u = self.get_enquiry_xmom()/(depth + velocity_protection/depth)
             v = self.get_enquiry_ymom()/(depth + velocity_protection/depth)
@@ -105 +110 @@
     def get_enquiry_xvelocity(self):
 
-            depth = self.get_enquiry_depth()
+            depth = self.get_enquiry_water_depth()
             return self.get_enquiry_xmom()/(depth + velocity_protection/depth)
 
     def get_enquiry_yvelocity(self):
 
-            depth = self.get_enquiry_depth()
+            depth = self.get_enquiry_water_depth()
             return self.get_enquiry_ymom()/(depth + velocity_protection/depth)
 

trunk/anuga_core/source/anuga/structures/inlet_operator.py

@@ -18 +18 @@
     def __init__(self,
                  domain,
-                 line,
+                 poly,
                  Q = 0.0,
                  velocity = None,
@@ -30 +30 @@
         anuga.Operator.__init__(self, domain, description, label, logging, verbose)
 
-        self.line = numpy.array(line, dtype='d')
+        self.poly = numpy.array(poly, dtype='d')
 
         # should set this up to be a function of time and or space)
@@ -38 +38 @@
         #print self.Q
 
-        self.enquiry_point = 0.5*(self.line[0] + self.line[1])
+
+        self.inlet = inlet.Inlet(self.domain, self.poly, verbose= verbose)
+        
+        n = len(self.poly)
+
+        self.enquiry_point = numpy.sum(self.poly,axis=1)/n
+
+
         #self.outward_vector = self.line
-        self.inlet = inlet.Inlet(self.domain, self.line, verbose= verbose)
 
         if velocity is not None:

trunk/anuga_core/source/anuga/structures/run_inlet_operator.py

@@ -104 +104 @@
 line0 = [[0.0, 5.0], [0.0, 10.0]]
 
+
 Q = file_function('test_hydrograph.tms', quantities=['hydrograph'])
 
-inlet0 = Inlet_operator(domain, line0, Q, label='first inlet')
+#inlet0 = Inlet_operator(domain, line0, Q, label='first inlet')
 
 
 line1 = [[1.0, 5.0], [2.0, 10.0]]
-inlet1 = Inlet_operator(domain, line1, 2.0)
+poly1 = [[1.0, 5.0], [2.0, 5.0], [2.0, 10.0], [1.0, 10.0]]
+inlet1 = Inlet_operator(domain, poly1, 2.0)
 
 
@@ -154 +156 @@
     print domain.volumetric_balance_statistics()
 
-    inlet0.print_timestepping_statistics()
-    print inlet1.timestepping_statistics()
+    #inlet0.print_timestepping_statistics()
+    inlet1.print_timestepping_statistics()
     pass
 

trunk/anuga_core/source/anuga/structures/structure_operator.py

@@ -298 +298 @@
         n_exchange_1 = len(self.exchange_lines[1])
 
-        assert n_exchange_0 == n_exchange_1, 'There shoiuld be the same number of points in both exchange_lines'
+        assert n_exchange_0 == n_exchange_1, 'There should be the same number of points in both exchange_lines'
 
         if n_exchange_0 == 2:

trunk/anuga_core/source/anuga/structures/test_inlet_operator.py

@@ -126 +126 @@
 
         assert numpy.allclose((Q1+Q2)*finaltime, vol1-vol0, rtol=1.0e-8) 
-        
-    def test_inlet_variable_Q(self):
+
+
+
+    def test_inlet_constant_Q_polygon(self):
         """test_inlet_Q
-        
+
         This tests that the inlet operator adds the correct amount of water
         """
@@ -140 +142 @@
         domain_length = 200.0
         domain_width = 200.0
-        
+
 
         domain = self._create_domain(d_length=domain_length,
@@ -154 +156 @@
 
         finaltime = 3.0
-
-        #Make sure we are inthe right directory to find the
-        #time series data for the inlets
-        import os
-        baseDir = os.getcwd()
-
-        try:
-            os.chdir('structures')
-        except:
-            pass
-
-        line1 = [[95.0, 10.0], [105.0, 10.0]]
-        Q1 = file_function(filename='inlet_operator_test1.tms', quantities=['hydrograph'])
-        
-        line2 = [[10.0, 90.0], [20.0, 90.0]]
-        Q2 = file_function(filename='inlet_operator_test2.tms', quantities=['hydrograph'])
-
-        os.chdir(baseDir)
-        
-        Inlet_operator(domain, line1, Q1)
-        Inlet_operator(domain, line2, Q2)
+        poly1 = [[95.0, 10.0], [105.0, 10.0], [105, 20.0], [95.0, 20.0]]
+        Q1 = 5.00
+
+
+        Inlet_operator(domain, poly1, Q1, logging=True)
+
 
         for t in domain.evolve(yieldstep = 1.0, finaltime = finaltime):
@@ -180 +167 @@
             #print domain.volumetric_balance_statistics()
             pass
- 
+
 
         vol1 = domain.compute_total_volume()
 
-        #print vol1-vol0
-        
-        assert numpy.allclose(13.5, vol1-vol0, rtol=1.0e-8) 
-                
-    def test_inlet_variable_Q_default(self):
+        assert numpy.allclose((Q1)*finaltime, vol1-vol0, rtol=1.0e-8)
+
+
+
+    def test_inlet_variable_Q(self):
         """test_inlet_Q
-
+        
         This tests that the inlet operator adds the correct amount of water
         """
@@ -201 +188 @@
         domain_length = 200.0
         domain_width = 200.0
-
+        
 
         domain = self._create_domain(d_length=domain_length,
@@ -214 +201 @@
         vol0 = domain.compute_total_volume()
 
-        finaltime = 5.0
+        finaltime = 3.0
 
         #Make sure we are inthe right directory to find the
@@ -228 +215 @@
         line1 = [[95.0, 10.0], [105.0, 10.0]]
         Q1 = file_function(filename='inlet_operator_test1.tms', quantities=['hydrograph'])
-
+        
         line2 = [[10.0, 90.0], [20.0, 90.0]]
         Q2 = file_function(filename='inlet_operator_test2.tms', quantities=['hydrograph'])
 
         os.chdir(baseDir)
-
-        Inlet_operator(domain, line1, Q1, default=6)
-        Inlet_operator(domain, line2, Q2, default=3)
+        
+        Inlet_operator(domain, line1, Q1)
+        Inlet_operator(domain, line2, Q2)
 
         for t in domain.evolve(yieldstep = 1.0, finaltime = finaltime):
@@ -241 +228 @@
             #print domain.volumetric_balance_statistics()
             pass
+ 
+
+        vol1 = domain.compute_total_volume()
+
+        #print vol1-vol0
+        
+        assert numpy.allclose(13.5, vol1-vol0, rtol=1.0e-8) 
+                
+    def test_inlet_variable_Q_default(self):
+        """test_inlet_Q
+
+        This tests that the inlet operator adds the correct amount of water
+        """
+
+        stage_0 = 11.0
+        stage_1 = 10.0
+        elevation_0 = 10.0
+        elevation_1 = 10.0
+
+        domain_length = 200.0
+        domain_width = 200.0
+
+
+        domain = self._create_domain(d_length=domain_length,
+                                     d_width=domain_width,
+                                     dx = 10.0,
+                                     dy = 10.0,
+                                     elevation_0 = elevation_0,
+                                     elevation_1 = elevation_1,
+                                     stage_0 = stage_0,
+                                     stage_1 = stage_1)
+
+        vol0 = domain.compute_total_volume()
+
+        finaltime = 5.0
+
+        #Make sure we are inthe right directory to find the
+        #time series data for the inlets
+        import os
+        baseDir = os.getcwd()
+
+        try:
+            os.chdir('structures')
+        except:
+            pass
+
+        line1 = [[95.0, 10.0], [105.0, 10.0]]
+        Q1 = file_function(filename='inlet_operator_test1.tms', quantities=['hydrograph'])
+
+        line2 = [[10.0, 90.0], [20.0, 90.0]]
+        Q2 = file_function(filename='inlet_operator_test2.tms', quantities=['hydrograph'])
+
+        os.chdir(baseDir)
+
+        Inlet_operator(domain, line1, Q1, default=6)
+        Inlet_operator(domain, line2, Q2, default=3)
+
+        for t in domain.evolve(yieldstep = 1.0, finaltime = finaltime):
+            #domain.write_time()
+            #print domain.volumetric_balance_statistics()
+            pass
 
 
@@ -251 +299 @@
 # =========================================================================
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_inlet_operator, 'test')
+    suite = unittest.makeSuite(Test_inlet_operator, 'test_inlet_constant_Q_polygon')
     runner = unittest.TextTestRunner()
     runner.run(suite)