diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C index 8023b9fd2b..69438250f3 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C @@ -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::orderedPhasePair::E() const -{ - return phase1().fluid().E(*this); -} - - // ************************************************************************* // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H index 40b1e0bf3f..cfa7056d09 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H @@ -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 E() const; }; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C index 3e4123a335..566d392cbd 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C @@ -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::phasePair::Ta() const Foam::tmp 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); } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H index d2ee205a6b..0e3d477898 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H @@ -136,7 +136,7 @@ public: tmp Ta() const; //- Aspect ratio - virtual tmp E() const; + tmp E() const; // Access