Changeset 8418

Timestamp:

May 8, 2012, 5:29:03 PM (13 years ago)

Author:

steve

Message:

Strange proble with parallel_safe

Location:

trunk/anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/generic_domain.py (modified) (1 diff)
• anuga/config.py (modified) (1 diff)
• anuga/operators/base_operator.py (modified) (2 diffs)
• anuga/shallow_water/shallow_water_domain.py (modified) (7 diffs)
• anuga_parallel/parallel_boyd_box_operator.py (modified) (1 diff)
• anuga_parallel/parallel_structure_operator.py (modified) (7 diffs)
• anuga_parallel/run_parallel_sw_merimbula_profile.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -467 +467 @@
         return q
 
+    def get_CFL(self):
+        """get CFL
+        """
+
+        return self.CFL
+    
+
     def set_CFL(self, cfl=1.0):
-        """Set CFL parameter, warn if greater than 1.0
-        """
-        if cfl > 1.0:
+        """Set CFL parameter, warn if greater than 2.0
+        """
+        if cfl > 2.0:
             self.CFL = cfl
-            log.warn('Setting CFL > 1.0')
+            log.warn('Setting CFL > 2.0')
 
         assert cfl > 0.0
         self.CFL = cfl
-
-
 
     def set_time(self, time=0.0):

trunk/anuga_core/source/anuga/config.py

@@ -117 +117 @@
 # beta values. In this case the settings for timestepping_method will be overriden 
 
-#flow_algorithm = 1    # 1st order euler and conservative piecewise constant spatial reconstruction
-flow_algorithm = 1.5  # 1st order euler and conservative piecewise linear spatial reconstruction
-#flow_algorithm = 1.75 # 1st order euler and more aggressive piecewise linear spatial reconstruction
-#flow_algorithm = 2    # 2nd order TVD scheme and more aggressive piecewise linear spatial reconstruction
-#flow_algorithm = 2.5  # 3rd order TVD scheme and more aggressive piecewise linear spatial reconstruction
+#flow_algorithm = '1_0'    # 1st order euler and conservative piecewise constant spatial reconstruction
+flow_algorithm = '1_5'  # 1st order euler and conservative piecewise linear spatial reconstruction
+#flow_algorithm = '1_75' # 1st order euler and more aggressive piecewise linear spatial reconstruction
+#flow_algorithm = '2_0'    # 2nd order TVD scheme and more aggressive piecewise linear spatial reconstruction
+#flow_algorithm = '2.5'  # 3rd order TVD scheme and more aggressive piecewise linear spatial reconstruction
 
 

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

@@ -27 +27 @@
 
 
-        if domain.numproc > 1:
-            msg = 'Not implemented to run in parallel'
-            assert self.__parallel_safe(), msg
+#        if domain.numproc > 1:
+#            msg = 'Not implemented to run in parallel'
+#            assert self.__parallel_safe(), msg
 
         if description == None:
@@ -63 +63 @@
         """By default an operator is not parallel safe
         """
+
+        print "ZZZZ in --parallel_safe base_oprator"
         return False
 

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -270 +270 @@
         parameters['use_sloped_mannings']     = self.use_sloped_mannings
         parameters['compute_fluxes_method']   = self.get_compute_fluxes_method()
-        parameters['flow_algorithm']             = self.get_flow_algorithm()
+        parameters['flow_algorithm']          = self.get_flow_algorithm()
+        parameters['CFL']                     = self.get_CFL()
+        parameters['timestepping_method']     = self.get_timestepping_method()
 
         parameters['optimised_gradient_limiter']        = self.optimised_gradient_limiter
@@ -358 +360 @@
         """
 
-        flag = str(flag)
-
-        flow_algorithms = ['1', '1.5', '1.75', '2', '2.5']
+        if isinstance(flag, str) :
+            flag = flag.replace(".","_")
+        else:
+            flag = str(float(str(flag))).replace(".","_")
+
+        flow_algorithms = ['1_0', '1_5', '1_75', '2_0', '2_5']
 
         if flag in flow_algorithms:
@@ -370 +375 @@
 
 
-        if self.flow_algorithm == '1':
+        if self.flow_algorithm == '1_0':
             self.set_timestepping_method(1)
             self.set_default_order(1)
-
-        if self.flow_algorithm == '1.5':
+            self.set_CFL(1.0)
+
+        if self.flow_algorithm == '1_5':
             self.set_timestepping_method(1)
             self.set_default_order(2)
@@ -384 +390 @@
             beta_vh_dry = 0.2
             self.set_betas(beta_w, beta_w_dry, beta_uh, beta_uh_dry, beta_vh, beta_vh_dry)
-
-
-        if self.flow_algorithm == '1.75':
+            self.set_CFL(1.0)
+
+
+        if self.flow_algorithm == '1_75':
             self.set_timestepping_method(1)
             self.set_default_order(2)
@@ -396 +403 @@
             beta_vh_dry = 0.2
             self.set_betas(beta_w, beta_w_dry, beta_uh, beta_uh_dry, beta_vh, beta_vh_dry)
-
-
-        if self.flow_algorithm == '2':
+            self.set_CFL(0.75)
+
+
+        if self.flow_algorithm == '2_0':
             self.set_timestepping_method(2)
             self.set_default_order(2)
-            beta_w      = 1.7
+            beta_w      = 1.9
             beta_w_dry  = 0.2
-            beta_uh     = 1.7
+            beta_uh     = 1.9
             beta_uh_dry = 0.2
-            beta_vh     = 1.7
+            beta_vh     = 1.9
             beta_vh_dry = 0.2
             self.set_betas(beta_w, beta_w_dry, beta_uh, beta_uh_dry, beta_vh, beta_vh_dry)
-
-        if self.flow_algorithm == '2.5':
+            self.set_CFL(1.0)
+
+        if self.flow_algorithm == '2_5':
             self.set_timestepping_method(3)
             self.set_default_order(2)
-            beta_w      = 1.7
+            beta_w      = 1.9
             beta_w_dry  = 0.2
-            beta_uh     = 1.7
+            beta_uh     = 1.9
             beta_uh_dry = 0.2
-            beta_vh     = 1.7
+            beta_vh     = 1.9
             beta_vh_dry = 0.2
             self.set_betas(beta_w, beta_w_dry, beta_uh, beta_uh_dry, beta_vh, beta_vh_dry)
+            self.set_CFL(1.0)
 
 
@@ -426 +436 @@
 
         Currently
-           1, 1.5, 2, 2.5
+           1_0, 1_5, 1_75 2_0, 2_5
         """
 
@@ -898 +908 @@
                 Q.extrapolate_first_order()
             elif self._order_ == 2:
-                Q.extrapolate_second_order_and_limit_by_edge()
+                if self.use_edge_limiter:
+                    Q.extrapolate_second_order_and_limit_by_edge()
+                else:
+                    Q.extrapolate_second_order_and_limit_by_vertex()
             else:
                 raise Exception('Unknown order')

trunk/anuga_core/source/anuga_parallel/parallel_boyd_box_operator.py

@@ -95 +95 @@
 
 
+    def __parallel_safe(self):
+
+        print "ZZZZ parallel_boyd"
+        return True
+
+
+
+
     def debug_discharge_routine(self):
         local_debug ='false'

trunk/anuga_core/source/anuga_parallel/parallel_structure_operator.py

@@ -55 +55 @@
                  enquiry_proc = None):
 
+        self.myid = pypar.rank()
+        self.num_procs = pypar.size()
+        
         anuga.Operator.__init__(self,domain)
 
@@ -82 +85 @@
         self.exchange_lines = ensure_numeric(exchange_lines)
         self.enquiry_points = ensure_numeric(enquiry_points)
-        self.myid = pypar.rank()
-        self.num_procs = pypar.size()
+
         
         if height is None:
@@ -162 +164 @@
         self.outflow_index = 1
 
-        self.set_logging(logging)
+        self.set_parallel_logging(logging)
 
     def __call__(self):
@@ -440 +442 @@
 
 
-    def set_logging(self, flag=True):
+    def set_parallel_logging(self, flag=True):
         # Warning: requires synchronization, must be called by all procs associated
         # with this structure
@@ -448 +450 @@
 
         # If flag is true open file with mode = "w" to form a clean file for logging
-        if self.logging:
+        if self.logging and self.myid == self.master_proc:
             self.log_filename = self.label + '.log'
             log_to_file(self.log_filename, stats, mode='w')
@@ -455 +457 @@
             #log_to_file(self.log_filename, self.culvert_type)
 
+    def set_logging(self, flag=True):
+        # Overwrite the sequential procedure with a dummy procedure.
+        # Need to call set_parallel_logging which needs t obe done later
+        # after the calculation of master processors
+
+        pass
+    
 
     def timestepping_statistics(self):
@@ -504 +513 @@
         return self.enquiry_proc
 
+
     def __parallel_safe(self):
         return True
+
+
+

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula_profile.py

@@ -35 +35 @@
 
 
-from anuga_parallel import distribute, myid, numprocs, finalize
+from anuga_parallel import distribute, myid, numprocs, finalize, barrier
 
 
@@ -83 +83 @@
 #domain.smooth = False
 
-domain.set_default_order(2)
-domain.set_timestepping_method('rk2')
+
+domain.set_flow_algorithm(2.0)
+
+if myid == 0:
+    domain.print_algorithm_parameters()
+
+barrier()
+
+#domain.set_default_order(2)
+#domain.set_timestepping_method('rk2')
 #domain.set_CFL(0.7)
 #domain.set_beta(1.5)
+
+
 domain.set_name('meribula')