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

multiphaseEuler::StationaryPhaseModel: Replaced functions returning 0 with notImplemented

Browse Source 
requiring all parts of the moving phase solution algorithm to loop and operate
on the moving phases only making the code easier to understand and maintain.
This commit is contained in:
Henry Weller
2023-09-03 10:21:31 +01:00
parent ba772c03e6
commit 3c18db77ed
10 changed files with 94 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/modules/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C
View File

@ -45,11 +45,6 @@ void Foam::solvers::multiphaseEuler::cellPressureCorrector()
{
volScalarField& p(p_);
const phaseSystem::phaseModelPartialList& movingPhases
(
fluid.movingPhases()
);
// Face volume fractions
PtrList<surfaceScalarField> alphafs(phases.size());
forAll(phases, phasei)

5
applications/modules/multiphaseEuler/multiphaseEuler/facePressureCorrector.C
View File

@ -45,11 +45,6 @@ void Foam::solvers::multiphaseEuler::facePressureCorrector()
{
volScalarField& p(p_);
const phaseSystem::phaseModelPartialList& movingPhases
(
fluid.movingPhases()
);
// Face volume fractions
PtrList<surfaceScalarField> alphafs(phases.size());
forAll(phases, phasei)

7
applications/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.C
View File

@ -72,12 +72,12 @@ void Foam::solvers::multiphaseEuler::correctCoNum()
fvc::surfaceSum(mag(phi))().primitiveField()
);
forAll(phases, phasei)
forAll(movingPhases, movingPhasei)
{
sumPhi = max
(
sumPhi,
fvc::surfaceSum(mag(phases[phasei].phi()))().primitiveField()
fvc::surfaceSum(mag(phases[movingPhasei].phi()))().primitiveField()
);
}
@ -164,6 +164,8 @@ Foam::solvers::multiphaseEuler::multiphaseEuler(fvMesh& mesh)
phases_(fluid_.phases()),
movingPhases_(fluid_.movingPhases()),
phi_(fluid_.phi()),
p_(phases_[0].thermo().p()),
@ -182,6 +184,7 @@ Foam::solvers::multiphaseEuler::multiphaseEuler(fvMesh& mesh)
fluid(fluid_),
phases(phases_),
movingPhases(movingPhases_),
p(p_),
phi(phi_)
{

5
applications/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.H
View File

@ -113,6 +113,8 @@ protected:
phaseSystem::phaseModelList& phases_;
phaseSystem::phaseModelPartialList& movingPhases_;
surfaceScalarField& phi_;
@ -202,6 +204,9 @@ public:
//- Reference to the phases
const phaseSystem::phaseModelList& phases;
//- Reference to the moving phases
const phaseSystem::phaseModelPartialList& movingPhases;
//- Reference to the pressure field
const volScalarField& p;

9
applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
View File

@ -253,10 +253,9 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
}
// Add the phase pressure
forAll(this->phaseModels_, phasei)
forAll(this->movingPhases(), movingPhasei)
{
const phaseModel& phase = this->phaseModels_[phasei];
const phaseModel& phase = this->movingPhases()[movingPhasei];
const tmp<volScalarField> pPrime(phase.pPrime());
addField
@ -375,9 +374,9 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Ffs() const
}
// Add the phase pressure
forAll(this->phaseModels_, phasei)
forAll(this->movingPhases(), movingPhasei)
{
const phaseModel& phase = this->phaseModels_[phasei];
const phaseModel& phase = this->movingPhases()[movingPhasei];
addField
(

119
applications/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C
View File

@ -63,7 +63,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::UEqn()
{
FatalErrorInFunction
<< "Cannot construct a momentum equation for a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return tmp<fvVectorMatrix>();
}
@ -75,7 +75,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::UfEqn()
{
FatalErrorInFunction
<< "Cannot construct a momentum equation for a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return tmp<fvVectorMatrix>();
}
@ -85,12 +85,11 @@ template<class BasePhaseModel>
Foam::tmp<Foam::volVectorField>
Foam::StationaryPhaseModel<BasePhaseModel>::U() const
{
return volVectorField::New
(
IOobject::groupName("U", this->name()),
this->mesh(),
dimensionedVector(dimVelocity, Zero)
);
FatalErrorInFunction
<< "Cannot access the velocity of a stationary phase"
<< abort(FatalError);
return volVectorField::null();
}
@ -100,7 +99,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::URef()
{
FatalErrorInFunction
<< "Cannot access the velocity of a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return const_cast<volVectorField&>(volVectorField::null());
}
@ -112,7 +111,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::URef() const
{
FatalErrorInFunction
<< "Cannot access the velocity of a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return volVectorField::null();
}
@ -122,12 +121,11 @@ template<class BasePhaseModel>
Foam::tmp<Foam::surfaceScalarField>
Foam::StationaryPhaseModel<BasePhaseModel>::phi() const
{
return surfaceScalarField::New
(
IOobject::groupName("phi", this->name()),
this->mesh(),
dimensionedScalar(dimVolume/dimTime, 0)
);
FatalErrorInFunction
<< "Cannot access the flux of a stationary phase"
<< abort(FatalError);
return surfaceScalarField::null();
}
@ -137,7 +135,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::phiRef()
{
FatalErrorInFunction
<< "Cannot access the flux of a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return const_cast<surfaceScalarField&>(surfaceScalarField::null());
}
@ -149,7 +147,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::phiRef() const
{
FatalErrorInFunction
<< "Cannot access the flux of a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return surfaceScalarField::null();
}
@ -174,7 +172,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::UfRef()
{
FatalErrorInFunction
<< "Cannot access the face velocity of a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return const_cast<surfaceVectorField&>(surfaceVectorField::null());
}
@ -186,7 +184,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::UfRef() const
{
FatalErrorInFunction
<< "Cannot access the face velocity of a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return surfaceVectorField::null();
}
@ -196,12 +194,11 @@ template<class BasePhaseModel>
Foam::tmp<Foam::surfaceScalarField>
Foam::StationaryPhaseModel<BasePhaseModel>::alphaPhi() const
{
return surfaceScalarField::New
(
IOobject::groupName("alphaPhi", this->name()),
this->mesh(),
dimensionedScalar(dimVolume/dimTime, 0)
);
FatalErrorInFunction
<< "Cannot access the flux of a stationary phase"
<< abort(FatalError);
return surfaceScalarField::null();
}
@ -211,7 +208,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::alphaPhiRef()
{
FatalErrorInFunction
<< "Cannot access the volumetric flux of a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return const_cast<surfaceScalarField&>(surfaceScalarField::null());
}
@ -222,8 +219,8 @@ const Foam::surfaceScalarField&
Foam::StationaryPhaseModel<BasePhaseModel>::alphaPhiRef() const
{
FatalErrorInFunction
<< "Cannot access the volumetric flux of a stationary phase"
<< exit(FatalError);
<< "Cannot access the flux of a stationary phase"
<< abort(FatalError);
return surfaceScalarField::null();
}
@ -233,12 +230,11 @@ template<class BasePhaseModel>
Foam::tmp<Foam::surfaceScalarField>
Foam::StationaryPhaseModel<BasePhaseModel>::alphaRhoPhi() const
{
return surfaceScalarField::New
(
IOobject::groupName("alphaRhoPhi", this->name()),
this->mesh(),
dimensionedScalar(dimMass/dimTime, 0)
);
FatalErrorInFunction
<< "Cannot access the flux of a stationary phase"
<< abort(FatalError);
return surfaceScalarField::null();
}
@ -247,8 +243,8 @@ Foam::surfaceScalarField&
Foam::StationaryPhaseModel<BasePhaseModel>::alphaRhoPhiRef()
{
FatalErrorInFunction
<< "Cannot access the mass flux of a stationary phase"
<< exit(FatalError);
<< "Cannot access the flux of a stationary phase"
<< abort(FatalError);
return const_cast<surfaceScalarField&>(surfaceScalarField::null());
}
@ -259,8 +255,8 @@ const Foam::surfaceScalarField&
Foam::StationaryPhaseModel<BasePhaseModel>::alphaRhoPhiRef() const
{
FatalErrorInFunction
<< "Cannot access the mass flux of a stationary phase"
<< exit(FatalError);
<< "Cannot access the flux of a stationary phase"
<< abort(FatalError);
return surfaceScalarField::null();
}
@ -271,8 +267,8 @@ Foam::tmp<Foam::fvVectorMatrix>
Foam::StationaryPhaseModel<BasePhaseModel>::UgradU() const
{
FatalErrorInFunction
<< "Cannot calculate DUDt of a stationary phase"
<< exit(FatalError);
<< "Cannot calculate UgradU of a stationary phase"
<< abort(FatalError);
return tmp<fvVectorMatrix>(nullptr);
}
@ -284,7 +280,7 @@ Foam::StationaryPhaseModel<BasePhaseModel>::DUDt() const
{
FatalErrorInFunction
<< "Cannot calculate DUDt of a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
return tmp<fvVectorMatrix>(nullptr);
}
@ -294,12 +290,11 @@ template<class BasePhaseModel>
Foam::tmp<Foam::volScalarField>
Foam::StationaryPhaseModel<BasePhaseModel>::continuityError() const
{
return volScalarField::New
(
IOobject::groupName("continuityError", this->name()),
this->mesh(),
dimensionedScalar(dimDensity/dimTime, 0)
);
FatalErrorInFunction
<< "Cannot access the continuityError of a stationary phase"
<< abort(FatalError);
return volScalarField::null();
}
@ -307,12 +302,11 @@ template<class BasePhaseModel>
Foam::tmp<Foam::volScalarField>
Foam::StationaryPhaseModel<BasePhaseModel>::K() const
{
return volScalarField::New
(
IOobject::groupName("K", this->name()),
this->mesh(),
dimensionedScalar(sqr(dimVelocity), 0)
);
FatalErrorInFunction
<< "Cannot access the kinetic energy of a stationary phase"
<< abort(FatalError);
return volScalarField::null();
}
@ -320,6 +314,10 @@ template<class BasePhaseModel>
const Foam::autoPtr<Foam::volScalarField>&
Foam::StationaryPhaseModel<BasePhaseModel>::divU() const
{
FatalErrorInFunction
<< "Cannot access the dilatation rate of a stationary phase"
<< abort(FatalError);
static autoPtr<volScalarField> divU_;
return divU_;
}
@ -333,7 +331,7 @@ void Foam::StationaryPhaseModel<BasePhaseModel>::divU
{
FatalErrorInFunction
<< "Cannot set the dilatation rate of a stationary phase"
<< exit(FatalError);
<< abort(FatalError);
}
@ -362,12 +360,11 @@ template<class BasePhaseModel>
Foam::tmp<Foam::volScalarField>
Foam::StationaryPhaseModel<BasePhaseModel>::pPrime() const
{
return volScalarField::New
(
IOobject::groupName("pPrime", this->name()),
this->mesh(),
dimensionedScalar(dimPressure, 0)
);
FatalErrorInFunction
<< "Cannot access the pPrime of a stationary phase"
<< abort(FatalError);
return volScalarField::null();
}

47
applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C
View File

@ -34,7 +34,7 @@ License
#include "fvCorrectPhi.H"
#include "fvcMeshPhi.H"
#include "correctContactAngle.H"
#include "dragModel.H"
#include "fixedValueFvsPatchFields.H"
#include "movingWallVelocityFvPatchVectorField.H"
#include "pressureReference.H"
@ -51,30 +51,6 @@ const Foam::word Foam::phaseSystem::propertiesName("phaseProperties");
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
Foam::tmp<Foam::surfaceScalarField> Foam::phaseSystem::calcPhi
(
const phaseModelList& phaseModels
) const
{
tmp<surfaceScalarField> tmpPhi
(
surfaceScalarField::New
(
"phi",
fvc::interpolate(phaseModels[0])*phaseModels[0].phi()
)
);
for (label phasei=1; phasei<phaseModels.size(); phasei++)
{
tmpPhi.ref() +=
fvc::interpolate(phaseModels[phasei])*phaseModels[phasei].phi();
}
return tmpPhi;
}
Foam::tmp<Foam::volScalarField> Foam::phaseSystem::sumAlphaMoving() const
{
tmp<volScalarField> sumAlphaMoving
@ -237,7 +213,17 @@ Foam::phaseSystem::phaseSystem
phaseModel::iNew(*this, referencePhaseName_)
),
phi_("phi", calcPhi(phaseModels_)),
phi_
(
IOobject
(
"phi",
mesh.time().name(),
mesh
),
mesh,
dimensionedScalar(dimFlux, 0)
),
dpdt_
(
@ -300,6 +286,13 @@ Foam::phaseSystem::phaseSystem
}
}
forAll(movingPhaseModels_, movingPhasei)
{
phi_ +=
fvc::interpolate(movingPhaseModels_[movingPhasei])
*movingPhaseModels_[movingPhasei].phi();
}
// Write phi
phi_.writeOpt() = IOobject::AUTO_WRITE;
@ -332,7 +325,7 @@ Foam::phaseSystem::phaseSystem
}
}
forAll(phases(), phasei)
forAll(phaseModels_, phasei)
{
const volScalarField& alphai = phases()[phasei];
mesh_.schemes().setFluxRequired(alphai.name());

44
applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H
View File

@ -172,20 +172,8 @@ protected:
interfaceSurfaceTensionModelTable interfaceSurfaceTensionModels_;
//- Flag to indicate that returned lists of fields are "complete"; i.e.,
// that an absence of force is returned as a constructed list of zeros,
// rather than a null pointer
static const bool fillFields_ = false;
// Protected member functions
//- Calculate and return the mixture flux
tmp<surfaceScalarField> calcPhi
(
const phaseModelList& phaseModels
) const;
//- Return the sum of the phase fractions of the moving phases
tmp<volScalarField> sumAlphaMoving() const;
@ -436,38 +424,6 @@ public:
) const;
// Field construction
//- Fill up gaps in a phase-indexed list of fields with zeros
template
<
class Type,
template<class> class PatchField,
class GeoMesh
>
void fillFields
(
const word& name,
const dimensionSet& dims,
PtrList<GeometricField<Type, PatchField, GeoMesh>>& fieldList
) const;
//- Fill up gaps in a phase-indexed table of fields with zeros
template
<
class Type,
template<class> class PatchField,
class GeoMesh
>
void fillFields
(
const word& name,
const dimensionSet& dims,
HashPtrTable<GeometricField<Type, PatchField, GeoMesh>>&
fieldTable
) const;
// Properties
//- Return the mixture density

4
applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C
View File

@ -182,9 +182,9 @@ void Foam::phaseSystem::solve(const PtrList<volScalarField>& rAs)
)
);
forAll(phases(), phasej)
forAll(movingPhases(), movingPhasej)
{
const phaseModel& phase2 = phases()[phasej];
const phaseModel& phase2 = movingPhases()[movingPhasej];
const volScalarField& alpha2 = phase2;
if (&phase2 != &phase)

72
applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C
View File

@ -97,78 +97,6 @@ Foam::dictionary Foam::phaseSystem::interfacialDict(const word& name) const
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::phaseSystem::fillFields
(
const word& name,
const dimensionSet& dims,
PtrList<GeometricField<Type, PatchField, GeoMesh>>& fieldList
) const
{
forAll(this->phaseModels_, phasei)
{
if (fieldList.set(phasei))
{
continue;
}
const phaseModel& phase = this->phaseModels_[phasei];
fieldList.set
(
phasei,
new GeometricField<Type, PatchField, GeoMesh>
(
IOobject
(
IOobject::groupName(name, phase.name()),
this->mesh_.time().name(),
this->mesh_
),
this->mesh_,
dimensioned<Type>("zero", dims, pTraits<Type>::zero)
)
);
}
}
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::phaseSystem::fillFields
(
const word& name,
const dimensionSet& dims,
HashPtrTable<GeometricField<Type, PatchField, GeoMesh>>& fieldTable
) const
{
forAll(this->phaseModels_, phasei)
{
const phaseModel& phase = this->phaseModels_[phasei];
if (fieldTable.set(phase.name()))
{
continue;
}
fieldTable.set
(
phase.name(),
new GeometricField<Type, PatchField, GeoMesh>
(
IOobject
(
IOobject::groupName(name, phase.name()),
this->mesh_.time().name(),
this->mesh_
),
this->mesh_,
dimensioned<Type>("zero", dims, pTraits<Type>::zero)
)
);
}
}
template<class ModelType>
Foam::word Foam::phaseSystem::modelName() const
{