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

multiphaseEulerFoam, phasePair: Made aspect ratio method consistent

Browse Source
This commit is contained in:
Will Bainbridge
2021-12-09 15:43:16 +00:00
parent 1548508149
commit 491f355d97
4 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -81,10 +81,4 @@ Foam::word Foam::orderedPhasePair::otherName() const
}
Foam::tmp<Foam::volScalarField> Foam::orderedPhasePair::E() const
{
return phase1().fluid().E(*this);
}
// ************************************************************************* //

5
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.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) 2014-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -79,9 +79,6 @@ public:
//- Other pair name
virtual word otherName() const;
//- Aspect ratio
virtual tmp<volScalarField> E() const;
};

8
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -196,11 +196,7 @@ Foam::tmp<Foam::volScalarField> Foam::phasePair::Ta() const
Foam::tmp<Foam::volScalarField> Foam::phasePair::E() const
{
FatalErrorInFunction
<< "Requested aspect ratio of the dispersed phase in an unordered pair"
<< exit(FatalError);
return phase1();
return dispersed().fluid().E(*this);
}

2
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H
View File

@ -136,7 +136,7 @@ public:
tmp<volScalarField> Ta() const;
//- Aspect ratio
virtual tmp<volScalarField> E() const;
tmp<volScalarField> E() const;
// Access