Commit 3e85a5ab authored by Andrew Heather's avatar Andrew Heather
Browse files

INT: clean-up

parent 402b8637
......@@ -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
......
......@@ -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;
}
......
......@@ -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,
......
......@@ -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,
......
......@@ -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);
......
......@@ -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,
......
......@@ -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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment