From 27d128f9365d956ecd5d1555e61852a492fac76c Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 15 Feb 2011 11:00:47 +0000
Subject: [PATCH] ENH: Updated coalCombustion lib re: particle forces

---
 src/lagrangian/coalCombustion/Make/files      |  1 +
 .../coalParcel/makeCoalParcelForces.C         | 40 +++++++++++++++++++
 .../coalParcel/makeCoalParcelSubmodels.C      |  4 +-
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/makeCoalParcelForces.C

diff --git a/src/lagrangian/coalCombustion/Make/files b/src/lagrangian/coalCombustion/Make/files
index 7f710449cf..53d75f43b4 100644
--- a/src/lagrangian/coalCombustion/Make/files
+++ b/src/lagrangian/coalCombustion/Make/files
@@ -2,5 +2,6 @@
 coalParcel/coalParcel.C
 coalParcel/defineCoalParcel.C
 coalParcel/makeCoalParcelSubmodels.C
+coalParcel/makeCoalParcelForces.C
 
 LIB = $(FOAM_LIBBIN)/libcoalCombustion
diff --git a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelForces.C b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelForces.C
new file mode 100644
index 0000000000..57c6806a62
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelForces.C
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "coalParcel.H"
+
+// Using thermodynamic variant
+#include "makeThermoParcelForces.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    // Kinematic sub-models
+    makeThermoParcelForces(coalParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
index 2bbd6777a2..f12784d62a 100644
--- a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
+++ b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,6 @@ License
 
 // Kinematic
 #include "makeParcelDispersionModels.H"
-#include "makeParcelDragModels.H"
 #include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
 #include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
@@ -53,7 +52,6 @@ namespace Foam
 {
     // Kinematic sub-models
     makeParcelDispersionModels(coalParcel);
-    makeParcelDragModels(coalParcel);
     makeReactingMultiphaseParcelInjectionModels(coalParcel);
     makeParcelCollisionModels(coalParcel);
     makeParcelPatchInteractionModels(coalParcel);