diff --git a/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H b/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H index 92931154..66216b87 100644 --- a/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H +++ b/applications/solvers/multiphase/driftFluxFoam/kEpsilon.H @@ -10,7 +10,7 @@ if (turbulence) dimensionedScalar epsilon0("epsilon0", epsilon.dimensions(), 0); dimensionedScalar epsilonMin("epsilonMin", epsilon.dimensions(), SMALL); - volScalarField divU(fvc::div(rhoPhi/fvc::interpolate(rho))); + volScalarField divU(fvc::div(phi)); tmp tgradU = fvc::grad(U); volScalarField G(mut*(tgradU() && dev(twoSymm(tgradU())))); diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C index b6669b09..1f91954e 100644 --- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C +++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,6 +55,12 @@ int main(int argc, char *argv[]) { # include "addOverwriteOption.H" argList::validArgs.append("cellSet"); + argList::addBoolOption + ( + "minSet", + "remove cells from input cellSet to keep to 2:1 ratio" + " (default is to extend set)" + ); # include "setRootCase.H" # include "createTime.H" @@ -65,6 +71,8 @@ int main(int argc, char *argv[]) word cellSetName(args.args()[1]); const bool overwrite = args.optionFound("overwrite"); + const bool minSet = args.optionFound("minSet"); + Info<< "Reading cells to refine from cellSet " << cellSetName << nl << endl; @@ -143,7 +151,7 @@ int main(int argc, char *argv[]) meshCutter.consistentRefinement ( cellsToRefine.toc(), - true // extend set + !minSet // extend set ) ); diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C index 04edda45..fdef885a 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,7 +57,7 @@ Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver const IOdictionary& dict ) : - displacementMotionSolver(mesh, dict, typeName), + displacementMotionSolver(mesh, dict, dict.lookup("solver")), fvMotionSolverCore(mesh), cellDisplacement_ ( diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H index 6d31eec0..566a9868 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,6 +111,12 @@ public: return cellDisplacement_; } + //- Return diffusivity + motionDiffusivity& diffusivity() + { + return diffusivityPtr_(); + } + //- Return point location obtained from the current motion field virtual tmp curPoints() const;