Changeset 4808

Timestamp:

Nov 12, 2007, 9:53:05 AM (16 years ago)

Author:

duncan

Message:

bug fix

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/general_mesh.py (modified) (2 diffs)
• abstract_2d_finite_volumes/quantity.py (modified) (1 diff)
• abstract_2d_finite_volumes/test_general_mesh.py (modified) (1 diff)
• utilities/quad.py (modified) (3 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -278 +278 @@
         if absolute is True:
             if not self.geo_reference.is_absolute():
-                V[0] += self.geo_reference.xllcorner
-                V[1] += self.geo_reference.yllcorner
-                
-        return V
+                return V + array([self.geo_reference.get_xllcorner(),
+                                  self.geo_reference.get_yllcorner()])
+            else:
+                return V
+        else:
+            return V
     
         
@@ -580 +582 @@
         ymin = min(Y.flat)
         ymax = max(Y.flat)
-
+        #print "C",C
         return xmin, xmax, ymin, ymax
 

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -783 +783 @@
             raise msg
 
-        coordinates = self.domain.get_nodes(absolute=True)
-        triangles = self.domain.triangles      #FIXME 
-        #vertex_attributes = fit_to_mesh(filename,
-         #                               mesh = self.domain, 
-        vertex_attributes = fit_to_mesh(filename,
-                                        coordinates, triangles, 
-                                        alpha=alpha,
-                                        attribute_name=attribute_name,
-                                        use_cache=use_cache,
-                                        verbose=verbose,
-                                        max_read_lines=max_read_lines)
+        if True:
+            vertex_attributes = fit_to_mesh(filename,
+                                            mesh = self.domain,  
+                                            alpha=alpha,
+                                            attribute_name=attribute_name,
+                                            use_cache=use_cache,
+                                            verbose=verbose,
+                                            max_read_lines=max_read_lines)
+        else:
+        
+            coordinates = self.domain.get_nodes(absolute=True)
+            triangles = self.domain.triangles      #FIXME 
+            vertex_attributes = fit_to_mesh(filename,
+                                            coordinates, triangles, 
+                                            alpha=alpha,
+                                            attribute_name=attribute_name,
+                                            use_cache=use_cache,
+                                            verbose=verbose,
+                                            max_read_lines=max_read_lines)
                                             
         # Call underlying method using array values

anuga_core/source/anuga/abstract_2d_finite_volumes/test_general_mesh.py

@@ -251 +251 @@
         self.assertEqual(nodes_absolute[2], node)
         
+        node = domain.get_node(2, absolute=True)     
+        self.assertEqual(nodes_absolute[2], node)
+        
 
 

anuga_core/source/anuga/utilities/quad.py

@@ -143 +143 @@
             point_id = int(args[1])
             x, y = self.mesh.get_node(point_id, absolute=True)
-
-            #print point_id, x, y
         elif len(args) == 3:
             x = float(args[1])
@@ -445 +443 @@
     #print mesh.coordinates
 
-    
-    nodes = mesh.get_nodes(absolute=True)
-    xmin = min(nodes[:,0])
-    xmax = max(nodes[:,0])
-    ymin = min(nodes[:,1])
-    ymax = max(nodes[:,1])
-
-    # Don't know why this didn't work
-    #xmin, xmax, ymin, ymax = mesh.get_extent(absolute=True)
+    xmin, xmax, ymin, ymax = mesh.get_extent(absolute=True)
     
     # Ensure boundary points are fully contained in region
@@ -473 +463 @@
     
     #FIXME: Use mesh.filename if it exists
+    # why?
     root = Cell(ymin, ymax, xmin, xmax,mesh,
-                #name = .... 
                 max_points_per_cell = max_points_per_cell)