Changeset 2400

Timestamp:

Feb 14, 2006, 3:21:23 PM (18 years ago)

Author:

sexton

Message:

tidying up script

File:

• production/sydney_2006/run_sydney_smf.py (modified) (3 diffs)

production/sydney_2006/run_sydney_smf.py

@@ -89 +89 @@
             verbose = True)
 
-#Add elevation data to the mesh - this is in place of set_quantity
-#mesh_elevname = 'elevation.msh'   
-#cache(fit_to_mesh_file,(meshname, project.combineddemname + '.pts',
-#                        mesh_elevname, DEFAULT_ALPHA),
-#      {'verbose': True, 'expand_search': True, 'precrop': True},
-#      dependencies = [meshname],
-#      #evaluate = True,   
-#      verbose = False)
-#meshname = mesh_elevname
-
 # Setup domain
 domain = cache(pmesh_to_domain_instance, (meshname, Domain),
@@ -104 +94 @@
                verbose = True)
 
-# This section replaced with fit_to_mesh_file above
+# Bring in elevation data
 domain.set_quantity('elevation',
                      filename = project.combineddemname + '.pts',
-#                     filename = project.finedemname + '.pts',
                      use_cache = True,
                      verbose = True)
-
-          
-        
+  
 print 'Number of triangles = ', len(domain)
 print 'The extent is ', domain.get_extent()
@@ -121 +108 @@
 domain.quantities_to_be_stored = ['stage', 'xmomentum', 'ymomentum']
 
-# slump parameters, wid=len
-len = 30000.0
-dep = 400.0
-#thk = 120.0 for scenario 1 and 176 for scenario 2 rang 0.2-0.44 of depth
-thk = 0.44*dep 
-rad = 3330
-dp = 0.23
-th = 6
-alpha = 0.0
-#x0 = project.x0 # slump origin
-#y0 = project.y0
-
-xllcorner = domain.geo_reference.get_xllcorner()
-yllcorner = domain.geo_reference.get_yllcorner()
-
-x0 = project.slump_origin[0] - xllcorner  # slump origin (relative)
-y0 = project.slump_origin[1] - yllcorner
-
 # Setup Initial conditions
-t = slump_tsunami(length=len, depth=dep, slope=th, thickness=thk, \
-                  radius=rad, dphi=dp, x0=x0, y0=y0, alpha=alpha)
+t = slump_tsunami(length=30000.0,
+                  depth=400.0,
+                  slope=6.0,
+                  thickness=176.0, 
+                  radius=3330,
+                  dphi=0.23,
+                  x0=project.slump_origin[0], 
+                  y0=project.slump_origin[1], 
+                  alpha=0.0, 
+                  domain=domain)
 domain.set_quantity('stage', t)
 domain.set_quantity('friction', 0)