Changeset 8492

Timestamp:

Aug 6, 2012, 11:14:34 AM (12 years ago)

Author:

steve

Message:

Fixed up logging in erosion operator

Location:

trunk/anuga_core/source

Files:

• anuga/operators/base_operator.py (modified) (4 diffs)
• anuga/operators/erosion_operators.py (modified) (3 diffs)
• anuga_parallel/run_parallel_sw_merimbula.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/operators/base_operator.py

@@ +1 @@
+
+from anuga.utilities.system_tools import log_to_file
+
 
 class Operator:
@@ -37 +40 @@
 
 
-        if label == None:
-            self.label = "operator_%g" % Operator.counter
-        else:
-            self.label = label + '_%g' % Operator.counter
+        self.set_label(label)
 
 
@@ -96 +96 @@
             log_to_file(self.log_filename, self.timestepping_statistics())
 
+    def set_label(self, label=None):
+
+        if label == None:
+            self.label = "operator_%g" % Operator.counter
+        else:
+            self.label = label + '_%g' % Operator.counter
 
 
@@ -106 +112 @@
             self.log_filename = self.label + '.log'
             log_to_file(self.log_filename, self.statistics(), mode='w')
-            log_to_file(self.log_filename, 'time,Q')
+            #log_to_file(self.log_filename, 'time,Q')
 
             #log_to_file(self.log_filename, self.culvert_type)

trunk/anuga_core/source/anuga/operators/erosion_operators.py

@@ -66 +66 @@
         #-----------------------------------------
         self.setup_node_structures()
+
+        #-----------------------------------------
+        # Some stras for reporting
+        #-----------------------------------------
+        self.max_change = 0
+        
         
 
@@ -89 +95 @@
             #--------------------------------------
             # Update all three vertices for each cell
+            # associated with self.indices
             #--------------------------------------
             ind = self.indices
             m = num.sqrt(self.xmom_c[ind]**2 + self.ymom_c[ind]**2)
-            m = num.vstack((m,m,m)).T
+            m = num.vstack((m,m,m)).T  # Stack up m to apply to vertices
             m = num.where(m>self.threshold, m, 0.0)
-            self.elev_v[ind] = num.maximum(self.elev_v[ind] - m*dt, self.base)
-             #num.maximum(self.elev_v[ind] - momentum*dt, Z)
-
+
+            de = m*dt
+            self.elev_v[ind] = num.maximum(self.elev_v[ind] - de, self.base)
+
+            self.max_change = num.max(de)
 
         return updated
@@ -188 +197 @@
 
     def timestepping_statistics(self):
-
-        message  = indent + self.label + ': Erosion_operator'
+        from anuga import indent
+
+        message  = indent + self.label + ': Erosion_operator, time '
+        message += str(self.get_time())+ ' max(Delta Elev) '+ str(self.max_change)
         return message
 

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -42 +42 @@
 #--------------------------------------------------------------------------
 
-mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
-#mesh_filename = "merimbula_43200.tsh"   ; x0 = 756000.0 ; x1 = 756500.0
+#mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
+mesh_filename = "merimbula_43200.tsh"   ; x0 = 756000.0 ; x1 = 756500.0
 #mesh_filename = "test-100.tsh" ; x0 = 0.25 ; x1 = 0.5
 #mesh_filename = "test-20.tsh" ; x0 = 250.0 ; x1 = 350.0
-yieldstep = 20
-finaltime = 1000
+yieldstep = 50
+finaltime = 500
 verbose = True
 
@@ -109 +109 @@
 #--------------------------------------------------------------------------
 
-    
+domain.set_flow_algorithm('2_0')   
+
 #domain.smooth = False
-domain.set_default_order(2)
-domain.set_timestepping_method('rk2')
+#domain.set_default_order(2)
+#domain.set_timestepping_method('rk2')
 #domain.set_CFL(0.7)
 #domain.set_beta(1.5)
@@ -153 +154 @@
 
 
-if myid == 0:
-    print 'Number of processors %g ' %numprocs
-    print 'That took %.2f seconds' %(time.time()-t0)
-    print 'Communication time %.2f seconds'%domain.communication_time
-    print 'Reduction Communication time %.2f seconds'%domain.communication_reduce_time
-    print 'Broadcast time %.2f seconds'%domain.communication_broadcast_time
+barrier()
+
+for p in range(numprocs):
+    if myid == p:
+        print 'Processor %g ' %myid
+        print 'That took %.2f seconds' %(time.time()-t0)
+        print 'Communication time %.2f seconds'%domain.communication_time
+        print 'Reduction Communication time %.2f seconds'%domain.communication_reduce_time
+        print 'Broadcast time %.2f seconds'%domain.communication_broadcast_time
+    else:
+        pass
+
+    barrier()
 
 
@@ -164 +172 @@
 # Merge the individual sww files into one file
 #--------------------------------------------------
-domain.sww_merge(delete_old=False)
+#domain.sww_merge(delete_old=False)
 
 finalize()