BUG: cellSizeFunction. Bad logic for triggering warning for bothSides

default whern surface does not support volumeType.

BUG: conformalVoronoiMesh.  Making test "totalHits >= hitLimit" rather than
"totalHits = hitLimit" to be strictly consistent and always trigger
the iteration termination message.
This commit is contained in:
graham
2010-02-26 16:11:30 +00:00
parent 0eea2bab54
commit 378b557cd3
5 changed files with 13 additions and 10 deletions

View File

@ -1,4 +1,4 @@
//EXE_DEBUG = -DFULLDEBUG -g -O0 EXE_DEBUG = -DFULLDEBUG -g -O0
EXE_FROUNDING_MATH = -frounding-math EXE_FROUNDING_MATH = -frounding-math
EXE_NDEBUG = -DNDEBUG EXE_NDEBUG = -DNDEBUG

View File

@ -68,7 +68,7 @@ int main(int argc, char *argv[])
<< nl << endl; << nl << endl;
} }
mesh.writeMesh(); mesh.writeMesh(runTime.constant());
Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s"

View File

@ -1,4 +1,4 @@
//EXE_DEBUG = -DFULLDEBUG -g -O0 EXE_DEBUG = -DFULLDEBUG -g -O0
EXE_FROUNDING_MATH = -frounding-math EXE_FROUNDING_MATH = -frounding-math
EXE_NDEBUG = -DNDEBUG EXE_NDEBUG = -DNDEBUG

View File

@ -80,12 +80,15 @@ cellSizeFunction::cellSizeFunction
<< exit(FatalError); << exit(FatalError);
} }
} }
else if (mode != rmBothsides) else
{
if (mode != "bothSides")
{ {
WarningIn("cellSizeFunction::cellSizeFunction") WarningIn("cellSizeFunction::cellSizeFunction")
<< "surface does not support volumeType, defaulting mode to " << "surface does not support volumeType, defaulting mode to "
<< "bothSides." << "bothSides."
<< endl; << endl;
}
sideMode_ = rmBothsides; sideMode_ = rmBothsides;
} }

View File

@ -230,7 +230,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
while while
( (
totalHits > 0 totalHits > 0
&& totalHits > hitLimit && totalHits >= hitLimit
&& iterationNo < maxIterations && iterationNo < maxIterations
) )
{ {