Changeset 9737 for trunk/anuga_core/anuga/structures/structure_operator.py

Timestamp:

Oct 4, 2016, 4:13:00 PM (9 years ago)

Author:

steve

Message:

Commit svn after a lot of git updates

File:

• trunk/anuga_core/anuga/structures/structure_operator.py (modified) (4 diffs)

trunk/anuga_core/anuga/structures/structure_operator.py

@@ -33 +33 @@
                  z1=None,#added by PM 4/10/2013 
                  z2=None,#added by PM 4/10/2013 
+                 blockage=None,#added by PM 24/7/2016  
                  apron=None,
                  manning=None,
@@ -85 +86 @@
         self.diameter = diameter
         self.z1 = z1 #added by PM 4/10/2013 
-        self.z2 = z2 #added by PM 4/10/2013 
+        self.z2 = z2 #added by PM 4/10/2013
+        self.blockage = blockage #added by PM 24/7/2016  
         self.apron  = apron
         self.manning = manning
@@ -367 +369 @@
 
         self.culvert_z2 = z2 #added by PM 4/10/2013 
+        
+    def set_culvert_blockage(self, blockage): #added by PM 24/7/2016  
+
+        self.culvert_blockage = blockage  #added by PM 24/7/2016  
 
     def __process_non_skew_culvert(self):
@@ -642 +648 @@
         return self.z2 #added by PM 4/10/2013 
 
+    def get_culvert_blockage(self): #added by PM 24/7/2016
+                
+        return self.blockage #added by PM 24/7/2016 
+        
     def get_culvert_apron(self):