#2244 Fix some issues with colour tilies after rebasing to master

src/psyclone/dynamo0p3.py

@@ -3729,6 +3729,7 @@ def _colourmap_init(self):
 
         for call in [call for call in self._schedule.coded_kernels() if
                      call.is_coloured()]:
+            self._add_mesh_symbols(["mesh"])
             # Keep a record of whether or not any kernels (loops) in this
             # invoke have been coloured and, if so, whether the associated loop
             # goes into the halo.
@@ -3778,9 +3779,6 @@ def _colourmap_init(self):
 
         if non_intergrid_kern and (self._needs_colourmap or
                                    self._needs_colourmap_halo):
-            # There aren't any inter-grid kernels but we do need colourmap
-            # information and that means we'll need a mesh object
-            self._add_mesh_symbols(["mesh"])
             # This creates the colourmap information for this invoke if we
             # don't already have one.
             colour_map = non_intergrid_kern.colourmap
@@ -3889,7 +3887,7 @@ def declarations(self, parent):
                     DeclGen(parent, datatype="integer", allocatable=True,
                             kind=api_config.default_kind["integer"],
                             entity_decls=[decln]))
-            if kern.colourtilemap_symbol:
+            if kern.tilecolourmap_symbol:
                 parent.add(
                     DeclGen(parent, datatype="integer",
                             kind=api_config.default_kind["integer"],
@@ -7266,6 +7264,8 @@ def stop_expr(self):
             colour_var = loop.ancestor(Loop).variable
 
             mesh_sym = sym_table.lookup_with_tag("mesh")
+            # Create a different array_reference accessor depending on the
+            # loop type
             if self._loop_type == "colour":
                 asym = self.kernel.last_cell_all_colours_symbol
                 if not asym:
@@ -7295,7 +7295,8 @@ def stop_expr(self):
 
             # If it has halos, add an extra argument with the halo depth
             const = LFRicConstants()
-            if self.upper_bound_name in LFRicConstants.HALO_ACCESS_LOOP_BOUNDS:
+            h_needed = self.upper_bound_name in const.HALO_ACCESS_LOOP_BOUNDS
+            if Config.get().distributed_memory and h_needed:
                 if self._upper_bound_halo_depth:
                     # TODO: #696 Add kind (precision) once the
                     # DynInvokeSchedule constructor has been extended to
@@ -7312,8 +7313,6 @@ def stop_expr(self):
                     halo_depth = Reference(depth_sym)
 
                 aref.addchild(halo_depth)
-            if sref is not None:
-                return sref
             return aref
 
         # This isn't a 'colour' loop so we have already set-up a

src/psyclone/psyir/nodes/array_reference.py

@@ -91,11 +91,11 @@ def create(symbol, indices):
                 raise GenerationError(
                     f"expecting the symbol '{symbol.name}' to be an array, but"
                     f" found '{symbol.datatype}'.")
-        elif len(symbol.shape) != len(indices):
+        elif len(symbol.shape) < len(indices):
             raise GenerationError(
-                f"the symbol '{symbol.name}' should have the same number of "
-                f"dimensions as indices (provided in the 'indices' argument). "
-                f"Expecting '{len(indices)}' but found '{len(symbol.shape)}'.")
+                f"the indices argument has '{len(indices)}' elements, but must"
+                f"have equal or less dimensions than the '{symbol.name}' shape,"
+                f" which has '{len(symbol.shape)}'.")
 
         array = ArrayReference(symbol)
         for ind, child in enumerate(indices):

src/psyclone/tests/domain/lfric/transformations/dynamo0p3_transformations_test.py

@@ -457,6 +457,7 @@ def test_colour_continuous_writer_intergrid(tmpdir, dist_mem):
     assert ("integer(kind=i_def), allocatable :: "
             "last_edge_cell_all_colours_field1(:)" in result)
     # Initialisation.
+    print(result)
     assert ("last_edge_cell_all_colours_field1 = mesh_field1%"
             "get_last_edge_cell_all_colours()" in result)
     # Usage. Since there is no need to loop into the halo, the upper loop