From e8cf40d6c81b28b8d5beb3b71b71578ec731e925 Mon Sep 17 00:00:00 2001 From: Christian Hovy Date: Wed, 13 Dec 2017 16:22:22 +0100 Subject: [PATCH] Replaced fs_allocate by fs_allocate_array in templates --- templates/icon_standalone/replay.test.tmpl | 10 +++++----- templates/icon_testbed/replay.test.tmpl | 10 +++++----- templates/standalone/replay.test.tmpl | 10 +++++----- templates/standalone_nompi/replay.test.tmpl | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/templates/icon_standalone/replay.test.tmpl b/templates/icon_standalone/replay.test.tmpl index c8644da..839dd78 100644 --- a/templates/icon_standalone/replay.test.tmpl +++ b/templates/icon_standalone/replay.test.tmpl @@ -8,7 +8,7 @@ PROGRAM ftg_${subroutine.name}_test USE ${module.name}, ONLY: ${subroutine.name}, ftg_${subroutine.name}_capture_input_enabled, ftg_${subroutine.name}_capture_output_enabled, ftg_${subroutine.name}_capture_round, ftg_${subroutine.name}_output_dir - USE m_serialize, ONLY: t_serializer, t_savepoint, fs_create_serializer, fs_create_savepoint, fs_destroy_serializer, fs_destroy_savepoint, fs_get_field_bounds, fs_read_field, fs_write_field, fs_allocate, fs_field_exists, fs_print_debuginfo + USE m_serialize, ONLY: t_serializer, t_savepoint, fs_create_serializer, fs_create_savepoint, fs_destroy_serializer, fs_destroy_savepoint, fs_get_field_bounds, fs_read_field, fs_write_field, fs_allocate_array, fs_field_exists, fs_print_debuginfo ${globals.imports} @@ -92,7 +92,7 @@ CONTAINS ! BASIC ARGUMENTS #for $argument in $arguments.all.basic #if $isArray($argument) - CALL fs_allocate(serializer, "$argument", $argument) + CALL fs_allocate_array(serializer, "$argument", $argument) #end if CALL fs_read_field(serializer, savepoint, "$argument", $argument) #end for @@ -101,7 +101,7 @@ CONTAINS #for $argument in $arguments.all.optional IF (PRESENT($argument)) THEN #if $isArray($argument) - CALL fs_allocate(serializer, "$argument", $argument) + CALL fs_allocate_array(serializer, "$argument", $argument) #end if CALL fs_read_field(serializer, savepoint, "$argument", $argument) END IF @@ -143,7 +143,7 @@ END PROGRAM ftg_${subroutine.name}_test #end if #end for #if $needsAllocation($var) - CALL fs_allocate(serializer, "$var", $var) + CALL fs_allocate_array(serializer, "$var", $var) #end if CALL fs_read_field(serializer, savepoint, "$var", $var) #else @@ -184,7 +184,7 @@ END PROGRAM ftg_${subroutine.name}_test #end for $writeVarNameWithFilledIndicesToString($var, "ftg_c", $mandDims, "ftg_d1", "ftg_d2", "ftg_d3", "ftg_d4") #set $filled = $fillIndices($var, $mandDims, "ftg_d1", "ftg_d2", "ftg_d3", "ftg_d4") - CALL fs_allocate(serializer, ftg_c, $filled) + CALL fs_allocate_array(serializer, ftg_c, $filled) CALL fs_read_field(serializer, savepoint, ftg_c, $filled) #for $d in range(1, $getNumberOfMandatoryDimensions($var) + 1) END DO diff --git a/templates/icon_testbed/replay.test.tmpl b/templates/icon_testbed/replay.test.tmpl index 6c51a72..a73556c 100644 --- a/templates/icon_testbed/replay.test.tmpl +++ b/templates/icon_testbed/replay.test.tmpl @@ -8,7 +8,7 @@ MODULE mo_ftg_${subroutine.name}_test USE ${module.name}, ONLY: ${subroutine.name}, ftg_${subroutine.name}_capture_input_enabled, ftg_${subroutine.name}_capture_output_enabled, ftg_${subroutine.name}_capture_round, ftg_${subroutine.name}_output_dir - USE m_serialize, ONLY: t_serializer, t_savepoint, fs_create_serializer, fs_create_savepoint, fs_destroy_serializer, fs_destroy_savepoint, fs_get_field_bounds, fs_read_field, fs_write_field, fs_allocate, fs_field_exists, fs_print_debuginfo + USE m_serialize, ONLY: t_serializer, t_savepoint, fs_create_serializer, fs_create_savepoint, fs_destroy_serializer, fs_destroy_savepoint, fs_get_field_bounds, fs_read_field, fs_write_field, fs_allocate_array, fs_field_exists, fs_print_debuginfo ${globals.imports} @@ -85,7 +85,7 @@ CONTAINS ! BASIC ARGUMENTS #for $argument in $arguments.all.basic #if $isArray($argument) - CALL fs_allocate(serializer, "$argument", $argument) + CALL fs_allocate_array(serializer, "$argument", $argument) #end if CALL fs_read_field(serializer, savepoint, "$argument", $argument) #end for @@ -94,7 +94,7 @@ CONTAINS #for $argument in $arguments.all.optional IF (PRESENT($argument)) THEN #if $isArray($argument) - CALL fs_allocate(serializer, "$argument", $argument) + CALL fs_allocate_array(serializer, "$argument", $argument) #end if CALL fs_read_field(serializer, savepoint, "$argument", $argument) END IF @@ -137,7 +137,7 @@ END MODULE mo_ftg_${subroutine.name}_test #end if #end for #if $needsAllocation($var) - CALL fs_allocate(serializer, "$var", $var) + CALL fs_allocate_array(serializer, "$var", $var) #end if CALL fs_read_field(serializer, savepoint, "$var", $var) #else @@ -178,7 +178,7 @@ END MODULE mo_ftg_${subroutine.name}_test #end for $writeVarNameWithFilledIndicesToString($var, "ftg_c", $mandDims, "ftg_d1", "ftg_d2", "ftg_d3", "ftg_d4") #set $filled = $fillIndices($var, $mandDims, "ftg_d1", "ftg_d2", "ftg_d3", "ftg_d4") - CALL fs_allocate(serializer, ftg_c, $filled) + CALL fs_allocate_array(serializer, ftg_c, $filled) CALL fs_read_field(serializer, savepoint, ftg_c, $filled) #for $d in range(1, $getNumberOfMandatoryDimensions($var) + 1) END DO diff --git a/templates/standalone/replay.test.tmpl b/templates/standalone/replay.test.tmpl index c935982..3f91407 100644 --- a/templates/standalone/replay.test.tmpl +++ b/templates/standalone/replay.test.tmpl @@ -4,7 +4,7 @@ PROGRAM ftg_${subroutine.name}_test USE ${module.name}, ONLY: ${subroutine.name}, ftg_${subroutine.name}_capture_input_enabled, ftg_${subroutine.name}_capture_output_enabled, ftg_${subroutine.name}_capture_round, ftg_${subroutine.name}_output_dir - USE m_serialize, ONLY: t_serializer, t_savepoint, fs_create_serializer, fs_create_savepoint, fs_destroy_serializer, fs_destroy_savepoint, fs_get_field_bounds, fs_read_field, fs_write_field, fs_allocate, fs_field_exists, fs_print_debuginfo + USE m_serialize, ONLY: t_serializer, t_savepoint, fs_create_serializer, fs_create_savepoint, fs_destroy_serializer, fs_destroy_savepoint, fs_get_field_bounds, fs_read_field, fs_write_field, fs_allocate_array, fs_field_exists, fs_print_debuginfo ${globals.imports} @@ -90,7 +90,7 @@ CONTAINS ! BASIC ARGUMENTS #for $argument in $arguments.all.basic #if $isArray($argument) - CALL fs_allocate(serializer, "$argument", $argument) + CALL fs_allocate_array(serializer, "$argument", $argument) #end if CALL fs_read_field(serializer, savepoint, "$argument", $argument) #end for @@ -99,7 +99,7 @@ CONTAINS #for $argument in $arguments.all.optional IF (PRESENT($argument)) THEN #if $isArray($argument) - CALL fs_allocate(serializer, "$argument", $argument) + CALL fs_allocate_array(serializer, "$argument", $argument) #end if CALL fs_read_field(serializer, savepoint, "$argument", $argument) END IF @@ -141,7 +141,7 @@ END PROGRAM ftg_${subroutine.name}_test #end if #end for #if $needsAllocation($var) - CALL fs_allocate(serializer, "$var", $var) + CALL fs_allocate_array(serializer, "$var", $var) #end if CALL fs_read_field(serializer, savepoint, "$var", $var) #else @@ -182,7 +182,7 @@ END PROGRAM ftg_${subroutine.name}_test #end for $writeVarNameWithFilledIndicesToString($var, "ftg_c", $mandDims, "ftg_d1", "ftg_d2", "ftg_d3", "ftg_d4") #set $filled = $fillIndices($var, $mandDims, "ftg_d1", "ftg_d2", "ftg_d3", "ftg_d4") - CALL fs_allocate(serializer, ftg_c, $filled) + CALL fs_allocate_array(serializer, ftg_c, $filled) CALL fs_read_field(serializer, savepoint, ftg_c, $filled) #for $d in range(1, $getNumberOfMandatoryDimensions($var) + 1) END DO diff --git a/templates/standalone_nompi/replay.test.tmpl b/templates/standalone_nompi/replay.test.tmpl index 310afc8..fce7cb1 100644 --- a/templates/standalone_nompi/replay.test.tmpl +++ b/templates/standalone_nompi/replay.test.tmpl @@ -2,7 +2,7 @@ PROGRAM ftg_${subroutine.name}_test USE ${module.name}, ONLY: ${subroutine.name}, ftg_${subroutine.name}_capture_input_enabled, ftg_${subroutine.name}_capture_output_enabled, ftg_${subroutine.name}_capture_round, ftg_${subroutine.name}_output_dir - USE m_serialize, ONLY: t_serializer, t_savepoint, fs_create_serializer, fs_create_savepoint, fs_destroy_serializer, fs_destroy_savepoint, fs_get_field_bounds, fs_read_field, fs_write_field, fs_allocate, fs_field_exists, fs_print_debuginfo + USE m_serialize, ONLY: t_serializer, t_savepoint, fs_create_serializer, fs_create_savepoint, fs_destroy_serializer, fs_destroy_savepoint, fs_get_field_bounds, fs_read_field, fs_write_field, fs_allocate_array, fs_field_exists, fs_print_debuginfo ${globals.imports} @@ -78,7 +78,7 @@ CONTAINS ! BASIC ARGUMENTS #for $argument in $arguments.all.basic #if $isArray($argument) - CALL fs_allocate(serializer, "$argument", $argument) + CALL fs_allocate_array(serializer, "$argument", $argument) #end if CALL fs_read_field(serializer, savepoint, "$argument", $argument) #end for @@ -87,7 +87,7 @@ CONTAINS #for $argument in $arguments.all.optional IF (PRESENT($argument)) THEN #if $isArray($argument) - CALL fs_allocate(serializer, "$argument", $argument) + CALL fs_allocate_array(serializer, "$argument", $argument) #end if CALL fs_read_field(serializer, savepoint, "$argument", $argument) END IF @@ -129,7 +129,7 @@ END PROGRAM ftg_${subroutine.name}_test #end if #end for #if $needsAllocation($var) - CALL fs_allocate(serializer, "$var", $var) + CALL fs_allocate_array(serializer, "$var", $var) #end if CALL fs_read_field(serializer, savepoint, "$var", $var) #else @@ -170,7 +170,7 @@ END PROGRAM ftg_${subroutine.name}_test #end for $writeVarNameWithFilledIndicesToString($var, "ftg_c", $mandDims, "ftg_d1", "ftg_d2", "ftg_d3", "ftg_d4") #set $filled = $fillIndices($var, $mandDims, "ftg_d1", "ftg_d2", "ftg_d3", "ftg_d4") - CALL fs_allocate(serializer, ftg_c, $filled) + CALL fs_allocate_array(serializer, ftg_c, $filled) CALL fs_read_field(serializer, savepoint, ftg_c, $filled) #for $d in range(1, $getNumberOfMandatoryDimensions($var) + 1) END DO