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

COMP: fix construct assignment from tmp (clang)

Browse Source
This commit is contained in:
Mark Olesen
2020-02-21 10:08:47 +01:00
parent 40e00fab01
commit 585ee0fe89
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
View File

@ -161,7 +161,6 @@ Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance:: Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
mDot() const mDot() const
{ {
return Pair<tmp<volScalarField>> return Pair<tmp<volScalarField>>
( (
tmp<volScalarField>(mDotc_), tmp<volScalarField>(mDotc_),
@ -191,8 +190,6 @@ mDotDeltaT() const
mDotc_*pos(TSat - T.oldTime())/(TSat - T.oldTime()), mDotc_*pos(TSat - T.oldTime())/(TSat - T.oldTime()),
-mDote_*pos(T.oldTime() - TSat)/(T.oldTime() - TSat) -mDote_*pos(T.oldTime() - TSat)/(T.oldTime() - TSat)
); );
} }
@ -200,7 +197,6 @@ Foam::tmp<Foam::fvScalarMatrix>
Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance:: Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
TSource() const TSource() const
{ {
const volScalarField& T = mesh_.lookupObject<volScalarField>("T"); const volScalarField& T = mesh_.lookupObject<volScalarField>("T");
tmp<fvScalarMatrix> tTSource tmp<fvScalarMatrix> tTSource
@ -223,7 +219,7 @@ TSource() const
const dimensionedScalar& TSat = thermo.TSat(); const dimensionedScalar& TSat = thermo.TSat();
// interface heat resistance // interface heat resistance
volScalarField IHRcoeff = interfaceArea_*R_; volScalarField IHRcoeff(interfaceArea_*R_);
TSource = fvm::Sp(IHRcoeff, T) - IHRcoeff*TSat; TSource = fvm::Sp(IHRcoeff, T) - IHRcoeff*TSat;
@ -234,7 +230,6 @@ TSource() const
void Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance:: void Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
correct() correct()
{ {
// Update Interface // Update Interface
updateInterface(); updateInterface();
@ -324,6 +319,7 @@ updateInterface()
} }
} }
Foam::Pair<Foam::tmp<Foam::volScalarField>> Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance:: Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
vDot() const vDot() const
@ -390,7 +386,6 @@ vDot() const
} }
bool Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance:: bool Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
read() read()
{ {

15
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.H
View File

@ -39,12 +39,10 @@ Description
Journal of Computational Physics 227 (2008), 5871-5895 Journal of Computational Physics 227 (2008), 5871-5895
\endverbatim \endverbatim
SourceFiles SourceFiles
interfaceHeatResistance.C interfaceHeatResistance.C
\*--------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef interfaceHeatResistance_H #ifndef interfaceHeatResistance_H
#define interfaceHeatResistance_H #define interfaceHeatResistance_H
@ -58,15 +56,15 @@ namespace Foam
namespace temperaturePhaseChangeTwoPhaseMixtures namespace temperaturePhaseChangeTwoPhaseMixtures
{ {
/*--------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class interfaceHeatResistance Class interfaceHeatResistance
\*--------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class interfaceHeatResistance class interfaceHeatResistance
: :
public temperaturePhaseChangeTwoPhaseMixture public temperaturePhaseChangeTwoPhaseMixture
{ {
// Private data // Private Data
//- Heat transfer coefficient [1/s/K] //- Heat transfer coefficient [1/s/K]
dimensionedScalar R_; dimensionedScalar R_;
@ -84,7 +82,7 @@ class interfaceHeatResistance
scalar spread_; scalar spread_;
// Private member functions // Private Member Functions
//- Update interface area //- Update interface area
void updateInterface(); void updateInterface();
@ -106,8 +104,7 @@ public:
); );
//- Destructor //- Destructor
virtual ~interfaceHeatResistance() virtual ~interfaceHeatResistance() = default;
{}
// Member Functions // Member Functions