diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C index af7439d5eb..1fdc860131 100644 --- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C @@ -240,7 +240,8 @@ void Foam::displacementComponentLaplacianFvMotionSolver::solve() ( fvm::laplacian ( - diffusivityPtr_->operator()(), + dimensionedScalar("viscosity", dimViscosity, 1.0) + *diffusivityPtr_->operator()(), cellDisplacement_, "laplacian(diffusivity,cellDisplacement)" ) @@ -249,8 +250,8 @@ void Foam::displacementComponentLaplacianFvMotionSolver::solve() ); fvOptions.constrain(TEqn); - TEqn.solveSegregatedOrCoupled(TEqn.solverDict()); + fvOptions.correct(cellDisplacement_); } diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C index bb783f74f1..6a61aee66a 100644 --- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C @@ -138,7 +138,8 @@ void Foam::velocityComponentLaplacianFvMotionSolver::solve() ( fvm::laplacian ( - diffusivityPtr_->operator()(), + dimensionedScalar("viscosity", dimViscosity, 1.0) + *diffusivityPtr_->operator()(), cellMotionU_, "laplacian(diffusivity,cellMotionU)" ) @@ -147,8 +148,8 @@ void Foam::velocityComponentLaplacianFvMotionSolver::solve() ); fvOptions.constrain(TEqn); - TEqn.solveSegregatedOrCoupled(TEqn.solverDict()); + fvOptions.correct(cellMotionU_); } diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C index df78e1ba6c..390a60fb12 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C @@ -183,7 +183,11 @@ void Foam::displacementSBRStressFvMotionSolver::solve() diffusivityPtr_->correct(); pointDisplacement_.boundaryFieldRef().updateCoeffs(); - surfaceScalarField Df(diffusivityPtr_->operator()()); + const surfaceScalarField Df + ( + dimensionedScalar("viscosity", dimViscosity, 1.0) + *diffusivityPtr_->operator()() + ); volTensorField gradCd("gradCd", fvc::grad(cellDisplacement_)); @@ -241,8 +245,8 @@ void Foam::displacementSBRStressFvMotionSolver::solve() ); fvOptions.constrain(TEqn); - TEqn.solveSegregatedOrCoupled(TEqn.solverDict()); + fvOptions.correct(cellDisplacement_); } diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C index d0011b035c..22d444062a 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C @@ -342,7 +342,8 @@ void Foam::displacementLaplacianFvMotionSolver::solve() ( fvm::laplacian ( - diffusivity().operator()(), + dimensionedScalar("viscosity", dimViscosity, 1.0) + *diffusivity().operator()(), cellDisplacement_, "laplacian(diffusivity,cellDisplacement)" ) @@ -351,8 +352,8 @@ void Foam::displacementLaplacianFvMotionSolver::solve() ); fvOptions.constrain(TEqn); - TEqn.solveSegregatedOrCoupled(TEqn.solverDict()); + fvOptions.correct(cellDisplacement_); } diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C index 5aa97ca960..aefde7ac5d 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C @@ -351,7 +351,8 @@ void Foam::solidBodyDisplacementLaplacianFvMotionSolver::solve() ( fvm::laplacian ( - diffusivity().operator()(), + dimensionedScalar("viscosity", dimViscosity, 1.0) + *diffusivity().operator()(), cellDisplacement_, "laplacian(diffusivity,cellDisplacement)" ) @@ -360,8 +361,8 @@ void Foam::solidBodyDisplacementLaplacianFvMotionSolver::solve() ); fvOptions.constrain(TEqn); - TEqn.solveSegregatedOrCoupled(TEqn.solverDict()); + fvOptions.correct(cellDisplacement_); } diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C index 79422161a0..9f9c2c27e2 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C @@ -381,7 +381,12 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::solve() sigmaD_ = magNewSigmaD; } - const surfaceScalarField Df(diffusivity().operator()()); + const surfaceScalarField Df + ( + dimensionedScalar("viscosity", dimViscosity, 1.0) + *diffusivity().operator()() + ); + pointDisplacement_.boundaryFieldRef().updateCoeffs(); fv::options& fvOptions(fv::options::New(fvMesh_)); @@ -417,6 +422,8 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::solve() // Note: solve uncoupled DEqn.solveSegregatedOrCoupled(DEqn.solverDict()); + + fvOptions.correct(cellDisp); } } diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C index c0e47c72e5..8d450954bf 100644 --- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C @@ -131,7 +131,8 @@ void Foam::velocityLaplacianFvMotionSolver::solve() ( fvm::laplacian ( - diffusivityPtr_->operator()(), + dimensionedScalar("viscosity", dimViscosity, 1.0) + *diffusivityPtr_->operator()(), cellMotionU_, "laplacian(diffusivity,cellMotionU)" ) @@ -140,8 +141,8 @@ void Foam::velocityLaplacianFvMotionSolver::solve() ); fvOptions.constrain(UEqn); - UEqn.solveSegregatedOrCoupled(UEqn.solverDict()); + fvOptions.correct(cellMotionU_); }