From 2e35cc76e854a17db896acc7ba997f07f21bf370 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 18 Mar 2015 15:03:10 +0000
Subject: [PATCH] twoPhaseEulerFoam JohnsonJacksonFrictionalStress:
 alphaDeltaMax now user input (previously hard-coded to 5e-2)

---
 .../JohnsonJackson/JohnsonJacksonFrictionalStress.C   | 11 +++++++----
 .../JohnsonJackson/JohnsonJacksonFrictionalStress.H   |  5 ++++-
 .../constant/turbulenceProperties.particles           |  1 +
 .../constant/turbulenceProperties.particles           |  1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index b71bb4f8d1c..c51a7d7e8cd 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,8 @@ JohnsonJackson
     Fr_("Fr", dimensionSet(1, -1, -2, 0, 0), coeffDict_.lookup("Fr")),
     eta_("eta", dimless, coeffDict_.lookup("eta")),
     p_("p", dimless, coeffDict_.lookup("p")),
-    phi_("phi", dimless, coeffDict_.lookup("phi"))
+    phi_("phi", dimless, coeffDict_.lookup("phi")),
+    alphaDeltaMax_("alphaDeltaMax", dimless, coeffDict_.lookup("alphaDeltaMax"))
 {
     phi_ *= constant::mathematical::pi/180.0;
 }
@@ -88,7 +89,7 @@ frictionalPressure
 
     return
         Fr_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_)
-       /pow(max(alphaMax - alpha1, scalar(5.0e-2)), p_);
+       /pow(max(alphaMax - alpha1, alphaDeltaMax_), p_);
 }
 
 
@@ -106,7 +107,7 @@ frictionalPressurePrime
         eta_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_ - 1.0)
        *(alphaMax-alpha1)
       + p_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_)
-    )/pow(max(alphaMax - alpha1, scalar(5.0e-2)), p_ + 1.0);
+    )/pow(max(alphaMax - alpha1, alphaDeltaMax_), p_ + 1.0);
 }
 
 
@@ -134,6 +135,8 @@ bool Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::read()
     phi_.read(coeffDict_);
     phi_ *= constant::mathematical::pi/180.0;
 
+    alphaDeltaMax_.read(coeffDict_);
+
     return true;
 }
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
index 0e5f7c9a84d..1d42177bf05 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,9 @@ class JohnsonJackson
         //- Angle of internal friction
         dimensionedScalar phi_;
 
+        //- Limit of alphaMax - alpha1 (~5e-2 or higher)
+        dimensionedScalar alphaDeltaMax_;
+
 
 public:
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
index 5ade08c6000..7d74e9d4bae 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
@@ -45,6 +45,7 @@ RAS
             eta                     2;
             p                       5;
             phi                     28.5;
+            alphaDeltaMax           0.05;
         }
     }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
index 39b5549d323..d36ee69392b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
@@ -44,6 +44,7 @@ RAS
             eta                     2;
             p                       5;
             phi                     28.5;
+            alphaDeltaMax           0.05;
         }
     }
 
-- 
GitLab