Changeset 4794

Timestamp:

Nov 5, 2007, 5:28:09 PM (16 years ago)

Author:

ole

Message:

Added some print out statements in advection.py to see if it is being called at all by the tests.

Location:

anuga_core/source/anuga

Files:

• advection/advection.py (modified) (3 diffs)
• advection/test_advection.py (modified) (5 diffs)
• test_all.py (modified) (1 diff)

anuga_core/source/anuga/advection/advection.py

@@ -1 @@
-import sys
-from os import sep
-
 """Class Domain -
 2D triangular domains for finite-volume computations of
@@ -23 +20 @@
 """
 
+print '************Advection module called'
 
 import logging, logging.config
@@ -35 +33 @@
 
 from anuga.abstract_2d_finite_volumes.domain import *
-Generic_domain = Domain #Rename
+Generic_domain = Domain # Rename
 
 class Domain(Generic_domain):

anuga_core/source/anuga/advection/test_advection.py

@@ -1 +1 @@
 import sys
 from os import sep
-sys.path.append('..'+sep+'pyvolution')
 
 import unittest
@@ -8 +7 @@
 from anuga.config import g, epsilon
 from Numeric import allclose, array, zeros, ones, Float
-from anuga.advection.advection import *
+from anuga.advection.advection import Domain, Transmissive_boundary, Dirichlet_boundary
 
 class Test_Advection(unittest.TestCase):
     def setUp(self):
+        print 'Running an advection test'
         pass
 
@@ -147 +147 @@
         #Test that system can evolve
 
-        from mesh_factory import rectangular
+        from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular
 
         points, vertices, boundary = rectangular(6, 6)
@@ -163 +163 @@
         domain.check_integrity()
 
+        print 'Advection domain evolving'
         #Check that the boundary value gets propagated to all elements
         for t in domain.evolve(yieldstep = 0.05, finaltime = 10):
+            domain.write_time()
             if allclose(domain.quantities['stage'].centroid_values, 3.1415):
                 break
@@ -173 +175 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Advection,'test')
+    suite = unittest.makeSuite(Test_Advection, 'test')
     runner = unittest.TextTestRunner()
     runner.run(suite)

anuga_core/source/anuga/test_all.py

@@ -21 +21 @@
 if sys.platform != 'win32':  #Windows
     exclude_files.append('test_advection.py') #Weave doesn't work on Linux
-
+    
 exclude_dirs = ['pypar_dist', #Special requirements
                 'props', 'wcprops', 'prop-base', 'text-base', '.svn', #Svn