zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bug-wrong-FatalIOError-message' into 'master'

Browse Source 
BUG: Wrong FatalIOError message in displacementMethod and optMeshMovement (#1537)

See merge request Development/openfoam!320
This commit is contained in:
Andrew Heather
2020-01-03 09:36:06 +00:00
parent 122e496590 fed6a9efd4
commit 227a0f5d43
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.C
View File

@ -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));
}

2
src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H
View File

@ -82,7 +82,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethoddisplacementLaplacian");
TypeName("displacementLaplacian");
// Constructors

2
src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H
View File

@ -86,7 +86,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethodelasticityMotionSolver");
TypeName("elasticityMotionSolver");
// Constructors

2
src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H
View File

@ -83,7 +83,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethodlaplacianMotionSolver");
TypeName("laplacianMotionSolver");
// Constructors

2
src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H
View File

@ -84,7 +84,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethodvelocityLaplacian");
TypeName("velocityLaplacian");
// Constructors

2
src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H
View File

@ -77,7 +77,7 @@ private:
public:
//- Runtime type information
TypeName("displacementMethodvolumetricBSplinesMotionSolver");
TypeName("volumetricBSplinesMotionSolver");
// Constructors

9
src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
View File

@ -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;