Changeset 7509

Timestamp:

Sep 11, 2009, 4:04:14 PM (14 years ago)

Author:

ole

Message:

Fiddled with ticket:223 and discovered problem with Nans and 'filler'
Test is disabled again.

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (4 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -3560 +3560 @@
     give a different final boundary, or crash.
     """
-
+    
     from Scientific.IO.NetCDF import NetCDFFile
     from shallow_water import Domain
@@ -3644 +3644 @@
         coordinates, volumes, boundary = weed(coordinates, volumes,boundary)
 
+      
+    
     try:
         domain = Domain(coordinates, volumes, boundary)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -3716 +3716 @@
         ##################################################################
 
+        #FIXME: See ticket 223
 
         from mesh_factory import rectangular
@@ -3762 +3763 @@
         filename = domain.datadir + os.sep + domain.get_name() + '.sww'
 
-        #Fail because NaNs are present
+        # Fail because NaNs are present
+        #domain2 = sww2domain(filename,
+        #                     boundary,
+        #                     fail_if_NaN=True,
+        #                     verbose=self.verbose)        
         try:
-            domain2 = sww2domain(filename,boundary,fail_if_NaN=True,verbose=self.verbose)
-        except:
-            #Now import it, filling NaNs to be 0
-            filler = 0
-            domain2 = sww2domain(filename,None,fail_if_NaN=False,NaN_filler = filler,verbose=self.verbose)
-
-        #Clean up
+            domain2 = sww2domain(filename,
+                                 boundary,
+                                 fail_if_NaN=True,
+                                 verbose=self.verbose)
+        except DataDomainError:
+            # Now import it, filling NaNs to be -9999
+            filler = -9999
+            domain2 = sww2domain(filename,
+                                 None,
+                                 fail_if_NaN=False,
+                                 NaN_filler=filler,
+                                 verbose=self.verbose)
+        else:
+            raise Exception, 'should have failed'
+
+            
+        # Now import it, filling NaNs to be 0
+        filler = -9999
+        domain2 = sww2domain(filename,
+                             None,
+                             fail_if_NaN=False,
+                             NaN_filler=filler,
+                             verbose=self.verbose)            
+                             
+        import sys; sys.exit() 
+            
+        # Clean up
         os.remove(filename)
 
@@ -3786 +3811 @@
             assert num.allclose(eval('domain.'+bit),eval('domain2.'+bit))
 
-        #print filler
-        #print max(max(domain2.get_quantity('xmomentum').get_values()))
+        print 
+        print
+        print domain2.get_quantity('xmomentum').get_values()
+        print
+        print domain2.get_quantity('stage').get_values()
+        print
+             
+        print 'filler', filler
+        print max(domain2.get_quantity('xmomentum').get_values().flat)
         
         assert max(max(domain2.get_quantity('xmomentum').get_values()))==filler
@@ -11679 +11711 @@
 
 if __name__ == "__main__":
+    #suite = unittest.makeSuite(Test_Data_Manager, 'test_sww2domain2')
     suite = unittest.makeSuite(Test_Data_Manager, 'test')
+