Changeset 3434

Timestamp:

Jul 31, 2006, 9:29:00 PM (19 years ago)

Author:

steve

Message:

Update import pypar in run_parallel_sw_merimbula_test.py

Files:

• development/cairns_2006/cairns_project.py (modified) (1 diff)
• development/cairns_2006/create_mesh.py (modified) (2 diffs)
• development/cairns_2006/run_cairns.py (modified) (1 diff)
• inundation/parallel/build_commun.py (modified) (1 diff)
• inundation/parallel/parallel_shallow_water.py (modified) (1 diff)
• inundation/parallel/print_stats.py (modified) (1 diff)
• inundation/parallel/run_parallel_sw_merimbula_test.py (modified) (4 diffs)

development/cairns_2006/cairns_project.py

@@ -3 +3 @@
 
 bathymetry_filename = 'cairns_meters.xya'
+mesh_filename = 'cairns_mesh.msh'

development/cairns_2006/create_mesh.py

@@ -7 +7 @@
 
 from pmesh.mesh import *
-from pyvolution.coordinate_transforms.geo_reference import Geo_reference
+from coordinate_transforms.geo_reference import Geo_reference
 from conversion import convert_latlon_to_xycoords
 
@@ -166 +166 @@
     m.generateMesh('pzq28.0z')
 
-    import project
+    import cairns_project as project
     m.export_mesh_file(project.mesh_filename)
     

development/cairns_2006/run_cairns.py

@@ -15 +15 @@
 from pyvolution.pmesh2domain import pmesh_to_domain_instance
 from Numeric import array, zeros, Float, allclose
-#import cairns_project
-import project
+import cairns_project as project
+#import project
 from caching import cache
 from utilities.polygon import read_polygon, Polygon_function

inundation/parallel/build_commun.py

@@ -29 +29 @@
 import sys
 
-from pypar_dist import pypar
-#import pypar
+import pypar
 
 from build_local import build_local_mesh

inundation/parallel/parallel_shallow_water.py

@@ -30 +30 @@
 from Numeric import zeros, Float, Int, ones, allclose, array
 
-from pypar_dist import pypar
+import pypar
 
 

inundation/parallel/print_stats.py

@@ -19 +19 @@
 import sys
 
-from pypar_dist import pypar
+import pypar
 
 from Numeric import array, Int8, zeros, ones, take, nonzero, Float

inundation/parallel/run_parallel_sw_merimbula_test.py

@@ -36 +36 @@
 #########################################################
 import sys
-from pypar_dist import pypar    # The Python-MPI interface
+import pypar    # The Python-MPI interface
 import time
 
@@ -180 +180 @@
 
 try:
-    domain.initialise_visualiser(rect=rect)
+    #domain.initialise_visualiser(rect=rect)
     #domain.visualiser.coloring['stage'] = True
-    domain.visualiser.scale_z['stage'] = 0.2
-    domain.visualiser.scale_z['elevation'] = 0.05
+    #domain.visualiser.scale_z['stage'] = 0.2
+    #domain.visualiser.scale_z['elevation'] = 0.05
+    pass
 except:
     print 'No visualiser'
+
 
 
@@ -213 +215 @@
 
 yieldstep = 1
-finaltime = 90
+finaltime = None
 
 #yieldstep = 1
@@ -231 +233 @@
 #result.dump_stats("profile." + str(numprocs) + "." + str(myid) + ".dat")
 
-#New hotshot profiling
-import hotshot
-profiler = hotshot.Profile("hotshot." + str(numprocs) + "." + str(myid) + ".prof")
-s = '''for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
-  if myid == 0:
-    domain.write_time()
-  print_test_stats(domain, tri_full_flag)
-
-'''
-result = profiler.runctx(s, globals(), locals())
-profiler.close()
+## #New hotshot profiling
+## import hotshot
+## profiler = hotshot.Profile("hotshot." + str(numprocs) + "." + str(myid) + ".prof")
+## s = '''for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
+##   if myid == 0:
+##     domain.write_time()
+##   print_test_stats(domain, tri_full_flag)
+
+## '''
+## result = profiler.runctx(s, globals(), locals())
+## profiler.close()
+
+from vtk_realtime_visualiser import Visualiser
+V = Visualiser(domain,default_scale_z=100.0)
+V.coloring['stage'] = True
+V.coloring['elevation'] = False
+V.setup['elevation']=True
+V.updating['stage']=True
+V.qcolor['stage'] = (0.1,0.4,0.99)
+
+
+V.start()
+V.idle.wait()
+V.idle.clear()
+
+
+
+
+
+for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
+    if myid == 0:
+        domain.write_time()
+        #print_test_stats(domain, tri_full_flag)
+
+    V.redraw_ready.set()
+    V.idle.wait()
+    V.idle.clear()
+    V.unpaused.wait()
+
 
 #print 'P%d: That took %.2f seconds' %(myid, time.time()-t0)