Skip to content

Commit

Permalink
using iF not F for consistency.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kaschau
kaschau committed May 30, 2024
1 parent 6346c1a commit 089cf36
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
22 changes: 11 additions & 11 deletions src/compute/diffFlux/alphaDampingFlux.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
double lambda = bulkVisc - 2.0 / 3.0 * mu;

// continuity
F(i, j, k, 0) = 0.0;
iF(i, j, k, 0) = 0.0;

// Geometric terms
double e[3] = {b.xc(i, j, k) - b.xc(i - iMod, j - jMod, k - kMod),
Expand Down Expand Up @@ -120,23 +120,23 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
double txy = -mu * (dvdx + dudy);
double txz = -mu * (dwdx + dudz);

F(i, j, k, 1) =
iF(i, j, k, 1) =
txx * isx(i, j, k) + txy * isy(i, j, k) + txz * isz(i, j, k);

// y momentum
double &tyx = txy;
double tyy = -2.0 * mu * dvdy - lambda * div;
double tyz = -mu * (dwdy + dvdz);

F(i, j, k, 2) =
iF(i, j, k, 2) =
tyx * isx(i, j, k) + tyy * isy(i, j, k) + tyz * isz(i, j, k);

// z momentum
double &tzx = txz;
double &tzy = tyz;
double tzz = -2.0 * mu * dwdz - lambda * div;

F(i, j, k, 3) =
iF(i, j, k, 3) =
tzx * isx(i, j, k) + tzy * isy(i, j, k) + tzz * isz(i, j, k);

// energy
Expand Down Expand Up @@ -170,9 +170,9 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
double wf =
0.5 * (b.q(i, j, k, 3) + b.q(i - iMod, j - jMod, k - kMod, 3));

F(i, j, k, 4) = -(uf * txx + vf * txy + wf * txz) * isx(i, j, k) -
(uf * tyx + vf * tyy + wf * tyz) * isy(i, j, k) -
(uf * tzx + vf * tzy + wf * tzz) * isz(i, j, k) + q;
iF(i, j, k, 4) = -(uf * txx + vf * txy + wf * txz) * isx(i, j, k) -
(uf * tyx + vf * tyy + wf * tyz) * isy(i, j, k) -
(uf * tzx + vf * tzy + wf * tzz) * isz(i, j, k) + q;

// Species
double Dk, Vc = 0.0;
Expand Down Expand Up @@ -205,7 +205,7 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
(dYdx * isx(i, j, k) + dYdy * isy(i, j, k) + dYdz * isz(i, j, k));
gradYns -= gradYk;
Vc += Dk * gradYk;
F(i, j, k, 5 + n) = -rho * Dk * gradYk;
iF(i, j, k, 5 + n) = -rho * Dk * gradYk;
}
// Apply n=ns species to correction
Dk = 0.5 * (b.qt(i, j, k, 2 + b.ne - 5) +
Expand All @@ -219,17 +219,17 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
Yk = 0.5 *
(b.q(i, j, k, 5 + n) + b.q(i - iMod, j - jMod, k - kMod, 5 + n));
Yns -= Yk;
F(i, j, k, 5 + n) += Yk * rho * Vc;
iF(i, j, k, 5 + n) += Yk * rho * Vc;
// Species thermal diffusion
hk = 0.5 * (b.qh(i, j, k, 5 + n) +
b.qh(i - iMod, j - jMod, k - kMod, 5 + n));
F(i, j, k, 4) += F(i, j, k, 5 + n) * hk;
iF(i, j, k, 4) += iF(i, j, k, 5 + n) * hk;
}
// Apply the n=ns species to thermal diffusion
Yns = fmax(Yns, 0.0);
hk = 0.5 *
(b.qh(i, j, k, b.ne) + b.qh(i - iMod, j - jMod, k - kMod, b.ne));
F(i, j, k, 4) += (-rho * Dk * gradYns + Yns * rho * Vc) * hk;
iF(i, j, k, 4) += (-rho * Dk * gradYns + Yns * rho * Vc) * hk;
});
}

Expand Down
22 changes: 11 additions & 11 deletions src/compute/diffFlux/diffusiveFlux.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
double lambda = bulkVisc - 2.0 / 3.0 * mu;

// continuity
F(i, j, k, 0) = 0.0;
iF(i, j, k, 0) = 0.0;

// Derivatives on face
double dudx = 0.5 * (b.dqdx(i, j, k, 1) +
Expand Down Expand Up @@ -59,23 +59,23 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
double txy = -mu * (dvdx + dudy);
double txz = -mu * (dwdx + dudz);

F(i, j, k, 1) =
iF(i, j, k, 1) =
txx * isx(i, j, k) + txy * isy(i, j, k) + txz * isz(i, j, k);

// y momentum
double &tyx = txy;
double tyy = -2.0 * mu * dvdy - lambda * div;
double tyz = -mu * (dwdy + dvdz);

F(i, j, k, 2) =
iF(i, j, k, 2) =
tyx * isx(i, j, k) + tyy * isy(i, j, k) + tyz * isz(i, j, k);

// z momentum
double &tzx = txz;
double &tzy = tyz;
double tzz = -2.0 * mu * dwdz - lambda * div;

F(i, j, k, 3) =
iF(i, j, k, 3) =
tzx * isx(i, j, k) + tzy * isy(i, j, k) + tzz * isz(i, j, k);

// energy
Expand All @@ -99,9 +99,9 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
double wf =
0.5 * (b.q(i, j, k, 3) + b.q(i - iMod, j - jMod, k - kMod, 3));

F(i, j, k, 4) = -(uf * txx + vf * txy + wf * txz) * isx(i, j, k) -
(uf * tyx + vf * tyy + wf * tyz) * isy(i, j, k) -
(uf * tzx + vf * tzy + wf * tzz) * isz(i, j, k) + q;
iF(i, j, k, 4) = -(uf * txx + vf * txy + wf * txz) * isx(i, j, k) -
(uf * tyx + vf * tyy + wf * tyz) * isy(i, j, k) -
(uf * tzx + vf * tzy + wf * tzz) * isz(i, j, k) + q;

// Species
double Dk, Vc = 0.0;
Expand All @@ -123,7 +123,7 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
(dYdx * isx(i, j, k) + dYdy * isy(i, j, k) + dYdz * isz(i, j, k));
gradYns -= gradYk;
Vc += Dk * gradYk;
F(i, j, k, 5 + n) = -rho * Dk * gradYk;
iF(i, j, k, 5 + n) = -rho * Dk * gradYk;
}
// Apply n=ns species to correction
Dk = 0.5 * (b.qt(i, j, k, 2 + b.ne - 5) +
Expand All @@ -137,17 +137,17 @@ static void computeFlux(const block_ &b, fourDview &F, const threeDview &isx,
Yk = 0.5 *
(b.q(i, j, k, 5 + n) + b.q(i - iMod, j - jMod, k - kMod, 5 + n));
Yns -= Yk;
F(i, j, k, 5 + n) += Yk * rho * Vc;
iF(i, j, k, 5 + n) += Yk * rho * Vc;
// Species thermal diffusion
hk = 0.5 * (b.qh(i, j, k, 5 + n) +
b.qh(i - iMod, j - jMod, k - kMod, 5 + n));
F(i, j, k, 4) += F(i, j, k, 5 + n) * hk;
iF(i, j, k, 4) += iF(i, j, k, 5 + n) * hk;
}
// Apply the n=ns species to thermal diffusion
Yns = fmax(Yns, 0.0);
hk = 0.5 *
(b.qh(i, j, k, b.ne) + b.qh(i - iMod, j - jMod, k - kMod, b.ne));
F(i, j, k, 4) += (-rho * Dk * gradYns + Yns * rho * Vc) * hk;
iF(i, j, k, 4) += (-rho * Dk * gradYns + Yns * rho * Vc) * hk;
});
}

Expand Down

0 comments on commit 089cf36

Please sign in to comment.