From d00c8060426b22b95e8283735f98294ac4f1a293 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 31 Jul 2012 15:21:55 +0100
Subject: [PATCH] STYLE: minor code formatting
---
.../InjectionModel/InjectionModel.C | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index eae421f3b4a..f1c6d2e5245 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -428,7 +428,7 @@ Foam::label Foam::InjectionModel<CloudType>::parcelsToInject
"("
"const scalar, "
"const scalar"
- ") const"
+ ")"
);
return 0;
@@ -448,7 +448,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::volumeToInject
"("
"const scalar, "
"const scalar"
- ") const"
+ ")"
);
return 0.0;
@@ -473,9 +473,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
}
const scalar time = this->owner().db().time().value();
- const scalar trackTime = this->owner().solution().trackTime();
- const polyMesh& mesh = this->owner().mesh();
- typename TrackData::cloudType& cloud = td.cloud();
// Prepare for next time step
label parcelsAdded = 0;
@@ -485,6 +482,10 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
if (prepareForNextTimeStep(time, newParcels, newVolume))
{
+ const scalar trackTime = this->owner().solution().trackTime();
+ const polyMesh& mesh = this->owner().mesh();
+ typename TrackData::cloudType& cloud = td.cloud();
+
// Duration of injection period during this timestep
const scalar deltaT =
max(0.0, min(trackTime, min(time - SOI_, timeEnd() - time0_)));
@@ -645,12 +646,7 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
cloud.checkParcelProperties(*pPtr, 0.0, fullyDescribed());
// Apply correction to velocity for 2-D cases
- meshTools::constrainDirection
- (
- mesh,
- mesh.solutionD(),
- pPtr->U()
- );
+ meshTools::constrainDirection(mesh, mesh.solutionD(), pPtr->U());
// Number of particles per parcel
pPtr->nParticle() =
--
GitLab