From 0ed79f3bc105c9fede72f98ab0c6d6c9d1dc88ea Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 8 Sep 2022 11:20:31 +0200
Subject: [PATCH] COMP: pass phase-change YInf by reference not by copy
- copying was inadvertently added by 85a2ae6eaa46e1ba
---
.../standardPhaseChange/standardPhaseChange.C | 6 ++---
.../standardPhaseChange/standardPhaseChange.H | 10 ++++----
.../waxSolventEvaporation.C | 2 +-
.../waxSolventEvaporation.H | 25 ++++++++-----------
4 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
index c9f03a7bd2f..95e9fcddf6d 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2018 OpenFOAM Foundation
- Copyright (C) 2020 OpenCFD Ltd.
+ Copyright (C) 2020-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -82,7 +82,7 @@ standardPhaseChange::standardPhaseChange
deltaMin_(coeffDict_.get<scalar>("deltaMin")),
L_(coeffDict_.get<scalar>("L")),
TbFactor_(coeffDict_.getOrDefault<scalar>("TbFactor", 1.1)),
- YInfZero_(coeffDict_.getOrDefault<Switch>("YInfZero", false))
+ YInfZero_(coeffDict_.getOrDefault("YInfZero", false))
{}
@@ -95,7 +95,7 @@ void standardPhaseChange::correctModel
scalarField& availableMass,
scalarField& dMass,
scalarField& dEnergy,
- YInfType YInf
+ const YInfType& YInf
)
{
const thermoSingleLayer& film = filmType<thermoSingleLayer>();
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
index 8f131df48b4..cd1f4d1bb29 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
@@ -34,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef standardPhaseChange_H
-#define standardPhaseChange_H
+#ifndef Foam_standardPhaseChange_H
+#define Foam_standardPhaseChange_H
#include "phaseChangeModel.H"
@@ -58,7 +58,7 @@ class standardPhaseChange
{
protected:
- // Protected data
+ // Protected Data
//- Minimum film height for model to be active
const scalar deltaMin_;
@@ -71,7 +71,7 @@ protected:
const scalar TbFactor_;
//- Switch to treat YInf as zero
- Switch YInfZero_;
+ bool YInfZero_;
// Protected member functions
@@ -86,7 +86,7 @@ protected:
scalarField& availableMass,
scalarField& dMass,
scalarField& dEnergy,
- YInfType YInf
+ const YInfType& YInf
);
//- No copy construct
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
index 376d29b3ffb..0b20fe648f6 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
@@ -153,7 +153,7 @@ void waxSolventEvaporation::correctModel
scalarField& availableMass,
scalarField& dMass,
scalarField& dEnergy,
- YInfType YInf
+ const YInfType& YInf
)
{
const thermoSingleLayer& film = filmType<thermoSingleLayer>();
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H
index a34cb4cc44f..ef7a2c5511e 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H
@@ -34,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef waxSolventEvaporation_H
-#define waxSolventEvaporation_H
+#ifndef Foam_waxSolventEvaporation_H
+#define Foam_waxSolventEvaporation_H
#include "phaseChangeModel.H"
#include "uniformDimensionedFields.H"
@@ -58,18 +58,9 @@ class waxSolventEvaporation
:
public phaseChangeModel
{
- // Private member functions
-
- //- No copy construct
- waxSolventEvaporation(const waxSolventEvaporation&) = delete;
-
- //- No copy assignment
- void operator=(const waxSolventEvaporation&) = delete;
-
-
protected:
- // Protected data
+ // Protected Data
//- Molecular weight of wax [kg/kmol]
uniformDimensionedScalarField Wwax_;
@@ -100,7 +91,7 @@ protected:
autoPtr<Function1<scalar>> activityCoeff_;
- // Protected member functions
+ // Protected Member Functions
//- Return Sherwood number as a function of Reynolds and Schmidt numbers
scalar Sh(const scalar Re, const scalar Sc) const;
@@ -112,9 +103,15 @@ protected:
scalarField& availableMass,
scalarField& dMass,
scalarField& dEnergy,
- YInfType YInf
+ const YInfType& YInf
);
+ //- No copy construct
+ waxSolventEvaporation(const waxSolventEvaporation&) = delete;
+
+ //- No copy assignment
+ void operator=(const waxSolventEvaporation&) = delete;
+
public:
--
GitLab