diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C index b46ea2b5bf18b14ab48c3eb4988c6c84ee723bc0..5d7616b158e3fa04db0dd47a4419998c67857e73 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C @@ -242,16 +242,12 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::dh template<class CloudType> -Foam::scalar Foam::LiquidEvaporation<CloudType>::TMax -( - const scalar pIn, - const scalar TIn -) const +Foam::scalar Foam::LiquidEvaporation<CloudType>::TMax(const scalar pIn) const { scalar T = -GREAT; forAll(liquids_, i) { - T = max(T, liquids_.properties()[i].pv(pIn, TIn)); + T = max(T, liquids_.properties()[i].pv(pIn)); } return T; diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H index 5a97dc73944b1a815514fe12a3a10ea8922629a3..fb2e2cdd9c8f38fb7f720e3512cb439ee7aff730 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H @@ -132,7 +132,7 @@ public: ) const; //- Return maximum/limiting temperature - virtual scalar TMax(const scalar pIn, const scalar TIn) const; + virtual scalar TMax(const scalar pIn) const; }; diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C index 8a88620992f306524ccb6e9782c2f24d1c6ff21c..468975d179b5df2b75cc32f549e2ca6575540715 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C @@ -343,14 +343,13 @@ Foam::scalar Foam::LiquidEvaporationBoil<CloudType>::dh template<class CloudType> Foam::scalar Foam::LiquidEvaporationBoil<CloudType>::TMax ( - const scalar pIn, - const scalar TIn + const scalar pIn ) const { scalar T = -GREAT; forAll(liquids_, i) { - T = max(T, liquids_.properties()[i].pv(pIn, TIn)); + T = max(T, liquids_.properties()[i].pv(pIn)); } return T; diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H index bf9ca867ce51205a14f641decd8cd12838e0adc1..2d11f55f3200869863ffc7632debce83ce2efad0 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H @@ -142,7 +142,7 @@ public: ) const; //- Return maximum/limiting temperature - virtual scalar TMax(const scalar pIn, const scalar TIn) const; + virtual scalar TMax(const scalar pIn) const; }; diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C index 7141ff98147cb1f6668900e1a59b69ddb5db698b..3ba13f27e1413ee76e64dd4dfa06dd110cec3aa1 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C @@ -179,11 +179,7 @@ Foam::scalar Foam::PhaseChangeModel<CloudType>::dh template<class CloudType> -Foam::scalar Foam::PhaseChangeModel<CloudType>::TMax -( - const scalar, - const scalar -) const +Foam::scalar Foam::PhaseChangeModel<CloudType>::TMax(const scalar) const { return GREAT; } diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H index ac6c5c06b344f297d37893c481fc25fe5ad162ab..f61031c758204131f0966a58b9ca37dc62badd00 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H @@ -185,7 +185,7 @@ public: ) const; //- Return maximum/limiting temperature - virtual scalar TMax(const scalar pIn, const scalar TIn) const; + virtual scalar TMax(const scalar pIn) const; //- Add to phase change mass void addToPhaseChangeMass(const scalar dMass);