zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fvOptions: verticalDamping: Fixed parallel crash and clang warning.

Browse Source
This commit is contained in:
Will Bainbridge
2017-06-02 16:08:08 +01:00
parent b255302fba
commit fb0d17b9f3
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/fvOptions/sources/derived/verticalDamping/verticalDamping.C
View File

@ -45,7 +45,7 @@ namespace fv
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::verticalDamping::addSup void Foam::fv::verticalDamping::add
( (
const volVectorField& alphaRhoU, const volVectorField& alphaRhoU,
fvMatrix<vector>& eqn, fvMatrix<vector>& eqn,
@ -63,12 +63,18 @@ void Foam::fv::verticalDamping::addSup
eqn.dimensions() eqn.dimensions()
- V.dimensions()*(lgg.dimensions() & alphaRhoU.dimensions()); - V.dimensions()*(lgg.dimensions() & alphaRhoU.dimensions());
// Calculate the force and apply it to the equation
vectorField force(cells_.size());
forAll(cells_, i) forAll(cells_, i)
{ {
const label c = cells_[i]; const label c = cells_[i];
vector f = V[c]*(lgg.value() & alphaRhoU[c]); force[i] = V[c]*(lgg.value() & alphaRhoU[c]);
meshTools::constrainDirection(mesh_, mesh_.solutionD(), f); }
eqn.source()[c] += f; meshTools::constrainDirection(mesh_, mesh_.solutionD(), force);
forAll(cells_, i)
{
const label c = cells_[i];
eqn.source()[c] += force[i];
} }
} }
@ -98,7 +104,7 @@ void Foam::fv::verticalDamping::addSup
const label fieldi const label fieldi
) )
{ {
addSup(eqn.psi(), eqn, fieldi); add(eqn.psi(), eqn, fieldi);
} }
@ -109,7 +115,7 @@ void Foam::fv::verticalDamping::addSup
const label fieldi const label fieldi
) )
{ {
addSup(rho*eqn.psi(), eqn, fieldi); add(rho*eqn.psi(), eqn, fieldi);
} }
@ -121,7 +127,7 @@ void Foam::fv::verticalDamping::addSup
const label fieldi const label fieldi
) )
{ {
addSup(alpha*rho*eqn.psi(), eqn, fieldi); add(alpha*rho*eqn.psi(), eqn, fieldi);
} }

2
src/fvOptions/sources/derived/verticalDamping/verticalDamping.H
View File

@ -83,7 +83,7 @@ private:
// Private Member Functions // Private Member Functions
//- Source term to momentum equation //- Source term to momentum equation
void addSup void add
( (
const volVectorField& alphaRhoU, const volVectorField& alphaRhoU,
fvMatrix<vector>& eqn, fvMatrix<vector>& eqn,