Skip to content

Commit acce87d

Browse files
committed
Merge branch 'framework/recursive_log_write' into hotfix-v6.2 (PR #181)
This merge adds the 'recursive' attribute to the MPAS_log_write routine. The MPAS_log_write routine can generate indirect recursive calls to itself, for example, when MPAS_log_write calls log_abort, which calls MPAS_log_finalize, which then calls MPAS_log_write. Without the recursive attribute, several compilers will halt execution when MPAS is compiled with DEBUG=true if a recursive call is detected in a routine not marked as recursive. * framework/recursive_log_write: Add missing 'recursive' attribute to MPAS_log_write(...) routine
2 parents 8f935c4 + 721f4ef commit acce87d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/framework/mpas_log.F

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ end subroutine mpas_log_open
461461
!
462462
!-----------------------------------------------------------------------
463463

464-
subroutine mpas_log_write(message, messageType, masterOnly, flushNow, &
464+
recursive subroutine mpas_log_write(message, messageType, masterOnly, flushNow, &
465465
intArgs, realArgs, logicArgs, err)
466466

467467
use mpas_threading

0 commit comments

Comments
 (0)