tidying up

This commit is contained in:
andy
2009-01-20 13:33:58 +00:00
parent 98481bc0fe
commit 21067168dd
2 changed files with 16 additions and 32 deletions

View File

@ -66,11 +66,7 @@ void spray::inject()
// constT is only larger than zero for the first // constT is only larger than zero for the first
// part of the injection // part of the injection
scalar constT = max scalar constT = max(0.0, it->tsoi() - time0);
(
0.0,
it->tsoi() - time0
);
// deltaT is the duration of injection during this timestep // deltaT is the duration of injection during this timestep
scalar deltaT = min scalar deltaT = min
@ -105,7 +101,8 @@ void spray::inject()
); );
scalar diameter = injection().d0(i, toi); scalar diameter = injection().d0(i, toi);
vector direction = injection().direction(i, n, toi, diameter); vector direction =
injection().direction(i, n, toi, diameter);
vector U = injection().velocity(i, toi)*direction; vector U = injection().velocity(i, toi)*direction;
scalar symComponent = direction & axisOfSymmetry_; scalar symComponent = direction & axisOfSymmetry_;
@ -148,7 +145,7 @@ void spray::inject()
fuels_->components() fuels_->components()
); );
injectedLiquidKE_ += 0.5*pPtr->m()*pow(mag(U), 2.0); injectedLiquidKE_ += 0.5*pPtr->m()*magSqr(U);
scalar dt = time - toi; scalar dt = time - toi;
@ -156,10 +153,7 @@ void spray::inject()
(runTime_.deltaT().value() - dt) (runTime_.deltaT().value() - dt)
/runTime_.deltaT().value(); /runTime_.deltaT().value();
bool keepParcel = pPtr->move bool keepParcel = pPtr->move(*this);
(
*this
);
if (keepParcel) if (keepParcel)
{ {

View File

@ -89,12 +89,7 @@ void spray::move()
void spray::breakupLoop() void spray::breakupLoop()
{ {
for forAllIter(spray::iterator, *this, elmnt)
(
spray::iterator elmnt = begin();
elmnt != end();
++elmnt
)
{ {
// interpolate... // interpolate...
vector velocity = UInterpolator().interpolate vector velocity = UInterpolator().interpolate
@ -128,12 +123,7 @@ void spray::breakupLoop()
void spray::atomizationLoop() void spray::atomizationLoop()
{ {
for forAllIter(spray::iterator, *this, elmnt)
(
spray::iterator elmnt = begin();
elmnt != end();
++elmnt
)
{ {
// interpolate... // interpolate...
vector velocity = UInterpolator().interpolate vector velocity = UInterpolator().interpolate