From fa2721ffd5d12f88dc7576279f646d5b454fcbcc Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 18 Mar 2015 15:40:39 +0000
Subject: [PATCH] JohnsonJacksonFrictionalStress: alphaDeltaMax ->
alphaDeltaMin (it is the lower limit)
---
.../JohnsonJackson/JohnsonJacksonFrictionalStress.C | 8 ++++----
.../JohnsonJackson/JohnsonJacksonFrictionalStress.H | 4 ++--
.../fluidisedBed/constant/turbulenceProperties.particles | 2 +-
.../fluidisedBed/constant/turbulenceProperties.particles | 2 +-
4 files changed, 8 insertions(+), 8 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 c51a7d7e8cd..9f2be1a235f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -62,7 +62,7 @@ JohnsonJackson
eta_("eta", dimless, coeffDict_.lookup("eta")),
p_("p", dimless, coeffDict_.lookup("p")),
phi_("phi", dimless, coeffDict_.lookup("phi")),
- alphaDeltaMax_("alphaDeltaMax", dimless, coeffDict_.lookup("alphaDeltaMax"))
+ alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_.lookup("alphaDeltaMin"))
{
phi_ *= constant::mathematical::pi/180.0;
}
@@ -89,7 +89,7 @@ frictionalPressure
return
Fr_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_)
- /pow(max(alphaMax - alpha1, alphaDeltaMax_), p_);
+ /pow(max(alphaMax - alpha1, alphaDeltaMin_), p_);
}
@@ -107,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, alphaDeltaMax_), p_ + 1.0);
+ )/pow(max(alphaMax - alpha1, alphaDeltaMin_), p_ + 1.0);
}
@@ -135,7 +135,7 @@ bool Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::read()
phi_.read(coeffDict_);
phi_ *= constant::mathematical::pi/180.0;
- alphaDeltaMax_.read(coeffDict_);
+ alphaDeltaMin_.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 1d42177bf05..cc5a9dc5ea1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
@@ -69,8 +69,8 @@ class JohnsonJackson
//- Angle of internal friction
dimensionedScalar phi_;
- //- Limit of alphaMax - alpha1 (~5e-2 or higher)
- dimensionedScalar alphaDeltaMax_;
+ //- Lower limit for (alphaMax - alpha1)
+ dimensionedScalar alphaDeltaMin_;
public:
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
index 7d74e9d4bae..6a26e64e586 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
@@ -45,7 +45,7 @@ RAS
eta 2;
p 5;
phi 28.5;
- alphaDeltaMax 0.05;
+ alphaDeltaMin 0.05;
}
}
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
index d36ee69392b..08671cc51ea 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
@@ -44,7 +44,7 @@ RAS
eta 2;
p 5;
phi 28.5;
- alphaDeltaMax 0.05;
+ alphaDeltaMin 0.05;
}
}
--
GitLab