zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop-pre-release

Browse Source
This commit is contained in:
Andrew Heather
2018-05-18 12:18:13 +01:00
parent 6180e0db8b 48d654cf19
commit ad25e18c7f
63 changed files with 745 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -426,7 +426,7 @@ Foam::multiphaseSystem::multiphaseSystem
iter(),
*phases_.lookup(iter.key().first()),
*phases_.lookup(iter.key().second())
).ptr()
)
);
}
@ -664,7 +664,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
Foam::autoPtr<Foam::multiphaseSystem::dragCoeffFields>
Foam::multiphaseSystem::dragCoeffs() const
{
autoPtr<dragCoeffFields> dragCoeffsPtr(new dragCoeffFields);
auto dragCoeffsPtr = autoPtr<dragCoeffFields>::New();
forAllConstIter(dragModelTable, dragModels_, iter)
{
@ -706,7 +706,7 @@ Foam::multiphaseSystem::dragCoeffs() const
}
}
dragCoeffsPtr().insert(iter.key(), Kptr);
dragCoeffsPtr().set(iter.key(), Kptr);
}
return dragCoeffsPtr;

20
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
View File

@ -70,7 +70,7 @@ HeatAndMassTransferPhaseSystem
// Initially assume no mass transfer
dmdt_.insert
dmdt_.set
(
pair,
new volScalarField
@ -88,7 +88,7 @@ HeatAndMassTransferPhaseSystem
)
);
dmdtExplicit_.insert
dmdtExplicit_.set
(
pair,
new volScalarField
@ -107,7 +107,7 @@ HeatAndMassTransferPhaseSystem
volScalarField H1(heatTransferModels_[pair][pair.first()]->K());
volScalarField H2(heatTransferModels_[pair][pair.second()]->K());
Tf_.insert
Tf_.set
(
pair,
new volScalarField
@ -257,18 +257,12 @@ template<class BasePhaseSystem>
Foam::autoPtr<Foam::phaseSystem::heatTransferTable>
Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
{
autoPtr<phaseSystem::heatTransferTable> eqnsPtr
(
new phaseSystem::heatTransferTable()
);
auto eqnsPtr = autoPtr<phaseSystem::heatTransferTable>::New();
auto& eqns = *eqnsPtr;
phaseSystem::heatTransferTable& eqns = eqnsPtr();
forAll(this->phaseModels_, phasei)
for (const phaseModel& phase : this->phaseModels_)
{
const phaseModel& phase = this->phaseModels_[phasei];
eqns.insert
eqns.set
(
phase.name(),
new fvScalarMatrix(phase.thermo().he(), dimEnergy/dimTime)

14
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
View File

@ -107,18 +107,12 @@ template<class BasePhaseSystem>
Foam::autoPtr<Foam::phaseSystem::heatTransferTable>
Foam::HeatTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
{
autoPtr<phaseSystem::heatTransferTable> eqnsPtr
(
new phaseSystem::heatTransferTable()
);
auto eqnsPtr = autoPtr<phaseSystem::heatTransferTable>::New();
auto& eqns = *eqnsPtr;
phaseSystem::heatTransferTable& eqns = eqnsPtr();
forAll(this->phaseModels_, phasei)
for (const phaseModel& phase : this->phaseModels_)
{
const phaseModel& phase = this->phaseModels_[phasei];
eqns.insert
eqns.set
(
phase.name(),
new fvScalarMatrix(phase.thermo().he(), dimEnergy/dimTime)

14
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
View File

@ -62,22 +62,16 @@ Foam::InterfaceCompositionPhaseChangePhaseSystem<BasePhaseSystem>::
massTransfer() const
{
// Create a mass transfer matrix for each species of each phase
autoPtr<phaseSystem::massTransferTable> eqnsPtr
(
new phaseSystem::massTransferTable()
);
auto eqnsPtr = autoPtr<phaseSystem::massTransferTable>::New();
auto& eqns = *eqnsPtr;
phaseSystem::massTransferTable& eqns = eqnsPtr();
forAll(this->phaseModels_, phasei)
for (const phaseModel& phase : this->phaseModels_)
{
const phaseModel& phase = this->phaseModels_[phasei];
const PtrList<volScalarField>& Yi = phase.Y();
forAll(Yi, i)
{
eqns.insert
eqns.set
(
Yi[i].name(),
new fvScalarMatrix(Yi[i], dimMass/dimTime)

33
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
View File

@ -87,7 +87,7 @@ MomentumTransferPhaseSystem
const phasePair& pair =
*(this->phasePairs_[dragModelIter.key()]);
Kds_.insert
Kds_.set
(
pair,
new volScalarField
@ -103,7 +103,7 @@ MomentumTransferPhaseSystem
const phasePair& pair =
*(this->phasePairs_[virtualMassModelIter.key()]);
Vms_.insert
Vms_.set
(
pair,
new volScalarField
@ -373,18 +373,12 @@ Foam::autoPtr<Foam::phaseSystem::momentumTransferTable>
Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
{
// Create a momentum transfer matrix for each phase
autoPtr<phaseSystem::momentumTransferTable> eqnsPtr
(
new phaseSystem::momentumTransferTable()
);
auto eqnsPtr = autoPtr<phaseSystem::momentumTransferTable>::New();
auto& eqns = *eqnsPtr;
phaseSystem::momentumTransferTable& eqns = eqnsPtr();
forAll(this->phaseModels_, phasei)
for (const phaseModel& phase : this->phaseModels_)
{
const phaseModel& phase = this->phaseModels_[phasei];
eqns.insert
eqns.set
(
phase.name(),
new fvVectorMatrix(phase.U(), dimMass*dimVelocity/dimTime)
@ -492,11 +486,8 @@ template<class BasePhaseSystem>
Foam::autoPtr<Foam::PtrList<Foam::volVectorField>>
Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
{
autoPtr<PtrList<volVectorField>> tFs
(
new PtrList<volVectorField>(this->phases().size())
);
PtrList<volVectorField>& Fs = tFs();
auto tFs = autoPtr<PtrList<volVectorField>>::New(this->phases().size());
auto& Fs = *tFs;
// Add the lift force
forAllConstIters(liftModels_, modelIter)
@ -570,11 +561,9 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
const PtrList<volScalarField>& rAUs
) const
{
autoPtr<PtrList<surfaceScalarField>> tphiDs
(
new PtrList<surfaceScalarField>(this->phases().size())
);
PtrList<surfaceScalarField>& phiDs = tphiDs();
auto tphiDs =
autoPtr<PtrList<surfaceScalarField>>::New(this->phases().size());
auto& phiDs = *tphiDs;
// Add the turbulent dispersion force
forAllConstIters(turbulentDispersionModels_, turbulentDispersionModelIter)

16
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
View File

@ -52,7 +52,7 @@ ThermalPhaseChangePhaseSystem
}
// Initially assume no mass transfer
iDmdt_.insert
iDmdt_.set
(
pair,
new volScalarField
@ -186,22 +186,16 @@ Foam::autoPtr<Foam::phaseSystem::massTransferTable>
Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::massTransfer() const
{
// Create a mass transfer matrix for each species of each phase
autoPtr<phaseSystem::massTransferTable> eqnsPtr
(
new phaseSystem::massTransferTable()
);
auto eqnsPtr = autoPtr<phaseSystem::massTransferTable>::New();
auto& eqns = *eqnsPtr;
phaseSystem::massTransferTable& eqns = eqnsPtr();
forAll(this->phaseModels_, phasei)
for (const phaseModel& phase : this->phaseModels_)
{
const phaseModel& phase = this->phaseModels_[phasei];
const PtrList<volScalarField>& Yi = phase.Y();
forAll(Yi, i)
{
eqns.insert
eqns.set
(
Yi[i].name(),
new fvScalarMatrix(Yi[i], dimMass/dimTime)