Changeset 6195

Timestamp:

Jan 19, 2009, 8:51:11 AM (16 years ago)

Author:

ole

Message:

Reinstated test for subclassing of Domain in quantity.
All tests pass.

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• quantity.py (modified) (1 diff)
• test_domain.py (modified) (2 diffs)
• test_generic_boundary_conditions.py (modified) (4 diffs)
• test_ghost.py (modified) (1 diff)
• test_quantity.py (modified) (3 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -37 +37 @@
         msg += 'must be of class Domain (or a subclass thereof). '
         msg += 'I got %s.' %str(domain.__class__)
-        # FIXME(Ole): Why doesn't this work now?
-        #assert isinstance(domain, Domain), msg
+        assert isinstance(domain, Domain), msg
 
         if vertex_values is None:

anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py

@@ -4 +4 @@
 from math import sqrt
 
-from domain import *
+from anuga.abstract_2d_finite_volumes.domain import *
 from anuga.config import epsilon
 
@@ -795 +795 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_Domain,'test')
-    #suite = unittest.makeSuite(Test_Domain,'test_track_speeds')
     runner = unittest.TextTestRunner()
     runner.run(suite)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_generic_boundary_conditions.py

@@ -5 +5 @@
 
 from generic_boundary_conditions import *
+from anuga.abstract_2d_finite_volumes.domain import Domain
 from anuga.config import epsilon
 
@@ -49 +50 @@
 
     def test_transmissive(self):
-        from domain import Domain
         from quantity import Quantity
 
@@ -114 +114 @@
         # to catch possible errors in the model setup
         
-        from domain import Domain
         from quantity import Quantity
         import time, os
@@ -208 +207 @@
         """
 
-        from domain import Domain
         from quantity import Quantity
         import time, os

anuga_core/source/anuga/abstract_2d_finite_volumes/test_ghost.py

@@ -4 +4 @@
 from math import sqrt
 
-from domain import *
+from anuga.abstract_2d_finite_volumes.domain import *
 from anuga.config import epsilon
 

anuga_core/source/anuga/abstract_2d_finite_volumes/test_quantity.py

@@ -10 +10 @@
 from anuga.fit_interpolate.fit import fit_to_mesh
 #from anuga.pyvolution.least_squares import fit_to_mesh         
-from domain import Domain
+from anuga.abstract_2d_finite_volumes.domain import Domain
 from anuga.geospatial_data.geospatial_data import Geospatial_data
 from anuga.coordinate_transforms.geo_reference import Geo_reference
@@ -26 +26 @@
 class Test_Quantity(unittest.TestCase):
     def setUp(self):
-        from domain import Domain
 
         a = [0.0, 0.0]
@@ -42 +41 @@
         self.mesh1 = Domain(points[:3], [elements[0]])
         self.mesh1.check_integrity()
+        
+        #print self.mesh1.__class__
+        #print isinstance(self.mesh1, Domain)
 
         self.mesh4 = Domain(points, elements)