Changeset 577

Timestamp:

Nov 17, 2004, 2:08:55 PM (20 years ago)

Author:

ole

Message:

Got contracting channel to work

Location:

inundation/ga/storm_surge/analytical solutions

Files:

• Analytical_solution_contracting_channel_import_mesh.py (modified) (3 diffs)
• converging_channel_30846.tsh (modified) (1 diff)

inundation/ga/storm_surge/analytical solutions/Analytical_solution_contracting_channel_import_mesh.py

@@ -18 +18 @@
 """
 
-######################
+#-----------------------------
 # Module imports 
-#
-
 import sys
 from os import sep
@@ -28 +26 @@
 from shallow_water import Transmissive_boundary, Reflective_boundary, \
      Dirichlet_boundary
-from shallow_water import Constant_height
-from domain import rectangular_domain, Domain, Volume
+from shallow_water import Constant_height, Domain
+from pmesh2domain import pmesh_to_domain_instance
 
-import visualise2 as visualise
-from Numeric import array
-from config import data_dir
 
-import os, sys
-usage = "usage: %s pmesh_file_name" %         os.path.basename(sys.argv[0])
-pmesh_file_name = "C:/Storm-Surge/analytical solutions/converging_channel_30846.tsh"
-
-tags = {}
-tags['upstream'] = Dirichlet_boundary(conserved_quantities = array([0.2, 1.2, 0.0]))
-tags['reflective'] = Reflective_boundary () 
-tags['transmissive'] = Transmissive_boundary ()
-
-######################
-# Domain and Boundary Condition
-#
-print "pmesh_file_name ", pmesh_file_name
-domain = Domain.pmesh_to_domain(pmesh_file_name, tags = tags)
+#------------------------------
+# Domain 
+filename = 'converging_channel_30846.tsh'
+print 'Creating domain from', filename
+domain = pmesh_to_domain_instance(filename, Domain)
+print 'Number of triangles = ', len(domain)
 
 domain.default_order = 2
@@ -54 +41 @@
 
 # Provide file name for storing output
-domain.filename="contracting_channel_second-order"
-
-print "Number of triangles = ", len(Volume.instances)
-
-domain.visualise = False
-domain.checkpoint = False #
-domain.store = True    #Store for visualisation purposes
+domain.store = True     #Store for visualisation purposes
 domain.format = 'sww'   #Native netcdf visualisation format
+domain.filename = 'contracting_channel_second-order'
 
 #Reduction operation for get_vertex_values              
-from pytools.stats import mean
+from util import mean
 domain.reduction = mean 
-#domain.reduction = min  #Looks better near steep slopes
 
-######################
+#------------------------------
+# Boundary Conditions
+tags = {}
+tags['upstream'] = Dirichlet_boundary([0.2, 1.2, 0.0])
+tags['reflective'] = Reflective_boundary(domain) 
+tags['transmissive'] = Transmissive_boundary(domain)
+domain.set_boundary(tags)
+
+#-----------------
 #Initial condition
-#
-print 'Initial condition'
-h = 0.2
+domain.set_quantity('elevation', 0.0)
+domain.set_quantity('level', 0.2)
+    
 
-#Bed-slope and friction
-def x_slope(x, y):
-    return 0*x
-
-domain.set_conserved_quantities(Constant_height(x_slope, h), None, None)
-    
-######################
-#Visualisation
-if domain.visualise:
-    visualise.create_surface(domain)
-  
-
-######################
+#-----------------
 #Evolution
-
 import time
 t0 = time.time()
-for t in domain.evolve(max_timestep = 0.1, yieldstep = 1.0, finaltime = 5):
+for t in domain.evolve(yieldstep = 0.1, finaltime = 5):
     domain.write_time()
-
-# Remove the following if Visual Python not required       
-    if domain.visualise:  
-        visualise.update(domain, index=0, smooth=True)
     
 print 'That took %.2f seconds' %(time.time()-t0)

inundation/ga/storm_surge/analytical solutions/converging_channel_30846.tsh

@@ -15844 +15844 @@
 15842 37.3882238461 2.92152822116 
 15843 39.9375 1.28837309717 
-15844 19.8782375705 1.68085158197 
+15844 19.8782375705 1.68085158197
+# vet att titles 
 30846 # <triangle #> [<vertex #>] [<neigbouring triangle #>] [attribute of region] ...Triangulation Triangles...
 0 12827 12825 3849 1394 24955 1395