Merge pull request #466 from OP2/multiple_top_bottom_masks

Multiple top bottom masks

Author: dham

pyop2/base.py

@@ -2890,11 +2890,15 @@ def __init__(self, iterset, toset, arity, values=None, name=None, offset=None, p
         self._cache = {}
         # Which indices in the extruded map should be masked out for
         # the application of strong boundary conditions
-        self._bottom_mask = np.zeros(len(offset)) if offset is not None else []
-        self._top_mask = np.zeros(len(offset)) if offset is not None else []
+        self._bottom_mask = {}
+        self._top_mask = {}
+
         if offset is not None and bt_masks is not None:
-            self._bottom_mask[bt_masks[0]] = -1
-            self._top_mask[bt_masks[1]] = -1
+            for name, mask in bt_masks.iteritems():
+                self._bottom_mask[name] = np.zeros(len(offset))
+                self._bottom_mask[name][mask[0]] = -1
+                self._top_mask[name] = np.zeros(len(offset))
+                self._top_mask[name][mask[1]] = -1
         Map._globalcount += 1
 
     @validate_type(('index', (int, IterationIndex), IndexTypeError))

pyop2/host.py

@@ -520,7 +520,7 @@ def c_map_init(self, is_top=False, layers=1, is_facet=False):
                                         'off': ' + ' + str(m.offset[idx])})
         return '\n'.join(val)+'\n'
 
-    def c_map_bcs(self, sign):
+    def c_map_bcs(self, sign, is_facet):
         maps = as_tuple(self.map, Map)
         val = []
         # To throw away boundary condition values, we subtract a large
@@ -534,16 +534,22 @@ def c_map_bcs(self, sign):
             if not map.iterset._extruded:
                 continue
             for j, m in enumerate(map):
-                if 'bottom' not in m.implicit_bcs:
-                    continue
-                need_bottom = True
-                for idx in range(m.arity):
-                    if m.bottom_mask[idx] < 0:
-                        val.append("xtr_%(name)s[%(ind)s] %(sign)s= %(val)s;" %
-                                   {'name': self.c_map_name(i, j),
-                                    'val': max_int,
-                                    'ind': idx,
-                                    'sign': sign})
+                bottom_masks = None
+                for location, name in m.implicit_bcs:
+                    if location == "bottom":
+                        if bottom_masks is None:
+                            bottom_masks = m.bottom_mask[name].copy()
+                        else:
+                            bottom_masks += m.bottom_mask[name]
+                        need_bottom = True
+                if bottom_masks is not None:
+                    for idx in range(m.arity):
+                        if bottom_masks[idx] < 0:
+                            val.append("xtr_%(name)s[%(ind)s] %(sign)s= %(val)s;" %
+                                       {'name': self.c_map_name(i, j),
+                                        'val': max_int,
+                                        'ind': idx,
+                                        'sign': sign})
         if need_bottom:
             val.insert(0, "if (j_0 == 0) {")
             val.append("}")
@@ -555,18 +561,25 @@ def c_map_bcs(self, sign):
             if not map.iterset._extruded:
                 continue
             for j, m in enumerate(map):
-                if 'top' not in m.implicit_bcs:
-                    continue
-                need_top = True
-                for idx in range(m.arity):
-                    if m.top_mask[idx] < 0:
-                        val.append("xtr_%(name)s[%(ind)s] %(sign)s= %(val)s;" %
-                                   {'name': self.c_map_name(i, j),
-                                    'val': max_int,
-                                    'ind': idx,
-                                    'sign': sign})
+                top_masks = None
+                for location, name in m.implicit_bcs:
+                    if location == "top":
+                        if top_masks is None:
+                            top_masks = m.top_mask[name].copy()
+                        else:
+                            top_masks += m.top_mask[name]
+                        need_top = True
+                if top_masks is not None:
+                    facet_offset = m.arity if is_facet else 0
+                    for idx in range(m.arity):
+                        if top_masks[idx] < 0:
+                            val.append("xtr_%(name)s[%(ind)s] %(sign)s= %(val)s;" %
+                                       {'name': self.c_map_name(i, j),
+                                        'val': max_int,
+                                        'ind': idx + facet_offset,
+                                        'sign': sign})
         if need_top:
-            val.insert(pos, "if (j_0 == end_layer - 1) {")
+            val.insert(pos, "if (j_0 == top_layer - 1) {")
             val.append("}")
         return '\n'.join(val)+'\n'
 
@@ -865,13 +878,13 @@ def extrusion_loop():
         _map_bcs_p = ""
         _layer_arg = ""
         if self._itspace._extruded:
-            _layer_arg = ", int start_layer, int end_layer"
+            _layer_arg = ", int start_layer, int end_layer, int top_layer"
             _map_decl += ';\n'.join([arg.c_map_decl(is_facet=is_facet)
                                      for arg in self._args if arg._uses_itspace])
             _map_init += ';\n'.join([arg.c_map_init(is_top=is_top, layers=self._itspace.layers, is_facet=is_facet)
                                      for arg in self._args if arg._uses_itspace])
-            _map_bcs_m += ';\n'.join([arg.c_map_bcs("-") for arg in self._args if arg._is_mat])
-            _map_bcs_p += ';\n'.join([arg.c_map_bcs("+") for arg in self._args if arg._is_mat])
+            _map_bcs_m += ';\n'.join([arg.c_map_bcs("-", is_facet) for arg in self._args if arg._is_mat])
+            _map_bcs_p += ';\n'.join([arg.c_map_bcs("+", is_facet) for arg in self._args if arg._is_mat])
             _apply_offset += ';\n'.join([arg.c_add_offset_map(is_facet=is_facet)
                                          for arg in self._args if arg._uses_itspace])
             _apply_offset += ';\n'.join([arg.c_add_offset(is_facet=is_facet)

pyop2/openmp.py

@@ -260,15 +260,19 @@ def prepare_arglist(self, iterset, *args):
             if region is ON_BOTTOM:
                 arglist.append(0)
                 arglist.append(1)
+                arglist.append(iterset.layers - 1)
             elif region is ON_TOP:
                 arglist.append(iterset.layers - 2)
                 arglist.append(iterset.layers - 1)
+                arglist.append(iterset.layers - 1)
             elif region is ON_INTERIOR_FACETS:
                 arglist.append(0)
                 arglist.append(iterset.layers - 2)
+                arglist.append(iterset.layers - 2)
             else:
                 arglist.append(0)
                 arglist.append(iterset.layers - 1)
+                arglist.append(iterset.layers - 1)
 
         return arglist
 

pyop2/sequential.py

@@ -130,15 +130,19 @@ def prepare_arglist(self, iterset, *args):
             if region is ON_BOTTOM:
                 arglist.append(0)
                 arglist.append(1)
+                arglist.append(iterset.layers - 1)
             elif region is ON_TOP:
                 arglist.append(iterset.layers - 2)
                 arglist.append(iterset.layers - 1)
+                arglist.append(iterset.layers - 1)
             elif region is ON_INTERIOR_FACETS:
                 arglist.append(0)
                 arglist.append(iterset.layers - 2)
+                arglist.append(iterset.layers - 2)
             else:
                 arglist.append(0)
                 arglist.append(iterset.layers - 1)
+                arglist.append(iterset.layers - 1)
         return arglist
 
     @cached_property