Commit fed6a9ef authored by Vaggelis Papoutsis's avatar Vaggelis Papoutsis Committed by Andrew Heather

BUG: Wrong FatalIOError message in displacementMethod and optMeshMovement

- The core of the FatalIOError message was not printed due to exiting
  with FatalError instead of FatalIOError
- Changed the TypeName in all derived classes of displacementMethod so
  that the toc printed by the FatalIOError corresponds to what the user
  should add in dynamicMeshDict
parent 122e4965
......@@ -75,12 +75,11 @@ Foam::autoPtr<Foam::displacementMethod> Foam::displacementMethod::New
false
)
);
word motionSolverName(dynamicMeshDict.get<word>("solver"));
word modelType("displacementMethod" + motionSolverName);
word solverType(dynamicMeshDict.get<word>("solver"));
Info<< "displacementMethod type : " << modelType << endl;
Info<< "displacementMethod type : " << solverType << endl;
auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
auto cstrIter = dictionaryConstructorTablePtr_->cfind(solverType);
if (!cstrIter.found())
{
......@@ -88,9 +87,9 @@ Foam::autoPtr<Foam::displacementMethod> Foam::displacementMethod::New
(
dynamicMeshDict,
"solver",
modelType,
solverType,
*dictionaryConstructorTablePtr_
) << exit(FatalError);
) << exit(FatalIOError);
}
return autoPtr<displacementMethod>(cstrIter()(mesh, patchIDs));
}
......
......@@ -82,7 +82,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethoddisplacementLaplacian");
TypeName("displacementLaplacian");
// Constructors
......
......@@ -86,7 +86,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethodelasticityMotionSolver");
TypeName("elasticityMotionSolver");
// Constructors
......
......@@ -83,7 +83,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethodlaplacianMotionSolver");
TypeName("laplacianMotionSolver");
// Constructors
......
......@@ -84,7 +84,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethodvelocityLaplacian");
TypeName("velocityLaplacian");
// Constructors
......
......@@ -77,7 +77,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethodvolumetricBSplinesMotionSolver");
TypeName("volumetricBSplinesMotionSolver");
// Constructors
......
......@@ -110,7 +110,7 @@ Foam::autoPtr<Foam::optMeshMovement> Foam::optMeshMovement::New
"type",
modelType,
*dictionaryConstructorTablePtr_
) << exit(FatalError);
) << exit(FatalIOError);
}
return autoPtr<optMeshMovement>(cstrIter()(mesh, dict, patchIDs));
......@@ -156,9 +156,10 @@ void Foam::optMeshMovement::writeMeshQualityMetrics()
if (writeMeshQualityMetrics_)
{
cellQuality cellQualityEngine(mesh_);
tmp<scalarField> cellNonOrtho = cellQualityEngine.nonOrthogonality();
tmp<scalarField> cellSkewness = cellQualityEngine.skewness();
Info<< "Average, Max cell non - orthogonality " << gAverage(cellNonOrtho())
tmp<scalarField> cellNonOrtho(cellQualityEngine.nonOrthogonality());
tmp<scalarField> cellSkewness(cellQualityEngine.skewness());
Info<< "Average, Max cell non - orthogonality "
<< gAverage(cellNonOrtho())
<< " " << gMax(cellNonOrtho()) << endl;
Info<< "Average, Max cell skewness " << gAverage(cellSkewness())
<< " " << gMax(cellSkewness()) << 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