zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

INT: clean-up

Browse Source
This commit is contained in:
Andrew Heather
2017-09-08 17:09:15 +01:00
parent 402b86371c
commit 3e85a5ab4b
7 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.C
View File

@ -44,7 +44,6 @@ bool Foam::DSMCParcel<ParcelType>::move
td.keepParticle = true;
const polyMesh& mesh = cloud.pMesh();
const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
// For reduced-D cases, the velocity used to track needs to be
// constrained, but the actual U_ of the parcel must not be

2
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
View File

@ -260,7 +260,7 @@ inline const Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb() const
template<class ParcelType>
inline bool& Foam::KinematicParcel<ParcelType>::active()
inline void Foam::KinematicParcel<ParcelType>::active(const bool state)
{
active_ = state;
}

1
src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
View File

@ -114,6 +114,7 @@ template<class CloudType>
Foam::forceSuSp Foam::InterfaceForce<CloudType>::calcNonCoupled
(
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt,
const scalar mass,
const scalar Re,

1
src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
View File

@ -109,6 +109,7 @@ public:
virtual forceSuSp calcNonCoupled
(
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt,
const scalar mass,
const scalar Re,

6
src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
View File

@ -99,7 +99,7 @@ void Foam::SprayParcel<ParcelType>::calc
const scalar mass0 = this->mass();
mu_ = liquids.mu(pc0, T0, X0);
ParcelType::calc(cloud,td, dt);
ParcelType::calc(cloud, td, dt);
if (td.keepParticle)
{
@ -246,6 +246,10 @@ void Foam::SprayParcel<ParcelType>::calcBreakup
scalar Urmag = mag(Urel);
scalar Re = this->Re(rhoAv, this->U(), td.Uc(), this->d(), muAv);
const typename TrackCloudType::parcelType& p =
static_cast<const typename TrackCloudType::parcelType&>(*this);
typename TrackCloudType::parcelType::trackingData& ttd =
static_cast<typename TrackCloudType::parcelType::trackingData&>(td);
const scalar mass = p.mass();
const typename TrackCloudType::forceType& forces = cloud.forces();
const forceSuSp Fcp = forces.calcCoupled(p, ttd, dt, mass, Re, muAv);

1
src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
View File

@ -160,6 +160,7 @@ template<class CloudType>
Foam::forceSuSp Foam::BrownianMotionForce<CloudType>::calcCoupled
(
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt,
const scalar mass,
const scalar Re,

1
src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
View File

@ -142,6 +142,7 @@ public:
virtual forceSuSp calcCoupled
(
const typename CloudType::parcelType& p,
const typename CloudType::parcelType::trackingData& td,
const scalar dt,
const scalar mass,
const scalar Re,