Unified calls to fs_allocate in replay templates

fortesg · Sep 11, 2017 · 3afb141 · 3afb141
1 parent 5e954d8
commit 3afb141
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 53 deletions.
diff --git 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_allocatable, fs_allocate_pointer, 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, 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_allocatable(serializer, "$argument", $argument)
+        CALL fs_allocate(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_allocatable(serializer, "$argument", $argument)
+        CALL fs_allocate(serializer, "$argument", $argument)
       #end if
         CALL fs_read_field(serializer, savepoint, "$argument", $argument)
       END IF
@@ -138,13 +138,9 @@ END PROGRAM ftg_${subroutine.name}_test
       #end if
     #end for
     #if $needsAllocation($var)
-      #if $isAllocatable($var)
-        CALL fs_allocate_allocatable(serializer, "$var", $var)
-      #else
-        CALL fs_allocate_pointer(serializer, "$var", $var)
-      #end if
+      CALL fs_allocate(serializer, "$var", $var)
     #end if
-        CALL fs_read_field(serializer, savepoint, "$var", $var)
+    CALL fs_read_field(serializer, savepoint, "$var", $var)
   #else
 
     #set $mandDims = $getNumberOfMandatoryDimensions($var)
@@ -183,11 +179,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")
-    #if $isAllocatable($var)
-      CALL fs_allocate_allocatable(serializer, ftg_c, $filled)
-    #else if $isPointer($var)
-      CALL fs_allocate_pointer(serializer, ftg_c, $filled)
-    #end if
+    CALL fs_allocate(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
@@ -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_allocatable, fs_allocate_pointer, 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, 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_allocatable(serializer, "$argument", $argument)
+        CALL fs_allocate(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_allocatable(serializer, "$argument", $argument)
+        CALL fs_allocate(serializer, "$argument", $argument)
       #end if
         CALL fs_read_field(serializer, savepoint, "$argument", $argument)
       END IF
@@ -131,11 +131,7 @@ END MODULE mo_ftg_${subroutine.name}_test
       #end if
     #end for
     #if $needsAllocation($var)
-      #if $isAllocatable($var)
-        CALL fs_allocate_allocatable(serializer, "$var", $var)
-      #else
-        CALL fs_allocate_pointer(serializer, "$var", $var)
-      #end if
+      CALL fs_allocate(serializer, "$var", $var)
     #end if
         CALL fs_read_field(serializer, savepoint, "$var", $var)
   #else
@@ -176,11 +172,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")
-    #if $isAllocatable($var)
-      CALL fs_allocate_allocatable(serializer, ftg_c, $filled)
-    #else if $isPointer($var)
-      CALL fs_allocate_pointer(serializer, ftg_c, $filled)
-    #end if
+    CALL fs_allocate(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
@@ -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_allocatable, fs_allocate_pointer, 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, 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_allocatable(serializer, "$argument", $argument)
+        CALL fs_allocate(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_allocatable(serializer, "$argument", $argument)
+        CALL fs_allocate(serializer, "$argument", $argument)
       #end if
         CALL fs_read_field(serializer, savepoint, "$argument", $argument)
       END IF
@@ -136,11 +136,7 @@ END PROGRAM ftg_${subroutine.name}_test
       #end if
     #end for
     #if $needsAllocation($var)
-      #if $isAllocatable($var)
-        CALL fs_allocate_allocatable(serializer, "$var", $var)
-      #else
-        CALL fs_allocate_pointer(serializer, "$var", $var)
-      #end if
+      CALL fs_allocate_allocatable(serializer, "$var", $var)
     #end if
         CALL fs_read_field(serializer, savepoint, "$var", $var)
   #else
@@ -181,11 +177,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")
-    #if $isAllocatable($var)
-      CALL fs_allocate_allocatable(serializer, ftg_c, $filled)
-    #else if $isPointer($var)
-      CALL fs_allocate_pointer(serializer, ftg_c, $filled)
-    #end if
+    CALL fs_allocate(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
@@ -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_allocatable, fs_allocate_pointer, 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, 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_allocatable(serializer, "$argument", $argument)
+        CALL fs_allocate(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_allocatable(serializer, "$argument", $argument)
+        CALL fs_allocate(serializer, "$argument", $argument)
       #end if
         CALL fs_read_field(serializer, savepoint, "$argument", $argument)
       END IF
@@ -124,11 +124,7 @@ END PROGRAM ftg_${subroutine.name}_test
       #end if
     #end for
     #if $needsAllocation($var)
-      #if $isAllocatable($var)
-        CALL fs_allocate_allocatable(serializer, "$var", $var)
-      #else
-        CALL fs_allocate_pointer(serializer, "$var", $var)
-      #end if
+      CALL fs_allocate(serializer, "$var", $var)
     #end if
         CALL fs_read_field(serializer, savepoint, "$var", $var)
   #else
@@ -169,11 +165,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")
-    #if $isAllocatable($var)
-      CALL fs_allocate_allocatable(serializer, ftg_c, $filled)
-    #else if $isPointer($var)
-      CALL fs_allocate_pointer(serializer, ftg_c, $filled)
-    #end if
+    CALL fs_allocate(serializer, ftg_c, $filled)
     CALL fs_read_field(serializer, savepoint, ftg_c, $filled)
     #for $d in range(1, $getNumberOfMandatoryDimensions($var) + 1)
       END DO