From 811d47824c46615d0da1b58dd3104b3288520b31 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 30 Jun 2009 19:14:04 +0100
Subject: [PATCH] renamed P->U for momentum transfer and force calc
---
.../Templates/KinematicParcel/KinematicParcel.C | 14 +++++++-------
.../Kinematic/DragModel/DragModel/DragModel.C | 2 +-
.../Kinematic/DragModel/DragModel/DragModel.H | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 55c10a0abfa..cf4dc68acb0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -150,13 +150,13 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
const polyMesh& mesh = this->cloud().pMesh();
// Momentum transfer coefficient
- const scalar ptc =
- td.cloud().drag().ptc(U - Uc_, d, rhoc_, muc_) + ROOTVSMALL;
+ const scalar utc =
+ td.cloud().drag().utc(U - Uc_, d, rhoc_, muc_) + ROOTVSMALL;
// Momentum source due to particle forces
- const vector PFCoupled =
+ const vector FCoupled =
mass*td.cloud().forces().calcCoupled(cellI, dt, rhoc_, rho, Uc_, U);
- const vector PFNonCoupled =
+ const vector FNonCoupled =
mass*td.cloud().forces().calcNonCoupled(cellI, dt, rhoc_, rho, Uc_, U);
@@ -165,15 +165,15 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
// Update velocity - treat as 3-D
const scalar As = this->areaS(d);
- const vector ap = Uc_ + (PFCoupled + PFNonCoupled + Su)/(ptc*As);
- const scalar bp = 6.0*ptc/(rho*d);
+ const vector ap = Uc_ + (FCoupled + FNonCoupled + Su)/(utc*As);
+ const scalar bp = 6.0*utc/(rho*d);
IntegrationScheme<vector>::integrationResult Ures =
td.cloud().UIntegrator().integrate(U, dt, ap, bp);
vector Unew = Ures.value();
- dUTrans += dt*(ptc*As*(Ures.average() - Uc_) - PFCoupled);
+ dUTrans += dt*(utc*As*(Ures.average() - Uc_) - FCoupled);
// Apply correction to velocity and dUTrans for reduced-D cases
meshTools::constrainDirection(mesh, mesh.solutionD(), Unew);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
index 1eb7f86b48e..ae4e2a20629 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
@@ -64,7 +64,7 @@ const Foam::dictionary& Foam::DragModel<CloudType>::dict() const
template<class CloudType>
-Foam::scalar Foam::DragModel<CloudType>::ptc
+Foam::scalar Foam::DragModel<CloudType>::utc
(
const vector& Ur,
const scalar d,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
index 69130b168ca..4b4d6c4dd83 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
@@ -121,8 +121,8 @@ public:
virtual scalar Cd(const scalar Re) const = 0;
//- Return momentum transfer coefficient
- // Drag force per unit particle surface area = ptc(U - Up)
- scalar ptc
+ // Drag force per unit particle surface area = utc(U - Up)
+ scalar utc
(
const vector& Ur,
const scalar d,
--
GitLab