From 8f92ff255105a70472291f2df357e9b75c34da2c Mon Sep 17 00:00:00 2001
From: Gerhard Holzinger <gerhard.holzinger@jku.at>
Date: Wed, 27 Sep 2017 15:44:15 +0200
Subject: [PATCH] clean-up: remove all references to totalMomentumExchange
 force model

There is no force model "totalMomentumExchange". There are some references in
the tutorials and the doxygen files. All references to "totalMomentumExchange" have
been removed from the tutorials.
---
 .../ErgunTestCG/CFD/constant/couplingProperties          | 9 +--------
 .../ErgunTestMPI/CFD/constant/couplingProperties         | 9 +--------
 .../ErgunTestMPI_cgs/CFD/constant/couplingProperties     | 9 +--------
 .../CFD/constant/couplingProperties_restart              | 9 +--------
 .../CFD/constant/couplingProperties_run                  | 9 +--------
 .../ErgunTestMPI/CFD/constant/couplingProperties         | 9 +--------
 6 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties
index 77aaa2d1..e82fc015 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties
@@ -61,7 +61,6 @@ forceModels
     GidaspowDrag
     //Archimedes
     //volWeightedAverage
-    //totalMomentumExchange
     particleCellVolume
 );
 
@@ -124,13 +123,7 @@ volWeightedAverageProps
     lowerThreshold 0;
     verbose true;
 }
-totalMomentumExchangeProps
-{
-    implicitMomExFieldName "Ksl";
-    explicitMomExFieldName "none";
-    fluidVelFieldName "U";
-    granVelFieldName "Us";
-}
+
 GidaspowDragProps
 {
     verbose true;
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
index 07b9c60f..51ca9d0d 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
@@ -63,7 +63,6 @@ forceModels
     KochHillDrag
     //Archimedes
     //volWeightedAverage
-    //totalMomentumExchange
     //particleCellVolume
     //fieldTimeAverage
 );
@@ -122,13 +121,7 @@ volWeightedAverageProps
     lowerThreshold 0;
     verbose true;
 }
-totalMomentumExchangeProps
-{
-    implicitMomExFieldName "Ksl";
-    explicitMomExFieldName "none";
-    fluidVelFieldName "U";
-    granVelFieldName "Us";
-}
+
 GidaspowDragProps
 {
     verbose true;
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties
index 16387bd8..01b5a9da 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties
@@ -59,7 +59,6 @@ forceModels
     viscForce
     //Archimedes
     //volWeightedAverage
-    //totalMomentumExchange
 );
 
 momCoupleModels
@@ -109,13 +108,7 @@ volWeightedAverageProps
     lowerThreshold 0;
     verbose;
 }
-totalMomentumExchangeProps
-{
-    implicitMomExFieldName "Ksl";
-    explicitMomExFieldName "none";
-    fluidVelFieldName "U";
-    granVelFieldName "Us";
-}
+
 GidaspowDragProps
 {
     velFieldName "U";
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_restart b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_restart
index 740c7f1b..2a924f59 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_restart
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_restart
@@ -60,7 +60,6 @@ forceModels
     viscForce
     //Archimedes
     //volWeightedAverage
-    //totalMomentumExchange
     //particleCellVolume
 );
 
@@ -118,13 +117,7 @@ volWeightedAverageProps
     lowerThreshold 0;
     verbose;
 }
-totalMomentumExchangeProps
-{
-    implicitMomExFieldName "Ksl";
-    explicitMomExFieldName "none";
-    fluidVelFieldName "U";
-    granVelFieldName "Us";
-}
+
 GidaspowDragProps
 {
     verbose;
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_run b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_run
index ee4aa52c..0d3313f8 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_run
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_run
@@ -60,7 +60,6 @@ forceModels
     viscForce
     //Archimedes
     //volWeightedAverage
-    //totalMomentumExchange
     //particleCellVolume
 );
 
@@ -118,13 +117,7 @@ volWeightedAverageProps
     lowerThreshold 0;
     verbose;
 }
-totalMomentumExchangeProps
-{
-    implicitMomExFieldName "Ksl";
-    explicitMomExFieldName "none";
-    fluidVelFieldName "U";
-    granVelFieldName "Us";
-}
+
 GidaspowDragProps
 {
     verbose;
diff --git a/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/constant/couplingProperties
index 20ce03dd..9fd8552c 100644
--- a/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/constant/couplingProperties
@@ -63,7 +63,6 @@ forceModels
     //KochHillDrag
     //Archimedes
     //volWeightedAverage
-    //totalMomentumExchange
     //particleCellVolume
     //fieldTimeAverage
 );
@@ -144,13 +143,7 @@ volWeightedAverageProps
     lowerThreshold 0;
     verbose true;
 }
-totalMomentumExchangeProps
-{
-    implicitMomExFieldName "Ksl";
-    explicitMomExFieldName "none";
-    fluidVelFieldName "U";
-    granVelFieldName "Us";
-}
+
 GidaspowDragProps
 {
     verbose true;