Skip to content

Commit

Permalink
Changed all template calls to ArgumentList.joinNames to commaList
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Hovy committed Jan 15, 2019
1 parent e616b08 commit ff950e0
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions templates/IconCompare/replay.test.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ CONTAINS
ftg_cmp_count_missing_field_as_failure = .FALSE.

CALL ftg_${subroutine.name}_init_for_replay('input', INPUT_DIR)
CALL ftg_${subroutine.name}_replay_input(${args.joinNames})
CALL ftg_${subroutine.name}_replay_input($commaList($args))
CALL ftg_destroy_serializer()

#if $subroutine.isFunction
${subroutine.name}_result = ${subroutine.name}(${args.joinNames})
${subroutine.name}_result = ${subroutine.name}($commaList($args))
#else
CALL ${subroutine.name}(${args.joinNames})
CALL ${subroutine.name}($commaList($args))
#end if

! One process after another to get nice, ordered printing
Expand Down Expand Up @@ -131,7 +131,7 @@ CONTAINS

END SUBROUTINE ftg_${subroutine.name}_init_for_replay

SUBROUTINE ftg_${subroutine.name}_replay_input(${args.joinNames})
SUBROUTINE ftg_${subroutine.name}_replay_input($commaList($args))

${args.specs(intent = 'inout', allocatable = True)}

Expand Down
2 changes: 1 addition & 1 deletion templates/IconStandalone/capture.aftersubroutine.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ LOGICAL FUNCTION ftg_${subroutine.name}_capture_input_active()

END FUNCTION ftg_${subroutine.name}_capture_input_active

SUBROUTINE ftg_${subroutine.name}_capture_input(${args.joinNames})
SUBROUTINE ftg_${subroutine.name}_capture_input($commaList($args))

USE mtime, ONLY: calendarType
USE mo_mpi, ONLY: get_my_mpi_all_id
Expand Down
8 changes: 4 additions & 4 deletions templates/IconStandalone/replay.test.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ CONTAINS
ftg_${subroutine.name}_capture_round = 1

CALL ftg_${subroutine.name}_init_for_replay('input')
CALL ftg_${subroutine.name}_replay_input(${args.joinNames})
CALL ftg_${subroutine.name}_replay_input($commaList($args))
CALL ftg_destroy_serializer()

#if $subroutine.isFunction
${subroutine.name}_result = ${subroutine.name}(${args.joinNames})
${subroutine.name}_result = ${subroutine.name}($commaList($args))
#else
CALL ${subroutine.name}(${args.joinNames})
CALL ${subroutine.name}($commaList($args))
#end if

END SUBROUTINE ftg_test_${subroutine.name}
Expand All @@ -72,7 +72,7 @@ CONTAINS

END SUBROUTINE ftg_${subroutine.name}_init_for_replay

SUBROUTINE ftg_${subroutine.name}_replay_input(${args.joinNames})
SUBROUTINE ftg_${subroutine.name}_replay_input($commaList($args))

${args.specs(intent = 'inout', allocatable = True)}

Expand Down
8 changes: 4 additions & 4 deletions templates/IconTestbed/replay.test.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ CONTAINS
ftg_${subroutine.name}_capture_round = 1

CALL ftg_${subroutine.name}_init_for_replay('input')
CALL ftg_${subroutine.name}_replay_input(${args.joinNames})
CALL ftg_${subroutine.name}_replay_input($commaList($args))
CALL ftg_destroy_serializer()

#if $subroutine.isFunction
${subroutine.name}_result = ${subroutine.name}(${args.joinNames})
${subroutine.name}_result = ${subroutine.name}($commaList($args))
#else
CALL ${subroutine.name}(${args.joinNames})
CALL ${subroutine.name}($commaList($args))
#end if

END SUBROUTINE ftg_test_${subroutine.name}
Expand All @@ -68,7 +68,7 @@ CONTAINS

END SUBROUTINE ftg_${subroutine.name}_init_for_replay

SUBROUTINE ftg_${subroutine.name}_replay_input(${args.joinNames})
SUBROUTINE ftg_${subroutine.name}_replay_input($commaList($args))

${args.specs(intent = 'inout', allocatable = True)}

Expand Down
2 changes: 1 addition & 1 deletion templates/Standalone/capture.afterlastspecification.tmpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$prologue

ftg_${subroutine.name}_round = ftg_${subroutine.name}_round + 1
CALL ftg_${subroutine.name}_capture_input(${args.joinNames})
CALL ftg_${subroutine.name}_capture_input($commaList($args))

$epilogue
2 changes: 1 addition & 1 deletion templates/Standalone/capture.aftersubroutine.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ LOGICAL FUNCTION ftg_${subroutine.name}_capture_input_active()

END FUNCTION ftg_${subroutine.name}_capture_input_active

SUBROUTINE ftg_${subroutine.name}_capture_input(${args.joinNames})
SUBROUTINE ftg_${subroutine.name}_capture_input($commaList($args))

USE mpi
USE m_ser_ftg, ONLY: ftg_set_savepoint, ftg_write, ftg_register_only, ftg_destroy_savepoint, ftg_destroy_serializer
Expand Down
8 changes: 4 additions & 4 deletions templates/Standalone/replay.test.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ CONTAINS
ftg_${subroutine.name}_capture_round = 1

CALL ftg_${subroutine.name}_init_for_replay('input')
CALL ftg_${subroutine.name}_replay_input(${args.joinNames})
CALL ftg_${subroutine.name}_replay_input($commaList($args))
CALL ftg_destroy_serializer()

#if $subroutine.isFunction
${subroutine.name}_result = ${subroutine.name}(${args.joinNames})
${subroutine.name}_result = ${subroutine.name}($commaList($args))
#else
CALL ${subroutine.name}(${args.joinNames})
CALL ${subroutine.name}($commaList($args))
#end if

END SUBROUTINE ftg_test_${subroutine.name}
Expand All @@ -75,7 +75,7 @@ CONTAINS

END SUBROUTINE ftg_${subroutine.name}_init_for_replay

SUBROUTINE ftg_${subroutine.name}_replay_input(${args.joinNames})
SUBROUTINE ftg_${subroutine.name}_replay_input($commaList($args))

${args.specs(intent = 'inout', allocatable = True)}

Expand Down
2 changes: 1 addition & 1 deletion templates/StandaloneNoMPI/capture.aftersubroutine.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ LOGICAL FUNCTION ftg_${subroutine.name}_capture_input_active()

END FUNCTION ftg_${subroutine.name}_capture_input_active

SUBROUTINE ftg_${subroutine.name}_capture_input(${args.joinNames})
SUBROUTINE ftg_${subroutine.name}_capture_input($commaList($args))

USE m_ser_ftg, ONLY: ftg_set_savepoint, ftg_write, ftg_register_only, ftg_destroy_savepoint, ftg_destroy_serializer

Expand Down
8 changes: 4 additions & 4 deletions templates/StandaloneNoMPI/replay.test.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ CONTAINS
ftg_${subroutine.name}_capture_round = 1

CALL ftg_${subroutine.name}_init_for_replay('input')
CALL ftg_${subroutine.name}_replay_input(${args.joinNames})
CALL ftg_${subroutine.name}_replay_input($commaList($args))
CALL ftg_destroy_serializer()

#if $subroutine.isFunction
${subroutine.name}_result = ${subroutine.name}(${args.joinNames})
${subroutine.name}_result = ${subroutine.name}($commaList($args))
#else
CALL ${subroutine.name}(${args.joinNames})
CALL ${subroutine.name}($commaList($args))
#end if

END SUBROUTINE ftg_test_${subroutine.name}
Expand All @@ -63,7 +63,7 @@ CONTAINS

END SUBROUTINE ftg_${subroutine.name}_init_for_replay

SUBROUTINE ftg_${subroutine.name}_replay_input(${args.joinNames})
SUBROUTINE ftg_${subroutine.name}_replay_input($commaList($args))

${args.specs(intent = 'inout', allocatable = True)}

Expand Down

0 comments on commit ff950e0

Please sign in to comment.