Changeset 7780 for trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py

Timestamp:

Jun 5, 2010, 10:58:55 AM (14 years ago)

Author:

hudson

Message:

Almost all failing tests fixed.

File:

• trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py

@@ -886 +886 @@
 
 
-    def test_that_mesh_methods_exist(self):
-        """test_that_mesh_methods_exist
-        
-        Test that relavent mesh methods are made available in 
-        domain through composition
-        """
-        from mesh_factory import rectangular
-        from shallow_water import Domain
-
-        # Create basic mesh
-        points, vertices, boundary = rectangular(1, 3)
-
-        # Create shallow water domain
-        domain = Domain(points, vertices, boundary)                             
-        
-        
-        domain.get_centroid_coordinates()
-        domain.get_radii()
-        domain.get_areas()
-        domain.get_area()
-        domain.get_vertex_coordinates()
-        domain.get_triangles()
-        domain.get_nodes()
-        domain.get_number_of_nodes()
-        domain.get_normal(0,0)
-        domain.get_triangle_containing_point([0.4,0.5])
-        domain.get_intersecting_segments([[0.0, 0.0], [0.0, 1.0]])
-        domain.get_disconnected_triangles()
-        domain.get_boundary_tags()
-        domain.get_boundary_polygon()
-        #domain.get_number_of_triangles_per_node()
-        domain.get_triangles_and_vertices_per_node()
-        domain.get_interpolation_object()
-        domain.get_tagged_elements()
-        domain.get_lone_vertices()
-        domain.get_unique_vertices()
-        g = domain.get_georeference()
-        domain.set_georeference(g)
-        domain.build_tagged_elements_dictionary()
-        domain.statistics()
-        domain.get_extent()
-
-    def NOtest_vertex_within_hole(self):
-        """ NOTE: This test fails - it is designed to test fitting on
-            a mesh with a hole, but more info is needed on the specific
-            problem."""
-        
-        # For test_fitting_using_shallow_water_domain example
-        def linear_function(point):
-            point = num.array(point)
-            return point[:,0]+point[:,1]        
-        
-        meshname = 'test_mesh.msh'
-        verbose = False
-        W = 0
-        S = 0
-        E = 10
-        N = 10
-
-        bounding_polygon = [[W, S], [E, S], [E, N], [W, N]]
-        hole = [[[.1,.1], [9.9,1.1], [9.9,9.9], [1.1,9.9]]]
-
-        create_mesh_from_regions(bounding_polygon,
-                                 boundary_tags={'south': [0], 
-                                                'east': [1], 
-                                                'north': [2], 
-                                                'west': [3]},
-                                 maximum_triangle_area=1,
-                                 filename=meshname,
-                                 interior_holes = hole,
-                                 use_cache=False,
-                                 verbose=verbose)
-
-        domain = Domain(meshname, use_cache=False, verbose=verbose)
-        quantity = Quantity(domain)
-        
-         # Get (enough) datapoints (relative to georef)
-        data_points     = [[ 0.66666667, 0.66666667],
-                           [ 1.33333333, 1.33333333],
-                           [ 2.66666667, 0.66666667],
-                           [ 0.66666667, 2.66666667],
-                           [ 0.0,        1.0],
-                           [ 0.0,        3.0],
-                           [ 1.0,        0.0],
-                           [ 1.0,        1.0],
-                           [ 1.0,        2.0],
-                           [ 1.0,        3.0],
-                           [ 2.0,        1.0],
-                           [ 3.0,        0.0],
-                           [ 3.0,        1.0]]
-
-
-        attributes = linear_function(data_points)
-        att = 'spam_and_eggs'
-
-        # Create .txt file
-        ptsfile = "points.txt"
-        file = open(ptsfile, "w")
-        file.write(" x,y," + att + " \n")
-        for data_point, attribute in map(None, data_points, attributes):
-            row = (str(data_point[0]) + ',' +
-                   str(data_point[1]) + ',' +
-                   str(attribute))
-            file.write(row + "\n")
-        file.close()
-
-        # Check that values can be set from file
-        quantity.set_values(filename=ptsfile, attribute_name=att, alpha=0)
-        answer = linear_function(quantity.domain.get_vertex_coordinates())
-
-        assert num.allclose(quantity.vertex_values.flat, answer)
-
-        # Check that values can be set from file using default attribute
-        quantity.set_values(filename = ptsfile, alpha = 0)
-        assert num.allclose(quantity.vertex_values.flat, answer)       
-        
-        
-
 #-------------------------------------------------------------