Changeset 6654 for anuga_core/source/anuga/abstract_2d_finite_volumes

Timestamp:

Mar 28, 2009, 6:54:15 PM (15 years ago)

Author:

ole

Message:

Added volumetric balance report for boundary flows and total volume.
Flows due to forcing terms have not yet been added.

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• general_mesh.py (modified) (1 diff)
• neighbour_mesh.py (modified) (2 diffs)
• quantity.py (modified) (2 diffs)
• quantity_ext.c (modified) (2 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -235 +235 @@
         """
         return self.normals[i, 2*j:2*j+2]
+        
+    def get_edgelength(self, i, j):
+        """Return length of j'th edge of the i'th triangle.
+        Return value is the numeric array slice [x, y]
+        """
+        return self.edgelengths[i, j]
+                
 
     def get_number_of_nodes(self):

anuga_core/source/anuga/abstract_2d_finite_volumes/neighbour_mesh.py

@@ -687 +687 @@
 
 
-        #Check neighbour structure
+        # Check neighbour structure
         for i in range(N):
             # For each triangle
@@ -869 +869 @@
 
     def get_triangle_containing_point(self, point):
-        """Return triangle id for triangle containing specifiend point (x,y)
+        """Return triangle id for triangle containing specified point (x,y)
 
         If point isn't within mesh, raise exception

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -1111 +1111 @@
     # @param use_cache 
     # @param verbose True if this method is to be verbose.
-    def get_values(self, interpolation_points=None,
-                         location='vertices',
-                         indices=None,
-                         use_cache=False,
-                         verbose=False):
+    def get_values(self, 
+                   interpolation_points=None,
+                   location='vertices',
+                   indices=None,
+                   use_cache=False,
+                   verbose=False):
         """Get values for quantity
 
@@ -1168 +1169 @@
         # Edges have already been deprecated in set_values, see changeset:5521,
         # but *might* be useful in get_values. Any thoughts anyone?
+        # YES (Ole): Edge values are necessary for volumetric balance check
 
         if location not in ['vertices', 'centroids',

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity_ext.c

@@ -607 +607 @@
 
 int _interpolate_from_vertices_to_edges(int N,
-                 double* vertex_values,
-                 double* edge_values) {
+                                        double* vertex_values,
+                                        double* edge_values) {
 
         int k, k3;
@@ -630 +630 @@
 
 int _interpolate_from_edges_to_vertices(int N,
-                 double* vertex_values,
-                 double* edge_values) {
+                                        double* vertex_values,
+                                        double* edge_values) {
 
         int k, k3;