From 194b84175fb1f2f8e3070116dbd046b325a59ca9 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 7 Mar 2011 12:19:33 +0000
Subject: [PATCH] STYLE: refactored cloud deltaT -> trackTime
---
.../Templates/KinematicCloud/KinematicCloud.C | 8 +++----
.../cloudSolution/cloudSolution.C | 23 ++++++++-----------
.../cloudSolution/cloudSolution.H | 11 ++++-----
.../cloudSolution/cloudSolutionI.H | 10 ++------
.../InjectionModel/InjectionModel.C | 4 ++--
5 files changed, 21 insertions(+), 35 deletions(-)
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 37b8569d92b..1c59cae4a63 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -218,10 +218,10 @@ void Foam::KinematicCloud<CloudType>::evolveCloud(TrackData& td)
{
// this->surfaceFilm().injectSteadyState(td);
- this->injection().injectSteadyState(td, solution_.deltaTValue());
+ this->injection().injectSteadyState(td, solution_.trackTime());
td.part() = TrackData::tpLinearTrack;
- CloudType::move(td, solution_.deltaTValue());
+ CloudType::move(td, solution_.trackTime());
}
}
@@ -511,7 +511,7 @@ void Foam::KinematicCloud<CloudType>::checkParcelProperties
parcel.rho() = constProps_.rho0();
}
- const scalar carrierDt = solution_.deltaTValue();
+ const scalar carrierDt = mesh_.time().deltaTValue();
parcel.stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
parcel.typeId() = constProps_.parcelTypeId();
}
@@ -589,7 +589,7 @@ template<class TrackData>
void Foam::KinematicCloud<CloudType>::motion(TrackData& td)
{
td.part() = TrackData::tpLinearTrack;
- CloudType::move(td, solution_.deltaTValue());
+ CloudType::move(td, solution_.trackTime());
updateCellOccupancy();
}
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
index 6a6b0c8ce2f..2d726f45e8a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
@@ -41,7 +41,7 @@ Foam::cloudSolution::cloudSolution
calcFrequency_(1),
maxCo_(0.3),
iter_(1),
- deltaT_(0.0),
+ trackTime_(0.0),
coupled_(false),
cellValueSourceCorrection_(false),
maxTrackTime_(0.0),
@@ -67,7 +67,7 @@ Foam::cloudSolution::cloudSolution
calcFrequency_(cs.calcFrequency_),
maxCo_(cs.maxCo_),
iter_(cs.iter_),
- deltaT_(cs.deltaT_),
+ trackTime_(cs.trackTime_),
coupled_(cs.coupled_),
cellValueSourceCorrection_(cs.cellValueSourceCorrection_),
maxTrackTime_(cs.maxTrackTime_),
@@ -88,7 +88,7 @@ Foam::cloudSolution::cloudSolution
calcFrequency_(0),
maxCo_(GREAT),
iter_(0),
- deltaT_(0.0),
+ trackTime_(0.0),
coupled_(false),
cellValueSourceCorrection_(false),
maxTrackTime_(0.0),
@@ -159,10 +159,8 @@ Foam::scalar Foam::cloudSolution::relaxCoeff(const word& fieldName) const
}
}
- FatalErrorIn
- (
- "scalar cloudSolution::relaxCoeff(const word& fieldName) const"
- ) << "Field name " << fieldName << " not found in schemes"
+ FatalErrorIn("scalar cloudSolution::relaxCoeff(const word&) const")
+ << "Field name " << fieldName << " not found in schemes"
<< abort(FatalError);
return 1.0;
@@ -179,10 +177,8 @@ bool Foam::cloudSolution::semiImplicit(const word& fieldName) const
}
}
- FatalErrorIn
- (
- "bool cloudSolution::semiImplicit(const word& fieldName) const"
- ) << "Field name " << fieldName << " not found in schemes"
+ FatalErrorIn("bool cloudSolution::semiImplicit(const word&) const")
+ << "Field name " << fieldName << " not found in schemes"
<< abort(FatalError);
return false;
@@ -202,14 +198,13 @@ bool Foam::cloudSolution::solveThisStep() const
bool Foam::cloudSolution::canEvolve()
{
- // Set the calculation time step
if (transient_)
{
- deltaT_ = mesh_.time().deltaTValue();
+ trackTime_ = mesh_.time().deltaTValue();
}
else
{
- deltaT_ = maxTrackTime_;
+ trackTime_ = maxTrackTime_;
}
return solveThisStep();
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
index cb1c8330b32..6c2430e4089 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
@@ -77,8 +77,8 @@ class cloudSolution
//- Current cloud iteration
label iter_;
- //- Cloud solution time step
- scalar deltaT_;
+ //- Particle track time
+ scalar trackTime_;
// Run-time options
@@ -168,11 +168,8 @@ public:
//- Increment and return iter counter
inline label nextIter();
- //- Return the time step
- inline scalar deltaTValue() const;
-
- //- Return the time step
- inline const dimensionedScalar deltaT() const;
+ //- Return the particle track time
+ inline scalar trackTime() const;
//- Return const access to the coupled flag
inline const Switch coupled() const;
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H
index a5da04150d9..0fc183bf9d0 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H
@@ -95,15 +95,9 @@ inline Foam::label Foam::cloudSolution::nextIter()
}
-inline Foam::scalar Foam::cloudSolution::deltaTValue() const
+inline Foam::scalar Foam::cloudSolution::trackTime() const
{
- return deltaT_;
-}
-
-
-inline const Foam::dimensionedScalar Foam::cloudSolution::deltaT() const
-{
- return dimensionedScalar("cloudSolution::deltaT", dimTime, deltaT_);
+ return trackTime_;
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index fb077dba513..8a4d63100ea 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -520,7 +520,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
}
const scalar time = this->owner().db().time().value();
- const scalar carrierDt = this->owner().solution().deltaTValue();
+ const scalar trackTime = this->owner().solution().trackTime();
const polyMesh& mesh = this->owner().mesh();
// Prepare for next time step
@@ -533,7 +533,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
// Duration of injection period during this timestep
const scalar deltaT =
- max(0.0, min(carrierDt, min(time - SOI_, timeEnd() - time0_)));
+ max(0.0, min(trackTime, min(time - SOI_, timeEnd() - time0_)));
// Pad injection time if injection starts during this timestep
const scalar padTime = max(0.0, SOI_ - time0_);
--
GitLab