#1312 ScalarArray code generation

src/psyclone/domain/lfric/kern_call_acc_arg_list.py

@@ -272,7 +272,7 @@ def scalar(self, scalar_arg, var_accesses=None):
             :py:class:`psyclone.core.VariablesAccessMap`]
 
         :raises NotImplementedError: OpenACC data regions are not currently
-            supported for arrays os scalars.
+            supported for arrays of scalars.
 
         '''
         if scalar_arg.is_scalar_array:

src/psyclone/domain/lfric/lfric_scalar_array_args.py

@@ -169,32 +169,31 @@ def stub_declarations(self):
         # Create declarations
         for intent in FORTRAN_INTENT_NAMES:
             for arg in self._scalar_array_args[intent]:
-                if arg._array_ndims >= 1:
-                    # Create the dimensions array symbol
-                    dims_array_symbol = self.symtab.find_or_create_tag(
-                        tag="dims_" + arg.name,
-                        symbol_type=DataSymbol,
-                        datatype=ArrayType(
-                            LFRicTypes("LFRicIntegerScalarDataType")(),
-                            [arg._array_ndims]))
-                    dims_array_symbol.interface = ArgumentInterface(
-                                        INTENT_MAPPING[intent])
-                    self.symtab.append_argument(dims_array_symbol)
-                    # Create list of dims_array references
-                    sym_list = [ArrayReference.create(
-                        dims_array_symbol,
-                        [Literal(str(idx), INTEGER_TYPE)])
-                            for idx in range(1, arg._array_ndims + 1)]
-                    # Create the symbol
-                    array_symbol = self.symtab.find_or_create_tag(
-                        tag=arg.name,
-                        symbol_type=DataSymbol,
-                        datatype=ArrayType(
-                            type_map[arg.intrinsic_type],
-                            sym_list))
-                    array_symbol.interface = ArgumentInterface(
-                                        INTENT_MAPPING[intent])
-                    self.symtab.append_argument(array_symbol)
+                # Create the dimensions array symbol
+                dims_array_symbol = self.symtab.find_or_create_tag(
+                    tag="dims_" + arg.name,
+                    symbol_type=DataSymbol,
+                    datatype=ArrayType(
+                        LFRicTypes("LFRicIntegerScalarDataType")(),
+                        [arg._array_ndims]))
+                dims_array_symbol.interface = ArgumentInterface(
+                                    INTENT_MAPPING[intent])
+                self.symtab.append_argument(dims_array_symbol)
+                # Create list of dims_array references
+                sym_list = [ArrayReference.create(
+                    dims_array_symbol,
+                    [Literal(str(idx), INTEGER_TYPE)])
+                        for idx in range(1, arg._array_ndims + 1)]
+                # Create the symbol
+                array_symbol = self.symtab.find_or_create_tag(
+                    tag=arg.name,
+                    symbol_type=DataSymbol,
+                    datatype=ArrayType(
+                        type_map[arg.intrinsic_type],
+                        sym_list))
+                array_symbol.interface = ArgumentInterface(
+                                    INTENT_MAPPING[intent])
+                self.symtab.append_argument(array_symbol)
 
     def _create_declarations(self):
         '''
@@ -208,36 +207,35 @@ def _create_declarations(self):
         # ScalarArray arguments
         for intent in FORTRAN_INTENT_NAMES:
             for arg in self._scalar_array_args[intent]:
-                if arg._array_ndims >= 1:
-                    # Create the dimensions array symbol
-                    dims_array_symbol = self.symtab.find_or_create_tag(
-                        tag="dims_" + arg.name,
-                        symbol_type=DataSymbol,
-                        datatype=ArrayType(
-                            LFRicTypes("LFRicIntegerScalarDataType")(),
-                            [arg._array_ndims]))
-                    dims_array_symbol.interface = ArgumentInterface(
-                                        INTENT_MAPPING[intent])
-                    self.symtab.append_argument(dims_array_symbol)
-                    # Create list of dims_array references
-                    sym_list = [ArrayReference.create(
-                        dims_array_symbol,
-                        [Literal(str(idx), INTEGER_TYPE)])
-                            for idx in range(1, arg._array_ndims + 1)]
-                    # Find the ScalarArray tag and convert it to an ArrayType
-                    array_symbol = self.symtab.lookup_with_tag(
-                        "AlgArgs_" + arg.name)
-                    array_symbol.datatype = ArrayType(
-                        type_map[arg.intrinsic_type],
-                        sym_list)
-                    # Replace the symbol with itself to ensure
-                    # the ScalarArray is generated after the
-                    # dimensions array to avoid compilation errors
-                    # TODO: #2202 may allow this to be removed
-                    self.symtab.swap(array_symbol, array_symbol)
-                    array_symbol.interface = ArgumentInterface(
-                                        INTENT_MAPPING[intent])
-                    self.symtab.append_argument(array_symbol)
+                # Create the dimensions array symbol
+                dims_array_symbol = self.symtab.find_or_create_tag(
+                    tag="dims_" + arg.name,
+                    symbol_type=DataSymbol,
+                    datatype=ArrayType(
+                        LFRicTypes("LFRicIntegerScalarDataType")(),
+                        [arg._array_ndims]))
+                dims_array_symbol.interface = ArgumentInterface(
+                                    INTENT_MAPPING[intent])
+                self.symtab.append_argument(dims_array_symbol)
+                # Create list of dims_array references
+                sym_list = [ArrayReference.create(
+                    dims_array_symbol,
+                    [Literal(str(idx), INTEGER_TYPE)])
+                        for idx in range(1, arg._array_ndims + 1)]
+                # Find the ScalarArray tag and convert it to an ArrayType
+                array_symbol = self.symtab.lookup_with_tag(
+                    "AlgArgs_" + arg.name)
+                array_symbol.datatype = ArrayType(
+                    type_map[arg.intrinsic_type],
+                    sym_list)
+                # Replace the symbol with itself to ensure
+                # the ScalarArray is generated after the
+                # dimensions array to avoid compilation errors
+                # TODO: #2202 may allow this to be removed
+                self.symtab.swap(array_symbol, array_symbol)
+                array_symbol.interface = ArgumentInterface(
+                                    INTENT_MAPPING[intent])
+                self.symtab.append_argument(array_symbol)
 
 
 # ---------- Documentation utils -------------------------------------------- #

src/psyclone/tests/domain/lfric/arg_ordering_test.py

@@ -217,6 +217,14 @@ def test_kernel_stub_invalid_scalar_argument():
     assert (f"Expected argument type to be one of "
             f"{const.VALID_SCALAR_NAMES + const.VALID_ARRAY_NAMES} "
             f"but got 'invalid'" in str(excinfo.value))
+    # Now call KernCallArgList to raise an exception
+    create_arg_list = KernCallArgList(kernel)
+    with pytest.raises(InternalError) as excinfo:
+        create_arg_list.scalar(arg)
+    const = LFRicConstants()
+    assert (f"Expected argument type to be one of "
+            f"{const.VALID_SCALAR_NAMES + const.VALID_ARRAY_NAMES} "
+            f"but got 'invalid'" in str(excinfo.value))
 
 
 def test_arg_ordering_generate_domain_kernel(dist_mem, fortran_writer):

src/psyclone/tests/domain/lfric/lfric_scalar_codegen_test.py

@@ -659,5 +659,6 @@ def test_scalar_array(tmpdir, dist_mem):
     )
     assert expected_subroutine in generated_code
     assert expected_declarations in generated_code
-    assert expected_calls[0], expected_calls[1] in generated_code
+    assert expected_calls[0] in generated_code
+    assert expected_calls[1] in generated_code
     assert LFRicBuild(tmpdir).code_compiles(psy)