Commit f4bcaa77 authored by Graham, Aaron's avatar Graham, Aaron
Browse files

Merge branch 'fixIntelBuild' into 'master'

Add fix for Intel compiler

See merge request futility/Futility!354
parents a6761ed9 5a02bd87
Pipeline #170267 passed with stage
in 2 minutes and 4 seconds
......@@ -56,6 +56,7 @@
MODULE Times
#include "Futility_DBC.h"
USE Futility_DBC
USE ISO_FORTRAN_ENV
USE IntrType
USE Strings
USE IO_Strings
......@@ -1012,7 +1013,8 @@ RECURSIVE FUNCTION getTimer(this,name) RESULT(timer)
TYPE IS(ParentTimerType)
timer => timerptr%getTimer(ADJUSTL(timername%substr(INDEX(timername,'->')+2)))
TYPE IS(TimerType)
STOP "Timer "//timernames(1)//" is not a parent timer and cannot match "//name
WRITE(ERROR_UNIT, *) "Timer "//timernames(1)//" is not a parent timer and cannot match "//name
STOP
ENDSELECT
ELSE
timer => this%timers(i)%t
......@@ -1056,7 +1058,8 @@ RECURSIVE SUBROUTINE addTimer(this,name)
TYPE IS(ParentTimerType)
CALL timer%addTimer(ADJUSTL(timername%substr(INDEX(timername,'->')+2)))
TYPE IS(TimerType)
STOP "Cannot add sub-timer "//name//" to non-parent timer "//timernames(1)
WRITE(ERROR_UNIT, *) "Cannot add sub-timer "//name//" to non-parent timer "//timernames(1)
STOP
ENDSELECT
ELSE
CONTINUE !Just do nothing for now if the timer already exists
......
......@@ -35,7 +35,6 @@ CONTAINS
!
!-------------------------------------------------------------------------------
SUBROUTINE testLogFileType()
LOGICAL :: bool
CALL testLogFile%e%addSurrogate(e)
ASSERT(.NOT.(testLogFile%isEcho()),'%isEcho()')
CALL testLogFile%setEcho(.TRUE.)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment