Changeset 5958 for anuga_core/source/anuga/shallow_water/test_data_manager.py

Timestamp:

Nov 17, 2008, 9:58:04 AM (16 years ago)

Author:

jakeman

Message:

John Jakeman added a Time varying boundary unit test to test urs methodology

File:

• anuga_core/source/anuga/shallow_water/test_data_manager.py (modified) (7 diffs)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -8769 +8769 @@
 
         
-    def Xtest_file_boundary_stsIV_sinewave_ordering(self):
+    def test_file_boundary_stsIV_sinewave_ordering(self):
         """test_file_boundary_stsIV_sinewave_ordering(self):
         Read correct points from ordering file and apply sts to boundary
@@ -8782 +8782 @@
         from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
+        from numpy import sin,cos
+
         lat_long_points=[[6.01,97.0],[6.02,97.0],[6.05,96.9],[6.0,97.0]]
         bounding_polygon=[[6.0,97.0],[6.01,97.0],[6.02,97.0],[6.02,97.02],[6.00,97.02]]
         tide = 0.35
         time_step_count = 50
-        time_step = 2
+        time_step = 0.1
+        times_ref = arange(0, time_step_count*time_step, time_step)
         
         n=len(lat_long_points)
@@ -8793 +8796 @@
         
         gauge_depth=20*ones(n,Float)
-        ha1[1]=2*sin(times_ref - 3)
-        ua=0.0*ones((n,time_step_count),Float)
-        va=0.0*ones((n,time_step_count),Float)
+        
+        ha1=ones((n,time_step_count),Float)
+        ua1=3.*ones((n,time_step_count),Float)
+        va1=2.*ones((n,time_step_count),Float)
+        for i in range(n):
+            ha1[i]=sin(times_ref)
         
         
@@ -8802 +8808 @@
                                            first_tstep, last_tstep,
                                            depth=gauge_depth,
-                                           ha=ha,
-                                           ua=ua,
-                                           va=va)
+                                           ha=ha1,
+                                           ua=ua1,
+                                           va=va1)
 
         # Write order file
@@ -8916 +8922 @@
     
         
-        domain_drchlt = Domain(meshname)
-        domain_drchlt.set_quantity('stage', tide)
-        Br = Reflective_boundary(domain_drchlt)
-        w = 2.0+tide
-        h = 20+w
-        Bd = Dirichlet_boundary([w, 10*h,-10*h])
-        domain_drchlt.set_boundary({'ocean': Bd,'otherocean': Br})
-        
-        temp_drchlt=zeros(int(finaltime/yieldstep)+1,Float)
-        
-        for i, t in enumerate(domain_drchlt.evolve(yieldstep=yieldstep,finaltime=finaltime, 
+        domain_time = Domain(meshname)
+        domain_time.set_quantity('stage', tide)
+        Br = Reflective_boundary(domain_time)
+        Bw=Time_boundary(domain=domain_time,
+                         f=lambda t: [sin(t)+tide,3.*(20.+sin(t)+tide),2.*(20.+sin(t)+tide)])
+        domain_time.set_boundary({'ocean': Bw,'otherocean': Br})
+        
+        temp_time=zeros(int(finaltime/yieldstep)+1,Float)
+        for i, t in enumerate(domain_time.evolve(yieldstep=yieldstep,
+                                                   finaltime=finaltime, 
                                                    skip_initial_step=False)):
-            temp_drchlt[i]=domain_drchlt.quantities['stage'].centroid_values[2]
-
-
-
-        print temp_fbound
-        print temp_drchlt
-
-        print domain_fbound.quantities['stage'].vertex_values
-        print domain_drchlt.quantities['stage'].vertex_values
-        
-        assert allclose(temp_fbound, temp_drchlt)                
+            temp_time[i]=domain_time.quantities['stage'].centroid_values[2]
+
+
+
+        #print temp_fbound
+        #print temp_time
+
+        #print domain_fbound.quantities['stage'].vertex_values
+        #print domain_time.quantities['stage'].vertex_values
+        
+        assert allclose(temp_fbound, temp_time)                
         assert allclose(domain_fbound.quantities['stage'].vertex_values,
-                        domain_drchlt.quantities['stage'].vertex_values)
+                        domain_time.quantities['stage'].vertex_values)
                         
         assert allclose(domain_fbound.quantities['xmomentum'].vertex_values,
-                        domain_drchlt.quantities['xmomentum'].vertex_values)                        
+                        domain_time.quantities['xmomentum'].vertex_values)                        
                         
         assert allclose(domain_fbound.quantities['ymomentum'].vertex_values,
-                        domain_drchlt.quantities['ymomentum'].vertex_values)                                                
+                        domain_time.quantities['ymomentum'].vertex_values)                                                
         
 
@@ -10933 +10938 @@
 if __name__ == "__main__":
 
-    #suite = unittest.makeSuite(Test_Data_Manager,'test')
+    suite = unittest.makeSuite(Test_Data_Manager,'test')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_stsI_beyond_model_time')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_stsIV_sinewave_ordering')
@@ -10942 +10947 @@
 
     # FIXME (Ole): This is the test that fails under Windows
-    suite = unittest.makeSuite(Test_Data_Manager,'test_read_mux_platform_problem2')     
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_read_mux_platform_problem2')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_stsIV')