diff --git a/tools/milhoja_pypkg/VERSION b/tools/milhoja_pypkg/VERSION index 1750564f..5a5831ab 100644 --- a/tools/milhoja_pypkg/VERSION +++ b/tools/milhoja_pypkg/VERSION @@ -1 +1 @@ -0.0.6 +0.0.7 diff --git a/tools/milhoja_pypkg/src/milhoja/TaskFunctionGenerator_OpenACC_F.py b/tools/milhoja_pypkg/src/milhoja/TaskFunctionGenerator_OpenACC_F.py index bb5163eb..f436d2ec 100644 --- a/tools/milhoja_pypkg/src/milhoja/TaskFunctionGenerator_OpenACC_F.py +++ b/tools/milhoja_pypkg/src/milhoja/TaskFunctionGenerator_OpenACC_F.py @@ -296,12 +296,14 @@ def generate_source_code(self, destination, overwrite): for argument in actual_args: spec = self._tf_spec.argument_specification(argument) extents = "" + offs = "" if spec["source"] in points: extents = "(:, n)" elif spec["source"] == TILE_DELTAS_ARGUMENT: extents = "(:, n)" elif spec["source"] == TILE_LEVEL_ARGUMENT: extents = "(1, n)" + offs = " + 1" elif spec["source"] in bounds: extents = "(:, :, n)" elif spec["source"] == GRID_DATA_ARGUMENT: @@ -310,7 +312,7 @@ def generate_source_code(self, destination, overwrite): dimension = len(parse_extents(spec["extents"])) tmp = [":" for _ in range(dimension)] extents = "(" + ", ".join(tmp) + ", n)" - arg_list.append(f"{INDENT*5}{argument}_d{extents}") + arg_list.append(f"{INDENT*5}{argument}_d{extents}{offs}") fptr.write(", &\n".join(arg_list) + " &\n") fptr.write(f"{INDENT*5})\n") fptr.write(f"{INDENT*2}end do\n") diff --git a/tools/milhoja_pypkg/src/milhoja/TaskFunctionGenerator_cpu_F.py b/tools/milhoja_pypkg/src/milhoja/TaskFunctionGenerator_cpu_F.py index 5affc2c6..3b62d3b4 100644 --- a/tools/milhoja_pypkg/src/milhoja/TaskFunctionGenerator_cpu_F.py +++ b/tools/milhoja_pypkg/src/milhoja/TaskFunctionGenerator_cpu_F.py @@ -281,7 +281,7 @@ def generate_source_code(self, destination, overwrite): # get the first argument in the tile level array? if argument == TILE_LEVEL_ARGUMENT: - arg += "(1)" + arg += "(1) + 1" arg_list.append(arg) fptr.write(", &\n".join(arg_list) + " &\n")