Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nektar
Nektar
Commits
f3f69939
Commit
f3f69939
authored
May 27, 2016
by
Chris Cantwell
Browse files
Updated CHANGELOG. Add code comments, tidy code.
parent
bcff0ce9
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
f3f69939
...
...
@@ -10,6 +10,8 @@ v4.3.2
-
Print error message for invalid equation also in release version (!634)
-
HistoryPoints filter now uses closest plane to requested z-coordinate and
output is produced in physical space (!621).
-
Fix bug in iterative solver where only root process would ASSERT when
exceeding the maximum number of iterations (!636)
**FieldConvert**
:
-
Fix appearence of duplicate messages when running in parallel (!626)
...
...
library/LibUtilities/BasicUtils/ErrorUtil.hpp
View file @
f3f69939
...
...
@@ -77,7 +77,6 @@ namespace ErrorUtil
inline
static
void
Error
(
ErrType
type
,
const
char
*
routine
,
int
lineNumber
,
const
char
*
msg
,
unsigned
int
level
)
{
int
rank
=
0
;
// The user of outStream is primarily for the unit tests.
// The unit tests often generate errors on purpose to make sure
// invalid usage is flagged appropriately. Printing the error
...
...
@@ -91,6 +90,9 @@ namespace ErrorUtil
#endif
msg
;
// Default rank is zero. If MPI used and initialised, populate with
// the correct rank. Messages are only printed on rank zero.
int
rank
=
0
;
#if defined(NEKTAR_USE_MPI)
int
flag
;
MPI_Initialized
(
&
flag
);
...
...
@@ -99,7 +101,7 @@ namespace ErrorUtil
MPI_Comm_rank
(
MPI_COMM_WORLD
,
&
rank
);
}
#endif
std
::
string
btMessage
(
""
);
#if defined(NEKTAR_FULLDEBUG)
#ifndef _WIN32
...
...
@@ -118,12 +120,12 @@ namespace ErrorUtil
#endif
#endif
switch
(
type
)
switch
(
type
)
{
case
efatal
:
if
(
!
rank
)
if
(
!
rank
)
{
if
(
outStream
)
if
(
outStream
)
{
(
*
outStream
)
<<
btMessage
;
(
*
outStream
)
<<
"Fatal : "
<<
baseMsg
<<
std
::
endl
;
...
...
@@ -135,13 +137,12 @@ namespace ErrorUtil
<<
std
::
endl
;
}
}
throw
NekError
(
baseMsg
);
break
;
case
ewarning
:
if
(
!
rank
)
if
(
!
rank
)
{
if
(
outStream
)
if
(
outStream
)
{
(
*
outStream
)
<<
btMessage
;
(
*
outStream
)
<<
"Warning: "
<<
baseMsg
<<
std
::
endl
;
...
...
@@ -153,7 +154,6 @@ namespace ErrorUtil
}
}
break
;
default:
std
::
cerr
<<
"Unknown warning type: "
<<
baseMsg
<<
std
::
endl
;
}
...
...
Chris Cantwell
@ccantwel
mentioned in commit
1496fb67
·
Jun 02, 2016
mentioned in commit
1496fb67
mentioned in commit 1496fb67a85f35004d31ffb485e4675c428032ca
Toggle commit list
Write
Preview
Supports
Markdown
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