From fed6a9efd4cad3e101eb9b9aea722346cfb0bbbd Mon Sep 17 00:00:00 2001
From: Vaggelis Papoutsis <vaggelisp@gmail.com>
Date: Thu, 2 Jan 2020 13:27:41 +0200
Subject: [PATCH] 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
---
.../displacementMethod/displacementMethod.C | 11 +++++------
.../displacementMethoddisplacementLaplacian.H | 2 +-
.../displacementMethodelasticityMotionSolver.H | 2 +-
.../displacementMethodlaplacianMotionSolver.H | 2 +-
.../displacementMethodvelocityLaplacian.H | 2 +-
...displacementMethodvolumetricBSplinesMotionSolver.H | 2 +-
.../optMeshMovement/optMeshMovement/optMeshMovement.C | 9 +++++----
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.C b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.C
index db9a4565312..9ac5a2812c5 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.C
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.C
@@ -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));
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H
index 2a4c30245b1..d9f2f3faef5 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H
@@ -82,7 +82,7 @@ private:
public:
//- Runtime type information
- TypeName("displacementMethoddisplacementLaplacian");
+ TypeName("displacementLaplacian");
// Constructors
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H
index a4123641601..50b8ec4df82 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H
@@ -86,7 +86,7 @@ private:
public:
//- Runtime type information
- TypeName("displacementMethodelasticityMotionSolver");
+ TypeName("elasticityMotionSolver");
// Constructors
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H
index 294c0ddd226..083ab095893 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H
@@ -83,7 +83,7 @@ private:
public:
//- Runtime type information
- TypeName("displacementMethodlaplacianMotionSolver");
+ TypeName("laplacianMotionSolver");
// Constructors
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H
index 1f109009e08..d2bea03b438 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H
@@ -84,7 +84,7 @@ private:
public:
//- Runtime type information
- TypeName("displacementMethodvelocityLaplacian");
+ TypeName("velocityLaplacian");
// Constructors
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H
index e82a17dd0f5..283769544fa 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H
@@ -77,7 +77,7 @@ private:
public:
//- Runtime type information
- TypeName("displacementMethodvolumetricBSplinesMotionSolver");
+ TypeName("volumetricBSplinesMotionSolver");
// Constructors
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
index 794ad1b04e9..e217065b300 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
@@ -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;
--
GitLab