Changeset 6195


Ignore:
Timestamp:
Jan 19, 2009, 8:51:11 AM (10 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:
5 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

    r6191 r6195  
    3737        msg += 'must be of class Domain (or a subclass thereof). '
    3838        msg += 'I got %s.' %str(domain.__class__)
    39         # FIXME(Ole): Why doesn't this work now?
    40         #assert isinstance(domain, Domain), msg
     39        assert isinstance(domain, Domain), msg
    4140
    4241        if vertex_values is None:
  • anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py

    r6174 r6195  
    44from math import sqrt
    55
    6 from domain import *
     6from anuga.abstract_2d_finite_volumes.domain import *
    77from anuga.config import epsilon
    88
     
    795795if __name__ == "__main__":
    796796    suite = unittest.makeSuite(Test_Domain,'test')
    797     #suite = unittest.makeSuite(Test_Domain,'test_track_speeds')
    798797    runner = unittest.TextTestRunner()
    799798    runner.run(suite)
  • anuga_core/source/anuga/abstract_2d_finite_volumes/test_generic_boundary_conditions.py

    r6145 r6195  
    55
    66from generic_boundary_conditions import *
     7from anuga.abstract_2d_finite_volumes.domain import Domain
    78from anuga.config import epsilon
    89
     
    4950
    5051    def test_transmissive(self):
    51         from domain import Domain
    5252        from quantity import Quantity
    5353
     
    114114        # to catch possible errors in the model setup
    115115       
    116         from domain import Domain
    117116        from quantity import Quantity
    118117        import time, os
     
    208207        """
    209208
    210         from domain import Domain
    211209        from quantity import Quantity
    212210        import time, os
  • anuga_core/source/anuga/abstract_2d_finite_volumes/test_ghost.py

    r6145 r6195  
    44from math import sqrt
    55
    6 from domain import *
     6from anuga.abstract_2d_finite_volumes.domain import *
    77from anuga.config import epsilon
    88
  • anuga_core/source/anuga/abstract_2d_finite_volumes/test_quantity.py

    r6191 r6195  
    1010from anuga.fit_interpolate.fit import fit_to_mesh
    1111#from anuga.pyvolution.least_squares import fit_to_mesh         
    12 from domain import Domain
     12from anuga.abstract_2d_finite_volumes.domain import Domain
    1313from anuga.geospatial_data.geospatial_data import Geospatial_data
    1414from anuga.coordinate_transforms.geo_reference import Geo_reference
     
    2626class Test_Quantity(unittest.TestCase):
    2727    def setUp(self):
    28         from domain import Domain
    2928
    3029        a = [0.0, 0.0]
     
    4241        self.mesh1 = Domain(points[:3], [elements[0]])
    4342        self.mesh1.check_integrity()
     43       
     44        #print self.mesh1.__class__
     45        #print isinstance(self.mesh1, Domain)
    4446
    4547        self.mesh4 = Domain(points, elements)
Note: See TracChangeset for help on using the changeset viewer.