zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dimensioned<Type>: Added constructor from name, dimensions and dictionary

Browse Source 
to simplify construction of dimensionedScalar properties and avoid the
duplication of the name string in the constructor call.
This commit is contained in:
Henry Weller
2015-07-21 12:57:07 +01:00
parent ecee2d275e
commit 40ae36b5f6
103 changed files with 342 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
View File

@ -76,13 +76,13 @@ Foam::diameterModels::IATE::IATE
),
phase_.U().mesh()
),
dMax_("dMax", dimLength, diameterProperties_.lookup("dMax")),
dMin_("dMin", dimLength, diameterProperties_.lookup("dMin")),
dMax_("dMax", dimLength, diameterProperties_),
dMin_("dMin", dimLength, diameterProperties_),
residualAlpha_
(
"residualAlpha",
dimless,
diameterProperties_.lookup("residualAlpha")
diameterProperties_
),
d_
(

6
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
View File

@ -51,9 +51,9 @@ randomCoalescence
)
:
IATEsource(iate),
Crc_("Crc", dimless, dict.lookup("Crc")),
C_("C", dimless, dict.lookup("C")),
alphaMax_("alphaMax", dimless, dict.lookup("alphaMax"))
Crc_("Crc", dimless, dict),
C_("C", dimless, dict),
alphaMax_("alphaMax", dimless, dict)
{}

6
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -51,8 +51,8 @@ turbulentBreakUp
)
:
IATEsource(iate),
Cti_("Cti", dimless, dict.lookup("Cti")),
WeCr_("WeCr", dimless, dict.lookup("WeCr"))
Cti_("Cti", dimless, dict),
WeCr_("WeCr", dimless, dict)
{}

4
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,7 +56,7 @@ wakeEntrainmentCoalescence
)
:
IATEsource(iate),
Cwe_("Cwe", dimless, dict.lookup("Cwe"))
Cwe_("Cwe", dimless, dict)
{}

2
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
View File

@ -53,7 +53,7 @@ Foam::diameterModels::constant::constant
)
:
diameterModel(diameterProperties, phase),
d_("d", dimLength, diameterProperties_.lookup("d"))
d_("d", dimLength, diameterProperties_)
{}

6
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -53,8 +53,8 @@ Foam::diameterModels::isothermal::isothermal
)
:
diameterModel(diameterProperties, phase),
d0_("d0", dimLength, diameterProperties_.lookup("d0")),
p0_("p0", dimPressure, diameterProperties_.lookup("p0"))
d0_("d0", dimLength, diameterProperties_),
p0_("p0", dimPressure, diameterProperties_)
{}