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:
parent
0eea2bab54
commit
378b557cd3
@ -1,4 +1,4 @@
|
||||
//EXE_DEBUG = -DFULLDEBUG -g -O0
|
||||
EXE_DEBUG = -DFULLDEBUG -g -O0
|
||||
EXE_FROUNDING_MATH = -frounding-math
|
||||
EXE_NDEBUG = -DNDEBUG
|
||||
|
||||
|
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
|
||||
<< nl << endl;
|
||||
}
|
||||
|
||||
mesh.writeMesh();
|
||||
mesh.writeMesh(runTime.constant());
|
||||
|
||||
Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
|
||||
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
|
||||
|
@ -1,4 +1,4 @@
|
||||
//EXE_DEBUG = -DFULLDEBUG -g -O0
|
||||
EXE_DEBUG = -DFULLDEBUG -g -O0
|
||||
EXE_FROUNDING_MATH = -frounding-math
|
||||
EXE_NDEBUG = -DNDEBUG
|
||||
|
||||
|
@ -76,16 +76,19 @@ cellSizeFunction::cellSizeFunction
|
||||
else
|
||||
{
|
||||
FatalErrorIn("cellSizeFunction::cellSizeFunction")
|
||||
<< "Unknown mode, expected: inside, outside or bothSides" << nl
|
||||
<< "Unknown mode, expected: inside, outside or bothSides" << nl
|
||||
<< exit(FatalError);
|
||||
}
|
||||
}
|
||||
else if (mode != rmBothsides)
|
||||
else
|
||||
{
|
||||
WarningIn("cellSizeFunction::cellSizeFunction")
|
||||
<< "surface does not support volumeType, defaulting mode to "
|
||||
<< "bothSides."
|
||||
<< endl;
|
||||
if (mode != "bothSides")
|
||||
{
|
||||
WarningIn("cellSizeFunction::cellSizeFunction")
|
||||
<< "surface does not support volumeType, defaulting mode to "
|
||||
<< "bothSides."
|
||||
<< endl;
|
||||
}
|
||||
|
||||
sideMode_ = rmBothsides;
|
||||
}
|
||||
|
@ -230,7 +230,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
|
||||
while
|
||||
(
|
||||
totalHits > 0
|
||||
&& totalHits > hitLimit
|
||||
&& totalHits >= hitLimit
|
||||
&& iterationNo < maxIterations
|
||||
)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user