Changeset 7973

Timestamp:

Aug 25, 2010, 12:31:00 PM (14 years ago)

Author:

habili

Message:

Added more functionalities

File:

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

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

@@ -1 +1 @@
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon
 from anuga.config import velocity_protection 
+import math
 
 import numpy as num
@@ -74 +75 @@
         return self.domain.quantities['stage'].centroid_values.take(self.triangle_indices)
         
+        
     def get_average_stage(self):
         
@@ -91 +93 @@
     
         return self.domain.quantities['xmomentum'].centroid_values.take(self.triangle_indices)
+        
         
     def get_average_xmom(self):
@@ -131 +134 @@
             
             
-    def get_average_velocities(self):
+    def get_average_velocity(self):
  
-            depths = self.get_stages() - self.get_elevations()
-            u = self.get_xmoms()/(depths + velocity_protection/depths)
-            v = self.get_ymoms()/(depths + velocity_protection/depths)
+            u, v = self.get_velocities()
             
-            return num.sum(u)/self.triangle_indices.size, num.sum(v)/self.triangle_indices.size
+            average_u = num.sum(u)/self.triangle_indices.size
+            average_v = num.sum(v)/self.triangle_indices.size
+            
+            return math.sqrt(average_u**2 + average_v**2) 
+
+
+    def set_total_energy(self, total_energy):
+        
+        self.total_energy = total_energy
+        
+        
+    def get_total_energy(self):
+        
+        return self.total_energy
+        
+        
+    def set_specific_energy(self, specific_energy):
+        
+        self.specific_energy = specific_energy
+
+    
+    def get_specific_energy(self):
+        
+        return self.specific_energy
+        
+