diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
index 864ebe11b99a00bede650855ad9aeecb5c5f7028..51a46046fc1560050bfaac7596f77bb6f2dfd293 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017 OpenFOAM Foundation
- Copyright (C) 2020 OpenCFD Ltd.
+ Copyright (C) 2020-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -122,7 +122,7 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
alphaSolidT_(Function1<scalar>::New("alphaSolidT", coeffs_)),
L_("L", dimEnergy/dimMass, coeffs_),
relax_(coeffs_.getOrDefault("relax", 0.9)),
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
index a7a19e2491e5216f98f243e8dab0753b95dc33dd..62ae9ae7006cec91b2d6b1497959f17e7096a7f9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H
@@ -99,7 +99,7 @@ namespace fv
class VoFSolidificationMeltingSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private data
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
index 069c34d6ba1ad54896261f217b9d896d6681b3ff..2119ba1e62b0832fd3db6fbeb2c1142b5110e3eb 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
@@ -31,7 +31,7 @@ License
bool Foam::fv::VoFSolidificationMeltingSource::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
alphaSolidT_ = Function1<scalar>::New("alphaSolidT", coeffs_);
coeffs_.readEntry("L", L_);
diff --git a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C
index 8f8b5e0ffca70a79cce3c42135ddda3622269cf6..d221ac3682e25f9188783c413bae2f0ce7dfda77 100644
--- a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C
@@ -51,7 +51,7 @@ Foam::fv::atmAmbientTurbSource::atmAmbientTurbSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
isEpsilon_(true),
rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
kAmb_
diff --git a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.H b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.H
index fa7bb11796e5fee0668da225920de012557560d7..b3addecdd1d93a14bcb687726de9b6f35b5593bb 100644
--- a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.H
+++ b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.H
@@ -130,7 +130,7 @@ namespace fv
class atmAmbientTurbSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C
index 111bafe6b2ea57053e571848a66639a4f5554e5a..4cec1cacf6f4ddade0f6dbd84ed048644e5eb764 100644
--- a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C
@@ -133,7 +133,7 @@ Foam::fv::atmBuoyancyTurbSource::atmBuoyancyTurbSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
isEpsilon_(true),
rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
Lmax_
diff --git a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.H b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.H
index c03be68be1e959e230be6b879535baa5252e756c..a069387390973627fedca6bac0cb1a90f678cd8b 100644
--- a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.H
+++ b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.H
@@ -145,7 +145,7 @@ namespace fv
class atmBuoyancyTurbSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.C b/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.C
index d53653d5ad7ea00005c58a39e5a5734d55b08f71..bcd5a83948a5f685a782ecabaaea0fb6d635740e 100644
--- a/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.C
+++ b/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.C
@@ -68,7 +68,7 @@ Foam::fv::atmCoriolisUSource::atmCoriolisUSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
latitude_
(
coeffs_.getCheckOrDefault<scalar>
diff --git a/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.H b/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.H
index e5e127bf6eb5c4951ef466bee2574f4335df2c3e..f2f501faa48f826f60887f617a6c6f55ffe9f250 100644
--- a/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.H
+++ b/src/atmosphericModels/fvOptions/atmCoriolisUSource/atmCoriolisUSource.H
@@ -146,7 +146,7 @@ namespace fv
class atmCoriolisUSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C
index c45ab84f1d75fdb8e30174c842246086fb47f187..c0d342dcfd87929e2307a376eb6948270adc1d57 100644
--- a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C
@@ -87,7 +87,7 @@ Foam::fv::atmLengthScaleTurbSource::atmLengthScaleTurbSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
isEpsilon_(true),
rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
Lmax_
diff --git a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.H b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.H
index 7bf73ef708a739ff94b7d84d45a94ad2091f738c..89b0cacc94e543baa46c165300c815beb23554aa 100644
--- a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.H
+++ b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.H
@@ -133,7 +133,7 @@ namespace fv
class atmLengthScaleTurbSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.C b/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.C
index b67ce2ab739e78769c1b1e8ffe523a1b95462098..c0ca1a6b5bdba3b0fb903941481dd3dfcd0e7b69 100644
--- a/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.C
+++ b/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.C
@@ -51,7 +51,7 @@ Foam::fv::atmNutSource::atmNutSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
artNutName_(dict.getOrDefault<word>("nut", "artNut")),
artNut_
(
diff --git a/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.H b/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.H
index 60b562a966ffcc08fe8a83c398f396b4617f8edc..c84f9d30acc943a608767412d69e946d5d9e7ec6 100644
--- a/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.H
+++ b/src/atmosphericModels/fvOptions/atmNutSource/atmNutSource.H
@@ -102,7 +102,7 @@ namespace fv
class atmNutSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.C
index 5faebf5973d4a12846a8793fdf22dbeff206a828..dbb68bfbb5677221b33dceddc76a98c060317e65 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.C
@@ -51,7 +51,7 @@ Foam::fv::atmPlantCanopyTSource::atmPlantCanopyTSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
Cp0_
(
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.H b/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.H
index bd959589e29704e66b8ba27554da69dfb30e9b7d..ae5069cde2d96098d9a5c9b73353080fb8d4ac3b 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.H
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTSource/atmPlantCanopyTSource.H
@@ -105,7 +105,7 @@ namespace fv
class atmPlantCanopyTSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
index b137b8ae947b089457f6eaca9cde78c8f787c5b9..ebf6ab78848ab543b581ace31e64b217b5941088 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
@@ -64,7 +64,7 @@ Foam::fv::atmPlantCanopyTurbSource::atmPlantCanopyTurbSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
isEpsilon_(true),
rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
Cmu_(Zero),
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H
index 8cc7e779e83c87509883c6205182616eaef21b9e..e6a053ee531cf5b9cea3cc17cef2728910847149 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H
@@ -114,7 +114,7 @@ namespace fv
class atmPlantCanopyTurbSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
index cefd8f877651b0e9d5c0037b10cce70ecee320ed..f1044030bda04737c4d76177ed0d286b3151286e 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
@@ -51,7 +51,7 @@ Foam::fv::atmPlantCanopyUSource::atmPlantCanopyUSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
plantCd_
(
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H
index b3f15b05f187c22cadd8ed191788a178d01d5f55..035204be7e14d70d099fa4e1aa10b28b02f3041a 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H
@@ -113,7 +113,7 @@ namespace fv
class atmPlantCanopyUSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/faOptions/faceSetOption/faceSetOption.C b/src/faOptions/faceSetOption/faceSetOption.C
index 04eefeb2ff3a704c91db4a78dbdb74c0346cbbe5..90d10014e7e32ac6870531f5591fdaa53eaf40f9 100644
--- a/src/faOptions/faceSetOption/faceSetOption.C
+++ b/src/faOptions/faceSetOption/faceSetOption.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2019-2020 OpenCFD Ltd.
+ Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -181,7 +181,7 @@ Foam::fa::faceSetOption::faceSetOption
const fvPatch& patch
)
:
- option(name, modelType, dict, patch),
+ fa::option(name, modelType, dict, patch),
timeStart_(-1.0),
duration_(0.0),
selectionMode_(selectionModeTypeNames_.get("selectionMode", coeffs_)),
diff --git a/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C b/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C
index 883027340772dc66ddf7a1fd919566ad03b425d0..5865449c5a4d240060d4ad195ed4d657cef74a18 100644
--- a/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C
+++ b/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C
@@ -54,7 +54,7 @@ Foam::fa::contactHeatFluxSource::contactHeatFluxSource
const fvPatch& patch
)
:
- faceSetOption(sourceName, modelType, dict, patch),
+ fa::faceSetOption(sourceName, modelType, dict, patch),
temperatureCoupledBase(patch, dict),
TName_(dict.getOrDefault<word>("T", "T")),
TprimaryName_(dict.get<word>("Tprimary")),
@@ -175,7 +175,7 @@ void Foam::fa::contactHeatFluxSource::addSup
bool Foam::fa::contactHeatFluxSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fa::option::read(dict))
{
coeffs_.readIfPresent("T", TName_);
diff --git a/src/faOptions/sources/derived/externalFileSource/externalFileSource.C b/src/faOptions/sources/derived/externalFileSource/externalFileSource.C
index cc6da002216da1d629b42e00f4a2afb80a0463f3..ed557286e634176772378515337195b2e89ef156 100644
--- a/src/faOptions/sources/derived/externalFileSource/externalFileSource.C
+++ b/src/faOptions/sources/derived/externalFileSource/externalFileSource.C
@@ -53,7 +53,7 @@ Foam::fa::externalFileSource::externalFileSource
const fvPatch& p
)
:
- faceSetOption(sourceName, modelType, dict, p),
+ fa::faceSetOption(sourceName, modelType, dict, p),
fieldName_(dict.get<word>("fieldName")),
tableName_(dict.get<word>("tableName")),
pExt_
@@ -118,7 +118,7 @@ void Foam::fa::externalFileSource::addSup
bool Foam::fa::externalFileSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fa::option::read(dict))
{
return true;
}
diff --git a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
index 2a559f0fe70a835ee5f062cf6662f5e5aed563e0..6c177730c5dd3a4ad16df1450a91fd5bdd0ebaea 100644
--- a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
+++ b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
@@ -68,7 +68,7 @@ Foam::fa::externalHeatFluxSource::externalHeatFluxSource
const fvPatch& patch
)
:
- faceSetOption(sourceName, modelType, dict, patch),
+ fa::faceSetOption(sourceName, modelType, dict, patch),
mode_(operationModeNames.get("mode", dict)),
TName_(dict.getOrDefault<word>("T", "T")),
Q_(0),
@@ -172,7 +172,7 @@ void Foam::fa::externalHeatFluxSource::addSup
bool Foam::fa::externalHeatFluxSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fa::option::read(dict))
{
dict.readIfPresent("T", TName_);
dict.readIfPresent("emissivity", emissivity_);
diff --git a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
index 583fd34ecd97fecb226a5c36878ed2d019c1917e..68a02faa3c88398167b066c2628b11be7b337274 100644
--- a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
+++ b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
@@ -52,7 +52,7 @@ Foam::fa::jouleHeatingSource::jouleHeatingSource
const fvPatch& patch
)
:
- faceSetOption(sourceName, modelType, dict, patch),
+ fa::faceSetOption(sourceName, modelType, dict, patch),
TName_(dict.getOrDefault<word>("T", "T")),
V_
(
@@ -174,7 +174,7 @@ void Foam::fa::jouleHeatingSource::addSup
bool Foam::fa::jouleHeatingSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fa::option::read(dict))
{
dict.readIfPresent("T", TName_);
diff --git a/src/fvOptions/cellSetOption/cellSetOption.C b/src/fvOptions/cellSetOption/cellSetOption.C
index 7f4d7168eb27c42a63e0dbb0215106b58a692baf..b74fb597db3f1d43c0f5254ba96229e420b81212 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.C
+++ b/src/fvOptions/cellSetOption/cellSetOption.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
- Copyright (C) 2017-2020 OpenCFD Ltd.
+ Copyright (C) 2017-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -204,7 +204,7 @@ Foam::fv::cellSetOption::cellSetOption
const fvMesh& mesh
)
:
- option(name, modelType, dict, mesh),
+ fv::option(name, modelType, dict, mesh),
timeStart_(-1.0),
duration_(0.0),
selectionMode_(selectionModeTypeNames_.get("selectionMode", coeffs_)),
@@ -224,7 +224,7 @@ Foam::fv::cellSetOption::cellSetOption
bool Foam::fv::cellSetOption::isActive()
{
- if (option::isActive() && inTimeLimits(mesh_.time().value()))
+ if (fv::option::isActive() && inTimeLimits(mesh_.time().value()))
{
// Update the cell set if the mesh is changing
if (mesh_.changing())
@@ -254,7 +254,7 @@ bool Foam::fv::cellSetOption::isActive()
bool Foam::fv::cellSetOption::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fv::option::read(dict))
{
if (coeffs_.readIfPresent("timeStart", timeStart_))
{
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index 1142b18bba3a8eb09389031deb4433be677ee323..17669fd837849e2125d725a7b48969dfe19de678 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -69,7 +69,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh),
+ fv::cellSetOption(name, modelType, dict, mesh),
mode_(temperatureModeNames_.get("mode", coeffs_)),
Tuniform_(nullptr),
TName_("T")
@@ -146,7 +146,7 @@ void Foam::fv::fixedTemperatureConstraint::constrain
bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
if (coeffs_.found(Tuniform_->name()))
{
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index 41d9435fb83e0f183f7d4ac33cbbce8699705e07..fa76db60cec0a32ff1b556aeb74073bfb557a131 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -119,7 +119,7 @@ namespace fv
class fixedTemperatureConstraint
:
- public cellSetOption
+ public fv::cellSetOption
{
public:
diff --git a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
index 9e96727a5280c4a4714ecc292e3eca1f303af086..808fda1531eec4ca18331fca92a8ca0032c6b133 100644
--- a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
+++ b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
@@ -96,7 +96,7 @@ Foam::fv::velocityDampingConstraint::velocityDampingConstraint
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh)
+ fv::cellSetOption(name, modelType, dict, mesh)
{
read(dict);
}
@@ -122,7 +122,7 @@ void Foam::fv::velocityDampingConstraint::writeData(Ostream& os) const
bool Foam::fv::velocityDampingConstraint::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
coeffs_.readEntry("UMax", UMax_);
diff --git a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
index e2d73c307d88d3640a90f00492db8f935abe27b1..648e2126651a4dd0fab0ea3f14a95084bc12a19b 100644
--- a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
+++ b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
@@ -118,7 +118,7 @@ namespace fv
class velocityDampingConstraint
:
- public cellSetOption
+ public fv::cellSetOption
{
protected:
diff --git a/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.C b/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.C
index 30681d5891d976afcffc2382e0c03d82f2ea50e7..43f0d08af73b1a543d2fc5f932baec29247c6e9b 100644
--- a/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.C
+++ b/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.C
@@ -42,7 +42,7 @@ Foam::fv::FixedValueConstraint<Type>::FixedValueConstraint
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh)
+ fv::cellSetOption(name, modelType, dict, mesh)
{
read(dict);
}
@@ -53,7 +53,7 @@ Foam::fv::FixedValueConstraint<Type>::FixedValueConstraint
template<class Type>
bool Foam::fv::FixedValueConstraint<Type>::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
const dictionary& fieldValuesDict = coeffs_.subDict("fieldValues");
diff --git a/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.H b/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.H
index b0168f904b121a8c7d86f2ed8a6ae17ff5e7a6d0..6a53ae82d85dc29c059a7d4e41a7a75008b0d8ab 100644
--- a/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.H
+++ b/src/fvOptions/constraints/general/fixedValueConstraint/FixedValueConstraint.H
@@ -116,7 +116,7 @@ namespace fv
template<class Type>
class FixedValueConstraint
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/fvOptions/corrections/limitTemperature/limitTemperature.C b/src/fvOptions/corrections/limitTemperature/limitTemperature.C
index 627e69cdeb0024367f1e42a06debac67a22f682e..f47361f0128d6cbe294fb8d5349e69e38242a8a6 100644
--- a/src/fvOptions/corrections/limitTemperature/limitTemperature.C
+++ b/src/fvOptions/corrections/limitTemperature/limitTemperature.C
@@ -53,7 +53,7 @@ Foam::fv::limitTemperature::limitTemperature
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh),
+ fv::cellSetOption(name, modelType, dict, mesh),
Tmin_(coeffs_.get<scalar>("min")),
Tmax_(coeffs_.get<scalar>("max")),
phase_(coeffs_.getOrDefault<word>("phase", word::null))
@@ -76,7 +76,7 @@ Foam::fv::limitTemperature::limitTemperature
bool Foam::fv::limitTemperature::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
coeffs_.readEntry("min", Tmin_);
coeffs_.readEntry("max", Tmax_);
diff --git a/src/fvOptions/corrections/limitTemperature/limitTemperature.H b/src/fvOptions/corrections/limitTemperature/limitTemperature.H
index cb9b5164bc839eb32ac31803f960111767348452..8475bcfdda389c0713de1d5496017ebf6b0ca46a 100644
--- a/src/fvOptions/corrections/limitTemperature/limitTemperature.H
+++ b/src/fvOptions/corrections/limitTemperature/limitTemperature.H
@@ -104,7 +104,7 @@ namespace fv
class limitTemperature
:
- public cellSetOption
+ public fv::cellSetOption
{
protected:
diff --git a/src/fvOptions/corrections/limitVelocity/limitVelocity.C b/src/fvOptions/corrections/limitVelocity/limitVelocity.C
index 445869598432c32096063c18290a7e9687ae91af..37f6ccae1909ad90373d36bb78986d37b1dcb198 100644
--- a/src/fvOptions/corrections/limitVelocity/limitVelocity.C
+++ b/src/fvOptions/corrections/limitVelocity/limitVelocity.C
@@ -52,7 +52,7 @@ Foam::fv::limitVelocity::limitVelocity
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh),
+ fv::cellSetOption(name, modelType, dict, mesh),
UName_(coeffs_.getOrDefault<word>("U", "U")),
max_(coeffs_.get<scalar>("max"))
{
@@ -65,7 +65,7 @@ Foam::fv::limitVelocity::limitVelocity
bool Foam::fv::limitVelocity::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
coeffs_.readEntry("max", max_);
diff --git a/src/fvOptions/corrections/limitVelocity/limitVelocity.H b/src/fvOptions/corrections/limitVelocity/limitVelocity.H
index 5fdb25a05efc75f73a7246ece7b7b25c6d50e18a..3002139fbd878334d48b85513e7e448bc5cbde04 100644
--- a/src/fvOptions/corrections/limitVelocity/limitVelocity.H
+++ b/src/fvOptions/corrections/limitVelocity/limitVelocity.H
@@ -98,7 +98,7 @@ namespace fv
class limitVelocity
:
- public cellSetOption
+ public fv::cellSetOption
{
protected:
diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C
index fc3d90a34b623a194e681fdf52a2c6334c1949a6..5f52ffea9e644d59f8e4572a7947b227aa12bbd7 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@@ -126,7 +126,7 @@ Foam::fv::interRegionOption::interRegionOption
bool Foam::fv::interRegionOption::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fv::option::read(dict))
{
return true;
}
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
index d9bfb7e95df697c3ff758e39c969aba1263953fc..f00cd64079fc0afd9a3dfa87286659bc79992571 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
@@ -84,7 +84,7 @@ Foam::fv::acousticDampingSource::acousticDampingSource
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh),
+ fv::cellSetOption(name, modelType, dict, mesh),
blendFactor_
(
volScalarField
@@ -174,7 +174,7 @@ void Foam::fv::acousticDampingSource::addSup
bool Foam::fv::acousticDampingSource::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
if (!coeffs_.readIfPresent("UNames", fieldNames_))
{
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
index f2a56766d230cbc85cba1f917998d722293b3f81..0e471f766cf9eef59f7bdf6796387983143a8119 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.H
@@ -120,7 +120,7 @@ namespace fv
class acousticDampingSource
:
- public cellSetOption
+ public fv::cellSetOption
{
protected:
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
index 4c4995e801f43e42623fcaa8127e2d0e7aab6a93..78b40132265fb1d52d578481196dfb50aa58637d 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
@@ -169,7 +169,7 @@ Foam::fv::actuationDiskSource::actuationDiskSource
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh),
+ fv::cellSetOption(name, modelType, dict, mesh),
writeFile(mesh, name, modelType, coeffs_),
forceMethod_
(
@@ -278,7 +278,7 @@ void Foam::fv::actuationDiskSource::addSup
bool Foam::fv::actuationDiskSource::read(const dictionary& dict)
{
- if (cellSetOption::read(dict) && writeFile::read(dict))
+ if (fv::cellSetOption::read(dict) && writeFile::read(dict))
{
dict.readIfPresent("sink", sink_);
dict.readIfPresent("writeFileStart", writeFileStart_);
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
index 38856b6278c875afdb9b229e76de7b080cefb1f4..18304a5330740c7dc745af100dc064b74cdc4a4a 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
@@ -227,7 +227,7 @@ namespace fv
class actuationDiskSource
:
- public cellSetOption,
+ public fv::cellSetOption,
public functionObjects::writeFile
{
protected:
diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
index 92d0cb41d51d3e5ef0b403a2650d661a553d6c68..d54e8968eb091bef15f39804e527bfc351b86384 100644
--- a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
+++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
@@ -53,7 +53,7 @@ Foam::fv::buoyancyEnergy::buoyancyEnergy
const fvMesh& mesh
)
:
- option(sourceName, modelType, dict, mesh),
+ fv::option(sourceName, modelType, dict, mesh),
UName_(coeffs_.getOrDefault<word>("U", "U"))
{
coeffs_.readEntry("fields", fieldNames_);
@@ -88,7 +88,7 @@ void Foam::fv::buoyancyEnergy::addSup
bool Foam::fv::buoyancyEnergy::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fv::option::read(dict))
{
coeffs_.readIfPresent("UName", UName_);
diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
index 1debb34aaed92ef073d9c14fead388b6d916ca3f..42139248c24cb343a7b092ff231172afb97602a2 100644
--- a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
+++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
@@ -53,7 +53,7 @@ Foam::fv::buoyancyForce::buoyancyForce
const fvMesh& mesh
)
:
- option(sourceName, modelType, dict, mesh),
+ fv::option(sourceName, modelType, dict, mesh),
g_(meshObjects::gravity::New(mesh.time()))
{
coeffs_.readEntry("fields", fieldNames_);
diff --git a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C
index b2b8be4bab405b0f21332159e14193430fb95fb3..5b7b0f5a69cfc446d633b9963e392adf43272bc2 100644
--- a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C
+++ b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C
@@ -134,7 +134,7 @@ Foam::fv::buoyancyTurbSource::buoyancyTurbSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
isEpsilon_(false),
rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
alphatName_(coeffs_.getOrDefault<word>("alphat", "alphat")),
diff --git a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.H b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.H
index b9e056b49a06401dcbbf6c4555ecaa59903fceb0..0b0662e36e10e7959d3b4c1784369c55e7dae090 100644
--- a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.H
+++ b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.H
@@ -182,7 +182,7 @@ namespace fv
class buoyancyTurbSource
:
- public cellSetOption
+ public fv::cellSetOption
{
// Private Data
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
index 6f1d97e559e8089e83dfcfbceb6c1e0d39032a28..26f06df76700df363b4791653138047244e3e7dd 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -161,7 +161,7 @@ directionalPressureGradientExplicitSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
model_(pressureDropModelNames_.get("model", coeffs_)),
gradP0_(cells_.size(), Zero),
dGradP_(cells_.size(), Zero),
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
index 533671418480336fabcdd1eea9afcf9f340a2c1d..a136f4ec234edfbaa7b4977f18d4ba5b4e9d8cc1 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
@@ -140,7 +140,7 @@ namespace fv
class directionalPressureGradientExplicitSource
:
- public cellSetOption
+ public fv::cellSetOption
{
public:
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index e2d9b56fd4dbdb1e2913c0c91cd7df8bf5da2f1c..fd57e62d40b8ab7e9776657b39ccb0044b282924 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -135,7 +135,7 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh),
+ fv::cellSetOption(name, modelType, dict, mesh),
secondaryMassFlowRate_(0),
secondaryInletT_(0),
primaryInletT_(0),
@@ -306,7 +306,7 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
UName_ = coeffs_.getOrDefault<word>("U", "U");
TName_ = coeffs_.getOrDefault<word>("T", "T");
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index 6e182e639608aeb97b1570e1d7062f5947697e25..b9d32a057e349fca98258d48e81b3a218c70f4e3 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
@@ -218,7 +218,7 @@ namespace fv
class effectivenessHeatExchangerSource
:
- public cellSetOption
+ public fv::cellSetOption
{
protected:
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
index d52cd09b5f9335d503ebe044cb63d7717d5455e0..805c55b41c76e9fce46b3d5a3182b7938a74125e 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
@@ -54,7 +54,7 @@ Foam::fv::explicitPorositySource::explicitPorositySource
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh),
+ fv::cellSetOption(name, modelType, dict, mesh),
porosityPtr_(nullptr)
{
read(dict);
@@ -115,7 +115,7 @@ void Foam::fv::explicitPorositySource::addSup
bool Foam::fv::explicitPorositySource::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
if (!coeffs_.readIfPresent("UNames", fieldNames_))
{
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
index d849a8c59d3a4691d8a75bae0330af1f32c602d2..09d54af1e3063a0ca496b2efccec9fb188dde220 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
@@ -136,7 +136,7 @@ namespace fv
class explicitPorositySource
:
- public cellSetOption
+ public fv::cellSetOption
{
protected:
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
index 5b59cfbfc80d648b9ad1c53e01a64332f5054c1a..be59edca20b660d7e33fb734a8e85152ab0e2d52 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
@@ -109,7 +109,7 @@ Foam::fv::jouleHeatingSource::jouleHeatingSource
const fvMesh& mesh
)
:
- option(sourceName, modelType, dict, mesh),
+ fv::option(sourceName, modelType, dict, mesh),
TName_("T"),
V_
(
@@ -203,7 +203,7 @@ void Foam::fv::jouleHeatingSource::addSup
bool Foam::fv::jouleHeatingSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fv::option::read(dict))
{
coeffs_.readIfPresent("T", TName_);
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index f10e8d8d9780251e802179e29384f18bf7884e90..909d57f395b2455289d21a4f9c1a39f6bfad55f1 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -82,7 +82,7 @@ Foam::fv::meanVelocityForce::meanVelocityForce
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
Ubar_(coeffs_.get<vector>("Ubar")),
gradP0_(0.0),
dGradP_(0.0),
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
index 31e25a40237a87cf2a377c5508cc95271c172067..0a01bbbb2d0205dcd9dba295cc274e12c9281862 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H
@@ -112,7 +112,7 @@ namespace fv
class meanVelocityForce
:
- public cellSetOption
+ public fv::cellSetOption
{
protected:
diff --git a/src/fvOptions/sources/derived/multiphaseStabilizedTurbulence/multiphaseStabilizedTurbulence.C b/src/fvOptions/sources/derived/multiphaseStabilizedTurbulence/multiphaseStabilizedTurbulence.C
index b88e7161630a9d3679781fd5c70abb7295087284..e49185ef835b9ed461837aafb30f78a6c42873a0 100644
--- a/src/fvOptions/sources/derived/multiphaseStabilizedTurbulence/multiphaseStabilizedTurbulence.C
+++ b/src/fvOptions/sources/derived/multiphaseStabilizedTurbulence/multiphaseStabilizedTurbulence.C
@@ -57,7 +57,7 @@ Foam::fv::multiphaseStabilizedTurbulence::multiphaseStabilizedTurbulence
const fvMesh& mesh
)
:
- option(sourceName, modelType, dict, mesh),
+ fv::option(sourceName, modelType, dict, mesh),
rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
Cmu_
(
diff --git a/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.C b/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.C
index 7d90715a32ecab858dd8bc864047818a018795f2..1000c00a30ed475b5c82d71538a7bba0d3a96d1d 100644
--- a/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.C
+++ b/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.C
@@ -42,7 +42,7 @@ Foam::fv::PhaseLimitStabilization<Type>::PhaseLimitStabilization
const fvMesh& mesh
)
:
- option(name, modelType, dict, mesh),
+ fv::option(name, modelType, dict, mesh),
fieldName_(coeffs_.get<word>("field")),
rateName_(coeffs_.get<word>("rate")),
residualAlpha_(coeffs_.get<scalar>("residualAlpha"))
@@ -75,7 +75,7 @@ void Foam::fv::PhaseLimitStabilization<Type>::addSup
template<class Type>
bool Foam::fv::PhaseLimitStabilization<Type>::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fv::option::read(dict))
{
coeffs_.readEntry("residualAlpha", residualAlpha_);
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 2094eb71700581a0436cecdb10eb4a5086a38951..4c70b9bc15237346be2bd757c19af374e76fb2d1 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -452,7 +452,7 @@ Foam::fv::rotorDiskSource::rotorDiskSource
)
:
- cellSetOption(name, modelType, dict, mesh),
+ fv::cellSetOption(name, modelType, dict, mesh),
rhoRef_(1.0),
omega_(0.0),
nBlades_(0),
@@ -545,7 +545,7 @@ void Foam::fv::rotorDiskSource::addSup
bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
coeffs_.readEntry("fields", fieldNames_);
fv::option::resetApplied();
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index e61f83fffdf1b7f21f08739716ee19c222b554f6..d0808d775f2bce314f9f2e0b102c1e8ffbfd067d 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -204,7 +204,7 @@ namespace fv
class rotorDiskSource
:
- public cellSetOption
+ public fv::cellSetOption
{
public:
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index ca9deb582714b12fc9a6a0b6680bbac693977e1f..0e3e4d9104a4b5cd08d575f9ccf9de8ba7a8621d 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -162,7 +162,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
const fvMesh& mesh
)
:
- cellSetOption(sourceName, modelType, dict, mesh),
+ fv::cellSetOption(sourceName, modelType, dict, mesh),
Tmelt_(coeffs_.get<scalar>("Tmelt")),
L_(coeffs_.get<scalar>("L")),
relax_(coeffs_.getOrDefault<scalar>("relax", 0.9)),
@@ -296,7 +296,7 @@ void Foam::fv::solidificationMeltingSource::addSup
bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
coeffs_.readEntry("Tmelt", Tmelt_);
coeffs_.readEntry("L", L_);
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
index 6ff5453e261a3820f63b474c8c11d9613b8abcba..33b67a46066e99b335d68fea5eabe81406c4e531 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -153,7 +153,7 @@ namespace fv
class solidificationMeltingSource
:
- public cellSetOption
+ public fv::cellSetOption
{
public:
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
index eafb5d8dc7e480fb978d109b8ae6e1a29082c923..9b8e57967836d7b4d7ac5a166fe54bdd05757d21 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
@@ -54,7 +54,7 @@ Foam::fv::tabulatedAccelerationSource::tabulatedAccelerationSource
const fvMesh& mesh
)
:
- option(name, modelType, dict, mesh),
+ fv::option(name, modelType, dict, mesh),
motion_(coeffs_, mesh.time()),
UName_(coeffs_.getOrDefault<word>("U", "U")),
g0_("g0", dimAcceleration, Zero)
@@ -94,7 +94,7 @@ void Foam::fv::tabulatedAccelerationSource::addSup
bool Foam::fv::tabulatedAccelerationSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fv::option::read(dict))
{
return motion_.read(coeffs_);
}
diff --git a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
index 79673faffa84f073e87b208bcbb907fa037d1a6e..ac2d5b980b3e0f4e6f1e00461b26c99f26728583 100644
--- a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
+++ b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
@@ -89,7 +89,7 @@ Foam::fv::viscousDissipation::viscousDissipation
const fvMesh& mesh
)
:
- option(sourceName, modelType, dict, mesh),
+ fv::option(sourceName, modelType, dict, mesh),
UName_(coeffs_.getOrDefault<word>("U", "U")),
rhoName_(coeffs_.getOrDefault<word>("rho", "none")),
rho_
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index f6053011394303555eb55acb904fd165e741d705..cbb84b1b71ec2445004b7a1e83d0401edb749641 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -117,7 +117,7 @@ Foam::fv::SemiImplicitSource<Type>::SemiImplicitSource
const fvMesh& mesh
)
:
- cellSetOption(name, modelType, dict, mesh),
+ fv::cellSetOption(name, modelType, dict, mesh),
volumeMode_(vmAbsolute),
VDash_(1.0)
{
@@ -203,7 +203,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
template<class Type>
bool Foam::fv::SemiImplicitSource<Type>::read(const dictionary& dict)
{
- if (cellSetOption::read(dict))
+ if (fv::cellSetOption::read(dict))
{
volumeMode_ = volumeModeTypeNames_.get("volumeMode", coeffs_);
setFieldData(coeffs_.subDict("injectionRateSuSp"));
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
index c5a0fd56ea00370296313fa7d9290d6fad1ae923..d3a375dcc44562abfcc5c03ef70d140a1753ea1b 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
@@ -146,7 +146,7 @@ Ostream& operator<<
template<class Type>
class SemiImplicitSource
:
- public cellSetOption
+ public fv::cellSetOption
{
public:
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index e800b41ced3ab1698f15098e7c669211f000888a..8464af5085914261c3732993fcc7bab168f78fc5 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -254,7 +254,7 @@ void Foam::fv::tabulatedNTUHeatTransfer::calculateHtc()
bool Foam::fv::tabulatedNTUHeatTransfer::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fv::option::read(dict))
{
coeffs_.readIfPresent("U", UName_);
coeffs_.readIfPresent("UNbr", UNbrName_);
diff --git a/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.C b/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.C
index e9f8993233e9baf5c86fdb4e381919c05e141105..82d8277e28c70b973692d91c0b7ee6cc7a0b3f76 100644
--- a/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.C
+++ b/src/thermophysicalModels/radiation/fvOptions/radiation/radiation.C
@@ -53,7 +53,7 @@ Foam::fv::radiation::radiation
const fvMesh& mesh
)
:
- option(sourceName, modelType, dict, mesh)
+ fv::option(sourceName, modelType, dict, mesh)
{
const auto& thermo = mesh_.lookupObject<basicThermo>(basicThermo::dictName);
diff --git a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
index b0e7d64fe615b551129c3cbce6cad6beb37d3a75..6c9ad94b3eb8ed760165d2a193c9fba044c60284 100644
--- a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
+++ b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
@@ -153,7 +153,7 @@ Foam::fv::multiphaseMangrovesSource::multiphaseMangrovesSource
const fvMesh& mesh
)
:
- option(name, modelType, dict, mesh),
+ fv::option(name, modelType, dict, mesh),
aZone_(),
NZone_(),
CmZone_(),
@@ -206,7 +206,7 @@ void Foam::fv::multiphaseMangrovesSource::addSup
bool Foam::fv::multiphaseMangrovesSource::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fv::option::read(dict))
{
if (!coeffs_.readIfPresent("UNames", fieldNames_))
{
diff --git a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
index 5cda1d1da8c276fd10f5a27f01e33b79dde61b01..e9fd781b4d767af2b0462c1f922849395bb2222f 100644
--- a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
+++ b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
@@ -154,7 +154,7 @@ Foam::fv::multiphaseMangrovesTurbulenceModel::multiphaseMangrovesTurbulenceModel
const fvMesh& mesh
)
:
- option(name, modelType, dict, mesh),
+ fv::option(name, modelType, dict, mesh),
aZone_(),
NZone_(),
CkpZone_(),
@@ -227,7 +227,7 @@ void Foam::fv::multiphaseMangrovesTurbulenceModel::addSup
bool Foam::fv::multiphaseMangrovesTurbulenceModel::read(const dictionary& dict)
{
- if (option::read(dict))
+ if (fv::option::read(dict))
{
if (!coeffs_.readIfPresent("epsilonNames", fieldNames_))
{