Changeset 1358

Timestamp:

May 9, 2005, 4:36:46 PM (20 years ago)

Author:

steve

Message:

Tested view_tsh.py

Location:

inundation/ga/storm_surge

Files:

• Merimbula/run_merimbula_lake.py (modified) (5 diffs)
• pyvolution/mesh.py (modified) (2 diffs)
• pyvolution/view_tsh.py (modified) (1 diff)
• zeus/Merimbula.zpi (modified) (1 diff)
• zeus/anuga-workspace.zwi (modified) (1 diff)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/Merimbula/run_merimbula_lake.py

@@ -4 +4 @@
    Christopher Zoppou, Stephen Roberts, Ole Nielsen, Duncan Gray
    Geoscience Australia, ANU
-   
+
 Specific methods pertaining to the 2D shallow water equation
 are imported from shallow_water
@@ -33 +33 @@
 filename = 'merimbula_interpolated_bathymetry.tsh'
 filename = 'merimbula_10834_bridge_refined_bathymetry.tsh'
+filename = 'merimbula_10785_1.tsh'
 print 'Creating domain from', filename
 domain = pmesh_to_domain_instance(filename, Domain)
@@ -38 +39 @@
 
 #------------------------------------------
-# Reduction operation for get_vertex_values              
+# Reduction operation for get_vertex_values
 from util import mean
-domain.reduction = mean 
+domain.reduction = mean
 
 
@@ -69 +70 @@
 # Initial water surface elevation
 domain.set_quantity('stage', -50.0)
-    
+
 #----------------------------------------------------------
 # Decide which quantities are to be stored at each timestep
@@ -84 +85 @@
 domain.default_order = 1
 domain.smooth = True
-print domain.set_inscribed_circle()
+print domain.use_inscribed_circle
 
 #---------
 # Evolution
 t0 = time.time()
+domain.visualise = False
 yieldstep = 900
 finaltime = 588000*3
 for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
     domain.write_time()
-    
-print 'That took %.2f seconds' %(time.time()-t0)    
+
+print 'That took %.2f seconds' %(time.time()-t0)

inundation/ga/storm_surge/pyvolution/mesh.py

@@ -75 +75 @@
         N = self.number_of_elements
 
+        self.use_inscribed_circle = use_inscribed_circle
+
         #Allocate space for geometric quantities
         self.centroid_coordinates = zeros((N, 2), Float)
@@ -101 +103 @@
 
 
-            if use_inscribed_circle == False:
+            if self.use_inscribed_circle == False:
                 #OLD code. Computed radii may exceed that of an
                 #inscribed circle

inundation/ga/storm_surge/pyvolution/view_tsh.py

@@ -44 +44 @@
 
     surface =  Surface(domain, scale_z = scale_z)
-    update_bed()
+    surface.update_quantity('stage')
 
-

inundation/ga/storm_surge/zeus/Merimbula.zpi

@@ -74 +74 @@
     <ReleaseProjectReload>Off</ReleaseProjectReload>
     <file>..\merimbula\run_least_squares_merimbula.py</file>
-    <file>..\merimbula\run_merimbula.py</file>
     <file>..\merimbula\run_merimbula_lake.py</file>
-    <file>..\merimbula\run_merimbula_lake_gauges_only.py</file>
+    <file>..\merimbula\run_merimbula_lake_checkpoint.py</file>
     <folder name="Header Files" />
     <folder name="Resource Files" />

inundation/ga/storm_surge/zeus/anuga-workspace.zwi

@@ -2 +2 @@
 <workspace name="anuga-workspace">
     <mode>Debug</mode>
-    <active>pyvolution</active>
+    <active>Merimbula</active>
     <project name="Merimbula">Merimbula.zpi</project>
     <project name="parallel">parallel.zpi</project>