Changeset 9737 for trunk/anuga_core/anuga/parallel

Timestamp:

Oct 4, 2016, 4:13:00 PM (9 years ago)

Author:

steve

Message:

Commit svn after a lot of git updates

Location:

trunk/anuga_core/anuga/parallel

Files:

• parallel_api.py (modified) (5 diffs)
• parallel_boyd_box_operator.py (modified) (4 diffs)
• parallel_generic_communications.py (modified) (5 diffs)
• parallel_operator_factory.py (modified) (3 diffs)
• parallel_shallow_water.py (modified) (1 diff)
• parallel_structure_operator.py (modified) (4 diffs)
• parallel_weir_orifice_trapezoid_operator.py (modified) (1 diff)
• sequential_distribute.py (modified) (5 diffs)
• tests/test_distribute_settings.py (added)
• tests/test_sequential_dist_sw_flow.py (modified) (2 diffs)

trunk/anuga_core/anuga/parallel/parallel_api.py

@@ -43 +43 @@
 
 
+def collect_value(value):
+    
+    value = value
+
+    if myid == 0:
+        for i in range(numprocs):
+            if i == 0: continue
+            val = receive(i)
+            value = value + val
+    else:
+        send(value, 0)
+
+    return value   
+    
+
+
+
 def distribute(domain, verbose=False, debug=False, parameters = None):
     """ Distribute the domain to all processes
@@ -61 +78 @@
                 domain_name, domain_dir, domain_store, domain_store_centroids, \
                 domain_minimum_storable_height, domain_minimum_allowed_height, \
-                domain_flow_algorithm, georef = partition.extract_submesh(0)
+                domain_flow_algorithm, domain_georef, \
+                domain_quantities_to_be_stored, domain_smooth \
+                 = partition.extract_submesh(0)
         
         for p in range(1, numprocs):
@@ -72 +91 @@
 
         kwargs, points, vertices, boundary, quantities, boundary_map, \
-                       domain_name, domain_dir, domain_store, domain_store_centroids, \
-                       domain_minimum_storable_height, domain_minimum_allowed_height, \
-                       domain_flow_algorithm, georef = receive(0)
+            domain_name, domain_dir, domain_store, domain_store_centroids, \
+            domain_minimum_storable_height, domain_minimum_allowed_height, \
+            domain_flow_algorithm, domain_georef, \
+            domain_quantities_to_be_stored, domain_smooth \
+             = receive(0)
 
     #---------------------------------------------------------------------------
@@ -111 +132 @@
     parallel_domain.set_minimum_allowed_height(domain_minimum_allowed_height)
     parallel_domain.set_flow_algorithm(domain_flow_algorithm)
-    parallel_domain.geo_reference = georef
-
+    parallel_domain.geo_reference = domain_georef
+    parallel_domain.set_quantities_to_be_stored(domain_quantities_to_be_stored)
+    parallel_domain.smooth = domain_smooth
 
     return parallel_domain
@@ -465 +487 @@
 
 ##     return l2g
-

trunk/anuga_core/anuga/parallel/parallel_boyd_box_operator.py

@@ -23 +23 @@
                  losses,
                  width,
+                 blockage=0.0, #added PM 24/7/2016
                  z1=0.0,
-                 z2=0.0,
-                 height=None,
+                 z2=0.0,                
+                 height=None,                
                  end_points=None,
                  exchange_lines=None,
@@ -55 +56 @@
                                           width=width,
                                           height=height,
+                                          blockage=0.0, #added PM 24/7/2016
                                           z1=0.0,
                                           z2=0.0,
-                                          diameter= None,
+                                          diameter= None,                                         
                                           apron=apron,
                                           manning=manning,
@@ -92 +94 @@
         self.culvert_width = self.get_culvert_width()
         self.culvert_height = self.get_culvert_height()
+        self.culvert_blockage = self.get_culvert_blockage()#added PM 24/7/2016
 
         self.max_velocity = 10.0
@@ -283 +286 @@
                                                 flow_width          =self.culvert_width,
                                                 length              =self.culvert_length,
+                                                blockage            =self.culvert_blockage, #added PM 24/7/2016
                                                 driving_energy      =self.driving_energy,
                                                 delta_total_energy  =self.delta_total_energy,

trunk/anuga_core/anuga/parallel/parallel_generic_communications.py

@@ -134 +134 @@
 
 
-def communicate_ghosts_asynchronous(domain):
+def communicate_ghosts_asynchronous(domain, quantities=None):
 
     # We must send the information from the full cells and
@@ -145 +145 @@
     import time
     t0 = time.time()
+    
+    if quantities is None:
+        quantities = domain.conserved_quantities
 
     # update of non-local ghost cells by copying full cell data into the
@@ -156 +159 @@
         Xout = domain.full_send_dict[send_proc][2]
 
-        for i, q in enumerate(domain.conserved_quantities):
+        for i, q in enumerate(quantities):
             #print 'Store send data',i,q
             Q_cv =  domain.quantities[q].centroid_values
@@ -163 +166 @@
 
 
-#    from pprint import pprint
-#
-#    if pypar.rank() == 0:
-#        print 'Before commun 0'
-#        pprint(domain.full_send_dict)
-#
-#    if pypar.rank() == 1:
-#        print 'Before commun 1'
-#        pprint(domain.full_send_dict)
+
 
 
@@ -197 +192 @@
         #print X
 
-        for i, q in enumerate(domain.conserved_quantities):
+        for i, q in enumerate(quantities):
             #print 'Read receive data',i,q
             Q_cv =  domain.quantities[q].centroid_values

trunk/anuga_core/anuga/parallel/parallel_operator_factory.py

@@ -118 +118 @@
 def Boyd_box_operator(domain,
                        losses,
-                       width,
-                       height=None,
+                       width,                       
+                       height=None,                                           
+                       blockage=0.0, #added by DPM 24/7/2016 
                        z1=0.0,
                        z2=0.0,
@@ -147 +148 @@
                                                                     width=width,
                                                                     height=height,
+                                                                    blockage=blockage,#added by DPM 24/7/2016
                                                                     z1=0.0,
                                                                     z2=0.0,
@@ -253 +255 @@
                                          width=width,
                                          height=height,
+                                         blockage=blockage, #added by DPM 24/7/2016
                                          end_points=end_points,
                                          exchange_lines=exchange_lines,

trunk/anuga_core/anuga/parallel/parallel_shallow_water.py

@@ -136 +136 @@
 
 
-    def update_ghosts(self):
+    def update_ghosts(self, quantities=None):
         """We must send the information from the full cells and
         receive the information for the ghost cells
         """
             
-        generic_comms.communicate_ghosts_asynchronous(self)
+        generic_comms.communicate_ghosts_asynchronous(self, quantities)
         #generic_comms.communicate_ghosts_blocking(self)
 

trunk/anuga_core/anuga/parallel/parallel_structure_operator.py

@@ -46 +46 @@
                  z1,#added by PM 22/10/2013
                  z2,#added by PM 22/10/2013
+                 blockage,#added by PM 24/7/2016  
                  apron,
                  manning,
@@ -117 +118 @@
         self.z1 = z1 #added by PM 22/10/2013
         self.z2 = z2 #added by PM 22/10/2013
+        self.blockage = blockage #added by PM 24/7/2016  
         self.apron  = apron
         self.manning = manning
@@ -710 +712 @@
     def get_culvert_z2(self): #added by PM 22/10/2013       
         return self.z2
-        
+
+    def get_culvert_blockage(self): #added by PM 24/7/2016              
+        return self.blockage #added by PM 24/7/2016 
+                
     def get_culvert_apron(self):
         return self.apron
@@ -746 +751 @@
 
         self.culvert_z2 = z2  
-        
+
+    def set_culvert_blockage(self, blockage): #added by PM 24/7/2016  
+
+        self.culvert_blockage = blockage  #added by PM 24/7/2016 
+                
     def parallel_safe(self):
         return True

trunk/anuga_core/anuga/parallel/parallel_weir_orifice_trapezoid_operator.py

@@ -247 +247 @@
             
                 Q, barrel_velocity, outlet_culvert_depth, flow_area, case = \
-                              weir_orifice_trapezoid_function(depth               =self.culvert_height,
+                              weir_orifice_trapezoid_function(depth =self.culvert_height,
                                                 width               =self.culvert_width,
                                                 z1                  =self.culvert_z1,

trunk/anuga_core/anuga/parallel/sequential_distribute.py

@@ -60 +60 @@
         self.domain_minimum_allowed_height = domain.get_minimum_allowed_height()
         self.domain_georef = domain.geo_reference
+        self.domain_quantities_to_be_stored = domain.quantities_to_be_stored
+        self.domain_smooth = domain.smooth
         self.number_of_global_triangles = domain.number_of_triangles
         self.number_of_global_nodes = domain.number_of_nodes
@@ -193 +195 @@
         domain_flow_algorithm = self.domain_flow_algorithm
         domain_georef = self.domain_georef
+        domain_quantities_to_be_stored = self.domain_quantities_to_be_stored
+        domain_smooth = self.domain_smooth
             
         tostore = (kwargs, points, vertices, boundary, quantities, \
@@ -199 +203 @@
                    domain_minimum_storable_height, \
                    domain_minimum_allowed_height, domain_flow_algorithm, \
-                   domain_georef)
+                   domain_georef, domain_quantities_to_be_stored, domain_smooth)
 
 
@@ -269 +273 @@
                    domain_name, domain_dir, domain_store, domain_store_centroids, \
                    domain_minimum_storable_height, domain_minimum_allowed_height, \
-                   domain_flow_algorithm, georef = cPickle.load(f)
+                   domain_flow_algorithm, domain_georef, \
+                   domain_quantities_to_be_stored, domain_smooth = cPickle.load(f)
     f.close()
 
@@ -304 +309 @@
     domain.set_minimum_storable_height(domain_minimum_storable_height)
     domain.set_minimum_allowed_height(domain_minimum_allowed_height)
-    domain.geo_reference = georef
-
+    domain.geo_reference = domain_georef
+    domain.set_quantities_to_be_stored(domain_quantities_to_be_stored)
+    domain.smooth = domain_smooth
 
     return domain

trunk/anuga_core/anuga/parallel/tests/test_sequential_dist_sw_flow.py

@@ -41 +41 @@
 #--------------------------------------------------------------------------
 yieldstep = 0.25
-finaltime = 3.0
+finaltime = 1.0
 nprocs = 4
 N = 29
@@ -149 +149 @@
         if verbose:
             
-            order = 0
+            order = 2
             print 'PDOMAIN CENTROID VALUES'
             print num.linalg.norm(odomain_c.x-pdomain_c.x,ord=order)