From 32711a0caa442863eced5d34635ecabd9756c022 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 11 Mar 2014 10:51:57 +0000
Subject: [PATCH 1/3] ENH: refineHexMesh: add option to keep to 2:1 ratio
 outside cellSet

---
 .../mesh/advanced/refineHexMesh/refineHexMesh.C      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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

From 3114c5990e39e8c3c1dc18a01559af968a918982 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 18 Mar 2014 23:19:41 +0000
Subject: [PATCH 2/3] Improved calculation of div(U) using the volumetric flux

---
 applications/solvers/multiphase/driftFluxFoam/kEpsilon.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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<volTensorField> tgradU = fvc::grad(U);
     volScalarField G(mut*(tgradU() && dev(twoSymm(tgradU()))));

From 45caaf4d106ad5abb951acc63225248b2791a6d2 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Thu, 20 Mar 2014 11:26:39 +0000
Subject: [PATCH 3/3] ENh: Adding access to diffusion model and make
 constructor from mesh and dictionary make to read solver type from the
 dictionary instead of typeName

---
 .../SBRStress/displacementSBRStressFvMotionSolver.C       | 4 ++--
 .../SBRStress/displacementSBRStressFvMotionSolver.H       | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

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<pointField> curPoints() const;