Changeset 4796

Timestamp:

Nov 5, 2007, 6:01:22 PM (16 years ago)

Author:

ole

Message:

Disabled faulty test in Advection and also commented the logging info out. Ended up excluding it altogether. If anyone think we need advection, see ticket:205, and revive it.

Location:

anuga_core

Files:

• source/anuga/advection/advection.py (modified) (2 diffs)
• source/anuga/advection/test_advection.py (modified) (3 diffs)
• source/anuga/test_all.py (modified) (1 diff)
• test_all.py (modified) (1 diff)

anuga_core/source/anuga/advection/advection.py

@@ -20 +20 @@
 """
 
-print '************Advection module called'
-
-import logging, logging.config
-logger = logging.getLogger('advection')
-logger.setLevel(logging.WARNING)
-
-try:
-    logging.config.fileConfig('log.ini')
-except:
-    pass
+
+#import logging, logging.config
+#logger = logging.getLogger('advection')
+#logger.setLevel(logging.WARNING)
+#
+#try:
+#    logging.config.fileConfig('log.ini')
+#except:
+#    pass
 
 
@@ -331 +330 @@
         """
 
-        logger.debug('Trying to weave advection.compute_fluxes')
+        #logger.debug('Trying to weave advection.compute_fluxes')
         weave.inline(code, ['stage_edge','stage_bdry','stage_update',
                              'neighbours','neighbour_edges','normals',

anuga_core/source/anuga/advection/test_advection.py

@@ -11 +11 @@
 class Test_Advection(unittest.TestCase):
     def setUp(self):
-        print 'Running an advection test'
         pass
 
@@ -144 +143 @@
 
 
-    def test_advection_example(self):
+    def FIXME_test_advection_example(self):
         #Test that system can evolve
 
@@ -163 +162 @@
         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

anuga_core/source/anuga/test_all.py

@@ -19 +19 @@
 
 exclude_files = []
-if sys.platform != 'win32':  #Windows
-    exclude_files.append('test_advection.py') #Weave doesn't work on Linux
-    
+
+#if sys.platform != 'win32':  
+#    exclude_files.append('test_advection.py') #Weave doesn't work on Linux
+
+# Exclude test_advection on all platforms for the time being. See ticket:205
+exclude_files.append('test_advection.py') #Weave doesn't work on Linux
+
+
+# Directories that should not be searched for test files.    
 exclude_dirs = ['pypar_dist', #Special requirements
                 'props', 'wcprops', 'prop-base', 'text-base', '.svn', #Svn

anuga_core/test_all.py

@@ -6 +6 @@
 os.chdir('anuga')
     
-#Complete horrible hack to decide which branch to take (Ole)
-#try:
-#    os.stat('inundation-numpy-branch')
-#except:
-#    os.chdir('inundation')
-#else:
-#    os.chdir('inundation-numpy-branch')    
-
 print 'Changing to', os.getcwd() #This is now different from buildroot