Skip to content
Snippets Groups Projects
Commit 21067168 authored by Andrew Heather's avatar Andrew Heather
Browse files

tidying up

parent 98481bc0
Branches
Tags
No related merge requests found
......@@ -63,14 +63,10 @@ void spray::inject()
{
Np = max(1, Np);
scalar mp = mass/Np/nHoles;
// constT is only larger than zero for the first
// constT is only larger than zero for the first
// part of the injection
scalar constT = max
(
0.0,
it->tsoi() - time0
);
scalar constT = max(0.0, it->tsoi() - time0);
// deltaT is the duration of injection during this timestep
scalar deltaT = min
......@@ -103,9 +99,10 @@ void spray::inject()
axisOfWedgeNormal_,
rndGen_
);
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;
scalar symComponent = direction & axisOfSymmetry_;
......@@ -117,13 +114,13 @@ void spray::inject()
scalar ddev = breakup().yDot0();
label injectorCell = mesh_.findCell(injectionPosition);
# include "findInjectorCell.H"
if (injectorCell >= 0)
{
scalar liquidCore = 1.0;
// construct the parcel that is to be injected
parcel* pPtr = new parcel
......@@ -148,19 +145,16 @@ void spray::inject()
fuels_->components()
);
injectedLiquidKE_ += 0.5*pPtr->m()*pow(mag(U), 2.0);
injectedLiquidKE_ += 0.5*pPtr->m()*magSqr(U);
scalar dt = time - toi;
pPtr->stepFraction() =
(runTime_.deltaT().value() - dt)
/runTime_.deltaT().value();
bool keepParcel = pPtr->move
(
*this
);
bool keepParcel = pPtr->move(*this);
if (keepParcel)
{
addParticle(pPtr);
......
......@@ -65,7 +65,7 @@ void spray::evolve()
inject();
atomizationLoop();
breakupLoop();
UInterpolator_.clear();
rhoInterpolator_.clear();
pInterpolator_.clear();
......@@ -89,12 +89,7 @@ void spray::move()
void spray::breakupLoop()
{
for
(
spray::iterator elmnt = begin();
elmnt != end();
++elmnt
)
forAllIter(spray::iterator, *this, elmnt)
{
// interpolate...
vector velocity = UInterpolator().interpolate
......@@ -128,12 +123,7 @@ void spray::breakupLoop()
void spray::atomizationLoop()
{
for
(
spray::iterator elmnt = begin();
elmnt != end();
++elmnt
)
forAllIter(spray::iterator, *this, elmnt)
{
// interpolate...
vector velocity = UInterpolator().interpolate
......
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