Changeset 8821 for trunk/anuga_core/demos/cairns

Timestamp:

Apr 9, 2013, 4:17:11 PM (12 years ago)

Author:

steve

Message:

Speed up of dem2pts via conversion to numpy

Location:

trunk/anuga_core/demos/cairns

Files:

• project.py (modified) (1 diff)
• run_parallel_cairns.py (modified) (2 diffs)

trunk/anuga_core/demos/cairns/project.py

@@ -57 +57 @@
 
 # bigger base_scale == less triangles
-#base_scale = 100000 # 162170 triangles
-base_scale = 400000 # 42093
+base_scale = 100000 # 162170 triangles
+#base_scale = 400000 # 42093
 default_res = 100 * base_scale   # Background resolution
 islands_res = base_scale

trunk/anuga_core/demos/cairns/run_parallel_cairns.py

@@ -156 +156 @@
 if project.scenario == 'slide':
     # Initial run without any event
-    for t in domain.evolve(yieldstep=10, finaltime=60): 
-        print domain.timestepping_statistics()
-        #print domain.boundary_statistics(tags='ocean_east')
+    for t in domain.evolve(yieldstep=10, finaltime=60):
+        if myid == 0:
+            print domain.timestepping_statistics()
+            #print domain.boundary_statistics(tags='ocean_east')
         
     # Add slide to water surface
@@ -167 +168 @@
     for t in domain.evolve(yieldstep=10, finaltime=5000, 
                            skip_initial_step=True):
-        print domain.timestepping_statistics()
-        #print domain.boundary_statistics(tags='ocean_east')
+        if myid == 0:
+            print domain.timestepping_statistics()
+            #print domain.boundary_statistics(tags='ocean_east')
 
 if project.scenario == 'fixed_wave':
     # Save every two mins leading up to wave approaching land
-    for t in domain.evolve(yieldstep=2*60, finaltime=5000): 
-        print domain.timestepping_statistics()
-        #print domain.boundary_statistics(tags='ocean_east')
+    for t in domain.evolve(yieldstep=2*60, finaltime=5000):
+        if myid == 0:
+            print domain.timestepping_statistics()
+            #print domain.boundary_statistics(tags='ocean_east')
 
     # Save every 30 secs as wave starts inundating ashore
     for t in domain.evolve(yieldstep=60*0.5, finaltime=10000, 
                            skip_initial_step=True):
-        print domain.timestepping_statistics()
-        #print domain.boundary_statistics(tags='ocean_east')
-            
-print 'That took %.2f seconds' %(time.time()-t0)
+        if myid == 0:
+            print domain.timestepping_statistics()
+            #print domain.boundary_statistics(tags='ocean_east')
+
+
+domain.sww_merge()
+
+if myid == 0:
+    print 'That took %.2f seconds' %(time.time()-t0)
+
+    
+
+finalize()