Loki_transform: Rename option to --derive-argument-array-shape

ecmwf-ifs · Sep 13, 2023 · 083a672 · 083a672
1 parent 1242703
commit 083a672
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmake/loki_transform.cmake b/cmake/loki_transform.cmake
@@ -182,7 +182,7 @@ endmacro()
 #       [OMNI_INCLUDE <omni-inc1> [<omni-inc2> ...]]
 #       [XMOD <xmod-dir1> [<xmod-dir2> ...]]
 #       [REMOVE_OPENMP] [DATA_OFFLOAD] [GLOBAL_VAR_OFFLOAD]
-#       [TRIM_VECTOR_SECTIONS] [REMOVE_DERIVED_ARGS] [ARGUMENT_ARRAY_SHAPE]
+#       [TRIM_VECTOR_SECTIONS] [REMOVE_DERIVED_ARGS] [DERIVE_ARGUMENT_ARRAY_SHAPE]
 #   )
 #
 # Call ``loki-transform.py convert ...`` with the provided arguments.
@@ -248,8 +248,8 @@ function( loki_transform_convert )
         list( APPEND _ARGS --remove-derived-args )
     endif()
 
-    if( ${_PAR_ARGUMENT_ARRAY_SHAPE} )
-        list( APPEND _ARGS --argument-array-shape )
+    if( ${_PAR_DERIVE_ARGUMENT_ARRAY_SHAPE} )
+        list( APPEND _ARGS --derive-argument-array-shape )
     endif()
 
     _loki_transform_env_setup()

diff --git a/scripts/loki_transform.py b/scripts/loki_transform.py
@@ -104,12 +104,12 @@ def cli(debug):
               help="Generate offload instructions for global vars imported via 'USE' statements.")
 @click.option('--remove-derived-args/--no-remove-derived-args', default=False,
               help="Remove derived-type arguments and replace with canonical arguments")
-@click.option('--argument-array-shape/--no-argument-array-shape', default=False,
+@click.option('--derive-argument-array-shape/--no-argument-array-shape', default=False,
               help="Recursively derive explicit shape dimension for argument arrays")
 def convert(
         mode, config, build, source, header, cpp, directive, include, define, omni_include, xmod,
         data_offload, remove_openmp, frontend, trim_vector_sections,
-        global_var_offload, remove_derived_args, argument_array_shape
+        global_var_offload, remove_derived_args, derive_argument_array_shape
 ):
     """
     Batch-processing mode for Fortran-to-Fortran transformations that
@@ -169,7 +169,7 @@ def convert(
         scheduler.process(transformation=DrHookTransformation(mode=mode, remove=False))
 
     # Backward insert argument shapes (for surface routines)
-    if argument_array_shape:
+    if derive_argument_array_shape:
         scheduler.process(transformation=ArgumentArrayShapeAnalysis())
         scheduler.process(transformation=ExplicitArgumentArrayShapeTransformation(), reverse=True)