From 199e53fd0da55625de019fedb392cb7009cb8d9e Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Wed, 13 Jan 2021 15:20:20 +0000
Subject: [PATCH] dynamicMotionSolverFvMesh: Removed unsupported motion solver
 keywords

A dynamicMotionSolverFvMesh must now use a "motionSolver" or
"motionSolvers" entry to select the underlying motion solver. For
example, in constant/dynamicMeshDict:

    dynamicFvMesh   dynamicMotionSolverFvMesh;
    motionSolverLibs ("librigidBodyMeshMotion.so");
    motionSolver    rigidBodyMotion;
    ...

Previously the motion solver could also be specified with the keyword
"solver", but this resulted in a name clash with rigid body solvers
which are frequently specified in the same scope. For this reason, the
"solver" and "solvers" entries have been removed.
---
 src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C | 8 ++------
 .../mixerVesselAMI2D/constant/dynamicMeshDict             | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index 9f4009b0ae..21d5628c2a 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -64,17 +64,13 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
     const dictionary& solverDict
 )
 {
-    if (solverDict.found("solvers"))
+    if (solverDict.found("motionSolvers"))
     {
         return autoPtr<motionSolver>(new motionSolverList(mesh, solverDict));
     }
     else
     {
-        const word solverTypeName =
-            solverDict.lookupBackwardsCompatible<word>
-            (
-                {"motionSolver", "solver"}
-            );
+        const word solverTypeName = solverDict.lookup<word>("motionSolver");
 
         Info<< "Selecting motion solver: " << solverTypeName << endl;
 
diff --git a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/dynamicMeshDict
index 11ef7443dd..1eee5171c7 100644
--- a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/dynamicMeshDict
+++ b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/dynamicMeshDict
@@ -17,7 +17,7 @@ FoamFile
 
 dynamicFvMesh   dynamicMotionSolverFvMesh;
 
-solver          multiSolidBodyMotionSolver;
+motionSolver    multiSolidBodyMotionSolver;
 
 multiSolidBodyMotionSolverCoeffs
 {