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

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2022-12-25 11:43:34 +00:00
parent 851c9391be f2543d7ecb
commit 623ebf7013
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fvModels/general/semiImplicitSource/semiImplicitSource.C
View File

@ -160,7 +160,7 @@ void Foam::fv::semiImplicitSource::addSupType
UIndirectList<scalar>(Sp, set_.cells()) =
fieldSp_[fieldName]->value(t)/VDash;
eqn += Su + fvm::SuSp(Sp, psi);
eqn += Su - fvm::SuSp(-Sp, psi);
}

2
src/lagrangian/basic/Cloud/Cloud.C
View File

@ -418,6 +418,8 @@ void Foam::Cloud<ParticleType>::move
template<class ParticleType>
void Foam::Cloud<ParticleType>::topoChange(const polyTopoChangeMap& map)
{
if (!map.mesh().topoChanged()) return;
// Ask for the tetBasePtIs to trigger all processors to build
// them, otherwise, if some processors have no particles then
// there is a comms mismatch.

40
src/lagrangian/parcel/clouds/Templates/ReactingCloud/ReactingCloudI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -118,7 +118,7 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
sourceField.primitiveFieldRef() =
rhoTrans_[i]/(this->db().time().deltaTValue()*this->mesh().V());
const dimensionedScalar Yismall("Yismall", dimless, small);
const dimensionedScalar Yismall(dimless, small);
return
fvm::Sp(neg(sourceField)*sourceField/(Yi + Yismall), Yi)
@ -178,40 +178,48 @@ Foam::ReactingCloud<CloudType>::Srho(const volScalarField& rho) const
{
if (this->solution().coupled())
{
tmp<volScalarField> trhoTrans
(
volScalarField::New
(
this->name() + ":rhoTrans",
this->mesh(),
dimensionedScalar(dimMass/dimTime/dimVolume, 0)
)
);
scalarField& sourceField = trhoTrans.ref();
if (this->solution().semiImplicit("rho"))
{
tmp<volScalarField> trhoTrans =
volScalarField::New
(
this->name() + ":rhoTrans",
this->mesh(),
dimensionedScalar(dimMass/dimTime/dimVolume, 0)
);
scalarField& sourceField = trhoTrans.ref();
forAll(rhoTrans_, i)
{
sourceField += rhoTrans_[i];
}
sourceField /= this->db().time().deltaTValue()*this->mesh().V();
return fvm::SuSp(trhoTrans()/rho, rho);
return
fvm::Sp(neg(trhoTrans())*trhoTrans()/rho, rho)
+ pos0(trhoTrans())*trhoTrans();
}
else
{
tmp<fvScalarMatrix> tfvm(new fvScalarMatrix(rho, dimMass/dimTime));
fvScalarMatrix& fvm = tfvm.ref();
tmp<volScalarField> trhoTransV =
volScalarField::New
(
this->name() + ":rhoTransV",
this->mesh(),
dimensionedScalar(dimMass/dimTime, 0)
);
scalarField& sourceField = trhoTransV.ref();
forAll(rhoTrans_, i)
{
sourceField += rhoTrans_[i];
}
sourceField /= this->db().time().deltaTValue();
fvm.source() = -trhoTrans()/this->db().time().deltaT();
fvm.source() = -trhoTransV();
return tfvm;
}