Changeset 851 for inundation/ga/storm_surge/pyvolution/test_shallow_water.py

Timestamp:

Feb 8, 2005, 7:07:56 PM (20 years ago)

Author:

ole

Message:

First cut at a spatio-temporal boundary.
Need to improve the test, though.

File:

• inundation/ga/storm_surge/pyvolution/test_shallow_water.py (modified) (4 diffs)

inundation/ga/storm_surge/pyvolution/test_shallow_water.py

@@ -2415 +2415 @@
         Bd = Dirichlet_boundary([0.3,0,0])      
         Bt = Transmissive_boundary(domain1)
-        domain1.set_boundary({'left': Bd, 'right': Bt, 'top': Br, 'bottom': Br})
+        domain1.set_boundary({'left': Bd, 'right': Br, 'top': Br, 'bottom': Br})
 
         #Initial condition
@@ -2452 +2452 @@
         domain2.reduction = domain1.reduction
         domain2.smooth = False
-        domain2.visualise = True
+        domain2.visualise = False
         domain2.default_order = 2
         
@@ -2465 +2465 @@
         
 
-        #FIXME: Continue from here!!!!!!!
-        return  
-                
         Bf = Spatio_temporal_boundary(domain1.filename + '.' + domain1.format,
                                       domain2)
-        domain2.set_boundary({'right':Bt, 'bottom':Br, 'diagonal':Bf})
+        domain2.set_boundary({'right':Br, 'bottom':Br, 'diagonal':Bf})
 
         #Initial condition 
@@ -2486 +2483 @@
         cv2 = domain2.quantities['stage'].centroid_values
         
-        print take(cv1, (12,14,16))  #Right
-        print take(cv2, (4,6,8))
-        
+        #print take(cv1, (12,14,16))  #Right
+        #print take(cv2, (4,6,8))
         #print take(cv1, (0,6,12))  #Bottom     
-        
-        assert allclose( take(cv1, (12,14,16)), take(cv2, (4,6,8))) #RHS
-        assert allclose( take(cv1, (0,6,12)), take(cv2, (0,1,4))) #Bottom       
+        #print take(cv2, (0,1,4))
+        #print take(cv1, (0,8,16))  #Diag       
+        #print take(cv2, (0,3,8))       
+        #assert allclose( take(cv1, (12,14,16)), take(cv2, (4,6,8))) #RHS
+        #assert allclose( take(cv1, (0,6,12)), take(cv2, (0,1,4))) #Bottom      
         
         #Cleanup
-        os.remove(domain1.filename + '.' + domain1.format)
-    
+        try:
+            os.remove(domain1.filename + '.' + domain1.format)
+        except:
+            pass
+             
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(TestCase,'test')
-    suite = unittest.makeSuite(TestCase,'test_spatio_temporal_boundary')
+    suite = unittest.makeSuite(TestCase,'test')
+    #suite = unittest.makeSuite(TestCase,'test_spatio_temporal_boundary')
     runner = unittest.TextTestRunner()
     runner.run(suite)