From 30d9cfa7c2d87bea4a28ae5bc4c69c5a70ffb3ef Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 12 Mar 2020 10:13:27 +0100
Subject: [PATCH] STYLE: remove trailing space, use Enum::get()
---
...peratureTwoPhaseRadCoupledMixedFvPatchScalarField.C | 4 ++--
...peratureTwoPhaseRadCoupledMixedFvPatchScalarField.H | 2 +-
.../interCondensatingEvaporatingFoam/Make/options | 2 --
.../alphatWallBoilingWallFunctionFvPatchScalarField.C | 10 +++++-----
.../alphatWallBoilingWallFunctionFvPatchScalarField.H | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
index b991acc70a0..bb4eee1efa8 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
@@ -225,10 +225,10 @@ turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
)
:
mixedFvPatchScalarField(p, iF),
- regionType_(regionTypeNames_.read(dict.lookup("region"))),
+ regionType_(regionTypeNames_.get("region", dict)),
method_(KMethodTypeNames_.get("kappaMethod", dict)),
kappaName_(dict.lookupOrDefault<word>("kappa", "none")),
- otherPhaseName_(dict.lookup("otherPhase")),
+ otherPhaseName_(dict.get<word>("otherPhase")),
TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")),
qrNbrName_(dict.lookupOrDefault<word>("qrNbr", "none")),
qrName_(dict.lookupOrDefault<word>("qr", "none"))
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.H
index ebd742e6dfa..072a0d28075 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.H
@@ -148,7 +148,7 @@ private:
//- Name of field on the neighbour region
const word TnbrName_;
- //- Name of the radiative heat flux in the neighbour region
+ //- Name of the radiative heat flux in the neighbour region
const word qrNbrName_;
//- Name of the radiative heat flux in local region
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options
index b7f1e28a140..0a9bec959fc 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options
@@ -35,5 +35,3 @@ EXE_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lfluidThermophysicalModels
-
-
diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index 99db3f857ca..11280ef3cc8 100644
--- a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -111,8 +111,8 @@ alphatWallBoilingWallFunctionFvPatchScalarField
)
:
alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(p, iF, dict),
- otherPhaseName_(dict.lookup("otherPhase")),
- phaseType_(phaseTypeNames_.read(dict.lookup("phaseType"))),
+ otherPhaseName_(dict.get<word>("otherPhase")),
+ phaseType_(phaseTypeNames_.get("phaseType", dict)),
relax_(Function1<scalar>::New("relax", dict)),
AbyV_(p.size(), 0),
alphatConv_(p.size(), 0),
@@ -1032,7 +1032,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
break;
}
}
-
+
scalar nSubCool(gSum(nSubCools));
scalar nTransient(gSum(nTransients));
scalar nFilm(gSum(nFilms));
@@ -1044,8 +1044,8 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
Info<< " transient faces : " << nTransient << endl;
Info<< " film faces : " << nFilm << endl;
Info<< " non-Boiling faces : " << nNonBoiling << endl;
- Info<< " total faces : "
- << nSubCool + nTransient + nFilm + nNonBoiling
+ Info<< " total faces : "
+ << nSubCool + nTransient + nFilm + nNonBoiling
<< endl << nl;
const scalarField qc
diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
index 809f8897e85..1f9835e337d 100644
--- a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
+++ b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
@@ -290,7 +290,7 @@ private:
phaseType phaseType_;
//- dmdt relaxationFactor
- autoPtr<Function1<scalar>> relax_;
+ autoPtr<Function1<scalar>> relax_;
//- Patch face area by cell volume
scalarField AbyV_;
--
GitLab