From d7c56992e3189473037af278bca44011db6c511c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 1 Dec 2015 10:05:22 +0000
Subject: [PATCH] boundaryFoam: Added support for fvOptions

---
 .../solvers/incompressible/boundaryFoam/Make/options   |  2 ++
 .../solvers/incompressible/boundaryFoam/boundaryFoam.C | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options
index 770a9fae92b..20feab872f6 100644
--- a/applications/solvers/incompressible/boundaryFoam/Make/options
+++ b/applications/solvers/incompressible/boundaryFoam/Make/options
@@ -5,6 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
@@ -13,4 +14,5 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \
+    -lfvOptions \
     -lsampling
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 4e35c5258f7..a08632abbae 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -38,6 +38,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
+#include "fvIOoptionList.H"
 #include "wallFvPatch.H"
 #include "makeGraph.H"
 
@@ -52,8 +53,11 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createFvOptions.H"
     #include "interrogateWallPatches.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -67,13 +71,17 @@ int main(int argc, char *argv[])
 
         fvVectorMatrix UEqn
         (
-            divR == gradP
+            divR == gradP + fvOptions(U)
         );
 
         UEqn.relax();
 
+        fvOptions.constrain(UEqn);
+
         UEqn.solve();
 
+        fvOptions.correct(U);
+
 
         // Correct driving force for a constant volume flow rate
         dimensionedVector UbarStar = flowMask & U.weightedAverage(mesh.V());
-- 
GitLab