Commit 1496fb67 authored by Chris Cantwell's avatar Chris Cantwell Committed by Douglas Serson

Updated CHANGELOG. Add code comments, tidy code.

(cherry picked from commit f3f69939)

Conflicts:
	CHANGELOG.md
parent c970cb5b
......@@ -13,6 +13,8 @@ v4.3.2
- Fix minor performance issue with time integration schemes (!632)
- Fix FilterCheckpoint filter to be consistent with `IO_CheckSteps` (!633)
- Fix `IO_CheckSteps` to avoid missing first checkpoint (!639)
- 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)
......
......@@ -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;
}
......
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