From 585ee0fe89392ee3c05a7a08fac9368369b19e26 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 21 Feb 2020 10:08:47 +0100
Subject: [PATCH] COMP: fix construct assignment from tmp (clang)
---
.../interfaceHeatResistance.C | 9 ++-------
.../interfaceHeatResistance.H | 17 +++++++----------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
index e786bfbb057..b3442ed9b83 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
@@ -161,7 +161,6 @@ Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
mDot() const
{
-
return Pair<tmp<volScalarField>>
(
tmp<volScalarField>(mDotc_),
@@ -191,8 +190,6 @@ mDotDeltaT() const
mDotc_*pos(TSat - T.oldTime())/(TSat - T.oldTime()),
-mDote_*pos(T.oldTime() - TSat)/(T.oldTime() - TSat)
);
-
-
}
@@ -200,7 +197,6 @@ Foam::tmp<Foam::fvScalarMatrix>
Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
TSource() const
{
-
const volScalarField& T = mesh_.lookupObject<volScalarField>("T");
tmp<fvScalarMatrix> tTSource
@@ -223,7 +219,7 @@ TSource() const
const dimensionedScalar& TSat = thermo.TSat();
// interface heat resistance
- volScalarField IHRcoeff = interfaceArea_*R_;
+ volScalarField IHRcoeff(interfaceArea_*R_);
TSource = fvm::Sp(IHRcoeff, T) - IHRcoeff*TSat;
@@ -234,7 +230,6 @@ TSource() const
void Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
correct()
{
-
// Update Interface
updateInterface();
@@ -324,6 +319,7 @@ updateInterface()
}
}
+
Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
vDot() const
@@ -390,7 +386,6 @@ vDot() const
}
-
bool Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
read()
{
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.H
index 98b9e33b49f..67c0aa5676d 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.H
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.H
@@ -39,12 +39,10 @@ Description
Journal of Computational Physics 227 (2008), 5871-5895
\endverbatim
-
-
SourceFiles
interfaceHeatResistance.C
-\*--------------------------------------------------------------------*/
+\*---------------------------------------------------------------------------*/
#ifndef interfaceHeatResistance_H
#define interfaceHeatResistance_H
@@ -58,15 +56,15 @@ namespace Foam
namespace temperaturePhaseChangeTwoPhaseMixtures
{
-/*--------------------------------------------------------------------*\
- Class interfaceHeatResistance
-\*--------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+ Class interfaceHeatResistance
+\*---------------------------------------------------------------------------*/
class interfaceHeatResistance
:
public temperaturePhaseChangeTwoPhaseMixture
{
- // Private data
+ // Private Data
//- Heat transfer coefficient [1/s/K]
dimensionedScalar R_;
@@ -84,7 +82,7 @@ class interfaceHeatResistance
scalar spread_;
- // Private member functions
+ // Private Member Functions
//- Update interface area
void updateInterface();
@@ -106,8 +104,7 @@ public:
);
//- Destructor
- virtual ~interfaceHeatResistance()
- {}
+ virtual ~interfaceHeatResistance() = default;
// Member Functions
--
GitLab