Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Futility
Futility
Commits
f4bcaa77
Commit
f4bcaa77
authored
Oct 22, 2021
by
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
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/Times.f90
View file @
f4bcaa77
...
...
@@ -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
...
...
unit_tests/testFileType_Log/testFileType_Log.f90
View file @
f4bcaa77
...
...
@@ -35,7 +35,6 @@ CONTAINS
!
!-------------------------------------------------------------------------------
SUBROUTINE
testLogFileType
()
LOGICAL
::
bool
CALL
testLogFile
%
e
%
addSurrogate
(
e
)
ASSERT
(
.NOT.
(
testLogFile
%
isEcho
()),
'%isEcho()'
)
CALL
testLogFile
%
setEcho
(
.TRUE.
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment