Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/fluid/addSourceTerms.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ struct Fluid_AddSourceTermsFunctor {
Uc(MX1,k,j,i) += TWO_F * dt * Vc(RHO,k,j,i) * OmegaZ * Vc(VX2,k,j,i);
Uc(MX2,k,j,i) += - TWO_F * dt * Vc(RHO,k,j,i) * OmegaZ * Vc(VX1,k,j,i);
}
if(haveFargo) {
Uc(MX1,k,j,i) += TWO_F * dt * Vc(RHO,k,j,i) * OmegaZ * sbS * x1(i);
}
#endif
// fetch fargo velocity when required
[[maybe_unused]] real fargoV = ZERO_F;
Expand Down
12 changes: 9 additions & 3 deletions src/fluid/calcRightHandSide.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -472,12 +472,18 @@ struct Fluid_CalcRHSFunctor {

// Body force
if(needBodyForce) {
rhs[MX1+dir] += dt * Vc(RHO,k,j,i) * bodyForce(dir,k,j,i);
real bf = bodyForce(dir,k,j,i);
#if GEOMETRY == CARTESIAN
if(haveFargo && dir==IDIR) {
// Remove Body force that is already compensated by Fargo shear*Rotation
bf -= -2*Omega*sbS * x1(i);
}
#endif
rhs[MX1+dir] += dt * Vc(RHO,k,j,i) * bf;
if constexpr(Phys::pressure) {
// rho * v . f, where rhov is taken as a volume average of Flux(RHO)
rhs[ENG] += HALF_F * dtdV * dl *
(Flux(RHO,k,j,i) + Flux(RHO, k+koffset, j+joffset, i+ioffset)) *
bodyForce(dir,k,j,i);
(Flux(RHO,k,j,i) + Flux(RHO, k+koffset, j+joffset, i+ioffset)) * bf;
} // Pressure

// Particular cases if we do not sweep all of the components
Expand Down