Merge pull request #464 from ecmwf-ifs/naml-fortran-c-adjustments

Transpile: Split C-kernel generation from ISO-C wrapper generation

loki/transformations/tests/test_array_indexing.py

@@ -22,7 +22,9 @@
     LowerConstantArrayIndices, remove_explicit_array_dimensions,
     add_explicit_array_dimensions
 )
-from loki.transformations.transpile import FortranCTransformation
+from loki.transformations.transpile import (
+    FortranCTransformation, FortranISOCWrapperTransformation
+)
 
 
 @pytest.fixture(scope='function', name='builder')
@@ -546,8 +548,13 @@ def validate_routine(routine):
     f2c_routine = Subroutine.from_source(fcode, frontend=frontend)
     f2c = FortranCTransformation()
     f2c.apply(source=f2c_routine, path=tmp_path)
+    f2cwrap = FortranISOCWrapperTransformation()
+    f2cwrap.apply(source=f2c_routine, path=tmp_path)
     libname = f'fc_{f2c_routine.name}_{start_index}_{frontend}'
-    c_kernel = jit_compile_lib([f2c.wrapperpath, f2c.c_path], path=tmp_path, name=libname, builder=builder)
+    c_kernel = jit_compile_lib(
+        [tmp_path/f'{f2c_routine.name}_fc.F90', tmp_path/f'{f2c_routine.name}_c.c'],
+        path=tmp_path, name=libname, builder=builder
+    )
     fc_function = c_kernel.transf_flatten_arr_fc_mod.transf_flatten_arr_fc
     f2c_x1, f2c_x2, f2c_x3, f2c_x4 = init_arguments(l1, l2, l3, l4, flattened=True)
     fc_function(f2c_x1, f2c_x2, f2c_x3, f2c_x4, l1, l2, l3, l4)

loki/transformations/transpile/__init__.py

@@ -6,4 +6,5 @@
 # nor does it submit to any jurisdiction.
 
 from loki.transformations.transpile.fortran_c import * # noqa
+from loki.transformations.transpile.fortran_iso_c_wrapper import * # noqa
 from loki.transformations.transpile.fortran_python import * # noqa