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
2020-08-23 10:20:32 +01:00
parent a63b3041d1 c39f990c65
commit 586a0a447b
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
View File

@ -1305,7 +1305,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
),
// Divergence term is handled explicitly to be
// consistent with the explicit transport solution
divU*min(alpha, scalar(1))
divU.v()*min(alpha.v(), scalar(1))
);
{

4
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C
View File

@ -187,8 +187,8 @@ void Foam::phaseSystem::solve
new volScalarField::Internal
(
"Su",
min(alpha, scalar(1))
*fvc::div(fvc::absolute(phi_, phase.U()))
min(alpha.v(), scalar(1))
*fvc::div(fvc::absolute(phi_, phase.U()))->v()
)
);

14
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C
View File

@ -318,7 +318,7 @@ birthByCoalescence
Pair<word>::compare(pDmdt_.find(pairij).key(), pairij)
);
pDmdt_[pairij]->ref() += dmdtSign*fj.x()/v*Sui_*fi.phase().rho();
*pDmdt_[pairij] += dmdtSign*fj.x()/v*Sui_*fi.phase().rho();
}
const phasePairKey pairik
@ -334,7 +334,7 @@ birthByCoalescence
Pair<word>::compare(pDmdt_.find(pairik).key(), pairik)
);
pDmdt_[pairik]->ref() += dmdtSign*fk.x()/v*Sui_*fi.phase().rho();
*pDmdt_[pairik] += dmdtSign*fk.x()/v*Sui_*fi.phase().rho();
}
sizeGroups_[i].shapeModelPtr()->addCoalescence(Sui_, fj, fk);
@ -393,7 +393,7 @@ birthByBreakup
Pair<word>::compare(pDmdt_.find(pair).key(), pair)
);
pDmdt_[pair]->ref() += dmdtSign*Sui_*fi.phase().rho();
*pDmdt_[pair] += dmdtSign*Sui_*fi.phase().rho();
}
sizeGroups_[i].shapeModelPtr()->addBreakup(Sui_, fk);
@ -475,7 +475,7 @@ birthByBinaryBreakup
Pair<word>::compare(pDmdt_.find(pairij).key(), pairij)
);
pDmdt_[pairij]->ref() += dmdtSign*Sui_*fi.phase().rho();
*pDmdt_[pairij] += dmdtSign*Sui_*fi.phase().rho();
}
dimensionedScalar Eta;
@ -515,7 +515,7 @@ birthByBinaryBreakup
)
);
pDmdt_[pairkj]->ref() += dmdtSign*Suk*fi.phase().rho();
*pDmdt_[pairkj] += dmdtSign*Suk*fi.phase().rho();
}
sizeGroups_[i].shapeModelPtr()->addBreakup(Suk, fj);
@ -631,7 +631,7 @@ void Foam::diameterModels::populationBalanceModel::drift
Pair<word>::compare(pDmdt_.find(pairij).key(), pairij)
);
pDmdt_[pairij]->ref() -= dmdtSign*Sue*fp.phase().rho();
*pDmdt_[pairij] -= dmdtSign*Sue*fp.phase().rho();
}
sizeGroups_[i+1].shapeModelPtr()->addDrift(Sue, fp, model);
@ -662,7 +662,7 @@ void Foam::diameterModels::populationBalanceModel::drift
Pair<word>::compare(pDmdt_.find(pairih).key(), pairih)
);
pDmdt_[pairih]->ref() -= dmdtSign*Suw*fp.phase().rho();
*pDmdt_[pairih] -= dmdtSign*Suw*fp.phase().rho();
}
sizeGroups_[i-1].shapeModelPtr()->addDrift(Suw, fp, model);

12
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
View File

@ -279,11 +279,11 @@ DimensionedField<Type, GeoMesh>::New
IOobject
(
name,
mesh.time().timeName(),
mesh,
mesh.thisDb().time().timeName(),
mesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE,
mesh.cacheTemporaryObject(name)
mesh.thisDb().cacheTemporaryObject(name)
),
mesh,
ds,
@ -309,11 +309,11 @@ DimensionedField<Type, GeoMesh>::New
IOobject
(
name,
mesh.time().timeName(),
mesh,
mesh.thisDb().time().timeName(),
mesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE,
mesh.cacheTemporaryObject(name)
mesh.thisDb().cacheTemporaryObject(name)
),
mesh,
dt,