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

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

See merge request !320

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

src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H

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

src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H

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

src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H

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

src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H

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

src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H

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

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;