Changeset 5154

Timestamp:

Mar 11, 2008, 10:13:40 AM (17 years ago)

Author:

duncan

Message:

commiting most recent dir

Location:

anuga_work/development/near_shore_PMD

Files:

• create_mesh.py (modified) (4 diffs)
• run_beach.py (modified) (6 diffs)

anuga_work/development/near_shore_PMD/create_mesh.py

@@ -3 +3 @@
 
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
-
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 
 xslope = 5.0 # Distance between the boundary ande the start of the slope
@@ -13 +13 @@
     # Basic geometry and bounding polygon
     xleft   = -100  # Beach
+    xleft   = 8000  # looking at the first 2 km of wave travel
     xright  = 10000  # wave generated here
     if thinner:
-        ytop    = 1000
-        ybottom = -1000
+        ytop    = 500
+        ybottom = -500
     else:
         ytop    = 2000
@@ -36 +37 @@
     xright  = 2000
     if thinner:
-        ytop    = 900
-        ybottom = -900
+        ytop    = 450
+        ybottom = -450
     else:
         ytop    = 1000
@@ -58 +59 @@
                                                 'wave': [0]},     
                                  maximum_triangle_area=maximum_triangle_area,
-                                 interior_regions=interior_regions,
+                                 #interior_regions=interior_regions,
+                                 mesh_geo_reference=Geo_reference(),
                                  filename=mesh_filename,
                                  verbose=True)

anuga_work/development/near_shore_PMD/run_beach.py

@@ -51 +51 @@
             # swash
             z[i] = -0.05*x[i] 
+            #z[i] = -30
         elif x[i] <= 1000:
             # surf
             z[i] = -0.15*(x[i]**(0.5))
+            #z[i] = -30
         else:
             # Nominal shoreface
             z[i] = -0.01888*(x[i]**(0.8))
+            #z[i] = -30
             #>>> -0.15*(1000**0.5)
             #-4.7434164902525691
@@ -71 +74 @@
     if is_trial_run is True:
         outputdir_name += '_test'
-        yieldstep = 10
-        finaltime = 1200.
+        yieldstep = 1
+        finaltime = 100.
         maximum_triangle_area=3000
         thinner=True
     else:
-        yieldstep = 5.
-        finaltime = 1200
-        maximum_triangle_area=50
+        yieldstep = 1.
+        finaltime = 1600
+        finaltime = 100
+        maximum_triangle_area = 100
         thinner=True
         
@@ -93 +97 @@
           pro_instance.outputdir + 'create_mesh.py')
     
+    #mesh_filename = pro_instance.meshdir + basename + '.tsh'
     mesh_filename = pro_instance.meshdir + basename + '.msh'
 
@@ -131 +136 @@
     domain.set_name(basename)
     domain.set_datadir(pro_instance.outputdir)
+    domain.set_default_order(2) # Use second order spatial scheme
     domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
     domain.set_minimum_storable_height(0.001)
@@ -152 +158 @@
     Bd = Dirichlet_boundary([10.,0,0])
     Bwp = Transmissive_Momentum_Set_Stage_boundary(domain,
-                   lambda t: [(1.2*sin(2*t*pi/10)), 0.0, 0.0])
+                   lambda t: [(1.2*sin(2*t*pi/10)), 0.0 ,0.0])
+    Bwp_velocity = Time_boundary(domain,
+                   lambda t: [(1.2*sin(2*t*pi/10)),
+                              0.24*sin(2*t*pi/10),0.0])
     Bws = Transmissive_Momentum_Set_Stage_boundary(domain,
                    lambda t: [1.2*sin(2*t*pi/10)+1.0*sin(2*t*pi/9.5),
                               0.0, 0.0])
-    domain.set_boundary( {'wall': Br, 'wave': Bws} )
+    domain.set_boundary( {'wall': Br, 'wave': Bwp_velocity} )
 
     #-------------------------------------------------------------------------
@@ -193 +202 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    main( is_trial_run = False,
-         outputdir_name='Primary_wave_thin_50')
+    main( is_trial_run = False, friction=0.0,
+         outputdir_name='Velocity_wave_thinner_100_0_friction_ft1600_2nd_order')