diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
index 6a6581182bbbacd58fe71bb8667fdee4f63efd54..25a4a2098edcf0197458e5d45a2d03d3ce7662fd 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
@@ -40,15 +40,14 @@ Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
Info<< "Selecting flame-wrinkling model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown PDRDragModel type "
<< modelType << nl << nl
- << "Valid PDRDragModels are : " << endl
+ << "Valid PDRDragModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
index 932080e71761b89b120fce4012831693b0eb8758..251d429c8fa2a9861e5e0606a34c2fd33f24ee23 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
@@ -39,15 +39,14 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
Info<< "Selecting flame-wrinkling model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown XiEqModel type "
<< modelType << nl << nl
- << "Valid XiEqModels are : " << endl
+ << "Valid XiEqModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
index 27fe3f5e17f1e37a4bd0c8bda24f5b412a3b8a6b..b46192ea3891800b4f30f3d9edfd718b94b9bd84 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
@@ -39,15 +39,14 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
Info<< "Selecting flame-wrinkling model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown XiGModel type "
<< modelType << nl << nl
- << "Valid XiGModels are : " << endl
+ << "Valid XiGModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
index ed9dfb2fb3d46f9638a076091ea96d6badd19862..c2dccb018047d61776bac9805819066ce83e99af 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
@@ -42,15 +42,14 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
Info<< "Selecting flame-wrinkling model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown XiModel type "
<< modelType << nl << nl
- << "Valid XiModels are : " << endl
+ << "Valid XiModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 627dd41b6f2ec5316cdcae0c0c1031a9759680c6..9b064b14c62dbd1f20597483506edd43671a907b 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -34,6 +34,7 @@ License
#include "fvcFlux.H"
#include "fvcMeshPhi.H"
#include "surfaceInterpolate.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -43,10 +44,6 @@ namespace Foam
}
-const Foam::scalar Foam::multiphaseMixtureThermo::convertToRad =
- Foam::constant::mathematical::pi/180.0;
-
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::multiphaseMixtureThermo::calcAlphas()
@@ -855,7 +852,7 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
bool matched = (tp.key().first() == alpha1.name());
- scalar theta0 = convertToRad*tp().theta0(matched);
+ const scalar theta0 = degToRad(tp().theta0(matched));
scalarField theta(boundary[patchi].size(), theta0);
scalar uTheta = tp().uTheta();
@@ -863,8 +860,8 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
// Calculate the dynamic contact angle if required
if (uTheta > SMALL)
{
- scalar thetaA = convertToRad*tp().thetaA(matched);
- scalar thetaR = convertToRad*tp().thetaR(matched);
+ const scalar thetaA = degToRad(tp().thetaA(matched));
+ const scalar thetaR = degToRad(tp().thetaR(matched));
// Calculated the component of the velocity parallel to the wall
vectorField Uwall
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
index 7c8c5b6f0336dd53ef47ed17ce1e7796f192d1ab..1fd4e406396ad1d18192c9627e57020299ced46b 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
@@ -144,9 +144,6 @@ private:
//- Stabilisation for normalisation of the interface normal
const dimensionedScalar deltaN_;
- //- Conversion factor for degrees into radians
- static const scalar convertToRad;
-
// Private member functions
diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
index 99c33123e8d75663ba6752f3859e94532f041c48..b21c4b7b5188223119539d91dd3e81ab1259775e 100644
--- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
+++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
@@ -41,15 +41,14 @@ Foam::autoPtr<Foam::mixtureViscosityModel> Foam::mixtureViscosityModel::New
Info<< "Selecting incompressible transport model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown mixtureViscosityModel type "
<< modelType << nl << nl
- << "Valid mixtureViscosityModels are : " << endl
+ << "Valid mixtureViscosityModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
index cf8abd2e6e75086835559093f93a80f9a327d165..f497b3c9884b49c92a769b60fbbd917dc83b49f5 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@@ -104,19 +104,18 @@ Foam::autoPtr<Foam::relativeVelocityModel> Foam::relativeVelocityModel::New
const incompressibleTwoPhaseInteractingMixture& mixture
)
{
- word modelType(dict.lookup(typeName));
+ const word modelType(dict.lookup(typeName));
Info<< "Selecting relative velocity model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown time scale model type " << modelType
- << ", constructor not in hash table" << nl << nl
- << " Valid time scale model types are:" << nl
+ << "Unknown time scale model type "
+ << modelType << nl << nl
+ << "Valid time scale model types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
@@ -141,13 +140,13 @@ Foam::relativeVelocityModel::~relativeVelocityModel()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-tmp<volScalarField> Foam::relativeVelocityModel::rho() const
+Foam::tmp<Foam::volScalarField> Foam::relativeVelocityModel::rho() const
{
return alphac_*rhoc_ + alphad_*rhod_;
}
-tmp<volSymmTensorField> Foam::relativeVelocityModel::tauDm() const
+Foam::tmp<Foam::volSymmTensorField> Foam::relativeVelocityModel::tauDm() const
{
volScalarField betac(alphac_*rhoc_);
volScalarField betad(alphad_*rhod_);
diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
index e4d71d2397ad6f7b5250596a0a86bd48bd63c306..137710d217e46193ab8eba72b9d125755f8d1c9f 100644
--- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
@@ -48,7 +48,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
)
);
- word temperaturePhaseChangeTwoPhaseMixtureTypeName
+ const word modelType
(
phaseChangePropertiesDict.lookup
(
@@ -56,19 +56,16 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
)
);
- Info<< "Selecting phaseChange model "
- << temperaturePhaseChangeTwoPhaseMixtureTypeName << endl;
+ Info<< "Selecting phaseChange model " << modelType << endl;
- componentsConstructorTable::iterator cstrIter =
- componentsConstructorTablePtr_
- ->find(temperaturePhaseChangeTwoPhaseMixtureTypeName);
+ auto cstrIter = componentsConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown temperaturePhaseChangeTwoPhaseMixture type "
- << temperaturePhaseChangeTwoPhaseMixtureTypeName << endl << endl
- << "Valid temperaturePhaseChangeTwoPhaseMixtures are : " << endl
+ << modelType << nl << nl
+ << "Valid temperaturePhaseChangeTwoPhaseMixture types :" << endl
<< componentsConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
index 644c3b25a0b13bc18d7fd3c5a6ac882981cb38e8..b5495dd6ae4a48ed8bbd6c4e194ef52db6fe6374 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
@@ -30,12 +30,7 @@ License
#include "fvcDiv.H"
#include "fvcGrad.H"
#include "fvcSnGrad.H"
-
-// * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
-
-const Foam::scalar Foam::threePhaseInterfaceProperties::convertToRad =
- Foam::constant::mathematical::pi/180.0;
-
+#include "unitConversion.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -83,7 +78,7 @@ void Foam::threePhaseInterfaceProperties::correctContactAngle
scalarField theta
(
- convertToRad
+ degToRad()
* (
twoPhaseAlpha2*(180 - a2cap.theta(U[patchi], nHatp))
+ twoPhaseAlpha3*(180 - a3cap.theta(U[patchi], nHatp))
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
index 826d6658d9f92a4c798ccfd3d8954f5f3aaa223d..482a8a1a8ea0e4dc0c626439087c8ec90c947b05 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
@@ -91,10 +91,6 @@ class threePhaseInterfaceProperties
public:
- //- Conversion factor for degrees into radians
- static const scalar convertToRad;
-
-
// Constructors
//- Construct from volume fraction field alpha and IOdictionary
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
index c14fa08d59be5ea32d3fa204a14506247d7eb6f2..534c1383e231802f35e1846a41954ee111893929 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
@@ -48,24 +48,21 @@ Foam::phaseChangeTwoPhaseMixture::New
)
);
- word phaseChangeTwoPhaseMixtureTypeName
+ const word modelType
(
transportPropertiesDict.lookup("phaseChangeTwoPhaseMixture")
);
- Info<< "Selecting phaseChange model "
- << phaseChangeTwoPhaseMixtureTypeName << endl;
+ Info<< "Selecting phaseChange model " << modelType << endl;
- componentsConstructorTable::iterator cstrIter =
- componentsConstructorTablePtr_
- ->find(phaseChangeTwoPhaseMixtureTypeName);
+ auto cstrIter = componentsConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown phaseChangeTwoPhaseMixture type "
- << phaseChangeTwoPhaseMixtureTypeName << endl << endl
- << "Valid phaseChangeTwoPhaseMixtures are : " << endl
+ << modelType << nl << nl
+ << "Valid phaseChangeTwoPhaseMixture types :" << endl
<< componentsConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index b880c4a6d34a9a8bda2a5965931a25fed3b82938..36765ebc3c18f581a4c52d93de9222f46f2ba358 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -34,22 +34,21 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
const phaseModel& phase2
)
{
- word dragModelType(interfaceDict.lookup("type"));
+ const word modelType(interfaceDict.lookup("type"));
Info << "Selecting dragModel for phase "
<< phase1.name()
<< ": "
- << dragModelType << endl;
+ << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(dragModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown dragModelType type "
- << dragModelType << endl << endl
- << "Valid dragModel types are : " << endl
+ << "Unknown dragModel type "
+ << modelType << nl << nl
+ << "Valid dragModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index b43d46f8a3d71b5461a8e1011e546413d0e7e6cb..db5d68f82942cbb08ff96687bf2651fc60bb5893 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -35,7 +35,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
const phaseModel& phase2
)
{
- word heatTransferModelType
+ const word modelType
(
interfaceDict.lookup("heatTransferModel" + phase1.name())
);
@@ -43,17 +43,16 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
Info<< "Selecting heatTransferModel for phase "
<< phase1.name()
<< ": "
- << heatTransferModelType << endl;
+ << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(heatTransferModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown heatTransferModelType type "
- << heatTransferModelType << endl << endl
- << "Valid heatTransferModel types are : " << endl
+ << "Unknown heatTransferModel type "
+ << modelType << nl << nl
+ << "Valid heatTransferModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
index 963ad160f7ec26e4186acb1fb8c0b9d806dd6e74..fc4000975d63ac73434dcb61ab91497dc1963fed 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
@@ -33,32 +33,28 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
const phaseModel& phase
)
{
- word diameterModelType
- (
- dict.lookup("diameterModel")
- );
+ const word modelType(dict.lookup("diameterModel"));
Info << "Selecting diameterModel for phase "
<< phase.name()
<< ": "
- << diameterModelType << endl;
+ << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(diameterModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown diameterModelType type "
- << diameterModelType << endl << endl
- << "Valid diameterModel types are : " << endl
+ << "Unknown diameterModel type "
+ << modelType << nl << nl
+ << "Valid diameterModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return cstrIter()
(
- dict.optionalSubDict(diameterModelType + "Coeffs"),
+ dict.optionalSubDict(modelType + "Coeffs"),
phase
);
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index de3084f69f010f2262fe66fa76156a3b4b0b1f19..425be38063bda45f4b979a70fb6396a03f19d504 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -35,12 +35,7 @@ License
#include "fvcDiv.H"
#include "fvcFlux.H"
#include "fvcAverage.H"
-
-// * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
-
-const Foam::scalar Foam::multiphaseSystem::convertToRad =
- Foam::constant::mathematical::pi/180.0;
-
+#include "unitConversion.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -290,7 +285,7 @@ void Foam::multiphaseSystem::correctContactAngle
bool matched = (tp.key().first() == phase1.name());
- scalar theta0 = convertToRad*tp().theta0(matched);
+ const scalar theta0 = degToRad(tp().theta0(matched));
scalarField theta(boundary[patchi].size(), theta0);
scalar uTheta = tp().uTheta();
@@ -298,8 +293,8 @@ void Foam::multiphaseSystem::correctContactAngle
// Calculate the dynamic contact angle if required
if (uTheta > SMALL)
{
- scalar thetaA = convertToRad*tp().thetaA(matched);
- scalar thetaR = convertToRad*tp().thetaR(matched);
+ const scalar thetaA = degToRad(tp().thetaA(matched));
+ const scalar thetaR = degToRad(tp().thetaR(matched));
// Calculated the component of the velocity parallel to the wall
vectorField Uwall
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
index 02b56684da91c337d16a354c3c3c91933a625f3b..0094c2c1648a74f57350f423f410590b9392dc01 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
@@ -187,9 +187,6 @@ private:
//- Stabilisation for normalisation of the interface normal
const dimensionedScalar deltaN_;
- //- Conversion factor for degrees into radians
- static const scalar convertToRad;
-
// Private member functions
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index b6144051a45c09a63b963531718910eeda82a49e..63a2776db4377fc1af8d53514f38133c1a50f795 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -33,12 +33,7 @@ License
#include "fvcSnGrad.H"
#include "fvcDiv.H"
#include "fvcFlux.H"
-
-// * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
-
-const Foam::scalar Foam::multiphaseMixture::convertToRad =
- Foam::constant::mathematical::pi/180.0;
-
+#include "unitConversion.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -456,7 +451,7 @@ void Foam::multiphaseMixture::correctContactAngle
bool matched = (tp.key().first() == alpha1.name());
- scalar theta0 = convertToRad*tp().theta0(matched);
+ const scalar theta0 = degToRad(tp().theta0(matched));
scalarField theta(boundary[patchi].size(), theta0);
scalar uTheta = tp().uTheta();
@@ -464,8 +459,8 @@ void Foam::multiphaseMixture::correctContactAngle
// Calculate the dynamic contact angle if required
if (uTheta > SMALL)
{
- scalar thetaA = convertToRad*tp().thetaA(matched);
- scalar thetaR = convertToRad*tp().thetaR(matched);
+ const scalar thetaA = degToRad(tp().thetaA(matched));
+ const scalar thetaR = degToRad(tp().thetaR(matched));
// Calculated the component of the velocity parallel to the wall
vectorField Uwall
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
index 44150c9d2b616e06deed519742bf682d34900aa7..0183652ffccb97bfc94292139fcdcb6cf0e5b314 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
@@ -154,9 +154,6 @@ private:
//- Stabilisation for normalisation of the interface normal
const dimensionedScalar deltaN_;
- //- Conversion factor for degrees into radians
- static const scalar convertToRad;
-
// Private member functions
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
index fee1253108be1e7481d70f8faa56185a7c9b8386..9b55bb03585ab18978b01a46b001c9937731751f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
@@ -36,7 +36,7 @@ Foam::interfaceCompositionModel::New
const phasePair& pair
)
{
- word interfaceCompositionModelType
+ const word modelType
(
word(dict.lookup("type"))
+ "<"
@@ -47,17 +47,16 @@ Foam::interfaceCompositionModel::New
);
Info<< "Selecting interfaceCompositionModel for "
- << pair << ": " << interfaceCompositionModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(interfaceCompositionModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown interfaceCompositionModelType type "
- << interfaceCompositionModelType << endl << endl
- << "Valid interfaceCompositionModel types are : " << endl
+ << "Unknown interfaceCompositionModel type "
+ << modelType << nl << nl
+ << "Valid interfaceCompositionModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
index 3b349be6939828af40848995ab76fc77d8683c10..8ae0f6f55220d7ba2244794a57ce7c734eade8ad 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::massTransferModel> Foam::massTransferModel::New
const phasePair& pair
)
{
- word massTransferModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting massTransferModel for "
- << pair << ": " << massTransferModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(massTransferModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown massTransferModelType type "
- << massTransferModelType << endl << endl
- << "Valid massTransferModel types are : " << endl
+ << "Unknown massTransferModel type "
+ << modelType << nl << nl
+ << "Valid massTransferModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
index 17fc43cac4280b85e3795ee922ee22a45abf86ee..fb59ed25747ae3e8c4fb667f63561bd99b55c544 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
@@ -32,20 +32,18 @@ Foam::autoPtr<Foam::saturationModel> Foam::saturationModel::New
const dictionary& dict
)
{
- word saturationModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
- Info<< "Selecting saturationModel: "
- << saturationModelType << endl;
+ Info<< "Selecting saturationModel: " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(saturationModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown saturationModelType type "
- << saturationModelType << endl << endl
- << "Valid saturationModel types are : " << endl
+ << "Unknown saturationModel type "
+ << modelType << nl << nl
+ << "Valid saturationModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
index f2c28eeb5ddbfba5a968bfbd990ffeb9fc8cf10c..57be04722d95f6bf81cd91024d55ee1ee8ea2574 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
@@ -35,20 +35,19 @@ Foam::surfaceTensionModel::New
const phasePair& pair
)
{
- word surfaceTensionModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting surfaceTensionModel for "
- << pair << ": " << surfaceTensionModelType << endl;
+ << pair << ": " << modelType << endl;
- multiphaseConstructorTable::iterator cstrIter =
- multiphaseConstructorTablePtr_->find(surfaceTensionModelType);
+ auto cstrIter = multiphaseConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown surfaceTensionModelType type "
- << surfaceTensionModelType << endl << endl
- << "Valid surfaceTensionModel types are : " << endl
+ << "Unknown surfaceTensionModel type "
+ << modelType << nl << nl
+ << "Valid surfaceTensionModel types :" << endl
<< multiphaseConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
index 2946810cf5ff13e1564172b0143618de1ae4d67b..5b44995b4e230b1047609c8759a4e047101bb6c3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
@@ -35,20 +35,19 @@ Foam::aspectRatioModel::New
const phasePair& pair
)
{
- word aspectRatioModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting aspectRatioModel for "
- << pair << ": " << aspectRatioModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(aspectRatioModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown aspectRatioModelType type "
- << aspectRatioModelType << endl << endl
- << "Valid aspectRatioModel types are : " << endl
+ << "Unknown aspectRatioModel type "
+ << modelType << nl << nl
+ << "Valid aspectRatioModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index c2a5f4074e731e968d92920abe99c52ba605d5d4..de8bc17cda56e94f8cd33947ccb0bb4692040683 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
const phasePair& pair
)
{
- word dragModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting dragModel for "
- << pair << ": " << dragModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(dragModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown dragModelType type "
- << dragModelType << endl << endl
- << "Valid dragModel types are : " << endl
+ << "Unknown dragModel type "
+ << modelType << nl << nl
+ << "Valid dragModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index 46e43f6b11a9e253832b2fceab8cd524d24ab543..71654baea64ad877a39685e767c4db2f932e936e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
const phasePair& pair
)
{
- word heatTransferModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting heatTransferModel for "
- << pair << ": " << heatTransferModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(heatTransferModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown heatTransferModelType type "
- << heatTransferModelType << endl << endl
- << "Valid heatTransferModel types are : " << endl
+ << "Unknown heatTransferModel type "
+ << modelType << nl << nl
+ << "Valid heatTransferModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
index 8dbdd5479c3a4bee3038cef438b947c346da58bc..a0fd721dfb6d60ce52f9203cd428cdf19192f9dd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
const phasePair& pair
)
{
- word liftModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting liftModel for "
- << pair << ": " << liftModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(liftModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown liftModelType type "
- << liftModelType << endl << endl
- << "Valid liftModel types are : " << endl
+ << "Unknown liftModel type "
+ << modelType << nl << nl
+ << "Valid liftModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
index fb16d0541833fa0453f69095f8776d5a600e75cd..a3f312de8f91ad7ff8fc2eee47e4b9f9d912a655 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
@@ -35,20 +35,19 @@ Foam::swarmCorrection::New
const phasePair& pair
)
{
- word swarmCorrectionType(dict.lookup("type"));
+ const word correctionType(dict.lookup("type"));
Info<< "Selecting swarmCorrection for "
- << pair << ": " << swarmCorrectionType << endl;
+ << pair << ": " << correctionType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(swarmCorrectionType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(correctionType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown swarmCorrectionType type "
- << swarmCorrectionType << endl << endl
- << "Valid swarmCorrection types are : " << endl
+ << "Unknown swarmCorrection type "
+ << correctionType << nl << nl
+ << "Valid swarmCorrection types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
index 53266ae6b2db068a89d828ab56aa5780a11d6832..123bad7691ed119d0be022d7e48be35350b23543 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
@@ -35,20 +35,19 @@ Foam::turbulentDispersionModel::New
const phasePair& pair
)
{
- word turbulentDispersionModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting turbulentDispersionModel for "
- << pair << ": " << turbulentDispersionModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(turbulentDispersionModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown turbulentDispersionModelType type "
- << turbulentDispersionModelType << endl << endl
- << "Valid turbulentDispersionModel types are : " << endl
+ << "Unknown turbulentDispersionModel type "
+ << modelType << nl << nl
+ << "Valid turbulentDispersionModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
index 1b092c197e9c0184092ce56f00d8f883998be5f8..6884a6b3bedc643791e47ee18140b1b3131993d8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::virtualMassModel> Foam::virtualMassModel::New
const phasePair& pair
)
{
- word virtualMassModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting virtualMassModel for "
- << pair << ": " << virtualMassModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(virtualMassModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown virtualMassModelType type "
- << virtualMassModelType << endl << endl
- << "Valid virtualMassModel types are : " << endl
+ << "Unknown virtualMassModel type "
+ << modelType << nl << nl
+ << "Valid virtualMassModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C
index 83ad7b42e5437c463cbfbd32cc4737459d33710a..bb59931dc15adabf011be771a2a3bc4e5201bcb1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::wallDampingModel> Foam::wallDampingModel::New
const phasePair& pair
)
{
- word wallDampingModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting wallDampingModel for "
- << pair << ": " << wallDampingModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(wallDampingModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown wallDampingModelType type "
- << wallDampingModelType << endl << endl
- << "Valid wallDampingModel types are : " << endl
+ << "Unknown wallDampingModel type "
+ << modelType << nl << nl
+ << "Valid wallDampingModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
index 806a1dd3b34897023a88a27c8a6aaa7e3e904777..2cfddbd92ca71fe51d5645de0cfe33212ef1b962 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::wallLubricationModel> Foam::wallLubricationModel::New
const phasePair& pair
)
{
- word wallLubricationModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting wallLubricationModel for "
- << pair << ": " << wallLubricationModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(wallLubricationModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown wallLubricationModelType type "
- << wallLubricationModelType << endl << endl
- << "Valid wallLubricationModel types are : " << endl
+ << "Unknown wallLubricationModel type "
+ << modelType << nl << nl
+ << "Valid wallLubricationModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
index cbb33a5fbd0299ff9c01eaa35b19174229431622..8324dc52bc9cd874eb144545d27c3fe8b11afbef 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
@@ -33,20 +33,19 @@ Foam::autoPtr<Foam::blendingMethod> Foam::blendingMethod::New
const wordList& phaseNames
)
{
- word blendingMethodType(dict.lookup("type"));
+ const word methodType(dict.lookup("type"));
Info<< "Selecting " << dict.dictName() << " blending method: "
- << blendingMethodType << endl;
+ << methodType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(blendingMethodType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown blendingMethodType type "
- << blendingMethodType << endl << endl
- << "Valid blendingMethod types are : " << endl
+ << "Unknown blendingMethod type "
+ << methodType << nl << nl
+ << "Valid blendingMethod types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
index 963ad160f7ec26e4186acb1fb8c0b9d806dd6e74..fc4000975d63ac73434dcb61ab91497dc1963fed 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
@@ -33,32 +33,28 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
const phaseModel& phase
)
{
- word diameterModelType
- (
- dict.lookup("diameterModel")
- );
+ const word modelType(dict.lookup("diameterModel"));
Info << "Selecting diameterModel for phase "
<< phase.name()
<< ": "
- << diameterModelType << endl;
+ << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(diameterModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown diameterModelType type "
- << diameterModelType << endl << endl
- << "Valid diameterModel types are : " << endl
+ << "Unknown diameterModel type "
+ << modelType << nl << nl
+ << "Valid diameterModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return cstrIter()
(
- dict.optionalSubDict(diameterModelType + "Coeffs"),
+ dict.optionalSubDict(modelType + "Coeffs"),
phase
);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
index c42b86070dacc6aca8aa994c691d35f4189c8578..d78fdbba5a9b9210cc0ea7e4e3c29962159d8f1b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
@@ -35,20 +35,19 @@ Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
const label index
)
{
- word phaseModelType(fluid.subDict(phaseName).lookup("type"));
+ const word modelType(fluid.subDict(phaseName).lookup("type"));
Info<< "Selecting phaseModel for "
- << phaseName << ": " << phaseModelType << endl;
+ << phaseName << ": " << modelType << endl;
- phaseSystemConstructorTable::iterator cstrIter =
- phaseSystemConstructorTablePtr_->find(phaseModelType);
+ auto cstrIter = phaseSystemConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown phaseModelType type "
- << phaseModelType << endl << endl
- << "Valid phaseModel types are : " << endl
+ << "Unknown phaseModel type "
+ << modelType << nl << nl
+ << "Valid phaseModel types :" << endl
<< phaseSystemConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 627af1db87f08a5912e12c0dd01a4650f53fcd99..1f8f83599bc9c086515d8e12f97a53bdcb9a4ff4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -40,6 +40,8 @@ License
#include "fvmLaplacian.H"
#include "fvmSup.H"
+#include "unitConversion.H"
+
// * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
namespace Foam
@@ -48,9 +50,6 @@ namespace Foam
defineRunTimeSelectionTable(multiphaseSystem, dictionary);
}
-const Foam::scalar Foam::multiphaseSystem::convertToRad =
- Foam::constant::mathematical::pi/180.0;
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -399,7 +398,7 @@ void Foam::multiphaseSystem::correctContactAngle
bool matched = (tp.key().first() == phase1.name());
- scalar theta0 = convertToRad*tp().theta0(matched);
+ const scalar theta0 = degToRad(tp().theta0(matched));
scalarField theta(boundary[patchi].size(), theta0);
scalar uTheta = tp().uTheta();
@@ -407,8 +406,8 @@ void Foam::multiphaseSystem::correctContactAngle
// Calculate the dynamic contact angle if required
if (uTheta > SMALL)
{
- scalar thetaA = convertToRad*tp().thetaA(matched);
- scalar thetaR = convertToRad*tp().thetaR(matched);
+ const scalar thetaA = degToRad(tp().thetaA(matched));
+ const scalar thetaR = degToRad(tp().thetaR(matched));
// Calculated the component of the velocity parallel to the wall
vectorField Uwall
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
index dca55bf87356d56a4dbfe7bf157bf2759b556f36..0c43f6dd8f109af55bb827bba8620cd66dc513bd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
@@ -65,9 +65,6 @@ class multiphaseSystem
//- Stabilisation for normalisation of the interface normal
const dimensionedScalar deltaN_;
- //- Conversion factor for degrees into radians
- static const scalar convertToRad;
-
// Private member functions
@@ -207,10 +204,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "multiphaseSystemI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
#endif
// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
index 0f116c70402a39763440c26e5c2dade9733c85a0..ae0958963491cf8a84e11dcf42947b9fddfc65f4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
@@ -32,7 +32,7 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
const fvMesh& mesh
)
{
- const word multiphaseSystemType
+ const word systemType
(
IOdictionary
(
@@ -48,18 +48,16 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
).lookup("type")
);
- Info<< "Selecting multiphaseSystem "
- << multiphaseSystemType << endl;
+ Info<< "Selecting multiphaseSystem " << systemType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(multiphaseSystemType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(systemType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown multiphaseSystemType type "
- << multiphaseSystemType << endl << endl
- << "Valid multiphaseSystem types are : " << endl
+ << "Unknown multiphaseSystem type "
+ << systemType << nl << nl
+ << "Valid multiphaseSystem types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index 034da573494e1d166c261b4f3a2d5e4d424fe8fa..a1ac6c46f6590e1b5fd456272aad268b13a6b793 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -43,26 +43,17 @@ using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
<
Foam::compressible::
- alphatWallBoilingWallFunctionFvPatchScalarField::phaseType,
- 2
->::names[] =
-{
- "vapor",
- "liquid"
-};
-
-const Foam::NamedEnum
-<
- Foam::compressible::
- alphatWallBoilingWallFunctionFvPatchScalarField::phaseType,
- 2
+ alphatWallBoilingWallFunctionFvPatchScalarField::phaseType
>
Foam::compressible::
-alphatWallBoilingWallFunctionFvPatchScalarField::phaseTypeNames_;
+alphatWallBoilingWallFunctionFvPatchScalarField::phaseTypeNames_
+{
+ { phaseType::vaporPhase, "vapor" },
+ { phaseType::liquidPhase, "liquid" },
+};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -111,7 +102,7 @@ alphatWallBoilingWallFunctionFvPatchScalarField
)
:
alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(p, iF, dict),
- phaseType_(phaseTypeNames_.read(dict.lookup("phaseType"))),
+ phaseType_(phaseTypeNames_.lookup("phaseType", dict)),
relax_(dict.lookupOrDefault<scalar>("relax", 0.5)),
AbyV_(p.size(), 0),
alphatConv_(p.size(), 0),
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
index 665d41197ebf573be4e7599b3c9dbd07055e516b..33ca2fe31e2a9119775f414b00e6a30fab8161b7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
@@ -164,7 +164,7 @@ private:
// Private data
//- Heat source type names
- static const NamedEnum<phaseType, 2> phaseTypeNames_;
+ static const Enum<phaseType> phaseTypeNames_;
//- Heat source type
phaseType phaseType_;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C
index dcc0cc0d0f11b4138f98bec8312adb566ffad1f1..94bbba3212d80c70530ec00a81e34bab4e7af7e4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C
@@ -33,20 +33,18 @@ Foam::wallBoilingModels::departureDiameterModel::New
const dictionary& dict
)
{
- word departureDiameterModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
- Info<< "Selecting departureDiameterModel: "
- << departureDiameterModelType << endl;
+ Info<< "Selecting departureDiameterModel: " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(departureDiameterModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown departureDiameterModelType type "
- << departureDiameterModelType << endl << endl
- << "Valid departureDiameterModel types are : " << endl
+ << "Unknown departureDiameterModel type "
+ << modelType << nl << nl
+ << "Valid departureDiameterModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C
index 13987ff4b0924f751a3bfa3e73887241bb4d0661..136224813a005206351cdad30a5938d3c87801df 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C
@@ -33,20 +33,18 @@ Foam::wallBoilingModels::departureFrequencyModel::New
const dictionary& dict
)
{
- word departureFrequencyModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
- Info<< "Selecting departureFrequencyModel: "
- << departureFrequencyModelType << endl;
+ Info<< "Selecting departureFrequencyModel: " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(departureFrequencyModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown departureFrequencyModelType type "
- << departureFrequencyModelType << endl << endl
- << "Valid departureFrequencyModel types are : " << endl
+ << "Unknown departureFrequencyModel type "
+ << modelType << nl << nl
+ << "Valid departureFrequencyModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C
index 32f2d5a520d59211f7f411934b9170cfc34db99b..6338ab66691086227e50cbd5af18e25d8a99436c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C
@@ -33,20 +33,18 @@ Foam::wallBoilingModels::nucleationSiteModel::New
const dictionary& dict
)
{
- word nucleationSiteModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
- Info<< "Selecting nucleationSiteModel: "
- << nucleationSiteModelType << endl;
+ Info<< "Selecting nucleationSiteModel: " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(nucleationSiteModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown nucleationSiteModelType type "
- << nucleationSiteModelType << endl << endl
- << "Valid nucleationSiteModel types are : " << endl
+ << "Unknown nucleationSiteModel type "
+ << modelType << nl << nl
+ << "Valid nucleationSiteModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C
index 6cf6d1d64cda6fbe8c49c97a52a9b96ea307ba08..ddc57a3e65d094b60c198dc7dc3d36246575e398 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C
@@ -33,20 +33,18 @@ Foam::wallBoilingModels::partitioningModel::New
const dictionary& dict
)
{
- word partitioningModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
- Info<< "Selecting partitioningModel: "
- << partitioningModelType << endl;
+ Info<< "Selecting partitioningModel: " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(partitioningModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown partitioningModelType type "
- << partitioningModelType << endl << endl
- << "Valid partitioningModel types are : " << endl
+ << "Unknown partitioningModel type "
+ << modelType << nl << nl
+ << "Valid partitioningModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
index bfadfc6399ce0d83f3f56b9a49c3e98606a60f5e..e4a3a64634503549c577c247bb2eb7001efa6fc6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
@@ -33,23 +33,20 @@ Foam::kineticTheoryModels::conductivityModel::New
const dictionary& dict
)
{
- word conductivityModelType(dict.lookup("conductivityModel"));
+ const word modelType(dict.lookup("conductivityModel"));
- Info<< "Selecting conductivityModel "
- << conductivityModelType << endl;
+ Info<< "Selecting conductivityModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(conductivityModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalError
- << "conductivityModel::New(const dictionary&) : " << endl
- << " unknown conductivityModelType type "
- << conductivityModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid conductivityModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown conductivityModel type "
+ << modelType << nl << nl
+ << "Valid conductivityModel types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<conductivityModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
index b68c03470f2c12225f178c169a60cdc2da2c3571..608cd1178da09fdf9a3221e6182526686e81e5db 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
@@ -33,24 +33,20 @@ Foam::kineticTheoryModels::frictionalStressModel::New
const dictionary& dict
)
{
- word frictionalStressModelType(dict.lookup("frictionalStressModel"));
+ const word modelType(dict.lookup("frictionalStressModel"));
- Info<< "Selecting frictionalStressModel "
- << frictionalStressModelType << endl;
+ Info<< "Selecting frictionalStressModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(frictionalStressModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalError
- << "frictionalStressModel::New(const dictionary&) : " << endl
- << " unknown frictionalStressModelType type "
- << frictionalStressModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid frictionalStressModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc()
- << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown frictionalStressModel type "
+ << modelType << nl << nl
+ << "Valid frictionalStressModel types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<frictionalStressModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
index a1ce25337f71f85046461e94a63ea7e5ecb3f8d5..1810e248bfe719fd6a55f8b248683756af9bfa10 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
@@ -33,24 +33,20 @@ Foam::kineticTheoryModels::granularPressureModel::New
const dictionary& dict
)
{
- word granularPressureModelType(dict.lookup("granularPressureModel"));
+ const word modelType(dict.lookup("granularPressureModel"));
- Info<< "Selecting granularPressureModel "
- << granularPressureModelType << endl;
+ Info<< "Selecting granularPressureModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(granularPressureModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalError
- << "granularPressureModel::New(const dictionary&) : " << endl
- << " unknown granularPressureModelType type "
- << granularPressureModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid granularPressureModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc()
- << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown granularPressureModel type "
+ << modelType << nl << nl
+ << "Valid granularPressureModel types : " << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<granularPressureModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
index 583ce1c3ad3e1f7e54aba3b5356929f5fabcad52..0ac0a36afee89d037fe6f05bea5371b2fd5d9cb5 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
@@ -33,24 +33,20 @@ Foam::kineticTheoryModels::radialModel::New
const dictionary& dict
)
{
- word radialModelType(dict.lookup("radialModel"));
+ const word modelType(dict.lookup("radialModel"));
- Info<< "Selecting radialModel "
- << radialModelType << endl;
+ Info<< "Selecting radialModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(radialModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalError
- << "radialModel::New(const dictionary&) : " << endl
- << " unknown radialModelType type "
- << radialModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid radialModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc()
- << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown radialModel type "
+ << modelType << nl << nl
+ << "Valid radialModel types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<radialModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
index 361850b414d6e1f6bdcf65a67ea84a24545db1f8..0120b2a1b49feeb954a1f5b027459c6dd64d493f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
@@ -33,23 +33,20 @@ Foam::kineticTheoryModels::viscosityModel::New
const dictionary& dict
)
{
- word viscosityModelType(dict.lookup("viscosityModel"));
+ const word modelType(dict.lookup("viscosityModel"));
- Info<< "Selecting viscosityModel "
- << viscosityModelType << endl;
+ Info<< "Selecting viscosityModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(viscosityModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalError
- << "viscosityModel::New(const dictionary&) : " << endl
- << " unknown viscosityModelType type "
- << viscosityModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid viscosityModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown viscosityModel type "
+ << modelType << nl << nl
+ << "Valid viscosityModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<viscosityModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index dfbd95e6b2d757baee0d1c3c77d9a1cb4766e182..18a941099adcf50f63162899dc926c8057525719 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -50,15 +50,14 @@ Foam::diameterModels::IATEsource::New
const dictionary& dict
)
{
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(type);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(type);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown IATE source type "
<< type << nl << nl
- << "Valid IATE source types : " << endl
+ << "Valid IATE source types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
index c2ca6358737700f5976caba090aadd55a5bbca55..50a2f015a76e37ab3e02990026d51709ec500ddd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
@@ -32,7 +32,7 @@ Foam::autoPtr<Foam::twoPhaseSystem> Foam::twoPhaseSystem::New
const fvMesh& mesh
)
{
- const word twoPhaseSystemType
+ const word systemType
(
IOdictionary
(
@@ -48,18 +48,16 @@ Foam::autoPtr<Foam::twoPhaseSystem> Foam::twoPhaseSystem::New
).lookup("type")
);
- Info<< "Selecting twoPhaseSystem "
- << twoPhaseSystemType << endl;
+ Info<< "Selecting twoPhaseSystem " << systemType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(twoPhaseSystemType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(systemType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown twoPhaseSystemType type "
- << twoPhaseSystemType << endl << endl
- << "Valid twoPhaseSystem types are : " << endl
+ << "Unknown twoPhaseSystem type "
+ << systemType << nl << nl
+ << "Valid twoPhaseSystem types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
index 2946810cf5ff13e1564172b0143618de1ae4d67b..5b44995b4e230b1047609c8759a4e047101bb6c3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
@@ -35,20 +35,19 @@ Foam::aspectRatioModel::New
const phasePair& pair
)
{
- word aspectRatioModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting aspectRatioModel for "
- << pair << ": " << aspectRatioModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(aspectRatioModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown aspectRatioModelType type "
- << aspectRatioModelType << endl << endl
- << "Valid aspectRatioModel types are : " << endl
+ << "Unknown aspectRatioModel type "
+ << modelType << nl << nl
+ << "Valid aspectRatioModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index c2a5f4074e731e968d92920abe99c52ba605d5d4..de8bc17cda56e94f8cd33947ccb0bb4692040683 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
const phasePair& pair
)
{
- word dragModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting dragModel for "
- << pair << ": " << dragModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(dragModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown dragModelType type "
- << dragModelType << endl << endl
- << "Valid dragModel types are : " << endl
+ << "Unknown dragModel type "
+ << modelType << nl << nl
+ << "Valid dragModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index 46e43f6b11a9e253832b2fceab8cd524d24ab543..71654baea64ad877a39685e767c4db2f932e936e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
const phasePair& pair
)
{
- word heatTransferModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting heatTransferModel for "
- << pair << ": " << heatTransferModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(heatTransferModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown heatTransferModelType type "
- << heatTransferModelType << endl << endl
- << "Valid heatTransferModel types are : " << endl
+ << "Unknown heatTransferModel type "
+ << modelType << nl << nl
+ << "Valid heatTransferModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
index 8dbdd5479c3a4bee3038cef438b947c346da58bc..a0fd721dfb6d60ce52f9203cd428cdf19192f9dd 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
const phasePair& pair
)
{
- word liftModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting liftModel for "
- << pair << ": " << liftModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(liftModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown liftModelType type "
- << liftModelType << endl << endl
- << "Valid liftModel types are : " << endl
+ << "Unknown liftModel type "
+ << modelType << nl << nl
+ << "Valid liftModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
index fb16d0541833fa0453f69095f8776d5a600e75cd..5462b768a2fd1779c979243b5f76af153a62ca70 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
@@ -35,20 +35,19 @@ Foam::swarmCorrection::New
const phasePair& pair
)
{
- word swarmCorrectionType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting swarmCorrection for "
- << pair << ": " << swarmCorrectionType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(swarmCorrectionType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown swarmCorrectionType type "
- << swarmCorrectionType << endl << endl
- << "Valid swarmCorrection types are : " << endl
+ << "Unknown swarmCorrection type "
+ << modelType << nl << nl
+ << "Valid swarmCorrection types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
index 53266ae6b2db068a89d828ab56aa5780a11d6832..123bad7691ed119d0be022d7e48be35350b23543 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
@@ -35,20 +35,19 @@ Foam::turbulentDispersionModel::New
const phasePair& pair
)
{
- word turbulentDispersionModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting turbulentDispersionModel for "
- << pair << ": " << turbulentDispersionModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(turbulentDispersionModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown turbulentDispersionModelType type "
- << turbulentDispersionModelType << endl << endl
- << "Valid turbulentDispersionModel types are : " << endl
+ << "Unknown turbulentDispersionModel type "
+ << modelType << nl << nl
+ << "Valid turbulentDispersionModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
index 1b092c197e9c0184092ce56f00d8f883998be5f8..6884a6b3bedc643791e47ee18140b1b3131993d8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::virtualMassModel> Foam::virtualMassModel::New
const phasePair& pair
)
{
- word virtualMassModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting virtualMassModel for "
- << pair << ": " << virtualMassModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(virtualMassModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown virtualMassModelType type "
- << virtualMassModelType << endl << endl
- << "Valid virtualMassModel types are : " << endl
+ << "Unknown virtualMassModel type "
+ << modelType << nl << nl
+ << "Valid virtualMassModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
index 806a1dd3b34897023a88a27c8a6aaa7e3e904777..2cfddbd92ca71fe51d5645de0cfe33212ef1b962 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::wallLubricationModel> Foam::wallLubricationModel::New
const phasePair& pair
)
{
- word wallLubricationModelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting wallLubricationModel for "
- << pair << ": " << wallLubricationModelType << endl;
+ << pair << ": " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(wallLubricationModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown wallLubricationModelType type "
- << wallLubricationModelType << endl << endl
- << "Valid wallLubricationModel types are : " << endl
+ << "Unknown wallLubricationModel type "
+ << modelType << nl << nl
+ << "Valid wallLubricationModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
index bfadfc6399ce0d83f3f56b9a49c3e98606a60f5e..e4a3a64634503549c577c247bb2eb7001efa6fc6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
@@ -33,23 +33,20 @@ Foam::kineticTheoryModels::conductivityModel::New
const dictionary& dict
)
{
- word conductivityModelType(dict.lookup("conductivityModel"));
+ const word modelType(dict.lookup("conductivityModel"));
- Info<< "Selecting conductivityModel "
- << conductivityModelType << endl;
+ Info<< "Selecting conductivityModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(conductivityModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalError
- << "conductivityModel::New(const dictionary&) : " << endl
- << " unknown conductivityModelType type "
- << conductivityModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid conductivityModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown conductivityModel type "
+ << modelType << nl << nl
+ << "Valid conductivityModel types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<conductivityModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
index b68c03470f2c12225f178c169a60cdc2da2c3571..255b15593a983d669f6ebc4b9ff20bf805ec1c08 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
@@ -33,24 +33,20 @@ Foam::kineticTheoryModels::frictionalStressModel::New
const dictionary& dict
)
{
- word frictionalStressModelType(dict.lookup("frictionalStressModel"));
+ const word modelType(dict.lookup("frictionalStressModel"));
- Info<< "Selecting frictionalStressModel "
- << frictionalStressModelType << endl;
+ Info<< "Selecting frictionalStressModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(frictionalStressModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalError
- << "frictionalStressModel::New(const dictionary&) : " << endl
- << " unknown frictionalStressModelType type "
- << frictionalStressModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid frictionalStressModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc()
- << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown frictionalStressModel type "
+ << modelType << nl << nl
+ << "Valid frictionalStressModelType types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<frictionalStressModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
index a1ce25337f71f85046461e94a63ea7e5ecb3f8d5..7898a94ccab9477d227dc10d263feb0006390ff0 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
@@ -33,24 +33,20 @@ Foam::kineticTheoryModels::granularPressureModel::New
const dictionary& dict
)
{
- word granularPressureModelType(dict.lookup("granularPressureModel"));
+ const word modelType(dict.lookup("granularPressureModel"));
- Info<< "Selecting granularPressureModel "
- << granularPressureModelType << endl;
+ Info<< "Selecting granularPressureModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(granularPressureModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalError
- << "granularPressureModel::New(const dictionary&) : " << endl
- << " unknown granularPressureModelType type "
- << granularPressureModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid granularPressureModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc()
- << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown granularPressureModel type "
+ << modelType << nl << nl
+ << "Valid granularPressureModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<granularPressureModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
index 583ce1c3ad3e1f7e54aba3b5356929f5fabcad52..0ac0a36afee89d037fe6f05bea5371b2fd5d9cb5 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
@@ -33,24 +33,20 @@ Foam::kineticTheoryModels::radialModel::New
const dictionary& dict
)
{
- word radialModelType(dict.lookup("radialModel"));
+ const word modelType(dict.lookup("radialModel"));
- Info<< "Selecting radialModel "
- << radialModelType << endl;
+ Info<< "Selecting radialModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(radialModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalError
- << "radialModel::New(const dictionary&) : " << endl
- << " unknown radialModelType type "
- << radialModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid radialModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc()
- << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown radialModel type "
+ << modelType << nl << nl
+ << "Valid radialModel types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<radialModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
index 361850b414d6e1f6bdcf65a67ea84a24545db1f8..83067ea6eec0883acbc9387811bacdb0a30adaf2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
@@ -33,23 +33,20 @@ Foam::kineticTheoryModels::viscosityModel::New
const dictionary& dict
)
{
- word viscosityModelType(dict.lookup("viscosityModel"));
+ const word modelName(dict.lookup("viscosityModel"));
- Info<< "Selecting viscosityModel "
- << viscosityModelType << endl;
+ Info<< "Selecting viscosityModel " << modelName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(viscosityModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelName);
if (!cstrIter.found())
{
- FatalError
- << "viscosityModel::New(const dictionary&) : " << endl
- << " unknown viscosityModelType type "
- << viscosityModelType
- << ", constructor not in hash table" << endl << endl
- << " Valid viscosityModelType types are :" << endl;
- Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
+ FatalErrorInFunction
+ << "Unknown viscosityModel type "
+ << modelName << nl << nl
+ << "Valid viscosityModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<viscosityModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
index cbb33a5fbd0299ff9c01eaa35b19174229431622..f4419b735e1f7f4759396681573ae4e3d1b15b76 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
@@ -33,20 +33,19 @@ Foam::autoPtr<Foam::blendingMethod> Foam::blendingMethod::New
const wordList& phaseNames
)
{
- word blendingMethodType(dict.lookup("type"));
+ const word methodName(dict.lookup("type"));
Info<< "Selecting " << dict.dictName() << " blending method: "
- << blendingMethodType << endl;
+ << methodName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(blendingMethodType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodName);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown blendingMethodType type "
- << blendingMethodType << endl << endl
- << "Valid blendingMethod types are : " << endl
+ << "Unknown blendingMethod type "
+ << methodName << nl << nl
+ << "Valid blendingMethod types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index fc011ece0c99be3ec20ac50c7718f0b9e0db6ab3..c77c7e7e996820ed743093d7a4feae5424657866 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -51,15 +51,14 @@ Foam::diameterModels::IATEsource::New
const dictionary& dict
)
{
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(type);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(type);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown IATE source type "
<< type << nl << nl
- << "Valid IATE source types : " << endl
+ << "Valid IATE source types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C
index 963ad160f7ec26e4186acb1fb8c0b9d806dd6e74..fc4000975d63ac73434dcb61ab91497dc1963fed 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C
@@ -33,32 +33,28 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
const phaseModel& phase
)
{
- word diameterModelType
- (
- dict.lookup("diameterModel")
- );
+ const word modelType(dict.lookup("diameterModel"));
Info << "Selecting diameterModel for phase "
<< phase.name()
<< ": "
- << diameterModelType << endl;
+ << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(diameterModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown diameterModelType type "
- << diameterModelType << endl << endl
- << "Valid diameterModel types are : " << endl
+ << "Unknown diameterModel type "
+ << modelType << nl << nl
+ << "Valid diameterModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return cstrIter()
(
- dict.optionalSubDict(diameterModelType + "Coeffs"),
+ dict.optionalSubDict(modelType + "Coeffs"),
phase
);
}
diff --git a/applications/test/PackedList2/Test-PackedList2.C b/applications/test/PackedList2/Test-PackedList2.C
index 26981b484ffd70cf98cca560e83de523f5093205..ce9b15ed51faa10a126f591c98c4085f3152a58e 100644
--- a/applications/test/PackedList2/Test-PackedList2.C
+++ b/applications/test/PackedList2/Test-PackedList2.C
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
std::vector<bool> stlVector(n, true);
labelHashSet emptyHash;
- labelHashSet fullHash(1000);
+ labelHashSet fullHash(1024);
for (label i = 0; i < n; i++)
{
fullHash.insert(i);
diff --git a/applications/test/dictionary/Test-dictionary.C b/applications/test/dictionary/Test-dictionary.C
index dc55b9902f87cb4d1b5ad808de357546e98564df..3d7e445ab568a31b6d14739b305ad97d5b22d3ac 100644
--- a/applications/test/dictionary/Test-dictionary.C
+++ b/applications/test/dictionary/Test-dictionary.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
dictionary dict;
dict.add(word("aa" + getEnv("WM_MPLIB") + "cc"), 16);
- string s("DDD${aa${WM_MPLIB}cc}EEE");
+ string s("DDD_${aa${WM_MPLIB}cc}_EEE");
stringOps::inplaceExpand(s, dict, true, false);
Info<< "variable expansion:" << s << endl;
}
diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C
index 7a61b77f72e169d3086b0e17ad68375bb9f7a46d..14ba97f7a561a39dd3ea5952b15553e04647f543 100644
--- a/applications/test/parallel/Test-parallel.C
+++ b/applications/test/parallel/Test-parallel.C
@@ -51,7 +51,7 @@ void testMapDistribute()
List<Tuple2<label, List<scalar>>> complexData(100);
forAll(complexData, i)
{
- complexData[i].first() = rndGen.integer(0, Pstream::nProcs()-1);
+ complexData[i].first() = rndGen.position(0, Pstream::nProcs()-1);
complexData[i].second().setSize(3);
complexData[i].second()[0] = 1;
complexData[i].second()[1] = 2;
diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
index ec4b6e994f0c12520b4780bce4f200eae547b7e9..06564cd80fa6c5d3025937d0e1a27c5c47f1391a 100644
--- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
+++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
fileName pointsFile(runTime.constantPath()/"points.tmp");
OFstream pFile(pointsFile);
- scalar a(degToRad(0.1));
+ const scalar a = 0.1_deg;
tensor rotateZ =
tensor
(
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 6b5fa8621c54f2516951c248418fd2e8d33b8ffc..8db1bdfec82f37b9d67ab784f861c1818fb4b695 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -419,7 +419,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
{
// Distribute the points to be +/- 2.5deg from the x-z plane
- scalar tanTheta = Foam::tan(degToRad(2.5));
+ const scalar tanTheta = Foam::tan(2.5_deg);
SLList<face>::iterator iterf = pFaces[WEDGE][0].begin();
SLList<face>::iterator iterb = pFaces[WEDGE][1].begin();
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 26b23f691ae85553053315f6c1b7b710dce9c3e0..52dba40d6e30d31d6c40123cc06fc69c06e17783 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -69,18 +69,12 @@ enum ExtrudeMode
SURFACE
};
-namespace Foam
+static const Enum<ExtrudeMode> ExtrudeModeNames
{
- template<>
- const char* NamedEnum<ExtrudeMode, 3>::names[] =
- {
- "mesh",
- "patch",
- "surface"
- };
-}
-
-static const NamedEnum<ExtrudeMode, 3> ExtrudeModeNames;
+ { ExtrudeMode::MESH, "mesh" },
+ { ExtrudeMode::PATCH, "patch" },
+ { ExtrudeMode::SURFACE, "surface" },
+};
void createDummyFvMeshFiles(const polyMesh& mesh, const word& regionName)
@@ -305,9 +299,10 @@ int main(int argc, char *argv[])
const Switch flipNormals(dict.lookup("flipNormals"));
// What to extrude
- const ExtrudeMode mode = ExtrudeModeNames.read
+ const ExtrudeMode mode = ExtrudeModeNames.lookup
(
- dict.lookup("constructFrom")
+ "constructFrom",
+ dict
);
// Any merging of small edges
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index f10a593a290c8305f06ab939cf4df6774ec3a1ef..e978b44e61c66e045e8fedff56a200df797468a9 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -60,17 +60,11 @@ enum ExtrudeMode
MESHEDSURFACE
};
-namespace Foam
+static const Enum<ExtrudeMode> ExtrudeModeNames
{
- template<>
- const char* NamedEnum<ExtrudeMode, 2>::names[] =
- {
- "polyMesh2D",
- "MeshedSurface"
- };
-}
-
-static const NamedEnum<ExtrudeMode, 2> ExtrudeModeNames;
+ { ExtrudeMode::POLYMESH2D, "polyMesh2D" },
+ { ExtrudeMode::MESHEDSURFACE, "MeshedSurface" },
+};
//pointField moveInitialPoints
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
index 15604c8867705a7a8ed7814c10a0fee8535f1669..c37b1ee0cc6b79825365e46df35c3fb8f1bf1dba 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
@@ -35,10 +35,6 @@ defineRunTimeSelectionTable(cellSizeAndAlignmentControl, dictionary);
}
-// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
-
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::cellSizeAndAlignmentControl::cellSizeAndAlignmentControl
@@ -57,7 +53,7 @@ Foam::cellSizeAndAlignmentControl::cellSizeAndAlignmentControl
controlFunctionDict.lookupOrDefault<Switch>
(
"forceInitialPointInsertion",
- "off"
+ Switch::OFF
)
),
name_(name)
@@ -76,28 +72,20 @@ Foam::cellSizeAndAlignmentControl::New
const scalar& defaultCellSize
)
{
- word cellSizeAndAlignmentControlTypeName
- (
- controlFunctionDict.lookup("type")
- );
+ const word controlType(controlFunctionDict.lookup("type"));
Info<< indent << "Selecting cellSizeAndAlignmentControl "
- << cellSizeAndAlignmentControlTypeName << endl;
+ << controlType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find
- (
- cellSizeAndAlignmentControlTypeName
- );
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(controlType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown cellSizeAndAlignmentControl type "
- << cellSizeAndAlignmentControlTypeName
- << endl << endl
- << "Valid cellSizeAndAlignmentControl types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << controlType << nl << nl
+ << "Valid cellSizeAndAlignmentControl types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -121,8 +109,4 @@ Foam::cellSizeAndAlignmentControl::~cellSizeAndAlignmentControl()
{}
-// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-
-
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
index 9a0333e9708f652c0edf42e149604bef1c29d5de..77316af0a9ccdbf8d03de0131a83d91cacb72fde 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
@@ -32,10 +32,11 @@ namespace Foam
{
defineTypeNameAndDebug(cellSizeFunction, 0);
defineRunTimeSelectionTable(cellSizeFunction, dictionary);
-
- scalar cellSizeFunction::snapToSurfaceTol_ = 1e-10;
}
+Foam::scalar Foam::cellSizeFunction::snapToSurfaceTol_ = 1e-10;
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::cellSizeFunction::cellSizeFunction
@@ -122,25 +123,23 @@ Foam::autoPtr<Foam::cellSizeFunction> Foam::cellSizeFunction::New
const labelList regionIndices
)
{
- word cellSizeFunctionTypeName
+ const word functionName
(
cellSizeFunctionDict.lookup("cellSizeFunction")
);
- Info<< indent << "Selecting cellSizeFunction " << cellSizeFunctionTypeName
- << endl;
+ Info<< indent << "Selecting cellSizeFunction "
+ << functionName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(cellSizeFunctionTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(functionName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown cellSizeFunction type "
- << cellSizeFunctionTypeName
- << endl << endl
- << "Valid cellSizeFunction types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << functionName << nl << nl
+ << "Valid cellSizeFunction types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
index 93aa04c5abb95a94b00e69742633f61410f095f8..2f4447d505301d8659c952991b416f2a78c612cc 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
@@ -60,25 +60,23 @@ Foam::autoPtr<Foam::cellSizeCalculationType> Foam::cellSizeCalculationType::New
const scalar& defaultCellSize
)
{
- word cellSizeCalculationTypeTypeName
+ const word calculationType
(
cellSizeCalculationTypeDict.lookup("cellSizeCalculationType")
);
Info<< indent << "Selecting cellSizeCalculationType "
- << cellSizeCalculationTypeTypeName << endl;
+ << calculationType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(cellSizeCalculationTypeTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(calculationType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown cellSizeCalculationType type "
- << cellSizeCalculationTypeTypeName
- << endl << endl
- << "Valid cellSizeCalculationType types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << calculationType << nl << nl
+ << "Valid cellSizeCalculationType types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
index ac6c12ce6bd5b0315baaa6d6457166aea490a247..ac72678573a5b38510a27f4d12e4e42c37d0f50e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
@@ -34,6 +34,7 @@ namespace Foam
defineRunTimeSelectionTable(surfaceCellSizeFunction, dictionary);
}
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::surfaceCellSizeFunction::surfaceCellSizeFunction
@@ -64,25 +65,23 @@ Foam::autoPtr<Foam::surfaceCellSizeFunction> Foam::surfaceCellSizeFunction::New
const scalar& defaultCellSize
)
{
- word surfaceCellSizeFunctionTypeName
+ const word functionName
(
surfaceCellSizeFunctionDict.lookup("surfaceCellSizeFunction")
);
Info<< indent << "Selecting surfaceCellSizeFunction "
- << surfaceCellSizeFunctionTypeName << endl;
+ << functionName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(surfaceCellSizeFunctionTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(functionName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown surfaceCellSizeFunction type "
- << surfaceCellSizeFunctionTypeName
- << endl << endl
- << "Valid surfaceCellSizeFunction types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << functionName << nl << nl
+ << "Valid surfaceCellSizeFunction types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 43131671d542ee69c1155e325fda802bc74c4837..141f36b93372175d0355c4770280843167ec42af 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -42,24 +42,20 @@ License
namespace Foam
{
defineTypeNameAndDebug(conformalVoronoiMesh, 0);
-
- template<>
- const char* NamedEnum
- <
- conformalVoronoiMesh::dualMeshPointType,
- 5
- >::names[] =
- {
- "internal",
- "surface",
- "featureEdge",
- "featurePoint",
- "constrained"
- };
}
-const Foam::NamedEnum<Foam::conformalVoronoiMesh::dualMeshPointType, 5>
- Foam::conformalVoronoiMesh::dualMeshPointTypeNames_;
+const Foam::Enum
+<
+ Foam::conformalVoronoiMesh::dualMeshPointType
+>
+Foam::conformalVoronoiMesh::dualMeshPointTypeNames_
+{
+ { dualMeshPointType::internal, "internal" },
+ { dualMeshPointType::surface, "surface" },
+ { dualMeshPointType::featureEdge, "featureEdge" },
+ { dualMeshPointType::featurePoint, "featurePoint" },
+ { dualMeshPointType::constrained, "constrained" },
+};
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index d204911c8f9162024cefd1fd31db9a55d451774f..0960b5e63c4b62e79e59a6d9156c95b72b89a758 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -122,7 +122,7 @@ public:
constrained = 4
};
- static const NamedEnum<dualMeshPointType, 5> dualMeshPointTypeNames_;
+ static const Enum<dualMeshPointType> dualMeshPointTypeNames_;
private:
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 9567b8886b17369ae67091c44d97e26779697b35..df009f30830afb543a73b9fc6c7e5b4ab5a543b4 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -33,10 +33,10 @@ License
using namespace Foam::vectorTools;
const Foam::scalar Foam::conformalVoronoiMesh::searchConeAngle
- = Foam::cos(degToRad(30));
+ = Foam::cos(30.0_deg);
const Foam::scalar Foam::conformalVoronoiMesh::searchAngleOppositeSurface
- = Foam::cos(degToRad(150));
+ = Foam::cos(150.0_deg);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
index 5dfac3963cc4e2415bc84ac66c80b48a6ebd6638..b9542b22ab01fd19c5726358089acf49acf6e7d5 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.C
@@ -27,20 +27,19 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template<>
-const char*
-Foam::NamedEnum<Foam::indexedCellEnum::cellTypes, 6>::names[] =
+const Foam::Enum
+<
+ Foam::indexedCellEnum::cellTypes
+>
+Foam::indexedCellEnum::cellTypesNames_
{
- "Unassigned",
- "Internal",
- "Surface",
- "FeatureEdge",
- "FeaturePoint",
- "Far"
+ { cellTypes::ctUnassigned, "Unassigned" },
+ { cellTypes::ctFar, "Far" },
+ { cellTypes::ctInternal, "Internal" },
+ { cellTypes::ctSurface, "Surface" },
+ { cellTypes::ctFeatureEdge, "FeatureEdge" },
+ { cellTypes::ctFeaturePoint,"FeaturePoint" },
};
-const Foam::NamedEnum<Foam::indexedCellEnum::cellTypes, 6>
-cellTypesNames_;
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
index d81deca00c938dc797003fb21fec8aa9416a915a..eeab020502b9319f40e727da0bb2e8d972a8d2e9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellEnum.H
@@ -34,7 +34,7 @@ SourceFiles
#ifndef indexedCellEnum_H
#define indexedCellEnum_H
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -47,7 +47,6 @@ class indexedCellEnum
{
public:
-
enum cellTypes
{
ctUnassigned = INT_MIN,
@@ -58,7 +57,7 @@ public:
ctFeaturePoint = INT_MIN + 5
};
- static const Foam::NamedEnum<cellTypes, 6> cellTypesNames_;
+ static const Enum<cellTypes> cellTypesNames_;
};
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
index ddb03fa28ed59cc1928124e044aa5bb1b15aec44..729eea93d20c1795916608738608f0998836df23 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
@@ -28,42 +28,42 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template<>
-const char*
-Foam::NamedEnum<Foam::indexedVertexEnum::vertexType, 15>::names[] =
+const Foam::Enum
+<
+ Foam::indexedVertexEnum::vertexType
+>
+Foam::indexedVertexEnum::vertexTypeNames_
{
- "Unassigned",
- "Internal",
- "InternalNearBoundary",
- "InternalSurface",
- "InternalSurfaceBaffle",
- "ExternalSurfaceBaffle",
- "InternalFeatureEdge",
- "InternalFeatureEdgeBaffle",
- "ExternalFeatureEdgeBaffle",
- "InternalFeaturePoint",
- "ExternalSurface",
- "ExternalFeatureEdge",
- "ExternalFeaturePoint",
- "Far",
- "Constrained"
+ { vertexType::vtUnassigned, "Unassigned" },
+ { vertexType::vtInternal, "Internal" },
+ { vertexType::vtInternalNearBoundary, "InternalNearBoundary" },
+ { vertexType::vtInternalSurface, "InternalSurface" },
+ { vertexType::vtInternalSurfaceBaffle, "InternalSurfaceBaffle" },
+ { vertexType::vtExternalSurfaceBaffle, "ExternalSurfaceBaffle" },
+ { vertexType::vtInternalFeatureEdge, "InternalFeatureEdge" },
+ { vertexType::vtInternalFeatureEdgeBaffle, "InternalFeatureEdgeBaffle" },
+ { vertexType::vtExternalFeatureEdgeBaffle, "ExternalFeatureEdgeBaffle" },
+ { vertexType::vtInternalFeaturePoint, "InternalFeaturePoint" },
+ { vertexType::vtExternalSurface, "ExternalSurface" },
+ { vertexType::vtExternalFeatureEdge, "ExternalFeatureEdge" },
+ { vertexType::vtExternalFeaturePoint, "ExternalFeaturePoint" },
+ { vertexType::vtFar, "Far" },
+ { vertexType::vtConstrained, "Constrained" },
};
-const Foam::NamedEnum<Foam::indexedVertexEnum::vertexType, 15>
-Foam::indexedVertexEnum::vertexTypeNames_;
-
-template<>
-const char*
-Foam::NamedEnum<Foam::indexedVertexEnum::vertexMotion, 2>::names[] =
+const Foam::Enum
+<
+ Foam::indexedVertexEnum::vertexMotion
+>
+Foam::indexedVertexEnum::vertexMotionNames_
{
- "fixed",
- "movable"
+ { vertexMotion::fixed, "fixed" },
+ { vertexMotion::movable, "movable" },
};
-const Foam::NamedEnum<Foam::indexedVertexEnum::vertexMotion, 2>
-vertexMotionNames_;
+// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
Foam::Ostream& Foam::operator<<
(
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
index 581bcf80a6e140c36fafe45852ac4a98c44f35e7..1568061fae6752b3df31d10c0fcf5c5d270a7f55 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexEnum.H
@@ -34,7 +34,7 @@ SourceFiles
#ifndef indexedVertexEnum_H
#define indexedVertexEnum_H
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -72,9 +72,9 @@ public:
movable = 1
};
- static const Foam::NamedEnum<vertexType, 15> vertexTypeNames_;
+ static const Enum<vertexType> vertexTypeNames_;
- static const Foam::NamedEnum<vertexMotion, 2> vertexMotionNames_;
+ static const Enum<vertexMotion> vertexMotionNames_;
friend Ostream& operator<<(Foam::Ostream&, const vertexType&);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
index 151a0b78844315d1a461611f45953729f2f29e7c..49c62fa66d44efc29dd31db22a585b182c7edfa7 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
@@ -26,20 +26,17 @@ License
#include "faceAreaWeightModel.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
defineTypeNameAndDebug(faceAreaWeightModel, 0);
defineRunTimeSelectionTable(faceAreaWeightModel, dictionary);
-
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-faceAreaWeightModel::faceAreaWeightModel
+Foam::faceAreaWeightModel::faceAreaWeightModel
(
const word& type,
const dictionary& relaxationDict
@@ -52,30 +49,24 @@ faceAreaWeightModel::faceAreaWeightModel
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-autoPtr<faceAreaWeightModel> faceAreaWeightModel::New
+Foam::autoPtr<Foam::faceAreaWeightModel> Foam::faceAreaWeightModel::New
(
const dictionary& relaxationDict
)
{
- word faceAreaWeightModelTypeName
- (
- relaxationDict.lookup("faceAreaWeightModel")
- );
+ const word modelType(relaxationDict.lookup("faceAreaWeightModel"));
- Info<< nl << "Selecting faceAreaWeightModel "
- << faceAreaWeightModelTypeName << endl;
+ Info<< nl << "Selecting faceAreaWeightModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(faceAreaWeightModelTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown faceAreaWeightModel type "
- << faceAreaWeightModelTypeName
- << endl << endl
- << "Valid faceAreaWeightModel types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << modelType << nl << nl
+ << "Valid faceAreaWeightModel types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -85,12 +76,8 @@ autoPtr<faceAreaWeightModel> faceAreaWeightModel::New
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-faceAreaWeightModel::~faceAreaWeightModel()
+Foam::faceAreaWeightModel::~faceAreaWeightModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
index 3cca22c751d775b6ae620586adc14ffa16b9b194..48e45954fb76352910e1f3e50c51a5a952979984 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
@@ -26,20 +26,17 @@ License
#include "initialPointsMethod.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
defineTypeNameAndDebug(initialPointsMethod, 0);
defineRunTimeSelectionTable(initialPointsMethod, dictionary);
-
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-initialPointsMethod::initialPointsMethod
+Foam::initialPointsMethod::initialPointsMethod
(
const word& type,
const dictionary& initialPointsDict,
@@ -73,7 +70,7 @@ initialPointsMethod::initialPointsMethod
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-autoPtr<initialPointsMethod> initialPointsMethod::New
+Foam::autoPtr<Foam::initialPointsMethod> Foam::initialPointsMethod::New
(
const dictionary& initialPointsDict,
const Time& runTime,
@@ -83,25 +80,20 @@ autoPtr<initialPointsMethod> initialPointsMethod::New
const autoPtr<backgroundMeshDecomposition>& decomposition
)
{
- word initialPointsMethodTypeName
- (
- initialPointsDict.lookup("initialPointsMethod")
- );
+ const word methodName(initialPointsDict.lookup("initialPointsMethod"));
Info<< nl << "Selecting initialPointsMethod "
- << initialPointsMethodTypeName << endl;
+ << methodName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(initialPointsMethodTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown initialPointsMethod type "
- << initialPointsMethodTypeName
- << endl << endl
- << "Valid initialPointsMethod types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << methodName << nl << nl
+ << "Valid initialPointsMethod types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -123,12 +115,8 @@ autoPtr<initialPointsMethod> initialPointsMethod::New
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-initialPointsMethod::~initialPointsMethod()
+Foam::initialPointsMethod::~initialPointsMethod()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
index b968dd2ebe0e2f3fc2920c070d80333754eddb51..5f0fd959931b1be386c74d1bb8f8332417317fc6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
@@ -26,20 +26,18 @@ License
#include "relaxationModel.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
defineTypeNameAndDebug(relaxationModel, 0);
defineRunTimeSelectionTable(relaxationModel, dictionary);
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-relaxationModel::relaxationModel
+Foam::relaxationModel::relaxationModel
(
const word& type,
const dictionary& relaxationDict,
@@ -54,31 +52,25 @@ relaxationModel::relaxationModel
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-autoPtr<relaxationModel> relaxationModel::New
+Foam::autoPtr<Foam::relaxationModel> Foam::relaxationModel::New
(
const dictionary& relaxationDict,
const Time& runTime
)
{
- word relaxationModelTypeName
- (
- relaxationDict.lookup("relaxationModel")
- );
+ const word modelType(relaxationDict.lookup("relaxationModel"));
- Info<< nl << "Selecting relaxationModel "
- << relaxationModelTypeName << endl;
+ Info<< nl << "Selecting relaxationModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(relaxationModelTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown relaxationModel type "
- << relaxationModelTypeName
- << endl << endl
- << "Valid relaxationModel types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << modelType << nl << nl
+ << "Valid relaxationModel types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -88,12 +80,8 @@ autoPtr<relaxationModel> relaxationModel::New
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-relaxationModel::~relaxationModel()
+Foam::relaxationModel::~relaxationModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
index b35c37df1a5c5e442451f10be558425ed5d91883..946f15ccaef2d98abb4e99a88807e35216994eff 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
@@ -43,17 +43,16 @@ Foam::searchableSurfaceFeatures::New
const dictionary& dict
)
{
- word searchableSurfaceFeaturesType = surface.type() + "Features";
+ const word featuresType = surface.type() + "Features";
- dictConstructorTable::iterator cstrIter =
- dictConstructorTablePtr_->find(searchableSurfaceFeaturesType);
+ auto cstrIter = dictConstructorTablePtr_->cfind(featuresType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown searchableSurfaceFeatures type "
- << searchableSurfaceFeaturesType << endl << endl
- << "Valid searchableSurfaceFeatures types : " << endl
+ << featuresType << nl << nl
+ << "Valid searchableSurfaceFeatures types :" << endl
<< dictConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 3e917474153ec2d0c0cd10db06e7b01d521ab80f..00f2c7d05d9ab3c67536afe45156a81db16ee9ea 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -393,7 +393,7 @@ void extractSurface
// Collect sizes. Hash on names to handle local-only patches (e.g.
// processor patches)
- HashTable<label> patchSize(1000);
+ HashTable<label> patchSize(1024);
label nFaces = 0;
forAllConstIter(labelHashSet, includePatches, iter)
{
@@ -405,7 +405,7 @@ void extractSurface
// Allocate zone/patch for all patches
- HashTable<label> compactZoneID(1000);
+ HashTable<label> compactZoneID(1024);
forAllConstIter(HashTable<label>, patchSize, iter)
{
label sz = compactZoneID.size();
@@ -848,7 +848,7 @@ int main(int argc, char *argv[])
(
meshRefinement::readFlags
(
- meshRefinement::IOdebugTypeNames,
+ meshRefinement::debugTypeNames,
flags
)
);
@@ -873,7 +873,7 @@ int main(int argc, char *argv[])
(
meshRefinement::readFlags
(
- meshRefinement::IOwriteTypeNames,
+ meshRefinement::writeTypeNames,
flags
)
)
@@ -892,7 +892,7 @@ int main(int argc, char *argv[])
(
meshRefinement::readFlags
(
- meshRefinement::IOoutputTypeNames,
+ meshRefinement::outputTypeNames,
flags
)
)
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
index dd66f694aa34c960c02c324aa710f2e3484c5b72..5c42ba3596b07ecebc6b5ec179bfb9db5a254f00 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
@@ -68,15 +68,14 @@ Foam::autoPtr<Foam::faceSelection> Foam::faceSelection::New
{
const word sampleType(dict.lookup("type"));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(sampleType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(sampleType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown faceSelection type "
<< sampleType << nl << nl
- << "Valid faceSelection types : " << endl
+ << "Valid faceSelection types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C
index 3feb5f8659d93d5a2c7dc4d24840875e6a0bb301..dff74bf277e60611ef10ea0f002c3d30a0490962 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C
@@ -34,8 +34,7 @@ Foam::autoPtr<Foam::helpType> Foam::helpType::New
{
Info<< "Selecting helpType " << helpTypeName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(helpTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(helpTypeName);
if (!cstrIter.found())
{
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 5c4862f2b8be343ef067d672c4c3689446eff8af..b61718dbfff10b38aa6c5dae86c73121113e23ac 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -59,6 +59,7 @@ Usage
\*---------------------------------------------------------------------------*/
#include "argList.H"
+#include "sigFpe.H"
#include "Time.H"
#include "fvMesh.H"
#include "fvMeshTools.H"
@@ -2277,7 +2278,7 @@ int main(int argc, char *argv[])
bool newTimes = args.optionFound("newTimes");
- if (env("FOAM_SIGFPE"))
+ if (Foam::sigFpe::requested())
{
WarningInFunction
<< "Detected floating point exception trapping (FOAM_SIGFPE)."
@@ -2287,7 +2288,6 @@ int main(int argc, char *argv[])
}
-
const HashSet<word> selectedFields(0);
const HashSet<word> selectedLagrangianFields(0);
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C b/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
index 88bf926c42e40798952ddebba90907a82ddbb367..4df3379e3c3befdb0ba2aa0998589455298a62af 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
@@ -45,6 +45,7 @@ Description
#include "fvMesh.H"
#include "cellModeller.H"
#include "globalFoam.H"
+#include "foamVersion.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
index 11fc19ac3e6144e028d76f52174a527810296dcb..5ea7f196f52369c95143a06ca63059067faec3fd 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
@@ -33,23 +33,14 @@ License
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
-namespace Foam
-{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::vector::components,
- 3
- >::names[] =
- {
- "x",
- "y",
- "z"
- };
-}
-
-const Foam::NamedEnum<Foam::vector::components, 3>
- Foam::channelIndex::vectorComponentsNames_;
+const Foam::Enum
+<
+ Foam::vector::components
+>
+Foam::channelIndex::vectorComponentsNames_
+(
+ Foam::vector::components::X, { "x", "y", "z" }
+);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -233,7 +224,7 @@ Foam::channelIndex::channelIndex
)
:
symmetric_(readBool(dict.lookup("symmetric"))),
- dir_(vectorComponentsNames_.read(dict.lookup("component")))
+ dir_(vectorComponentsNames_.lookup("component", dict))
{
const polyBoundaryMesh& patches = mesh.boundaryMesh();
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H
index 5e554fa062158324693dabefc0493b537c835dfe..36e7764c4d32e661af0936887a5ac4b2a6404b6a 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H
@@ -55,7 +55,7 @@ class channelIndex
// Private data
- static const NamedEnum<vector::components, 3> vectorComponentsNames_;
+ static const Enum<vector::components> vectorComponentsNames_;
//- Is mesh symmetric
const bool symmetric_;
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
index 4bea82a29513fd710a3558536f291358cbdeeebe..280e2ac645ce4a7a7b43042f50fcd77d93b0e037 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
@@ -29,24 +29,19 @@ License
#include "polyMesh.H"
#include "regionProperties.H"
-using namespace Foam;
-
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::solverTemplate::solverType
+>
+Foam::solverTemplate::solverTypeNames_
{
- template<>
- const char* Foam::NamedEnum<Foam::solverTemplate::solverType, 4>::names[] =
- {
- "compressible",
- "incompressible",
- "buoyant",
- "unknown"
- };
-}
-
-const Foam::NamedEnum<Foam::solverTemplate::solverType, 4>
- Foam::solverTemplate::solverTypeNames_;
+ { solverType::stCompressible, "compressible" },
+ { solverType::stIncompressible, "incompressible" },
+ { solverType::stBuoyant, "buoyant" },
+ { solverType::stUnknown, "unknown" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -261,7 +256,7 @@ Foam::solverTemplate::solverTemplate
Info<< "Selecting " << solverName << ": ";
- solverType_ = solverTypeNames_.read(solverDict.lookup("solverType"));
+ solverType_ = solverTypeNames_.lookup("solverType", solverDict);
Info<< solverTypeNames_[solverType_];
multiRegion_ = readBool(solverDict.lookup("multiRegion"));
@@ -366,7 +361,7 @@ bool Foam::solverTemplate::multiRegion() const
}
-label Foam::solverTemplate::nRegion() const
+Foam::label Foam::solverTemplate::nRegion() const
{
return regionTypes_.size();
}
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
index 26c9577f4c5fae9117b44e10fb32046ee1e7c185..89810575fca82c9333303c65c287dd716f137b1d 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
+++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
@@ -36,7 +36,7 @@ Description
#include "wordList.H"
#include "dimensionSet.H"
#include "IOobject.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,7 +65,7 @@ public:
};
//- Solver type names
- static const NamedEnum<solverType, 4> solverTypeNames_;
+ static const Enum<solverType> solverTypeNames_;
private:
diff --git a/applications/utilities/preProcessing/setAlphaField/Make/files b/applications/utilities/preProcessing/setAlphaField/Make/files
old mode 100755
new mode 100644
diff --git a/applications/utilities/preProcessing/setAlphaField/Make/options b/applications/utilities/preProcessing/setAlphaField/Make/options
old mode 100755
new mode 100644
diff --git a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
index 6fe8001e31d440e8a8d4e188c80308cd84d5be49..58fde7f78d84d99f2cf3b6f5b031204e7889590b 100644
--- a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
+++ b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
@@ -59,7 +59,12 @@ class shapeSelector
static const Foam::Enum<shapeType> shapeTypeNames;
};
-const Foam::Enum<shapeSelector::shapeType> shapeSelector::shapeTypeNames
+
+const Foam::Enum
+<
+ shapeSelector::shapeType
+>
+shapeSelector::shapeTypeNames
{
{ shapeSelector::shapeType::PLANE, "plane" },
{ shapeSelector::shapeType::SPHERE, "sphere" },
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
index 7857569be374ebfbc911c11675cf83554f4e7cdc..eb38f408b28655ec741f5da66435b6a1ae796f44 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
@@ -41,22 +41,16 @@ namespace Foam
dictionary
);
}
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::tabulatedWallFunctions::general::interpolationType,
- 1
- >::names[] =
- {
- "linear"
- };
-
}
-const
-Foam::NamedEnum<Foam::tabulatedWallFunctions::general::interpolationType, 1>
- Foam::tabulatedWallFunctions::general::interpolationTypeNames_;
+const Foam::Enum
+<
+ Foam::tabulatedWallFunctions::general::interpolationType
+>
+Foam::tabulatedWallFunctions::general::interpolationTypeNames_
+{
+ { interpolationType::itLinear, "linear" },
+};
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@@ -138,7 +132,7 @@ Foam::tabulatedWallFunctions::general::general
)
:
tabulatedWallFunction(dict, mesh, typeName),
- interpType_(interpolationTypeNames_[coeffDict_.lookup("interpType")]),
+ interpType_(interpolationTypeNames_.lookup("interpType", coeffDict_)),
yPlus_(),
uPlus_(),
log10YPlus_(coeffDict_.lookup("log10YPlus")),
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H
index c61cc356d6744bd4864e2e6b2901bdf5cc53efb7..fc3c7ead914343dc87f554e30b37aef4c14f899b 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.H
@@ -63,7 +63,7 @@ SourceFiles
#define general_H
#include "tabulatedWallFunction.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -91,7 +91,7 @@ public:
itLinear
};
- static const NamedEnum<interpolationType, 1> interpolationTypeNames_;
+ static const Enum<interpolationType> interpolationTypeNames_;
protected:
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
index b4d67de9e2e2efc5a4776fc0db601fd961a14fc3..2f6cfa09fc3da358710368b606520c094c9aef25 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
@@ -25,34 +25,27 @@ License
#include "tabulatedWallFunction.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace tabulatedWallFunctions
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-autoPtr<tabulatedWallFunction> tabulatedWallFunction::New
+Foam::autoPtr<Foam::tabulatedWallFunctions::tabulatedWallFunction>
+Foam::tabulatedWallFunctions::tabulatedWallFunction::New
(
const dictionary& dict,
const polyMesh& mesh
)
{
- word twfTypeName = dict.lookup("tabulatedWallFunction");
+ const word functionName = dict.lookup("tabulatedWallFunction");
- Info<< "Selecting tabulatedWallFunction " << twfTypeName << endl;
+ Info<< "Selecting tabulatedWallFunction " << functionName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(twfTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(functionName);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown tabulatedWallFunction type " << twfTypeName
+ << "Unknown tabulatedWallFunction type " << functionName
<< nl << nl << "Valid tabulatedWallFunction types are:" << nl
- << dictionaryConstructorTablePtr_->toc()
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -60,9 +53,4 @@ autoPtr<tabulatedWallFunction> tabulatedWallFunction::New
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace tabulatedWallFunctions
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 712ed6564e972dfc28a875731472ea045763d527..e97ab8154913440b60202339a7dcdee406bbe523 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
// From (name of) patch to compact 'zone' index
- HashTable<label> compactZoneID(1000);
+ HashTable<label> compactZoneID(1024);
// Mesh face and compact zone indx
DynamicList<label> faceLabels;
DynamicList<label> compactZones;
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
{
// Collect sizes. Hash on names to handle local-only patches (e.g.
// processor patches)
- HashTable<label> patchSize(1000);
+ HashTable<label> patchSize(1024);
label nFaces = 0;
forAllConstIter(labelHashSet, includePatches, iter)
{
@@ -247,7 +247,7 @@ int main(int argc, char *argv[])
nFaces += pp.size();
}
- HashTable<label> zoneSize(1000);
+ HashTable<label> zoneSize(1024);
forAllConstIter(labelHashSet, includeFaceZones, iter)
{
const faceZone& pp = fzm[iter.key()];
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
index a3dc719dc8e51ddd2fde7867aaccb489bf0413e8..67a47a6de3f990d58ab0dfa7fe9d38442a3f304d 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
@@ -64,15 +64,14 @@ Foam::searchableSurfaceModifier::New
const dictionary& dict
)
{
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(type);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(type);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown searchableSurfaceModifier type "
<< type << nl << nl
- << "Valid searchableSurfaceModifier types : " << endl
+ << "Valid searchableSurfaceModifier types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
index dca869faad8b730a8c23640bf521b69c386ed0ef..a17b6a033eb542f3c473f54e7397b5cdba1e2e4c 100755
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -39,8 +39,9 @@ usage: ${0##*/}
-foamVersion ver specify project version (eg, 1612)
-projectName name specify project directory name (eg, openfoam1612)
-archOption 32|64 specify 'WM_ARCH_OPTION' architecture option
+ -SP | -float32 specify 'WM_PRECISION_OPTION'
+ -DP | -float64 specify 'WM_PRECISION_OPTION'
-int32 | -int64 specify 'WM_LABEL_SIZE'
- -SP | -DP specify 'WM_PRECISION_OPTION'
-system name specify 'system' compiler to be used
-third name specify 'ThirdParty' compiler to be used
-boost ver specify 'boost_version'
@@ -63,7 +64,7 @@ usage: ${0##*/}
-scotch-path dir specify 'SCOTCH_ARCH_PATH' (eg, /opt/OpenFOAM-scotch_6.0.4)
-vtk ver specify 'vtk_version' (eg, VTK-7.1.0)
-mesa ver specify 'mesa_version' (eg, mesa-13.0.1)
- -sigfpe | -no-sigfpe activate/deactivate FOAM_SIGFPE handling
+ -sigfpe | -no-sigfpe [defunct - now under etc/controlDict]
gmp-VERSION for ThirdParty gcc (gmp-system for system library)
mpfr-VERSION for ThirdParty gcc (mpfr-system for system library)
mpc-VERSION for ThirdParty gcc (mpc-system for system library)
@@ -251,17 +252,22 @@ do
shift
;;
- -int32 | -int64)
- # Replace WM_LABEL_SIZE=...
- optionValue="${1#-int}"
- replace etc/bashrc WM_LABEL_SIZE "$optionValue"
+ -SP | -float32)
+ # Replace WM_PRECISION_OPTION=...
+ replace etc/bashrc WM_PRECISION_OPTION "SP"
adjusted=true
;;
- -SP | -DP)
+ -DP | -float64)
# Replace WM_PRECISION_OPTION=...
- optionValue="${1#-}"
- replace etc/bashrc WM_PRECISION_OPTION "$optionValue"
+ replace etc/bashrc WM_PRECISION_OPTION "DP"
+ adjusted=true
+ ;;
+
+ -int32 | -int64)
+ # Replace WM_LABEL_SIZE=...
+ optionValue="${1#-int}"
+ replace etc/bashrc WM_LABEL_SIZE "$optionValue"
adjusted=true
;;
@@ -471,20 +477,8 @@ do
adjusted=true
;;
- -sigfpe)
- # Enable FOAM_SIGFPE handling
- _inlineSed etc/bashrc \
- "[a-z][a-z]* FOAM_SIGFPE.*" \
- "export FOAM_SIGFPE=" \
- "Activate FOAM_SIGFPE handling"
- ;;
-
- -no-sigfpe)
- # Disable FOAM_SIGFPE handling
- _inlineSed etc/bashrc \
- "[a-z][a-z]* FOAM_SIGFPE.*" \
- "unset FOAM_SIGFPE" \
- "Deactivate FOAM_SIGFPE handling"
+ -sigfpe | -no-sigfpe)
+ echo "Enable/disable FOAM_SIGFPE now via controlDict" 1>&2
;;
*)
diff --git a/etc/bashrc b/etc/bashrc
index 2060a58690b5a838f05c950471bd2b0606ae9916..97c8152b33379af199a35700b5cb6b3f8fc053f6 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -96,13 +96,13 @@ export WM_MPLIB=SYSTEMOPENMPI
# WM_OSTYPE = POSIX
#export WM_OSTYPE=POSIX
-#- Floating-point signal handling:
-# set or unset
-export FOAM_SIGFPE=
+#- Alternative to 'trapFpe' controlDict entry
+# for floating-point exceptions (true|false)
+#export FOAM_SIGFPE=true
-#- memory initialisation:
-# set or unset
-#export FOAM_SETNAN=
+#- Alternative to 'setNaN' controlDict entry
+# for memory initialisation (true|false)
+#export FOAM_SETNAN=false
################################################################################
diff --git a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
index 14af1b9e48472ade3f43611e78cbd320a9489455..c637c7b4f7e6de70fa803347d19be954e9a6b993 100644
--- a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
+++ b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
@@ -16,11 +16,9 @@ FoamFile
extractionMethod extractFromSurface;
-extractFromSurfaceCoeffs
-{
- includedAngle 150;
- geometricTestOnly no;
-}
+includedAngle 150;
+
+geometricTestOnly no;
subsetFeatures
{
diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index c4df2b627e79ec357c4d6a4f0c8b1c0abeb912f7..e1e7fba8e1ebea4079808fad70d8465a7f0cc297 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -257,19 +257,7 @@ if ( "$FOAM_MPI" != dummy ) then
_foamAddLib ${FOAM_LIBBIN}/${FOAM_MPI}
endif
-
-# Minimum MPI buffer size (used by all except SGI MPI)
-if ( ! $?minBufferSize ) set minBufferSize=20000000
-if ( $?MPI_BUFFER_SIZE ) then
- if ( $MPI_BUFFER_SIZE < $minBufferSize ) then
- setenv MPI_BUFFER_SIZE $minBufferSize
- endif
-else
- setenv MPI_BUFFER_SIZE $minBufferSize
-endif
-
-# Cleanup environment
-# ~~~~~~~~~~~~~~~~~~~
-unset minBufferSize
+# Alternative to 'mpiBufferSize' controlDict entry
+#setenv MPI_BUFFER_SIZE 20000000
#------------------------------------------------------------------------------
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 4c663ce276fd5a33312c171ab1d42f25e4083464..9d22c3e700660c76c185abe48da83cacfeb675f9 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -274,18 +274,7 @@ then
_foamAddLib $FOAM_LIBBIN/$FOAM_MPI
fi
-
-# Minimum MPI buffer size (used by all except SGI MPI)
-: ${minBufferSize:=20000000}
-if [ "${MPI_BUFFER_SIZE:=$minBufferSize}" -lt $minBufferSize ]
-then
- MPI_BUFFER_SIZE=$minBufferSize
-fi
-export MPI_BUFFER_SIZE
-
-
-# Cleanup environment
-# ~~~~~~~~~~~~~~~~~~~
-unset minBufferSize
+# Alternative to 'mpiBufferSize' controlDict entry
+#export MPI_BUFFER_SIZE=20000000
#------------------------------------------------------------------------------
diff --git a/etc/controlDict b/etc/controlDict
index 72112b0ddcfd576deffabe02d66bfa39d49bdba1..2b435d1fe4c194454fa15e8c0f3775fe8bf5ce62 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -65,6 +65,11 @@ OptimisationSwitches
floatTransfer 0;
nProcsSimpleSum 0;
+ // MPI buffer size (bytes)
+ // Can override with the MPI_BUFFER_SIZE env variable.
+ // The default and minimum is (20000000).
+ mpiBufferSize 0;
+
// Optional max size (bytes) for unstructured data exchanges. In some
// phases of OpenFOAM it can send over very large data chunks
// (e.g. in parallel load balancing) and some Pstream implementations have
@@ -74,6 +79,14 @@ OptimisationSwitches
// global reduction, even if multi-pass is not needed)
maxCommsSize 0;
+ // Trap floating point exception.
+ // Can override with FOAM_SIGFPE (true|false)
+ trapFpe 1;
+
+ // Initialization malloced memory to NaN.
+ // Can override with FOAM_SETNAN (true|false)
+ setNaN 0;
+
// Force dumping (at next timestep) upon signal (-1 to disable)
writeNowSignal -1; // 10;
diff --git a/etc/cshrc b/etc/cshrc
index 3208ca0ac8efcfb40dcf48fd4ae7467ba58b4514..6c42ebdf61f1679c8c8fb9b347872e34d3477a4b 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -93,13 +93,13 @@ setenv WM_MPLIB SYSTEMOPENMPI
# WM_OSTYPE = POSIX
#setenv WM_OSTYPE POSIX
-#- Floating-point signal handling:
-# set or unset
-setenv FOAM_SIGFPE
+#- Alternative to 'trapFpe' controlDict entry
+# for floating-point exceptions (true|false)
+#setenv FOAM_SIGFPE true
-#- memory initialisation:
-# set or unset
-#setenv FOAM_SETNAN
+#- Alternative to 'setNaN' controlDict entry
+# for memory initialisation (true|false)
+#setenv FOAM_SETNAN false
################################################################################
diff --git a/etc/templates/closedVolume/system/surfaceFeatureExtractDict b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
index ba8a72f5d04240011e0189af266e5a3cdc9ae67b..a2642e67a3807acf7fb23398c3b20ada5c940b64 100644
--- a/etc/templates/closedVolume/system/surfaceFeatureExtractDict
+++ b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ CAD.obj
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 150;
- }
+ includedAngle 150;
subsetFeatures
{
diff --git a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
index ba8a72f5d04240011e0189af266e5a3cdc9ae67b..a2642e67a3807acf7fb23398c3b20ada5c940b64 100644
--- a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ CAD.obj
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 150;
- }
+ includedAngle 150;
subsetFeatures
{
diff --git a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
index ba8a72f5d04240011e0189af266e5a3cdc9ae67b..a2642e67a3807acf7fb23398c3b20ada5c940b64 100644
--- a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ CAD.obj
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 150;
- }
+ includedAngle 150;
subsetFeatures
{
diff --git a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C
index 20d6bc883143b23b2f20b3ef0039836a29ee3a39..f4cfc95a2f6016bf87f93fda9c7d9dc97e22cf76 100644
--- a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C
+++ b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C
@@ -33,18 +33,17 @@ Foam::autoPtr<Foam::ODESolver> Foam::ODESolver::New
const dictionary& dict
)
{
- word ODESolverTypeName(dict.lookup("solver"));
- Info<< "Selecting ODE solver " << ODESolverTypeName << endl;
+ const word solverType(dict.lookup("solver"));
+ Info<< "Selecting ODE solver " << solverType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(ODESolverTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(solverType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown ODESolver type "
- << ODESolverTypeName << nl << nl
- << "Valid ODESolvers are : " << endl
+ << solverType << nl << nl
+ << "Valid ODESolver types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index ff7deb7538a1f9f7c307c4f2212b7590c46146ae..bdab2431b727d70091132b8b1d96f236a4b8c0be 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -45,25 +45,22 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
- Foam::fileMonitor::fileStateNames_;
+const Foam::Enum
+<
+ Foam::fileMonitor::fileState
+>
+Foam::fileMonitor::fileStateNames_
+{
+ { fileState::UNMODIFIED, "unmodified" },
+ { fileState::MODIFIED, "modified" },
+ { fileState::DELETED, "deleted" },
+};
+
namespace Foam
{
defineTypeNameAndDebug(fileMonitor, 0);
- template<>
- const char* Foam::NamedEnum
- <
- Foam::fileMonitor::fileState,
- 3
- >::names[] =
- {
- "unmodified",
- "modified",
- "deleted"
- };
-
//- Reduction operator for PackedList of fileState
class reduceFileStates
{
diff --git a/src/OSspecific/POSIX/fileMonitor.H b/src/OSspecific/POSIX/fileMonitor.H
index 18e4ab05ff6266abf8b495ce121b398d46752587..6a9cc1245e638bcc8ba1869ec5a602d132ed9048 100644
--- a/src/OSspecific/POSIX/fileMonitor.H
+++ b/src/OSspecific/POSIX/fileMonitor.H
@@ -43,7 +43,7 @@ SourceFiles
#define fileMonitor_H
#include <sys/types.h>
-#include "NamedEnum.H"
+#include "Enum.H"
#include "className.H"
#include "DynamicList.H"
@@ -74,7 +74,7 @@ public:
DELETED = 2
};
- static const NamedEnum<fileState, 3> fileStateNames_;
+ static const Enum<fileState> fileStateNames_;
private:
// Private data
diff --git a/src/OSspecific/POSIX/regExp.C b/src/OSspecific/POSIX/regExp.C
index 95e70ece9d4280b80a7e2892836d33f2fd229d20..0f9cd7cb21cc95cd68c10dfe2af111d61215a3ee 100644
--- a/src/OSspecific/POSIX/regExp.C
+++ b/src/OSspecific/POSIX/regExp.C
@@ -77,38 +77,6 @@ bool Foam::regExp::matchGrouping
}
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::regExp::regExp()
-:
- preg_(nullptr)
-{}
-
-
-Foam::regExp::regExp(const char* pattern, bool ignoreCase)
-:
- preg_(nullptr)
-{
- set(pattern, ignoreCase);
-}
-
-
-Foam::regExp::regExp(const std::string& pattern, bool ignoreCase)
-:
- preg_(nullptr)
-{
- set(pattern.c_str(), ignoreCase);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::regExp::~regExp()
-{
- clear();
-}
-
-
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::regExp::set(const char* pattern, bool ignoreCase)
diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp.H
index 640f6a819e1566374c312a1fc5910b4e4dafa296..1f82552d07fb177946ed575a953fefc3a52f72b4 100644
--- a/src/OSspecific/POSIX/regExp.H
+++ b/src/OSspecific/POSIX/regExp.H
@@ -77,7 +77,7 @@ class regExp
//- Return true if it matches and sets the sub-groups matched.
bool matchGrouping
(
- const std::string&,
+ const std::string& text,
List<std::string>& groups
) const;
@@ -99,17 +99,23 @@ public:
// Constructors
//- Construct null
- regExp();
+ inline regExp();
+
+ //- Construct from character array
+ inline explicit regExp(const char* pattern);
+
+ //- Construct from string
+ inline explicit regExp(const std::string& pattern);
//- Construct from character array, optionally ignore case
- regExp(const char* pattern, bool ignoreCase=false);
+ inline regExp(const char* pattern, bool ignoreCase);
//- Construct from string, optionally ignore case
- regExp(const std::string& pattern, bool ignoreCase=false);
+ inline regExp(const std::string& pattern, bool ignoreCase);
//- Destructor
- ~regExp();
+ inline ~regExp();
// Member functions
@@ -143,20 +149,20 @@ public:
// Matching/Searching
- //- Find position within string.
- // \Return The index where it begins or string::npos if not found
+ //- Find position within the text.
+ // \return The index where it begins or string::npos if not found
std::string::size_type find(const std::string& text) const;
- //- Return true if it matches the entire string
+ //- True if the regex matches the entire text.
// The begin-of-line (^) and end-of-line ($) anchors are implicit
bool match(const std::string& text) const;
- //- Return true if it matches and sets the sub-groups matched
+ //- True if the regex matches the text, set the sub-groups matched.
// The begin-of-line (^) and end-of-line ($) anchors are implicit
bool match(const std::string& text, List<std::string>& groups) const;
- //- Return true if the regex was found within string
- bool search(const std::string& text) const;
+ //- Return true if the regex was found within the text
+ inline bool search(const std::string& text) const;
// Member Operators
diff --git a/src/OSspecific/POSIX/regExpI.H b/src/OSspecific/POSIX/regExpI.H
index e33564e611a8e79b8225a2a1f83aad2bb8e2bd51..7302e02410bd8486372eca38d07dc6bda55faf04 100644
--- a/src/OSspecific/POSIX/regExpI.H
+++ b/src/OSspecific/POSIX/regExpI.H
@@ -38,6 +38,54 @@ inline bool Foam::regExp::meta(const char c)
}
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+inline Foam::regExp::regExp()
+:
+ preg_(nullptr)
+{}
+
+
+inline Foam::regExp::regExp(const char* pattern)
+:
+ preg_(nullptr)
+{
+ set(pattern, false);
+}
+
+
+inline Foam::regExp::regExp(const std::string& pattern)
+:
+ preg_(nullptr)
+{
+ set(pattern, false);
+}
+
+
+inline Foam::regExp::regExp(const char* pattern, bool ignoreCase)
+:
+ preg_(nullptr)
+{
+ set(pattern, ignoreCase);
+}
+
+
+inline Foam::regExp::regExp(const std::string& pattern, bool ignoreCase)
+:
+ preg_(nullptr)
+{
+ set(pattern, ignoreCase);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+inline Foam::regExp::~regExp()
+{
+ clear();
+}
+
+
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
inline bool Foam::regExp::empty() const
diff --git a/src/OSspecific/POSIX/signals/sigFpe.C b/src/OSspecific/POSIX/signals/sigFpe.C
index 609de778abb8337264aa87aa45489d15d74786de..513a6d6d369e2dee6f528948146480d8c7949c3e 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.C
+++ b/src/OSspecific/POSIX/signals/sigFpe.C
@@ -28,6 +28,7 @@ License
#include "JobInfo.H"
#include "OSspecific.H"
#include "IOstreams.H"
+#include "Switch.H"
#ifdef LINUX_GNUC
#ifndef __USE_GNU
@@ -43,17 +44,41 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+bool Foam::sigFpe::switchFpe_(Foam::debug::optimisationSwitch("trapFpe", 0));
+bool Foam::sigFpe::switchNan_(Foam::debug::optimisationSwitch("setNaN", 0));
+
+bool Foam::sigFpe::sigActive_ = false;
+bool Foam::sigFpe::mallocNanActive_ = false;
+
struct sigaction Foam::sigFpe::oldAction_;
-bool Foam::sigFpe::sigFpeActive_ = false;
+
+// File-scope function.
+// Controlled by env variable containing a bool (true|false|on|off ...)
+// or by the specified flag
+static bool isTrue(const char* envName, const bool flag)
+{
+ const std::string str = Foam::getEnv(envName);
+
+ if (str.size())
+ {
+ Foam::Switch sw(str, true); // silently ignore bad input
+ if (sw.valid())
+ {
+ return sw;
+ }
+ }
+
+ // Env was not set or did not contain a valid bool value
+ return flag;
+}
+
void Foam::sigFpe::fillNan(UList<scalar>& lst)
{
lst = std::numeric_limits<scalar>::signaling_NaN();
}
-bool Foam::sigFpe::mallocNanActive_ = false;
-
#ifdef LINUX
extern "C"
@@ -128,9 +153,15 @@ Foam::sigFpe::~sigFpe()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+bool Foam::sigFpe::requested()
+{
+ return isTrue("FOAM_SIGFPE", switchFpe_);
+}
+
+
void Foam::sigFpe::set(const bool verbose)
{
- if (!sigFpeActive_ && env("FOAM_SIGFPE"))
+ if (!sigActive_ && requested())
{
bool supported = false;
@@ -155,7 +186,7 @@ void Foam::sigFpe::set(const bool verbose)
<< abort(FatalError);
}
- sigFpeActive_ = true;
+ sigActive_ = true;
#elif defined(sgiN32) || defined(sgiN32Gcc)
supported = true;
@@ -179,28 +210,28 @@ void Foam::sigFpe::set(const bool verbose)
nullptr
);
- sigFpeActive_ = true;
+ sigActive_ = true;
#endif
if (verbose)
{
+ Info<< "trapFpe: Floating point exception trapping ";
+
if (supported)
{
- Info<< "sigFpe : Enabling floating point exception trapping"
- << " (FOAM_SIGFPE)." << endl;
+ Info<< "enabled (FOAM_SIGFPE)." << endl;
}
else
{
- Info<< "sigFpe : Floating point exception trapping"
- << " - not supported on this platform" << endl;
+ Info<< "- not supported on this platform" << endl;
}
}
}
- if (env("FOAM_SETNAN"))
+ if (isTrue("FOAM_SETNAN", switchNan_))
{
#ifdef LINUX
mallocNanActive_ = true;
@@ -208,15 +239,15 @@ void Foam::sigFpe::set(const bool verbose)
if (verbose)
{
+ Info<< "setNaN : Initialise allocated memory to NaN ";
+
if (mallocNanActive_)
{
- Info<< "SetNaN : Initialising allocated memory to NaN"
- << " (FOAM_SETNAN)." << endl;
+ Info<< "enabled (FOAM_SETNAN)." << endl;
}
else
{
- Info<< "SetNaN : Initialise allocated memory to NaN"
- << " - not supported on this platform" << endl;
+ Info<< " - not supported on this platform" << endl;
}
}
}
@@ -227,7 +258,7 @@ void Foam::sigFpe::unset(const bool verbose)
{
#ifdef LINUX_GNUC
// Reset signal
- if (sigFpeActive_)
+ if (sigActive_)
{
if (verbose)
{
@@ -256,7 +287,7 @@ void Foam::sigFpe::unset(const bool verbose)
<< "Cannot reset SIGFPE trapping"
<< abort(FatalError);
}
- sigFpeActive_ = false;
+ sigActive_ = false;
}
#endif
diff --git a/src/OSspecific/POSIX/signals/sigFpe.H b/src/OSspecific/POSIX/signals/sigFpe.H
index a4473825bb164cb86d20b184e5586ba5fe4f769a..fe1c49b6384a4d5aa9ad4ab630247f307a889932 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.H
+++ b/src/OSspecific/POSIX/signals/sigFpe.H
@@ -27,17 +27,24 @@ Class
Description
Set up trapping for floating point exceptions (signal FPE).
- Controlled by two env vars:
- - \par FOAM_SIGFPE
- Exception trapping
- - \par FOAM_SETNAN
- Initialization of all malloced memory to NaN. If FOAM_SIGFPE
- also set, this will cause usage of uninitialized scalars to trigger
- an abort.
-
- Can be used either directly through the static member functions or
- through the scope of the object (constructor sets trapping; destructor
- restores original).
+ Defined by controlDict InfoSwitch entries:
+ - \par trapFpe
+ Enable floating point exception trapping.
+
+ - \par setNaN
+ Initialization all malloced memory to NaN.
+ Combined with \c trapFpe, this causes usage of uninitialized scalars
+ to trigger an abort.
+
+ Environment variables:
+ - \par FOAM_SIGFPE (true|false)
+ overrides \c trapFpe
+ - \par FOAM_SETNAN (true|false)
+ overrides \c setNaN
+
+ Note that trapping can be set/removed through the static member functions
+ or through the scope of the object (constructor sets trapping; destructor
+ restores original). The class behaves as a singleton.
SourceFiles
sigFpe.C
@@ -73,12 +80,20 @@ class sigFpe
{
// Private data
+ //- Flag that floating point trapping should be used.
+ // Can override with FOAM_SIGFPE env variable
+ static bool switchFpe_;
+
+ //- Flag that NaN initialisation should be used.
+ // Can override with FOAM_SETNAN env variable
+ static bool switchNan_;
+
+ //- Flag to indicate floating point trapping is currently active
+ static bool sigActive_;
+
//- Saved old signal trapping setting
static struct sigaction oldAction_;
- //- Flag to indicate floating point trapping is enabled
- static bool sigFpeActive_;
-
// Static data members
@@ -90,6 +105,11 @@ class sigFpe
public:
+ // Public data
+
+ //- Flag to indicate mallocNan is enabled
+ static bool mallocNanActive_;
+
// Constructors
@@ -103,6 +123,11 @@ public:
// Member functions
+ //- Check if SIGFPE signals handler is to be enabled.
+ // This is controlled by the trapFpe entry or the FOAM_SIGFPE
+ // environment variable
+ static bool requested();
+
//- Activate SIGFPE signal handler when FOAM_SIGFPE is %set
// Fill memory with NaN when FOAM_SETNAN is %set
static void set(const bool verbose);
@@ -110,16 +135,13 @@ public:
//- Deactivate SIGFPE signal handler and NaN memory initialisation
static void unset(const bool verbose);
- //- Flag to indicate mallocNan is enabled
- static bool mallocNanActive_;
-
#ifdef LINUX
//- Malloc function which initializes to NaN
static void* mallocNan(size_t size);
#endif
//- Fill block of data with NaN
- static void fillNan(UList<scalar>&);
+ static void fillNan(UList<scalar>& lst);
};
diff --git a/src/OSspecific/POSIX/signals/sigQuit.C b/src/OSspecific/POSIX/signals/sigQuit.C
index 9b0a7443f044643e98ae16bd31d7e3ad5da27e6a..b8352dd83237c015c31ade40a6592d69e01ebd33 100644
--- a/src/OSspecific/POSIX/signals/sigQuit.C
+++ b/src/OSspecific/POSIX/signals/sigQuit.C
@@ -86,7 +86,7 @@ void Foam::sigQuit::set(const bool verbose)
if (sigaction(SIGQUIT, &newAction, &oldAction_) < 0)
{
FatalErrorInFunction
- << "Cannot call sigQuit::set() more than once"
+ << "Cannot call more than once"
<< abort(FatalError);
}
sigActive_ = true;
@@ -100,9 +100,9 @@ void Foam::sigQuit::unset(const bool)
{
if (sigaction(SIGQUIT, &oldAction_, nullptr) < 0)
{
- FatalErrorInFunction
- << "Cannot set SIGQUIT trapping"
- << abort(FatalError);
+ FatalErrorInFunction
+ << "Cannot unset SIGQUIT trapping"
+ << abort(FatalError);
}
sigActive_ = false;
}
diff --git a/src/OSspecific/POSIX/signals/sigSegv.C b/src/OSspecific/POSIX/signals/sigSegv.C
index 188c24495a39645993c09e49811edf24ad4c8129..27cf6678845148e6ce4c6985787c6b067fdef3b0 100644
--- a/src/OSspecific/POSIX/signals/sigSegv.C
+++ b/src/OSspecific/POSIX/signals/sigSegv.C
@@ -86,7 +86,7 @@ void Foam::sigSegv::set(const bool)
if (sigaction(SIGSEGV, &newAction, &oldAction_) < 0)
{
FatalErrorInFunction
- << "Cannot call sigSegv::set() more than once"
+ << "Cannot call more than once"
<< abort(FatalError);
}
sigActive_ = true;
@@ -101,7 +101,7 @@ void Foam::sigSegv::unset(const bool)
if (sigaction(SIGSEGV, &oldAction_, nullptr) < 0)
{
FatalErrorInFunction
- << "Cannot set SIGSEGV trapping"
+ << "Cannot unset SIGSEGV trapping"
<< abort(FatalError);
}
sigActive_ = false;
diff --git a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
index 9808f91c113db1755a0a2e249a2a447529a5017e..1198daa6ad728786b485fd6b16069e83caf456f1 100644
--- a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
@@ -78,7 +78,6 @@ addstopAtWriteNowSignalToOpt addstopAtWriteNowSignalToOpt_
Foam::Time const* Foam::sigStopAtWriteNow::runTimePtr_ = nullptr;
-
struct sigaction Foam::sigStopAtWriteNow::oldAction_;
@@ -109,7 +108,8 @@ void Foam::sigStopAtWriteNow::sigHandler(int)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::sigStopAtWriteNow::sigStopAtWriteNow(){}
+Foam::sigStopAtWriteNow::sigStopAtWriteNow()
+{}
Foam::sigStopAtWriteNow::sigStopAtWriteNow
diff --git a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H
index bf83a350d7809777417765321f8164cc9a934657..22510310be5f3327f3959715ab93616f8ec1d023 100644
--- a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H
+++ b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.H
@@ -67,6 +67,7 @@ class sigStopAtWriteNow
// Private Member Functions
+ //- Handler for caught signals
static void sigHandler(int);
diff --git a/src/OSspecific/POSIX/signals/sigWriteNow.C b/src/OSspecific/POSIX/signals/sigWriteNow.C
index c226ff6e1f5d2dd832659ac1603b8f26b61b6b72..01d13cfddf5d0e3477d16aa21c6a0446659ef553 100644
--- a/src/OSspecific/POSIX/signals/sigWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigWriteNow.C
@@ -33,13 +33,13 @@ License
namespace Foam
{
-
// Signal number to catch
int sigWriteNow::signal_
(
debug::optimisationSwitch("writeNowSignal", -1)
);
+
// Register re-reader
class addwriteNowSignalToOpt
:
@@ -75,7 +75,6 @@ addwriteNowSignalToOpt addwriteNowSignalToOpt_("writeNowSignal");
Foam::Time* Foam::sigWriteNow::runTimePtr_ = nullptr;
-
struct sigaction Foam::sigWriteNow::oldAction_;
diff --git a/src/OSspecific/POSIX/signals/sigWriteNow.H b/src/OSspecific/POSIX/signals/sigWriteNow.H
index 67506f7fa29b505e73cedd56583e962dd1265e9a..12fa7c313188df80a42217db02b5ff70581a3a4d 100644
--- a/src/OSspecific/POSIX/signals/sigWriteNow.H
+++ b/src/OSspecific/POSIX/signals/sigWriteNow.H
@@ -66,6 +66,7 @@ class sigWriteNow
// Private Member Functions
+ //- Handler for caught signals
static void sigHandler(int);
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index f95dc85741bbcb8bb740606b61ea57a538c00f11..91781cff7c8659635fb4735ee8c6d91cdaa331a3 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -123,6 +123,7 @@ $(ranges)/labelRange/labelRange.C
$(ranges)/labelRange/labelRanges.C
$(ranges)/scalarRange/scalarRange.C
$(ranges)/scalarRange/scalarRanges.C
+$(ranges)/tableBounds/tableBounds.C
spatialVectorAlgebra = primitives/spatialVectorAlgebra
$(spatialVectorAlgebra)/SpatialVector/spatialVector/spatialVector.C
diff --git a/src/OpenFOAM/algorithms/indexedOctree/volumeType.C b/src/OpenFOAM/algorithms/indexedOctree/volumeType.C
index 1bb1356b9670d1deefb5ed23b398bb559ffef36d..beabdfb61472381eef6f015961f453f28d693c8b 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/volumeType.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/volumeType.C
@@ -27,23 +27,17 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::volumeType
+>
+Foam::volumeType::names
{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::volumeType,
- 4
- >::names[] =
- {
- "unknown",
- "mixed",
- "inside",
- "outside"
- };
-}
-
-const Foam::NamedEnum<Foam::volumeType, 4> Foam::volumeType::names;
+ { type::UNKNOWN, "unknown" },
+ { type::MIXED, "mixed" },
+ { type::INSIDE, "inside" },
+ { type::OUTSIDE, "outside" },
+};
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/algorithms/indexedOctree/volumeType.H b/src/OpenFOAM/algorithms/indexedOctree/volumeType.H
index 3d845c414bef3fda5df79c57cb64d471f2dd3218..56c6c93f2e2c5957d40cb5c11bb231ee63d1364a 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/volumeType.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/volumeType.H
@@ -34,7 +34,7 @@ SourceFiles
#ifndef volumeType_H
#define volumeType_H
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,8 +44,8 @@ namespace Foam
// Forward declaration of friend functions and operators
class volumeType;
-Istream& operator>>(Istream& is, volumeType&);
-Ostream& operator<<(Ostream& os, const volumeType& C);
+Istream& operator>>(Istream& is, volumeType& vt);
+Ostream& operator<<(Ostream& os, const volumeType& vt);
/*---------------------------------------------------------------------------*\
@@ -65,6 +65,9 @@ public:
OUTSIDE = 3
};
+ // Static data
+ static const Enum<volumeType> names;
+
private:
@@ -76,11 +79,6 @@ private:
public:
- // Static data
-
- static const NamedEnum<volumeType, 4> names;
-
-
// Constructors
//- Construct null
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
index a6f960db6e76cb756f9e07e4248914fd025710dd..992ffd287aabf8b8fe99591a31e84e195141138f 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
@@ -50,7 +50,7 @@ Foam::Distribution<Type>::Distribution(const Type& binWidth)
template<class Type>
Foam::Distribution<Type>::Distribution(const Distribution<Type>& d)
:
- List<List<scalar>>(static_cast<const List<List<scalar>>& >(d)),
+ List<List<scalar>>(static_cast<const List<List<scalar>>&>(d)),
binWidth_(d.binWidth()),
listStarts_(d.listStarts())
{}
@@ -603,7 +603,7 @@ Foam::Ostream& Foam::operator<<
const Distribution<Type>& d
)
{
- os << static_cast<const List<List<scalar>>& >(d)
+ os << static_cast<const List<List<scalar>>&>(d)
<< d.binWidth_ << token::SPACE
<< d.listStarts_;
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 5953185baa4d13f824c8907158241cfb39d701b3..60734683a4c1f5ea0f7c0aaed3e5d18031217418 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -32,37 +32,32 @@ License
namespace Foam
{
defineTypeNameAndDebug(IOobject, 0);
-
- template<>
- const char* NamedEnum
- <
- IOobject::fileCheckTypes,
- 4
- >::names[] =
- {
- "timeStamp",
- "timeStampMaster",
- "inotify",
- "inotifyMaster"
- };
}
+const Foam::Enum
+<
+ Foam::IOobject::fileCheckTypes
+>
+Foam::IOobject::fileCheckTypesNames
+{
+ { fileCheckTypes::timeStamp, "timeStamp" },
+ { fileCheckTypes::timeStampMaster, "timeStampMaster" },
+ { fileCheckTypes::inotify, "inotify" },
+ { fileCheckTypes::inotifyMaster, "inotifyMaster" },
+};
-const Foam::NamedEnum<Foam::IOobject::fileCheckTypes, 4>
- Foam::IOobject::fileCheckTypesNames;
// Default fileCheck type
Foam::IOobject::fileCheckTypes Foam::IOobject::fileModificationChecking
(
- fileCheckTypesNames.read
+ fileCheckTypesNames.lookup
(
- debug::optimisationSwitches().lookup
- (
- "fileModificationChecking"
- )
+ "fileModificationChecking",
+ debug::optimisationSwitches()
)
);
+
namespace Foam
{
// Register re-reader
@@ -100,6 +95,17 @@ namespace Foam
}
+// file-scope
+//
+// A file is 'outside' of the case if it has been specified using an
+// absolute path (starts with '/')
+//
+static inline bool isOutsideOfCase(const std::string& file)
+{
+ return !file.empty() && file[0] == '/';
+}
+
+
// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
// Return components following the IOobject requirements
@@ -109,10 +115,10 @@ namespace Foam
// ----- ------
// "foo" ("", "", "foo")
// "foo/bar" ("foo", "", "bar")
-// "/XXX/bar" ("/XXX", "", "bar")
// "foo/bar/" ERROR - no name
// "foo/xxx/bar" ("foo", "xxx", "bar")
// "foo/xxx/yyy/bar" ("foo", "xxx/yyy", "bar")
+// "/xxx/yyy/bar" ("/xxx/yyy", "", "bar")
bool Foam::IOobject::fileNameComponents
(
const fileName& path,
@@ -125,7 +131,7 @@ bool Foam::IOobject::fileNameComponents
local.clear();
name.clear();
- // called with directory
+ // Called with directory
if (isDir(path))
{
WarningInFunction
@@ -134,44 +140,49 @@ bool Foam::IOobject::fileNameComponents
return false;
}
- if (path.isAbsolute())
+ const auto first = path.find('/');
+ const auto last = path.rfind('/');
+
+ // The raw length of name (without validating for word chars)
+ auto nameLen = path.size();
+
+ if (first == std::string::npos)
+ {
+ // No '/' found (or empty entirely)
+ // => no instance or local
+
+ name = word::validated(path, false);
+ }
+ else if (first == 0)
{
- string::size_type last = path.rfind('/');
+ // Absolute path (starts with '/')
+ // => no local
+
instance = path.substr(0, last);
- // Check afterwards
- name.string::operator=(path.substr(last+1));
+ const std::string ending = path.substr(last+1);
+ nameLen = ending.size(); // The raw length of name
+ name = word::validated(ending, false);
}
else
{
- string::size_type first = path.find('/');
+ // Normal case.
+ // First part is instance, remainder is local
+ instance = path.substr(0, first);
- if (first == string::npos)
+ if (last > first)
{
- // no '/' found - no instance or local
-
- // check afterwards
- name.string::operator=(path);
+ // With local
+ local = path.substr(first+1, last-first-1);
}
- else
- {
- instance = path.substr(0, first);
-
- string::size_type last = path.rfind('/');
- if (last > first)
- {
- // with local
- local = path.substr(first+1, last-first-1);
- }
- // check afterwards
- name.string::operator=(path.substr(last+1));
- }
+ const std::string ending = path.substr(last+1);
+ nameLen = ending.size(); // The raw length of name
+ name = word::validated(ending, false);
}
-
// Check for valid (and stripped) name, regardless of the debug level
- if (name.empty() || string::stripInvalid<word>(name))
+ if (!nameLen || nameLen != name.size())
{
WarningInFunction
<< "has invalid word for name: \"" << name
@@ -351,6 +362,12 @@ const Foam::Time& Foam::IOobject::time() const
}
+const Foam::fileName& Foam::IOobject::rootPath() const
+{
+ return time().rootPath();
+}
+
+
const Foam::fileName& Foam::IOobject::caseName() const
{
return time().caseName();
@@ -359,24 +376,24 @@ const Foam::fileName& Foam::IOobject::caseName() const
Foam::word Foam::IOobject::group() const
{
- word::size_type i = name_.find_last_of('.');
+ const auto i = name_.rfind('.');
- if (i == word::npos || i == 0)
+ if (i == std::string::npos || i == 0)
{
return word::null;
}
else
{
- return name_.substr(i+1, word::npos);
+ return name_.substr(i+1);
}
}
Foam::word Foam::IOobject::member() const
{
- word::size_type i = name_.find_last_of('.');
+ const auto i = name_.rfind('.');
- if (i == word::npos || i == 0)
+ if (i == std::string::npos || i == 0)
{
return name_;
}
@@ -387,15 +404,9 @@ Foam::word Foam::IOobject::member() const
}
-const Foam::fileName& Foam::IOobject::rootPath() const
-{
- return time().rootPath();
-}
-
-
Foam::fileName Foam::IOobject::path() const
{
- if (instance().isAbsolute())
+ if (isOutsideOfCase(instance()))
{
return instance();
}
@@ -419,9 +430,9 @@ Foam::fileName Foam::IOobject::path
Foam::fileName Foam::IOobject::localFilePath(const bool search) const
{
- if (instance().isAbsolute())
+ if (isOutsideOfCase(instance()))
{
- fileName objectPath = instance()/name();
+ const fileName objectPath = instance()/name();
if (isFile(objectPath))
{
@@ -434,8 +445,8 @@ Foam::fileName Foam::IOobject::localFilePath(const bool search) const
}
else
{
- fileName path = this->path();
- fileName objectPath = path/name();
+ const fileName path = this->path();
+ const fileName objectPath = path/name();
if (isFile(objectPath))
{
@@ -445,14 +456,14 @@ Foam::fileName Foam::IOobject::localFilePath(const bool search) const
{
if (!isDir(path) && search)
{
- word newInstancePath = time().findInstancePath
+ const word newInstancePath = time().findInstancePath
(
instant(instance())
);
if (newInstancePath.size())
{
- fileName fName
+ const fileName fName
(
rootPath()/caseName()
/newInstancePath/db_.dbDir()/local()/name()
@@ -473,9 +484,9 @@ Foam::fileName Foam::IOobject::localFilePath(const bool search) const
Foam::fileName Foam::IOobject::globalFilePath(const bool search) const
{
- if (instance().isAbsolute())
+ if (isOutsideOfCase(instance()))
{
- fileName objectPath = instance()/name();
+ const fileName objectPath = instance()/name();
if (isFile(objectPath))
{
if (objectRegistry::debug)
@@ -497,8 +508,8 @@ Foam::fileName Foam::IOobject::globalFilePath(const bool search) const
}
else
{
- fileName path = this->path();
- fileName objectPath = path/name();
+ const fileName path = this->path();
+ const fileName objectPath = path/name();
if (isFile(objectPath))
{
@@ -521,7 +532,7 @@ Foam::fileName Foam::IOobject::globalFilePath(const bool search) const
{
// Constant & system can come from global case
- fileName parentObjectPath =
+ const fileName parentObjectPath =
rootPath()/time().globalCaseName()
/instance()/db().dbDir()/local()/name();
@@ -539,14 +550,14 @@ Foam::fileName Foam::IOobject::globalFilePath(const bool search) const
// Check for approximately same (local) time
if (!isDir(path) && search)
{
- word newInstancePath = time().findInstancePath
+ const word newInstancePath = time().findInstancePath
(
instant(instance())
);
if (newInstancePath.size())
{
- fileName fName
+ const fileName fName
(
rootPath()/caseName()
/newInstancePath/db().dbDir()/local()/name()
@@ -591,10 +602,8 @@ Foam::Istream* Foam::IOobject::objectStream(const fileName& fName)
return nullptr;
}
}
- else
- {
- return nullptr;
- }
+
+ return nullptr;
}
@@ -617,6 +626,8 @@ void Foam::IOobject::setBad(const string& s)
}
+// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
+
void Foam::IOobject::operator=(const IOobject& io)
{
name_ = io.name_;
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index b08b3bb66179314b7281c70b971ff4241512fba5..567511f6ab1029669d2a36d403e0fa5c79e68b67 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -76,7 +76,7 @@ SourceFiles
#include "typeInfo.H"
#include "autoPtr.H"
#include "InfoProxy.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -129,7 +129,7 @@ public:
inotifyMaster
};
- static const NamedEnum<fileCheckTypes, 4> fileCheckTypesNames;
+ static const Enum<fileCheckTypes> fileCheckTypesNames;
private:
@@ -191,6 +191,12 @@ public:
TypeName("IOobject");
+ // Static data members
+
+ //- Type of file modification checking
+ static fileCheckTypes fileModificationChecking;
+
+
// Static Member Functions
//- Split path into instance, local, name components
@@ -202,11 +208,9 @@ public:
word& name
);
- template<class Name>
- static inline word groupName(Name name, const word& group);
-
- //- Type of file modification checking
- static fileCheckTypes fileModificationChecking;
+ //- Create dot-delimited name.group
+ template<class StringType>
+ static inline word groupName(StringType name, const word& group);
// Constructors
@@ -280,214 +284,162 @@ public:
// Member Functions
- // General access
+ // General access
+
+ //- Return the local objectRegistry
+ const objectRegistry& db() const;
+
+ //- Return time
+ const Time& time() const;
+
+ //- Return name
+ inline const word& name() const;
+
+ //- Return name of the class name read from header
+ inline const word& headerClassName() const;
+
+ //- Return the optional note
+ inline const string& note() const;
+
+ //- Return non-constant access to the optional note
+ inline string& note();
+
+ //- Rename
+ virtual void rename(const word& newName)
+ {
+ name_ = newName;
+ }
+
+ //- Register object created from this IOobject with registry if true
+ inline bool registerObject() const;
+
+ //- Register object created from this IOobject with registry if true
+ inline bool& registerObject();
+
+ //- Is object same for all processors
+ inline bool globalObject() const;
+
+ //- Is object same for all processors
+ inline bool& globalObject();
+
+
+ // Read/write options
- //- Return time
- const Time& time() const;
+ //- The read option
+ inline readOption readOpt() const;
- //- Return the local objectRegistry
- const objectRegistry& db() const;
+ //- Non-constant access to the read option
+ inline readOption& readOpt();
- //- Return name
- const word& name() const
- {
- return name_;
- }
+ //- The write option
+ inline writeOption writeOpt() const;
- //- Return name of the class name read from header
- const word& headerClassName() const
- {
- return headerClassName_;
- }
-
- //- Return non-constant access to the optional note
- string& note()
- {
- return note_;
- }
-
- //- Return the optional note
- const string& note() const
- {
- return note_;
- }
-
- //- Rename
- virtual void rename(const word& newName)
- {
- name_ = newName;
- }
-
- //- Register object created from this IOobject with registry if true
- bool& registerObject()
- {
- return registerObject_;
- }
-
- //- Register object created from this IOobject with registry if true
- bool registerObject() const
- {
- return registerObject_;
- }
-
- //- Is object same for all processors
- bool& globalObject()
- {
- return globalObject_;
- }
-
- //- Is object same for all processors
- bool globalObject() const
- {
- return globalObject_;
- }
-
-
- // Read/write options
-
- readOption readOpt() const
- {
- return rOpt_;
- }
-
- readOption& readOpt()
- {
- return rOpt_;
- }
-
- writeOption writeOpt() const
- {
- return wOpt_;
- }
-
- writeOption& writeOpt()
- {
- return wOpt_;
- }
+ //- Non-constant access to the write option
+ inline writeOption& writeOpt();
- // Path components
-
- //- Return group (extension part of name)
- word group() const;
-
- //- Return member (name without the extension)
- word member() const;
+ // Path components
- const fileName& rootPath() const;
+ //- Return group (extension part of name)
+ word group() const;
- const fileName& caseName() const;
+ //- Return member (name without the extension)
+ word member() const;
- const fileName& instance() const
- {
- return instance_;
- }
-
- fileName& instance()
- {
- return instance_;
- }
+ const fileName& rootPath() const;
- const fileName& local() const
- {
- return local_;
- }
+ const fileName& caseName() const;
- //- Return complete path
- fileName path() const;
+ inline const fileName& instance() const;
- //- Return complete path with alternative instance and local
- fileName path
- (
- const word& instance,
- const fileName& local = fileName::null
- ) const;
+ inline fileName& instance();
- //- Return complete path + object name
- fileName objectPath() const
- {
- return path()/name();
- }
+ inline const fileName& local() const;
- //- Helper for filePath that searches locally.
- // When search is false, simply use the current instance,
- // otherwise search previous instances.
- fileName localFilePath(const bool search=true) const;
+ //- Return complete path
+ fileName path() const;
- //- Helper for filePath that searches up if in parallel
- // When search is false, simply use the current instance,
- // otherwise search previous instances.
- fileName globalFilePath(const bool search=true) const;
+ //- Return complete path with alternative instance and local
+ fileName path
+ (
+ const word& instance,
+ const fileName& local = fileName::null
+ ) const;
+
+ //- Return complete path + object name
+ inline fileName objectPath() const;
+
+ //- Helper for filePath that searches locally.
+ // When search is false, simply use the current instance,
+ // otherwise search previous instances.
+ fileName localFilePath(const bool search=true) const;
+ //- Helper for filePath that searches up if in parallel
+ // When search is false, simply use the current instance,
+ // otherwise search previous instances.
+ fileName globalFilePath(const bool search=true) const;
- // Reading
- //- Read header
- bool readHeader(Istream&);
+ // Reading
- //- Read header (uses typeFilePath to find file) and check its info.
- // Optionally checks headerClassName against the type-name.
- // When search is false, simply use the current instance,
- // otherwise search previous instances.
- template<class Type>
- bool typeHeaderOk
- (
- const bool checkType = true,
- const bool search = true
- );
+ //- Read header
+ bool readHeader(Istream& is);
- //- Helper: warn that type does not support re-reading
- template<class Type>
- void warnNoRereading() const;
+ //- Read header (uses typeFilePath to find file) and check its info.
+ // Optionally checks headerClassName against the type-name.
+ // When search is false, simply use the current instance,
+ // otherwise search previous instances.
+ template<class Type>
+ bool typeHeaderOk
+ (
+ const bool checkType = true,
+ const bool search = true
+ );
- // Writing
+ //- Helper: warn that type does not support re-reading
+ template<class Type>
+ void warnNoRereading() const;
- //- Write the standard OpenFOAM file/dictionary banner
- // Optionally without -*- C++ -*- editor hint (eg, for logs)
- template<class Stream>
- static inline Stream& writeBanner(Stream& os, bool noHint=false);
- //- Write the standard file section divider
- template<class Stream>
- static inline Stream& writeDivider(Stream& os);
+ // Writing
- //- Write the standard end file divider
- template<class Stream>
- static inline Stream& writeEndDivider(Stream& os);
+ //- Write the standard OpenFOAM file/dictionary banner
+ // Optionally without -*- C++ -*- editor hint (eg, for logs)
+ static Ostream& writeBanner(Ostream& os, bool noHint=false);
- //- Write header
- bool writeHeader(Ostream&) const;
+ //- Write the standard file section divider
+ static Ostream& writeDivider(Ostream& os);
- //- Write header. Allow override of type
- bool writeHeader(Ostream&, const word& objectType) const;
+ //- Write the standard end file divider
+ static Ostream& writeEndDivider(Ostream& os);
+ //- Write header
+ bool writeHeader(Ostream& os) const;
- // Error Handling
+ //- Write header. Allow override of type
+ bool writeHeader(Ostream& os, const word& objectType) const;
- bool good() const
- {
- return objState_ == GOOD;
- }
- bool bad() const
- {
- return objState_ == BAD;
- }
+ // Error Handling
+ inline bool good() const;
- // Info
+ inline bool bad() const;
- //- Return info proxy.
- // Used to print token information to a stream
- InfoProxy<IOobject> info() const
- {
- return *this;
- }
+
+ // Info
+
+ //- Return info proxy.
+ // Used to print token information to a stream
+ InfoProxy<IOobject> info() const
+ {
+ return *this;
+ }
// Member operators
- void operator=(const IOobject&);
+ void operator=(const IOobject& io);
};
diff --git a/src/OpenFOAM/db/IOobject/IOobjectI.H b/src/OpenFOAM/db/IOobject/IOobjectI.H
index be0a0760a284f5bde5b77da2e5233a4df24f3f12..adce4e7fdc5167899d9278dfdcd36c0c9d19491c 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectI.H
+++ b/src/OpenFOAM/db/IOobject/IOobjectI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,95 +23,137 @@ License
\*---------------------------------------------------------------------------*/
-#include "foamVersion.H"
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-template<class Name>
-inline Foam::word Foam::IOobject::groupName(Name name, const word& group)
+template<class StringType>
+inline Foam::word Foam::IOobject::groupName(StringType name, const word& group)
{
- if (group != word::null)
+ if (group.empty())
{
- return name + ('.' + group);
+ return name;
}
else
{
- return name;
+ return name + ('.' + group);
}
}
-template<class Stream>
-inline Stream& Foam::IOobject::writeBanner(Stream& os, bool noHint)
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+// General access
+
+inline const Foam::word& Foam::IOobject::name() const
{
- static bool spacesSet(false);
- static char spaces[40];
+ return name_;
+}
- if (!spacesSet)
- {
- memset(spaces, ' ', 40);
-
- size_t len = strlen(Foam::FOAMversion);
- if (len < 38)
- {
- spaces[38 - len] = '\0';
- }
- else
- {
- spaces[0] = '\0';
- }
- spacesSet = true;
- }
- if (noHint)
- {
- os <<
- "/*--------------------------------------"
- "-------------------------------------*\\\n";
- }
- else
- {
- os <<
- "/*--------------------------------*- C++ "
- "-*----------------------------------*\\\n";
- }
+inline const Foam::word& Foam::IOobject::headerClassName() const
+{
+ return headerClassName_;
+}
+
+
+inline const Foam::string& Foam::IOobject::note() const
+{
+ return note_;
+}
+
+
+inline Foam::string& Foam::IOobject::note()
+{
+ return note_;
+}
+
+
+inline bool Foam::IOobject::registerObject() const
+{
+ return registerObject_;
+}
+
+
+inline bool& Foam::IOobject::registerObject()
+{
+ return registerObject_;
+}
+
+
+inline bool Foam::IOobject::globalObject() const
+{
+ return globalObject_;
+}
- os <<
- "| ========= |"
- " |\n"
- "| \\\\ / F ield |"
- " OpenFOAM: The Open Source CFD Toolbox |\n"
- "| \\\\ / O peration |"
- " Version: " << FOAMversion << spaces << "|\n"
- "| \\\\ / A nd |"
- " Web: www.OpenFOAM.com |\n"
- "| \\\\/ M anipulation |"
- " |\n"
- "\\*-----------------------------------------"
- "----------------------------------*/\n";
- return os;
+inline bool& Foam::IOobject::globalObject()
+{
+ return globalObject_;
}
-template<class Stream>
-inline Stream& Foam::IOobject::writeDivider(Stream& os)
+// Read/write options
+
+inline Foam::IOobject::readOption Foam::IOobject::readOpt() const
{
- os <<
- "// * * * * * * * * * * * * * * * * * "
- "* * * * * * * * * * * * * * * * * * * * //\n";
+ return rOpt_;
+}
- return os;
+
+inline Foam::IOobject::readOption& Foam::IOobject::readOpt()
+{
+ return rOpt_;
}
-template<class Stream>
-inline Stream& Foam::IOobject::writeEndDivider(Stream& os)
+
+inline Foam::IOobject::writeOption Foam::IOobject::writeOpt() const
{
- os << "\n\n"
- "// *****************************************"
- "******************************** //\n";
+ return wOpt_;
+}
+
+
+inline Foam::IOobject::writeOption& Foam::IOobject::writeOpt()
+{
+ return wOpt_;
+}
+
+
+// Path components
+
+inline const Foam::fileName& Foam::IOobject::instance() const
+{
+ return instance_;
+}
+
- return os;
+inline Foam::fileName& Foam::IOobject::instance()
+{
+ return instance_;
+}
+
+
+inline const Foam::fileName& Foam::IOobject::local() const
+{
+ return local_;
+}
+
+
+inline Foam::fileName Foam::IOobject::objectPath() const
+{
+ return path()/name();
+}
+
+
+// Error Handling
+
+inline bool Foam::IOobject::good() const
+{
+ return objState_ == GOOD;
+}
+
+
+inline bool Foam::IOobject::bad() const
+{
+ return objState_ == BAD;
}
diff --git a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
index f93384bf8cc00fd49d773b34f04f03e433a5f4f0..58757394db789d24e0bc910de6f66c35f20b7cc4 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
@@ -116,9 +116,8 @@ void Foam::IOobject::warnNoRereading() const
{
WarningInFunction
<< Type::typeName << ' ' << name()
- << " constructed with IOobject::MUST_READ_IF_MODIFIED"
- " but " << Type::typeName
- << " does not support automatic rereading."
+ << " constructed with IOobject::MUST_READ_IF_MODIFIED but "
+ << Type::typeName << " does not support automatic rereading."
<< endl;
}
}
diff --git a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
index 51d6f7d853db2e9306c4243e38f377c9441e1751..4e01787843e6d09e17cbcba0cdaaccc884dc006c 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -29,29 +29,91 @@ Description
#include "IOobject.H"
#include "objectRegistry.H"
-#include "endian.H"
-#include "label.H"
-#include "scalar.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// file-scope
-// Hint about machine endian, OpenFOAM label and scalar sizes
-static const std::string archHint =
-(
-#ifdef WM_LITTLE_ENDIAN
- "LSB"
-#elif defined (WM_BIG_ENDIAN)
- "MSB"
-#else
- "???"
-#endif
- ";label=" + std::to_string(8*sizeof(Foam::label))
- + ";scalar=" + std::to_string(8*sizeof(Foam::scalar))
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "foamVersion.H"
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+// A banner corresponding to this:
+//
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: VERSION |
+| \\ / A nd | Web: www.OpenFOAM.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+
+Foam::Ostream& Foam::IOobject::writeBanner(Ostream& os, bool noHint)
+{
+ // The version padded with spaces to fit after "Version: "
+ // - initialized with zero-length string to detect if it has been populated
+ static char paddedVersion[39] = "";
+
+ if (!*paddedVersion)
+ {
+ // Populate: like strncpy but without trailing '\0'
+ const char *p = Foam::FOAMversion;
+
+ memset(paddedVersion, ' ', 38);
+ for (int i = 0; *p && i < 38; ++i)
+ {
+ paddedVersion[i] = *p++;
+ }
+ paddedVersion[38] = '\0';
+ }
+
+ os <<
+ "/*--------------------------------";
+
+ if (noHint)
+ {
+ // Without syntax hint
+ os << "---------";
+ }
+ else
+ {
+ // With syntax hint
+ os << "*- C++ -*";
+ }
+
+ os <<
+ "----------------------------------*\\\n"
+ "| ========= |"
+ " |\n"
+ "| \\\\ / F ield |"
+ " OpenFOAM: The Open Source CFD Toolbox |\n"
+ "| \\\\ / O peration |"
+ " Version: " << paddedVersion << "|\n"
+ "| \\\\ / A nd |"
+ " Web: www.OpenFOAM.com |\n"
+ "| \\\\/ M anipulation |"
+ " |\n"
+ "\\*-----------------------------------------"
+ "----------------------------------*/\n";
+
+ return os;
+}
+
+
+Foam::Ostream& Foam::IOobject::writeDivider(Ostream& os)
+{
+ os <<
+ "// * * * * * * * * * * * * * * * * * "
+ "* * * * * * * * * * * * * * * * * * * * //\n";
+
+ return os;
+}
+
+
+Foam::Ostream& Foam::IOobject::writeEndDivider(Ostream& os)
+{
+ os << "\n\n"
+ "// *****************************************"
+ "******************************** //\n";
+
+ return os;
+}
+
bool Foam::IOobject::writeHeader(Ostream& os, const word& type) const
{
@@ -72,7 +134,7 @@ bool Foam::IOobject::writeHeader(Ostream& os, const word& type) const
if (os.format() == IOstream::BINARY)
{
- os << " arch " << archHint << ";\n";
+ os << " arch " << Foam::FOAMbuildArch << ";\n";
}
if (!note().empty())
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
index b558fbd3219bfc72bab997843d93001db46f7ae0..f48aa9982b3e7d08089e98c81eac011fbc8d3839 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
@@ -91,12 +91,11 @@ Foam::IFstream::IFstream
ISstream
(
*ifPtr_,
- "IFstream.sourceFile_",
+ pathname,
format,
version,
IFstreamAllocator::compression_
- ),
- pathname_(pathname)
+ )
{
setClosed();
@@ -166,7 +165,7 @@ Foam::IFstream& Foam::IFstream::operator()() const
if (!good())
{
// also checks .gz file
- if (isFile(pathname_, true))
+ if (isFile(this->name(), true))
{
check("IFstream::operator()");
FatalIOError.exit();
@@ -174,7 +173,7 @@ Foam::IFstream& Foam::IFstream::operator()() const
else
{
FatalIOErrorInFunction(*this)
- << "file " << pathname_ << " does not exist"
+ << "file " << this->name() << " does not exist"
<< exit(FatalIOError);
}
}
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
index 4a0361b345b8399d6590cabc7c77913cd150f295..b2280d70ae11bee9b67e1c6897cb39dc3b2584d3 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
@@ -84,10 +84,6 @@ class IFstream
public IFstreamAllocator,
public ISstream
{
- // Private data
-
- fileName pathname_;
-
public:
// Declare name of the class and its debug switch
@@ -113,17 +109,8 @@ public:
// Access
- //- Return the name of the stream
- const fileName& name() const
- {
- return pathname_;
- }
-
- //- Return non-const access to the name of the stream
- fileName& name()
- {
- return pathname_;
- }
+ //- Read/write access to the name of the stream
+ using ISstream::name;
// STL stream
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index 6e4ca2d057938fd0d35ed441ded80251746c2214..384d40dfcee79271db785a93a21a52b63bf511f2 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -93,8 +93,7 @@ Foam::OFstream::OFstream
)
:
OFstreamAllocator(pathname, compression),
- OSstream(*ofPtr_, "OFstream.sinkFile_", format, version, compression),
- pathname_(pathname)
+ OSstream(*ofPtr_, pathname, format, version, compression)
{
setClosed();
setState(ofPtr_->rdstate());
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
index 2350e3f394262157b01221fade33e30939ed0ca1..6601fcd53c00f09af96850d54f30921410f79b42 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
@@ -84,11 +84,6 @@ class OFstream
private OFstreamAllocator,
public OSstream
{
- // Private data
-
- fileName pathname_;
-
-
public:
// Declare name of the class and its debug switch
@@ -115,17 +110,8 @@ public:
// Access
- //- Return the name of the stream
- const fileName& name() const
- {
- return pathname_;
- }
-
- //- Return non-const access to the name of the stream
- fileName& name()
- {
- return pathname_;
- }
+ //- Read/write access to the name of the stream
+ using OSstream::name;
// STL stream
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
index 5f80c3a4a361b197802353394561d885786da125..016fc281d84c6406bc03815b9b4f9f962673a875 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-Foam::fileName Foam::IOstream::name_("IOstream");
+Foam::fileName Foam::IOstream::staticName_("IOstream");
// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
@@ -89,6 +89,18 @@ Foam::IOstream::compressionEnum(const word& compression)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+const Foam::fileName& Foam::IOstream::name() const
+{
+ return staticName_;
+}
+
+
+Foam::fileName& Foam::IOstream::name()
+{
+ return staticName_;
+}
+
+
bool Foam::IOstream::check(const char* operation) const
{
if (bad())
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index 0fe6ede26a8aad3d3b78cdfeec42ff3677ec43c4..653fe66e507c9184c45ea9ae23cebfca766224f2 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -214,8 +214,8 @@ private:
// Private data
- //- Name of the stream
- static fileName name_;
+ //- Name for any generic stream - normally treat as readonly
+ static fileName staticName_;
streamFormat format_;
versionNumber version_;
@@ -295,17 +295,11 @@ public:
//- Return the name of the stream
// Useful for Fstream to return the filename
- virtual const fileName& name() const
- {
- return name_;
- }
+ virtual const fileName& name() const;
//- Return non-const access to the name of the stream
// Useful to alter the stream name
- virtual fileName& name()
- {
- return name_;
- }
+ virtual fileName& name();
// Check
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
index 984110e31460cc1d5475fc2897a0b0a41c6c3f53..77131761969e0ca866f446bbdf277864f912ae3e 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
@@ -72,7 +72,7 @@ public:
// Constructors
- //- Set stream status
+ //- Construct and set stream status
Istream
(
streamFormat format=ASCII,
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index 1634689c641170380f8f11a4fc390245a88e9f40..3604a22d0be60e68812e83f64e6b015aeb04cfb2 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -74,7 +74,7 @@ public:
// Constructors
- //- Set stream status
+ //- Construct and set stream status
Ostream
(
streamFormat format=ASCII,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 77692890b3216362ed086740da3050d3aa1d89db..9bd97a134993e2b87430cc2e6e33a257974952eb 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -34,23 +34,18 @@ License
namespace Foam
{
defineTypeNameAndDebug(UPstream, 0);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::UPstream::commsTypes,
- 3
- >::names[] =
- {
- "blocking",
- "scheduled",
- "nonBlocking"
- };
}
-
-const Foam::NamedEnum<Foam::UPstream::commsTypes, 3>
- Foam::UPstream::commsTypeNames;
+const Foam::Enum
+<
+ Foam::UPstream::commsTypes
+>
+Foam::UPstream::commsTypeNames
+{
+ { commsTypes::blocking, "blocking" },
+ { commsTypes::scheduled, "scheduled" },
+ { commsTypes::nonBlocking, "nonBlocking" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -351,7 +346,7 @@ template<>
const Foam::UPstream::commsStruct&
Foam::UList<Foam::UPstream::commsStruct>::operator[](const label procID) const
{
- return const_cast<UList<UPstream::commsStruct>& >(*this).operator[](procID);
+ return const_cast<UList<UPstream::commsStruct>&>(*this).operator[](procID);
}
@@ -411,7 +406,11 @@ registerOptSwitch
Foam::UPstream::commsTypes Foam::UPstream::defaultCommsType
(
- commsTypeNames.read(Foam::debug::optimisationSwitches().lookup("commsType"))
+ commsTypeNames.lookup
+ (
+ "commsType",
+ Foam::debug::optimisationSwitches()
+ )
);
namespace Foam
@@ -476,4 +475,10 @@ registerOptSwitch
);
+const int Foam::UPstream::mpiBufferSize
+(
+ Foam::debug::optimisationSwitch("mpiBufferSize", 0)
+);
+
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index d6a62e3af67800a13b8f727c6d79ac8536e0ed7e..7e71fc543c211a7d1db8a2305023233b33cf9eb5 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -43,7 +43,7 @@ SourceFiles
#include "DynamicList.H"
#include "HashTable.H"
#include "string.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "ListOps.H"
#include "LIFOStack.H"
@@ -69,7 +69,7 @@ public:
nonBlocking
};
- static const NamedEnum<commsTypes, 3> commsTypeNames;
+ static const Enum<commsTypes> commsTypeNames;
// Public classes
@@ -272,6 +272,9 @@ public:
//- Optional maximum message size (bytes)
static int maxCommsSize;
+ //- MPI buffer-size (bytes)
+ static const int mpiBufferSize;
+
//- Default communicator (all processors)
static label worldComm;
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
index 3f6ebb42cd502acefd447be42d00a886a3d7093b..b77f79ed13a6e5413e7080624f41614f2dbc5533 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
@@ -75,7 +75,7 @@ class ISstream
Istream& readVariable(string&);
//- Disallow default bitwise assignment
- void operator=(const ISstream&);
+ void operator=(const ISstream&) = delete;
public:
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
index b43b46e564b6edbc6c5a1525d5d454cd77d00218..e0b56d725bb75379bdf585f2f915035b92d27a56 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
@@ -62,14 +62,14 @@ class OSstream
// Private Member Functions
//- Disallow default bitwise assignment
- void operator=(const OSstream&);
+ void operator=(const OSstream&) = delete;
public:
// Constructors
- //- Set stream status
+ //- Construct and set stream status
OSstream
(
ostream& os,
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H
index b4188f75fc76c0d53182b9ded7c7f14f5a7511a7..3c32f578c073cfb4872b639ac3818c720074a70b 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H
@@ -44,7 +44,7 @@ namespace Foam
//- Read a hex label from an input stream
template<class T>
-T ReadHex(ISstream&);
+T ReadHex(ISstream& is);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
index d372d6b14415bd2aadd41f110da85fa100aca673..b7f0ddc5b88c6728da2eb0b4aeab1280b61d867c 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
@@ -68,7 +68,7 @@ public:
// Constructors
- //- Set stream status
+ //- Construct and set stream status
prefixOSstream
(
ostream& os,
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
index 5bf068b81b4d309cde7d416db826b3f3d271eeda..b4f86ec62e0c6857479ae7f5bc890dca56934fb2 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
@@ -67,7 +67,7 @@ public:
ISstream
(
*(new std::istringstream(buffer)),
- "IStringStream.sourceFile",
+ "input",
format,
version
)
@@ -85,7 +85,7 @@ public:
ISstream
(
*(new std::istringstream(buffer)),
- "IStringStream.sourceFile",
+ "input",
format,
version
)
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
index 896f3cfc5df79f86cfa01f4aa2c082acdd2cb973..c6fc3103f26d63c8f58d3569d0b5e5ce61aad276 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
@@ -66,7 +66,7 @@ public:
OSstream
(
*(new std::ostringstream()),
- "OStringStream.sinkFile",
+ "output",
format,
version
)
@@ -126,7 +126,7 @@ public:
// Print
//- Print description to Ostream
- void print(Ostream&) const;
+ void print(Ostream& os) const;
};
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/StringStreamsPrint.C b/src/OpenFOAM/db/IOstreams/StringStreams/StringStreamsPrint.C
index 1024ed8186c27a6959defee1b09ee15afccd39cb..334235ff6bf7f8562d18ce71d6efc7651d92be25 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/StringStreamsPrint.C
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/StringStreamsPrint.C
@@ -34,7 +34,7 @@ Description
void Foam::IStringStream::print(Ostream& os) const
{
os << "IStringStream " << name() << " : "
- << "buffer = \n" << str() << Foam::endl;
+ << "buffer =\n" << str() << Foam::endl;
ISstream::print(os);
}
@@ -43,7 +43,7 @@ void Foam::IStringStream::print(Ostream& os) const
void Foam::OStringStream::print(Ostream& os) const
{
os << "OStringStream " << name() << " : "
- << "buffer = \n" << str() << Foam::endl;
+ << "buffer =\n" << str() << Foam::endl;
OSstream::print(os);
}
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
index 9a179e2d078f079f1fa687c83da395c07c3bda26..26617cb37e6f01edddf7a75c738f1311c21331d7 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
@@ -126,13 +126,13 @@ public:
// Inquiry
//- Return the name of the stream
- const fileName& name() const
+ virtual const fileName& name() const
{
return name_;
}
//- Return non-const access to the name of the stream
- fileName& name()
+ virtual fileName& name()
{
return name_;
}
@@ -165,7 +165,7 @@ public:
// Read functions
//- Return next token from stream
- virtual Istream& read(token&);
+ virtual Istream& read(token& t);
//- Read a character
virtual Istream& read(char&);
@@ -203,8 +203,8 @@ public:
// Print
- //- Print description of IOstream to Ostream
- void print(Ostream&) const;
+ //- Print description of stream to Ostream
+ void print(Ostream& os) const;
};
diff --git a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
index 49f5f439f2d54a051f2c241694d65f096a106786..d0f3ce2d59991b0d9f38f83f1e450d9ceea24e69 100644
--- a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
+++ b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
@@ -72,7 +72,7 @@ public:
// Member Functions
- // Write
+ // Write
//- Process unbuffered
virtual std::streamsize xsputn(const char* str, std::streamsize n)
@@ -109,7 +109,7 @@ public:
// Member Functions
- // Access
+ // Access
//- This hides both signatures of std::basic_ios::rdbuf()
sha1streambuf* rdbuf()
@@ -139,16 +139,16 @@ class OSHA1stream
// Private Member Functions
//- Disallow default bitwise copy construct
- OSHA1stream(const OSHA1stream&);
+ OSHA1stream(const OSHA1stream&) = delete;
//- Disallow default bitwise assignment
- void operator=(const OSHA1stream&);
+ void operator=(const OSHA1stream&) = delete;
public:
// Constructors
- //- Construct and set stream status
+ //- Construct with an empty digest
OSHA1stream
(
streamFormat format=ASCII,
@@ -158,7 +158,7 @@ public:
OSstream
(
*(new osha1stream),
- "OSHA1stream.sinkFile_",
+ "OSHA1stream",
format,
version
)
@@ -174,7 +174,7 @@ public:
// Member functions
- // Access
+ // Access
//- Full access to the sha1
Foam::SHA1& sha1()
@@ -188,7 +188,8 @@ public:
return sha1().digest();
}
- // Edit
+
+ // Edit
//- Clear the SHA1 calculation
void rewind()
diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C
index 7e8b7ed141a79f11c18a2674cfccf34ce7332927..4246fc80e740c70cbd953beb6c48fbe4e8769f24 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.C
+++ b/src/OpenFOAM/db/IOstreams/token/token.C
@@ -62,13 +62,13 @@ Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
Istream& is
)
{
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(compoundType);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(compoundType);
if (!cstrIter.found())
{
FatalIOErrorInFunction(is)
- << "Unknown compound type " << compoundType << nl << nl
+ << "Unknown compound type "
+ << compoundType << nl << nl
<< "Valid compound types:" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< abort(FatalIOError);
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 7229e58b8628c6805b2a9ff8c188ed557a1e610d..26dc543f5b00e45a8176655bd73e3eec18c7f41b 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -134,10 +134,10 @@ public:
// Private Member Functions
//- Disallow default bitwise copy construct
- compound(const compound&);
+ compound(const compound&) = delete;
//- Disallow default bitwise assignment
- void operator=(const compound&);
+ void operator=(const compound&) = delete;
public:
@@ -195,11 +195,6 @@ public:
virtual label size() const = 0;
-
- // Check
-
- // Edit
-
// Write
virtual void write(Ostream&) const = 0;
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index fbf6ebff65e0227479cf34d0b42c28066f6665ca..0a7ae9f3df21dd58ec3f8b21cf6fb730f0a8c376 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -37,40 +37,34 @@ License
namespace Foam
{
defineTypeNameAndDebug(Time, 0);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::Time::stopAtControls,
- 4
- >::names[] =
- {
- "endTime",
- "noWriteNow",
- "writeNow",
- "nextWrite"
- };
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::Time::writeControls,
- 5
- >::names[] =
- {
- "timeStep",
- "runTime",
- "adjustableRunTime",
- "clockTime",
- "cpuTime"
- };
}
-const Foam::NamedEnum<Foam::Time::stopAtControls, 4>
- Foam::Time::stopAtControlNames_;
+const Foam::Enum
+<
+ Foam::Time::stopAtControls
+>
+Foam::Time::stopAtControlNames_
+{
+ { stopAtControls::saEndTime, "endTime" },
+ { stopAtControls::saNoWriteNow, "noWriteNow" },
+ { stopAtControls::saWriteNow, "writeNow" },
+ { stopAtControls::saNextWrite, "nextWrite" },
+};
+
+
+const Foam::Enum
+<
+ Foam::Time::writeControls
+>
+Foam::Time::writeControlNames_
+{
+ { writeControls::wcTimeStep, "timeStep" },
+ { writeControls::wcRunTime, "runTime" },
+ { writeControls::wcAdjustableRunTime, "adjustableRunTime" },
+ { writeControls::wcClockTime, "clockTime" },
+ { writeControls::wcCpuTime, "cpuTime" },
+};
-const Foam::NamedEnum<Foam::Time::writeControls, 5>
- Foam::Time::writeControlNames_;
Foam::Time::fmtflags Foam::Time::format_(Foam::Time::general);
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index 5f6dc17321121270684cb353cdc859d16c26c96d..f43f74d360e15c97b4b51e63e995d9f771835cf0 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -47,7 +47,7 @@ SourceFiles
#include "TimeState.H"
#include "Switch.H"
#include "instantList.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "typeInfo.H"
#include "dlLibraryTable.H"
#include "functionObjectList.H"
@@ -130,10 +130,10 @@ protected:
scalar startTime_;
mutable scalar endTime_;
- static const NamedEnum<stopAtControls, 4> stopAtControlNames_;
+ static const Enum<stopAtControls> stopAtControlNames_;
mutable stopAtControls stopAt_;
- static const NamedEnum<writeControls, 5> writeControlNames_;
+ static const Enum<writeControls> writeControlNames_;
writeControls writeControl_;
scalar writeInterval_;
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 86517390fa4829d1fa38822862ace291022e3c58..5c8c2c5c5ab39bad0d0a09e1919ab8711a9e054e 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -201,9 +201,10 @@ void Foam::Time::readDict()
if (controlDict_.found("writeControl"))
{
- writeControl_ = writeControlNames_.read
+ writeControl_ = writeControlNames_.lookup
(
- controlDict_.lookup("writeControl")
+ "writeControl",
+ controlDict_
);
}
@@ -288,7 +289,7 @@ void Foam::Time::readDict()
// if nothing is specified, the endTime is zero
if (controlDict_.found("stopAt"))
{
- stopAt_ = stopAtControlNames_.read(controlDict_.lookup("stopAt"));
+ stopAt_ = stopAtControlNames_.lookup("stopAt", controlDict_);
if (stopAt_ == saEndTime)
{
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 067fbb2c2bae49680560250f6841e3664fda0704..33acac0ace16db6be191887197ced5c8fb35133a 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -35,12 +35,50 @@ License
namespace Foam
{
defineTypeNameAndDebug(dictionary, 0);
- const dictionary dictionary::null;
+}
+
+const Foam::dictionary Foam::dictionary::null;
+
+bool Foam::dictionary::writeOptionalEntries
+(
+ Foam::debug::infoSwitch("writeOptionalEntries", 0)
+);
+
- bool dictionary::writeOptionalEntries
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+ // file-scope
+ //- Walk lists of patterns and regexps for an exact match
+ // or regular expression match
+ template<class WcIterator, class ReIterator>
+ static bool findInPatterns
(
- debug::infoSwitch("writeOptionalEntries", 0)
- );
+ const bool patternMatch,
+ const word& keyword,
+ WcIterator& wcIter,
+ ReIterator& reIter
+ )
+ {
+ while (wcIter.found())
+ {
+ if
+ (
+ patternMatch
+ ? reIter()->match(keyword)
+ : wcIter()->keyword() == keyword
+ )
+ {
+ return true;
+ }
+
+ ++reIter;
+ ++wcIter;
+ }
+
+ return false;
+ }
}
@@ -158,68 +196,6 @@ const Foam::entry* Foam::dictionary::lookupScopedSubEntryPtr
}
-bool Foam::dictionary::findInPatterns
-(
- const bool patternMatch,
- const word& keyword,
- DLList<entry*>::const_iterator& wcLink,
- DLList<autoPtr<regExp>>::const_iterator& reLink
-) const
-{
- if (patternEntries_.size())
- {
- while (wcLink != patternEntries_.end())
- {
- if
- (
- patternMatch
- ? reLink()->match(keyword)
- : wcLink()->keyword() == keyword
- )
- {
- return true;
- }
-
- ++reLink;
- ++wcLink;
- }
- }
-
- return false;
-}
-
-
-bool Foam::dictionary::findInPatterns
-(
- const bool patternMatch,
- const word& keyword,
- DLList<entry*>::iterator& wcLink,
- DLList<autoPtr<regExp>>::iterator& reLink
-)
-{
- if (patternEntries_.size())
- {
- while (wcLink != patternEntries_.end())
- {
- if
- (
- patternMatch
- ? reLink()->match(keyword)
- : wcLink()->keyword() == keyword
- )
- {
- return true;
- }
-
- ++reLink;
- ++wcLink;
- }
- }
-
- return false;
-}
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::dictionary::dictionary()
@@ -242,17 +218,17 @@ Foam::dictionary::dictionary
)
:
dictionaryName(dict.name()),
- IDLList<entry>(dict, *this),
+ parent_type(dict, *this),
parent_(parentDict)
{
- forAllIter(IDLList<entry>, *this, iter)
+ forAllIter(parent_type, *this, iter)
{
hashedEntries_.insert(iter().keyword(), &iter());
if (iter().keyword().isPattern())
{
- patternEntries_.insert(&iter());
- patternRegexps_.insert
+ patterns_.insert(&iter());
+ regexps_.insert
(
autoPtr<regExp>(new regExp(iter().keyword()))
);
@@ -267,17 +243,17 @@ Foam::dictionary::dictionary
)
:
dictionaryName(dict.name()),
- IDLList<entry>(dict, *this),
+ parent_type(dict, *this),
parent_(dictionary::null)
{
- forAllIter(IDLList<entry>, *this, iter)
+ forAllIter(parent_type, *this, iter)
{
hashedEntries_.insert(iter().keyword(), &iter());
if (iter().keyword().isPattern())
{
- patternEntries_.insert(&iter());
- patternRegexps_.insert
+ patterns_.insert(&iter());
+ regexps_.insert
(
autoPtr<regExp>(new regExp(iter().keyword()))
);
@@ -384,7 +360,7 @@ Foam::SHA1Digest Foam::dictionary::digest() const
OSHA1stream os;
// Process entries
- forAllConstIter(IDLList<entry>, *this, iter)
+ forAllConstIter(parent_type, *this, iter)
{
os << *iter;
}
@@ -423,31 +399,25 @@ bool Foam::dictionary::found
{
return true;
}
- else
- {
- if (patternMatch && patternEntries_.size())
- {
- DLList<entry*>::const_iterator wcLink =
- patternEntries_.begin();
- DLList<autoPtr<regExp>>::const_iterator reLink =
- patternRegexps_.begin();
- // Find in patterns using regular expressions only
- if (findInPatterns(patternMatch, keyword, wcLink, reLink))
- {
- return true;
- }
- }
+ if (patternMatch && patterns_.size())
+ {
+ pattern_const_iterator wcLink = patterns_.begin();
+ regexp_const_iterator reLink = regexps_.begin();
- if (recursive && &parent_ != &dictionary::null)
- {
- return parent_.found(keyword, recursive, patternMatch);
- }
- else
+ // Find in patterns using regular expressions only
+ if (findInPatterns(patternMatch, keyword, wcLink, reLink))
{
- return false;
+ return true;
}
}
+
+ if (recursive && &parent_ != &dictionary::null)
+ {
+ return parent_.found(keyword, recursive, patternMatch);
+ }
+
+ return false;
}
@@ -458,35 +428,31 @@ const Foam::entry* Foam::dictionary::lookupEntryPtr
bool patternMatch
) const
{
- HashTable<entry*>::const_iterator iter = hashedEntries_.find(keyword);
+ auto iter = hashedEntries_.cfind(keyword);
- if (iter == hashedEntries_.end())
+ if (iter.found())
{
- if (patternMatch && patternEntries_.size())
- {
- DLList<entry*>::const_iterator wcLink =
- patternEntries_.begin();
- DLList<autoPtr<regExp>>::const_iterator reLink =
- patternRegexps_.begin();
+ return iter();
+ }
- // Find in patterns using regular expressions only
- if (findInPatterns(patternMatch, keyword, wcLink, reLink))
- {
- return wcLink();
- }
- }
+ if (patternMatch && patterns_.size())
+ {
+ pattern_const_iterator wcLink = patterns_.begin();
+ regexp_const_iterator reLink = regexps_.begin();
- if (recursive && &parent_ != &dictionary::null)
+ // Find in patterns using regular expressions only
+ if (findInPatterns(patternMatch, keyword, wcLink, reLink))
{
- return parent_.lookupEntryPtr(keyword, recursive, patternMatch);
- }
- else
- {
- return nullptr;
+ return wcLink();
}
}
- return iter();
+ if (recursive && &parent_ != &dictionary::null)
+ {
+ return parent_.lookupEntryPtr(keyword, recursive, patternMatch);
+ }
+
+ return nullptr;
}
@@ -497,40 +463,36 @@ Foam::entry* Foam::dictionary::lookupEntryPtr
bool patternMatch
)
{
- HashTable<entry*>::iterator iter = hashedEntries_.find(keyword);
+ auto iter = hashedEntries_.find(keyword);
- if (iter == hashedEntries_.end())
+ if (iter.found())
{
- if (patternMatch && patternEntries_.size())
- {
- DLList<entry*>::iterator wcLink =
- patternEntries_.begin();
- DLList<autoPtr<regExp>>::iterator reLink =
- patternRegexps_.begin();
+ return iter();
+ }
- // Find in patterns using regular expressions only
- if (findInPatterns(patternMatch, keyword, wcLink, reLink))
- {
- return wcLink();
- }
- }
+ if (patternMatch && patterns_.size())
+ {
+ pattern_iterator wcLink = patterns_.begin();
+ regexp_iterator reLink = regexps_.begin();
- if (recursive && &parent_ != &dictionary::null)
- {
- return const_cast<dictionary&>(parent_).lookupEntryPtr
- (
- keyword,
- recursive,
- patternMatch
- );
- }
- else
+ // Find in patterns using regular expressions only
+ if (findInPatterns(patternMatch, keyword, wcLink, reLink))
{
- return nullptr;
+ return wcLink();
}
}
- return iter();
+ if (recursive && &parent_ != &dictionary::null)
+ {
+ return const_cast<dictionary&>(parent_).lookupEntryPtr
+ (
+ keyword,
+ recursive,
+ patternMatch
+ );
+ }
+
+ return nullptr;
}
@@ -575,7 +537,7 @@ const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
bool patternMatch
) const
{
- if (keyword[0] == ':' || keyword[0] == '^')
+ if ((keyword[0] == ':' || keyword[0] == '^'))
{
// Go up to top level
const dictionary* dictPtr = this;
@@ -591,15 +553,13 @@ const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
patternMatch
);
}
- else
- {
- return lookupScopedSubEntryPtr
- (
- keyword,
- recursive,
- patternMatch
- );
- }
+
+ return lookupScopedSubEntryPtr
+ (
+ keyword,
+ recursive,
+ patternMatch
+ );
}
@@ -609,7 +569,8 @@ bool Foam::dictionary::substituteScopedKeyword
bool mergeEntry
)
{
- const word varName = keyword(1, keyword.size()-1);
+ // Drop first character of keyword to get the var-name, already validated.
+ const word varName(keyword.substr(1), false);
// Lookup the variable name in the given dictionary
const entry* ePtr = lookupScopedEntryPtr(varName, true, true);
@@ -619,7 +580,7 @@ bool Foam::dictionary::substituteScopedKeyword
{
const dictionary& addDict = ePtr->dict();
- forAllConstIter(IDLList<entry>, addDict, iter)
+ forAllConstIter(parent_type, addDict, iter)
{
add(iter(), mergeEntry);
}
@@ -766,7 +727,7 @@ Foam::wordList Foam::dictionary::toc() const
wordList keys(size());
label nKeys = 0;
- forAllConstIter(IDLList<entry>, *this, iter)
+ forAllConstIter(parent_type, *this, iter)
{
keys[nKeys++] = iter().keyword();
}
@@ -786,7 +747,7 @@ Foam::List<Foam::keyType> Foam::dictionary::keys(bool patterns) const
List<keyType> keys(size());
label nKeys = 0;
- forAllConstIter(IDLList<entry>, *this, iter)
+ forAllConstIter(parent_type, *this, iter)
{
if (iter().keyword().isPattern() ? patterns : !patterns)
{
@@ -801,12 +762,9 @@ Foam::List<Foam::keyType> Foam::dictionary::keys(bool patterns) const
bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
{
- HashTable<entry*>::iterator iter = hashedEntries_.find
- (
- entryPtr->keyword()
- );
+ auto iter = hashedEntries_.find(entryPtr->keyword());
- if (mergeEntry && iter != hashedEntries_.end())
+ if (mergeEntry && iter.found())
{
// Merge dictionary with dictionary
if (iter()->isDict() && entryPtr->isDict())
@@ -816,50 +774,50 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
return true;
}
- else
- {
- // Replace existing dictionary with entry or vice versa
- IDLList<entry>::replace(iter(), entryPtr);
- delete iter();
- hashedEntries_.erase(iter);
- if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
- {
- entryPtr->name() = name() + '.' + entryPtr->keyword();
- if (entryPtr->keyword().isPattern())
- {
- patternEntries_.insert(entryPtr);
- patternRegexps_.insert
- (
- autoPtr<regExp>(new regExp(entryPtr->keyword()))
- );
- }
+ // Replace existing dictionary with entry or vice versa
+ parent_type::replace(iter(), entryPtr);
+ delete iter();
+ hashedEntries_.erase(iter);
- return true;
- }
- else
- {
- IOWarningInFunction((*this))
- << "problem replacing entry "<< entryPtr->keyword()
- << " in dictionary " << name() << endl;
+ if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
+ {
+ entryPtr->name() = name() + '.' + entryPtr->keyword();
- IDLList<entry>::remove(entryPtr);
- delete entryPtr;
- return false;
+ if (entryPtr->keyword().isPattern())
+ {
+ patterns_.insert(entryPtr);
+ regexps_.insert
+ (
+ autoPtr<regExp>(new regExp(entryPtr->keyword()))
+ );
}
+
+ return true;
+ }
+ else
+ {
+ IOWarningInFunction((*this))
+ << "problem replacing entry "<< entryPtr->keyword()
+ << " in dictionary " << name() << endl;
+
+ parent_type::remove(entryPtr);
+ delete entryPtr;
+ return false;
}
}
+
if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
{
entryPtr->name() = name() + '.' + entryPtr->keyword();
- IDLList<entry>::append(entryPtr);
+ parent_type::append(entryPtr);
if (entryPtr->keyword().isPattern())
{
- patternEntries_.insert(entryPtr);
- patternRegexps_.insert
+ patterns_.insert(entryPtr);
+ regexps_.insert
(
autoPtr<regExp>(new regExp(entryPtr->keyword()))
);
@@ -928,6 +886,7 @@ void Foam::dictionary::add
void Foam::dictionary::set(entry* entryPtr)
{
+ // Find non-recursive with patterns
entry* existingPtr = lookupEntryPtr(entryPtr->keyword(), false, true);
// Clear dictionary so merge acts like overwrite
@@ -953,24 +912,22 @@ void Foam::dictionary::set(const keyType& k, const dictionary& d)
bool Foam::dictionary::remove(const word& keyword)
{
- HashTable<entry*>::iterator iter = hashedEntries_.find(keyword);
+ auto iter = hashedEntries_.find(keyword);
if (iter.found())
{
- // Delete from patterns first
- DLList<entry*>::iterator wcLink =
- patternEntries_.begin();
- DLList<autoPtr<regExp>>::iterator reLink =
- patternRegexps_.begin();
+ // Delete from patterns
+ pattern_iterator wcLink = patterns_.begin();
+ regexp_iterator reLink = regexps_.begin();
// Find in pattern using exact match only
if (findInPatterns(false, keyword, wcLink, reLink))
{
- patternEntries_.remove(wcLink);
- patternRegexps_.remove(reLink);
+ patterns_.remove(wcLink);
+ regexps_.remove(reLink);
}
- IDLList<entry>::remove(iter());
+ parent_type::remove(iter());
delete iter();
hashedEntries_.erase(iter);
@@ -996,10 +953,10 @@ bool Foam::dictionary::changeKeyword
return false;
}
- HashTable<entry*>::iterator iter = hashedEntries_.find(oldKeyword);
+ // Check that oldKeyword exists and can be changed
+ auto iter = hashedEntries_.find(oldKeyword);
- // oldKeyword not found - do nothing
- if (iter == hashedEntries_.end())
+ if (!iter.found())
{
return false;
}
@@ -1016,30 +973,28 @@ bool Foam::dictionary::changeKeyword
}
- HashTable<entry*>::iterator iter2 = hashedEntries_.find(newKeyword);
+ auto iter2 = hashedEntries_.find(newKeyword);
// newKeyword already exists
- if (iter2 != hashedEntries_.end())
+ if (iter2.found())
{
if (forceOverwrite)
{
if (iter2()->keyword().isPattern())
{
- // Delete from patterns first
- DLList<entry*>::iterator wcLink =
- patternEntries_.begin();
- DLList<autoPtr<regExp>>::iterator reLink =
- patternRegexps_.begin();
+ // Delete from patterns
+ pattern_iterator wcLink = patterns_.begin();
+ regexp_iterator reLink = regexps_.begin();
// Find in patterns using exact match only
if (findInPatterns(false, iter2()->keyword(), wcLink, reLink))
{
- patternEntries_.remove(wcLink);
- patternRegexps_.remove(reLink);
+ patterns_.remove(wcLink);
+ regexps_.remove(reLink);
}
}
- IDLList<entry>::replace(iter2(), iter());
+ parent_type::replace(iter2(), iter());
delete iter2();
hashedEntries_.erase(iter2);
}
@@ -1063,8 +1018,8 @@ bool Foam::dictionary::changeKeyword
if (newKeyword.isPattern())
{
- patternEntries_.insert(iter());
- patternRegexps_.insert
+ patterns_.insert(iter());
+ regexps_.insert
(
autoPtr<regExp>(new regExp(newKeyword))
);
@@ -1086,11 +1041,11 @@ bool Foam::dictionary::merge(const dictionary& dict)
bool changed = false;
- forAllConstIter(IDLList<entry>, dict, iter)
+ forAllConstIter(parent_type, dict, iter)
{
- HashTable<entry*>::iterator fnd = hashedEntries_.find(iter().keyword());
+ auto fnd = hashedEntries_.find(iter().keyword());
- if (fnd != hashedEntries_.end())
+ if (fnd.found())
{
// Recursively merge sub-dictionaries
// TODO: merge without copying
@@ -1121,10 +1076,10 @@ bool Foam::dictionary::merge(const dictionary& dict)
void Foam::dictionary::clear()
{
- IDLList<entry>::clear();
+ parent_type::clear();
hashedEntries_.clear();
- patternEntries_.clear();
- patternRegexps_.clear();
+ patterns_.clear();
+ regexps_.clear();
}
@@ -1134,10 +1089,10 @@ void Foam::dictionary::transfer(dictionary& dict)
// but what about the names?
name() = dict.name();
- IDLList<entry>::transfer(dict);
+ parent_type::transfer(dict);
hashedEntries_.transfer(dict.hashedEntries_);
- patternEntries_.transfer(dict.patternEntries_);
- patternRegexps_.transfer(dict.patternRegexps_);
+ patterns_.transfer(dict.patterns_);
+ regexps_.transfer(dict.regexps_);
}
@@ -1171,7 +1126,7 @@ void Foam::dictionary::operator=(const dictionary& rhs)
// Create clones of the entries in the given dictionary
// resetting the parentDict to this dictionary
- forAllConstIter(IDLList<entry>, rhs, iter)
+ forAllConstIter(parent_type, rhs, iter)
{
add(iter().clone(*this).ptr());
}
@@ -1188,7 +1143,7 @@ void Foam::dictionary::operator+=(const dictionary& rhs)
<< abort(FatalIOError);
}
- forAllConstIter(IDLList<entry>, rhs, iter)
+ forAllConstIter(parent_type, rhs, iter)
{
add(iter().clone(*this).ptr());
}
@@ -1205,7 +1160,7 @@ void Foam::dictionary::operator|=(const dictionary& rhs)
<< abort(FatalIOError);
}
- forAllConstIter(IDLList<entry>, rhs, iter)
+ forAllConstIter(parent_type, rhs, iter)
{
if (!found(iter().keyword()))
{
@@ -1225,7 +1180,7 @@ void Foam::dictionary::operator<<=(const dictionary& rhs)
<< abort(FatalIOError);
}
- forAllConstIter(IDLList<entry>, rhs, iter)
+ forAllConstIter(parent_type, rhs, iter)
{
set(iter().clone(*this).ptr());
}
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 9a2296632b2ba723d6c314a6801d664af3ff09d1..fc34a32d991c09df2f8dfa6696761b61c9676172 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -100,8 +100,8 @@ class regExp;
class dictionary;
class SHA1Digest;
-Istream& operator>>(Istream&, dictionary&);
-Ostream& operator<<(Ostream&, const dictionary&);
+Istream& operator>>(Istream& is, dictionary& dict);
+Ostream& operator<<(Ostream& os, const dictionary& dict);
/*---------------------------------------------------------------------------*\
Class dictionaryName Declaration
@@ -176,20 +176,31 @@ class dictionary
//- Report optional keywords and values if not present in dictionary
static bool writeOptionalEntries;
- //- HashTable of the entries held on the DL-list for quick lookup
- HashTable<entry*> hashedEntries_;
-
//- Parent dictionary
const dictionary& parent_;
+ //- HashTable of the entries held on the IDLList for quick lookup
+ HashTable<entry*> hashedEntries_;
+
//- Entries of matching patterns
- DLList<entry*> patternEntries_;
+ DLList<entry*> patterns_;
//- Patterns as precompiled regular expressions
- DLList<autoPtr<regExp>> patternRegexps_;
+ DLList<autoPtr<regExp>> regexps_;
+
+
+ // Typedefs
+
+ //- The storage container
+ typedef IDLList<entry> parent_type;
+
+ typedef DLList<entry*>::iterator pattern_iterator;
+ typedef DLList<entry*>::const_iterator pattern_const_iterator;
+ typedef DLList<autoPtr<regExp>>::iterator regexp_iterator;
+ typedef DLList<autoPtr<regExp>>::const_iterator regexp_const_iterator;
- // Private Member Functions
+ // Private Member Functions
//- Find and return an entry data stream pointer if present
// otherwise return nullptr. Allows scoping using '.'
@@ -200,24 +211,6 @@ class dictionary
bool patternMatch
) const;
- //- Search patterns table for exact match or regular expression match
- bool findInPatterns
- (
- const bool patternMatch,
- const word& Keyword,
- DLList<entry*>::const_iterator& wcLink,
- DLList<autoPtr<regExp>>::const_iterator& reLink
- ) const;
-
- //- Search patterns table for exact match or regular expression match
- bool findInPatterns
- (
- const bool patternMatch,
- const word& Keyword,
- DLList<entry*>::iterator& wcLink,
- DLList<autoPtr<regExp>>::iterator& reLink
- );
-
public:
@@ -228,8 +221,7 @@ public:
// Declare name of the class and its debug switch
ClassName("dictionary");
-
- //- Null dictionary
+ //- An empty dictionary, which is also the parent for all dictionaries
static const dictionary null;
@@ -287,6 +279,8 @@ public:
// Member functions
+ // Access
+
//- Return the parent dictionary
const dictionary& parent() const
{
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
index 7ac7670f24d88cfde1a4869a00447849a1531516..c2d552b775068193dfa6c15ca2ba4df7c495a010 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
@@ -55,11 +55,11 @@ namespace Foam
class dictionaryEntry;
-Ostream& operator<<(Ostream&, const dictionaryEntry&);
+Ostream& operator<<(Ostream& os, const dictionaryEntry& de);
/*---------------------------------------------------------------------------*\
- Class dictionaryEntry Declaration
+ Class dictionaryEntry Declaration
\*---------------------------------------------------------------------------*/
class dictionaryEntry
@@ -69,10 +69,8 @@ class dictionaryEntry
{
// Private Member Functions
- void readData(Istream&);
-
- //- Dissallow bitwise copy
- dictionaryEntry(const dictionary&);
+ //- Disallow bitwise copy
+ dictionaryEntry(const dictionaryEntry&) = delete;
public:
@@ -80,20 +78,20 @@ public:
// Constructors
//- Construct from the parent dictionary and Istream
- dictionaryEntry(const dictionary& parentDict, Istream&);
+ dictionaryEntry(const dictionary& parentDict, Istream& is);
//- Construct from the keyword, parent dictionary and a Istream
dictionaryEntry
(
- const keyType&,
+ const keyType& key,
const dictionary& parentDict,
- Istream&
+ Istream& is
);
//- Construct from the keyword, parent dictionary and a dictionary
dictionaryEntry
(
- const keyType&,
+ const keyType& key,
const dictionary& parentDict,
const dictionary& dict
);
@@ -102,7 +100,7 @@ public:
dictionaryEntry
(
const dictionary& parentDict,
- const dictionaryEntry&
+ const dictionaryEntry& dictEnt
);
autoPtr<entry> clone(const dictionary& parentDict) const
@@ -113,12 +111,6 @@ public:
// Member functions
- //- Return the local dictionary name (final part of scoped name)
- const word dictName() const
- {
- return dictionary::dictName();
- }
-
//- Return the dictionary name (scoped, e.g. dictA::dictB::dictC)
const fileName& name() const
{
@@ -153,8 +145,9 @@ public:
//- Return non-const access to dictionary
dictionary& dict();
+
//- Write
- void write(Ostream&) const;
+ void write(Ostream& os) const;
//- Return info proxy.
// Used to print token information to a stream
@@ -166,12 +159,12 @@ public:
// Ostream operator
- friend Ostream& operator<<(Ostream&, const dictionaryEntry&);
+ friend Ostream& operator<<(Ostream& os, const dictionaryEntry& de);
};
template<>
-Ostream& operator<<(Ostream&, const InfoProxy<dictionaryEntry>&);
+Ostream& operator<<(Ostream& os, const InfoProxy<dictionaryEntry>& ip);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index 1d55ff27946c9b357592e63a554b4e6320744e7d..836add62f945569134f323a449ca8d7af5a5082f 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -103,7 +103,7 @@ bool Foam::dictionary::read(Istream& is, const bool keepHeader)
while (!is.eof() && entry::New(*this, is))
{}
- // normally remove the FoamFile header entry if it exists
+ // Normally remove the FoamFile header entry if it exists
if (!keepHeader)
{
remove("FoamFile");
@@ -140,7 +140,7 @@ bool Foam::dictionary::substituteKeyword(const word& keyword, bool mergeEntry)
{
const dictionary& addDict = ePtr->dict();
- forAllConstIter(IDLList<entry>, addDict, iter)
+ forAllConstIter(parent_type, addDict, iter)
{
add(iter(), mergeEntry);
}
@@ -179,7 +179,7 @@ void Foam::dictionary::writeEntry(const keyType& kw, Ostream& os) const
void Foam::dictionary::writeEntries(Ostream& os, const bool extraNewLine) const
{
- forAllConstIter(IDLList<entry>, *this, iter)
+ forAllConstIter(parent_type, *this, iter)
{
const entry& e = *iter;
diff --git a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H
index 762bfaad9be35336718c98b676258f048425acab..389e79c7a33d682620e16ba0155477e344768ea2 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H
+++ b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H
@@ -69,8 +69,8 @@ class dictionaryListEntry
//- Returns size of dictionary without FoamFile
static label realSize(const dictionary&);
- //- Dissallow bitwise copy
- dictionaryListEntry(const dictionary&);
+ //- Disallow bitwise copy
+ dictionaryListEntry(const dictionaryListEntry&) = delete;
public:
diff --git a/src/OpenFOAM/db/dictionary/entry/entry.H b/src/OpenFOAM/db/dictionary/entry/entry.H
index dcbe358f1843a0a3773ab923624d65e1d1b3302c..6bb08646a4b6c8305d7853d35e167f91113f4826 100644
--- a/src/OpenFOAM/db/dictionary/entry/entry.H
+++ b/src/OpenFOAM/db/dictionary/entry/entry.H
@@ -75,15 +75,18 @@ class entry
// Private Member Functions
- //- Get the next valid keyword. Return true if a valid keyType.
+ //- Get the next valid keyword.
+ // \return True if it is a valid keyType.
static bool getKeyword
(
keyType& keyword,
- token& keywordToken,
+ token& keyToken,
Istream& is
);
- //- Get the next valid keyword otherwise return false
+ //- Get the next valid keyword.
+ // Warn when an invalid token is encountered that is not an end-of-block or eof
+ // \return True if it is a valid keyType.
static bool getKeyword(keyType& keyword, Istream& is);
diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C
index 3d554bd619afa429ec0fdeecdcad83b9504abf66..a153e4bd3e6d5e54422418db3f296e5f4d392df5 100644
--- a/src/OpenFOAM/db/dictionary/entry/entryIO.C
+++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C
@@ -34,33 +34,33 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-bool Foam::entry::getKeyword(keyType& keyword, token& keywordToken, Istream& is)
+bool Foam::entry::getKeyword(keyType& keyword, token& keyToken, Istream& is)
{
// Read the next valid token discarding spurious ';'s
do
{
if
(
- is.read(keywordToken).bad()
+ is.read(keyToken).bad()
|| is.eof()
- || !keywordToken.good()
+ || !keyToken.good()
)
{
return false;
}
}
- while (keywordToken == token::END_STATEMENT);
+ while (keyToken == token::END_STATEMENT);
// If the token is a valid keyword set 'keyword' return true...
- if (keywordToken.isWord())
+ if (keyToken.isWord())
{
- keyword = keywordToken.wordToken();
+ keyword = keyToken.wordToken();
return true;
}
- else if (keywordToken.isString())
+ else if (keyToken.isString())
{
// Enable wildcards
- keyword = keywordToken.stringToken();
+ keyword = keyToken.stringToken();
return true;
}
else
@@ -72,34 +72,32 @@ bool Foam::entry::getKeyword(keyType& keyword, token& keywordToken, Istream& is)
bool Foam::entry::getKeyword(keyType& keyword, Istream& is)
{
- token keywordToken;
- const bool ok = getKeyword(keyword, keywordToken, is);
+ token keyToken;
+ const bool valid = getKeyword(keyword, keyToken, is);
- if (ok)
+ if (valid)
{
return true;
}
+
+ // Do some more checking
+ if (keyToken == token::END_BLOCK || is.eof())
+ {
+ return false;
+ }
else
{
- // Do some more checking
- if (keywordToken == token::END_BLOCK || is.eof())
- {
- return false;
- }
- else
- {
- // Otherwise the token is invalid
- cerr<< "--> FOAM Warning : " << std::endl
- << " From function "
- << "entry::getKeyword(keyType&, Istream&)" << std::endl
- << " in file " << __FILE__
- << " at line " << __LINE__ << std::endl
- << " Reading " << is.name().c_str() << std::endl
- << " found " << keywordToken << std::endl
- << " expected either " << token::END_BLOCK << " or EOF"
- << std::endl;
- return false;
- }
+ // Otherwise the token is invalid
+ cerr<< "--> FOAM Warning : " << std::endl
+ << " From function "
+ << FUNCTION_NAME << std::endl
+ << " in file " << __FILE__
+ << " at line " << __LINE__ << std::endl
+ << " Reading " << is.name().c_str() << std::endl
+ << " found " << keyToken << std::endl
+ << " expected either " << token::END_BLOCK << " or EOF"
+ << std::endl;
+ return false;
}
}
@@ -139,7 +137,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
// Otherwise the token is invalid
cerr<< "--> FOAM Warning : " << std::endl
<< " From function "
- << "entry::getKeyword(keyType&, Istream&)" << std::endl
+ << FUNCTION_NAME << std::endl
<< " in file " << __FILE__
<< " at line " << __LINE__ << std::endl
<< " Reading " << is.name().c_str() << std::endl
@@ -153,7 +151,6 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
{
if (keyword[0] == '#') // ... Function entry
{
- const word functionName = keyword(1, keyword.size()-1);
if (disableFunctionEntries)
{
return parentDict.add
@@ -169,6 +166,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
}
else
{
+ const word functionName(keyword.substr(1), false);
return functionEntry::execute(functionName, parentDict, is);
}
}
@@ -183,19 +181,23 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
if (keyword.size() > 2 && keyword[1] == token::BEGIN_BLOCK)
{
- // Recursive substitution mode. Replace between {} with
- // expansion and then let standard variable expansion deal
- // with rest.
- string s(keyword(2, keyword.size()-3));
- // Substitute dictionary and environment variables. Do not allow
- // empty substitutions.
- stringOps::inplaceExpand(s, parentDict, true, false);
- keyword.std::string::replace(1, keyword.size()-1, s);
+ // Recursive substitution mode.
+ // Content between {} is replaced with expansion.
+ // Then let standard variable expansion deal with rest.
+ string expanded = keyword.substr(2, keyword.size()-3);
+
+ // Substitute dictionary and environment variables.
+ // Do not allow empty substitutions.
+ stringOps::inplaceExpand(expanded, parentDict, true, false);
+
+ // Restore the '$' prefix. Use replace since operator= is private
+
+ keyword.std::string::replace(1, keyword.size()-1, expanded);
}
if (nextToken == token::BEGIN_BLOCK)
{
- const word varName = keyword(1, keyword.size()-1);
+ const word varName = keyword.substr(1);
// lookup the variable name in the given dictionary
const entry* ePtr = parentDict.lookupScopedEntryPtr
@@ -239,14 +241,6 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
return true;
}
- else if
- (
- !disableFunctionEntries
- && keyword == "include"
- ) // ... For backward compatibility
- {
- return functionEntries::includeEntry::execute(parentDict, is);
- }
else // ... Data entries
{
token nextToken(is);
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
index d72a67791f0cf02a34eecab3c15f3d47c01cac2c..2798b924e3a77b936f3e876ef4c41682b04228fe 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
@@ -97,8 +97,8 @@ bool Foam::functionEntry::execute
return true;
}
- executedictionaryIstreamMemberFunctionTable::iterator mfIter =
- executedictionaryIstreamMemberFunctionTablePtr_->find(functionName);
+ auto mfIter =
+ executedictionaryIstreamMemberFunctionTablePtr_->cfind(functionName);
if (!mfIter.found())
{
@@ -106,8 +106,8 @@ bool Foam::functionEntry::execute
<< "Unknown functionEntry '" << functionName
<< "' in " << is.name() << " near line " << is.lineNumber()
<< nl << nl
- << "Valid functionEntries are :" << endl
- << executedictionaryIstreamMemberFunctionTablePtr_->toc()
+ << "Valid functionEntries :" << endl
+ << executedictionaryIstreamMemberFunctionTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -136,8 +136,11 @@ bool Foam::functionEntry::execute
return true;
}
- executeprimitiveEntryIstreamMemberFunctionTable::iterator mfIter =
- executeprimitiveEntryIstreamMemberFunctionTablePtr_->find(functionName);
+ auto mfIter =
+ executeprimitiveEntryIstreamMemberFunctionTablePtr_->cfind
+ (
+ functionName
+ );
if (!mfIter.found())
{
@@ -145,8 +148,8 @@ bool Foam::functionEntry::execute
<< "Unknown functionEntry '" << functionName
<< "' in " << is.name() << " near line " << is.lineNumber()
<< nl << nl
- << "Valid functionEntries are :" << endl
- << executeprimitiveEntryIstreamMemberFunctionTablePtr_->toc()
+ << "Valid functionEntries :" << endl
+ << executeprimitiveEntryIstreamMemberFunctionTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index 9bc12364b43cb9844d33ab8ed6fbeeb7d2f12404..b36c7d4770a052fee40e3d639506270cf2062f9c 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -41,26 +41,24 @@ void Foam::primitiveEntry::append(const UList<token>& varTokens)
bool Foam::primitiveEntry::expandVariable
(
- const string& w,
+ const string& varName,
const dictionary& dict
)
{
- if (w.size() > 2 && w[0] == '$' && w[1] == token::BEGIN_BLOCK)
+ if (varName.size() > 1 && varName[0] == token::BEGIN_BLOCK)
{
- // Recursive substitution mode. Replace between {} with expansion.
- string s(w(2, w.size()-3));
- // Substitute dictionary and environment variables. Do not allow
- // empty substitutions.
- stringOps::inplaceExpand(s, dict, true, false);
- string newW(w);
- newW.std::string::replace(1, newW.size()-1, s);
-
- return expandVariable(newW, dict);
+ // Recursive substitution mode.
+ // Content between {} is replaced with expansion.
+ string expanded = varName.substr(1, varName.size()-2);
+
+ // Substitute dictionary and environment variables.
+ // Do not allow empty substitutions.
+ stringOps::inplaceExpand(expanded, dict, true, false);
+
+ return expandVariable(expanded, dict);
}
else
{
- string varName = w(1, w.size()-1);
-
// lookup the variable name in the given dictionary....
// Note: allow wildcards to match? For now disabled since following
// would expand internalField to wildcard match and not expected
@@ -83,8 +81,8 @@ bool Foam::primitiveEntry::expandVariable
}
else
{
- // not in the dictionary - try an environment variable
- string envStr = getEnv(varName);
+ // Not in the dictionary - try an environment variable
+ const string envStr = getEnv(varName);
if (envStr.empty())
{
@@ -100,6 +98,7 @@ bool Foam::primitiveEntry::expandVariable
append(tokenList(IStringStream('(' + envStr + ')')()));
}
}
+
return true;
}
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index 74392ebda7fc186571ef423b56497a975f20984f..b5cebed502ea9c427a265d1ba567c27ade124fc5 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -25,13 +25,13 @@ Class
Foam::primitiveEntry
Description
- A keyword and a list of tokens is a 'primitiveEntry'.
- An primitiveEntry can be read, written and printed, and the types and
+ A keyword and a list of tokens comprise a primitiveEntry.
+ A primitiveEntry can be read, written and printed, and the types and
values of its tokens analysed.
- A primitiveEntry is a high-level building block for data description. It
- is a front-end for the token parser. A list of entries can be used as a
- set of keyword syntax elements, for example.
+ A primitiveEntry is a high-level building block for data description.
+ It is a front-end for the token parser. A list of entries can be used
+ as a set of keyword syntax elements, for example.
SourceFiles
primitiveEntry.C
@@ -42,9 +42,6 @@ SourceFiles
#ifndef primitiveEntry_H
#define primitiveEntry_H
-#include "IStringStream.H"
-#include "OStringStream.H"
-
#include "entry.H"
#include "ITstream.H"
#include "InfoProxy.H"
@@ -68,29 +65,38 @@ class primitiveEntry
// Private Member Functions
//- Append the given tokens starting at the current tokenIndex
- void append(const UList<token>&);
+ void append(const UList<token>& varTokens);
//- Append the given token to this entry
void append
(
const token& currToken,
- const dictionary&,
- Istream&
+ const dictionary& dict,
+ Istream& is
);
- //- Expand the given variable (keyword starts with $)
- bool expandVariable(const string&, const dictionary&);
+ //- Expand the given variable.
+ // The keyword starts with '$', but has been removed by the caller
+ // and thus passed as a varName.
+ // Keywords with '${}' are expanded recursively.
+ bool expandVariable
+ (
+ const string& varName,
+ const dictionary& dict
+ );
- //- Expand the given function (keyword starts with #)
+ //- Expand the given function.
+ // The keyword starts with '#', but has been removed by the caller.
+ // and thus passed as a functionName.
bool expandFunction
(
- const word&,
- const dictionary&,
- Istream&
+ const word& functionName,
+ const dictionary& dict,
+ Istream& is
);
//- Read the complete entry from the given stream
- void readEntry(const dictionary&, Istream&);
+ void readEntry(const dictionary& dict, Istream& is);
public:
@@ -98,26 +104,26 @@ public:
// Constructors
//- Construct from keyword and a Istream
- primitiveEntry(const keyType&, Istream&);
+ primitiveEntry(const keyType& key, Istream& is);
//- Construct from keyword, parent dictionary and Istream
- primitiveEntry(const keyType&, const dictionary& parentDict, Istream&);
+ primitiveEntry(const keyType& key, const dictionary& dict, Istream& is);
//- Construct from keyword and a ITstream
- primitiveEntry(const keyType&, const ITstream&);
+ primitiveEntry(const keyType& key, const ITstream& is);
//- Construct from keyword and a single token
- primitiveEntry(const keyType&, const token&);
+ primitiveEntry(const keyType& key, const token& t);
//- Construct from keyword and a list of tokens
- primitiveEntry(const keyType&, const UList<token>&);
+ primitiveEntry(const keyType& key, const UList<token>& tokens);
//- Construct from keyword and by transferring a list of tokens
- primitiveEntry(const keyType&, const Xfer<List<token>>&);
+ primitiveEntry(const keyType& key, const Xfer<List<token>>& tokens);
//- Construct from keyword and a T
template<class T>
- primitiveEntry(const keyType&, const T&);
+ primitiveEntry(const keyType& key, const T& t);
autoPtr<entry> clone(const dictionary&) const
{
@@ -166,13 +172,13 @@ public:
dictionary& dict();
//- Read tokens from the given stream
- virtual bool read(const dictionary&, Istream&);
+ virtual bool read(const dictionary& dict, Istream& is);
//- Write
- void write(Ostream&) const;
+ void write(Ostream& os) const;
//- Write, optionally with contents only (no keyword, etc)
- void write(Ostream&, const bool contentsOnly) const;
+ void write(Ostream& os, const bool contentsOnly) const;
//- Return info proxy.
// Used to print token information to a stream
@@ -184,7 +190,7 @@ public:
template<>
-Ostream& operator<<(Ostream&, const InfoProxy<primitiveEntry>&);
+Ostream& operator<<(Ostream& os, const InfoProxy<primitiveEntry>& ip);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
index 39580f5a4fe3e3f2b034335d44fb266c1b3c860f..1b9870347b628ef2379790861c0c3611e0cd1a67 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -37,15 +37,15 @@ void Foam::primitiveEntry::append
{
if (currToken.isWord())
{
- const word& w = currToken.wordToken();
+ const word& key = currToken.wordToken();
if
(
disableFunctionEntries
- || w.size() == 1
+ || key.size() == 1
|| (
- !(w[0] == '$' && expandVariable(w, dict))
- && !(w[0] == '#' && expandFunction(w, dict, is))
+ !(key[0] == '$' && expandVariable(key.substr(1), dict))
+ && !(key[0] == '#' && expandFunction(key.substr(1), dict, is))
)
)
{
@@ -54,16 +54,16 @@ void Foam::primitiveEntry::append
}
else if (currToken.isVariable())
{
- const string& w = currToken.stringToken();
+ const string& key = currToken.stringToken();
if
(
disableFunctionEntries
- || w.size() <= 3
+ || key.size() <= 3
|| !(
- w[0] == '$'
- && w[1] == token::BEGIN_BLOCK
- && expandVariable(w, dict)
+ key[0] == '$'
+ && key[1] == token::BEGIN_BLOCK
+ && expandVariable(key.substr(1), dict)
)
)
{
@@ -79,13 +79,12 @@ void Foam::primitiveEntry::append
bool Foam::primitiveEntry::expandFunction
(
- const word& keyword,
- const dictionary& parentDict,
+ const word& functionName,
+ const dictionary& dict,
Istream& is
)
{
- word functionName = keyword(1, keyword.size()-1);
- return functionEntry::execute(functionName, parentDict, *this, is);
+ return functionEntry::execute(functionName, dict, *this, is);
}
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryTemplates.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryTemplates.C
index 985eb0692a1adb72ed34e5aa33a0c31dc8776ec0..57c1b9775f0a4f49ec6dad75546efc9675d79e8a 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryTemplates.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryTemplates.C
@@ -25,6 +25,8 @@ License
#include "primitiveEntry.H"
#include "dictionary.H"
+#include "IStringStream.H"
+#include "OStringStream.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index a3141abb9164618a97001cdbea55c62980965c29..51e1323ec8d16fd288a4740990e7e417b4d7ad66 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -100,15 +100,14 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
<< exit(FatalError);
}
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(functionType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(functionType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown function type "
<< functionType << nl << nl
- << "Valid functions are : " << nl
+ << "Valid function types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << endl
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
index 816049967d74c75fa21add8c9a75ad197cdda724..5a10c23e1fccf7623e068d34c53b9c329b7278ec 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
@@ -28,27 +28,22 @@ License
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::timeControl::timeControls
+>
+Foam::timeControl::timeControlNames_
{
- template<>
- const char* NamedEnum<timeControl::timeControls, 9>::
- names[] =
- {
- "timeStep",
- "writeTime",
- "outputTime",
- "adjustableRunTime",
- "runTime",
- "clockTime",
- "cpuTime",
- "onEnd",
- "none"
- };
-}
-
-const Foam::NamedEnum<Foam::timeControl::timeControls, 9>
- Foam::timeControl::timeControlNames_;
-
+ { timeControl::ocTimeStep, "timeStep" },
+ { timeControl::ocWriteTime, "writeTime" },
+ { timeControl::ocOutputTime, "outputTime" },
+ { timeControl::ocAdjustableRunTime, "adjustableRunTime" },
+ { timeControl::ocRunTime, "runTime" },
+ { timeControl::ocClockTime, "clockTime" },
+ { timeControl::ocCpuTime, "cpuTime" },
+ { timeControl::ocOnEnd, "onEnd" },
+ { timeControl::ocNone, "none" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -117,7 +112,7 @@ void Foam::timeControl::read(const dictionary& dict)
if (dict.found(controlName))
{
- timeControl_ = timeControlNames_.read(dict.lookup(controlName));
+ timeControl_ = timeControlNames_.lookup(controlName, dict);
}
else
{
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
index 247ef2d3de85374b9cf8d4b44c227085d14f7d45..86b91b2466ef8477f680edc1e3476b0b657b85a7 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControl.H
@@ -77,7 +77,7 @@ private:
const word prefix_;
//- String representation of timeControls enums
- static const NamedEnum<timeControls, 9> timeControlNames_;
+ static const Enum<timeControls> timeControlNames_;
//- Type of time control
timeControls timeControl_;
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index 513efc44e50e948c97e44dfec9817939c4585be9..3cf47f0cd50cfe755a16235fcaaaa0c938abb475 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
@@ -42,7 +42,7 @@ tmp<DimensionedField<TypeR, GeoMesh>> New
)
{
DimensionedField<TypeR, GeoMesh>& df1 =
- const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+ const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
if (tdf1.isTmp())
{
@@ -115,7 +115,7 @@ public:
)
{
DimensionedField<TypeR, GeoMesh>& df1 =
- const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+ const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
if (tdf1.isTmp())
{
@@ -192,7 +192,7 @@ public:
{
const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
DimensionedField<TypeR, GeoMesh>& df2 =
- const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf2());
+ const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf2());
if (tdf2.isTmp())
{
@@ -235,7 +235,7 @@ public:
)
{
DimensionedField<TypeR, GeoMesh>& df1 =
- const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+ const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
if (tdf1.isTmp())
{
@@ -278,9 +278,9 @@ public:
)
{
DimensionedField<TypeR, GeoMesh>& df1 =
- const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+ const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
DimensionedField<TypeR, GeoMesh>& df2 =
- const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf2());
+ const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf2());
if (tdf1.isTmp())
{
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index a9c849c53a5a38862c7fff216f26c80affc5b726..c6fb56706d37bf0d928acfdf0485b6ed573276ec 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -85,7 +85,7 @@ tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
)
{
GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
- const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+ const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
if (reusable(tgf1))
{
@@ -171,7 +171,7 @@ public:
)
{
GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
- const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+ const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
if (reusable(tgf1))
{
@@ -264,7 +264,7 @@ public:
{
const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();
GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
- const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf2());
+ const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf2());
if (reusable(tgf2))
{
@@ -313,7 +313,7 @@ public:
)
{
GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
- const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+ const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
if (reusable(tgf1))
{
@@ -356,9 +356,9 @@ public:
)
{
GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
- const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+ const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
- const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf2());
+ const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf2());
if (reusable(tgf1))
{
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
index 47a8a8c3ce7411fddff201e3ea5151bf7fe1bbed..1dcbd942795535cc006924d49c6272ebe765563d 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
@@ -91,8 +91,8 @@ Foam::pointPatchField<Type>::NewCalculatedType
const pointPatchField<Type2>& pf
)
{
- typename pointPatchConstructorTable::iterator patchTypeCstrIter =
- pointPatchConstructorTablePtr_->find(pf.patch().type());
+ auto patchTypeCstrIter =
+ pointPatchConstructorTablePtr_->cfind(pf.patch().type());
if (patchTypeCstrIter.found())
{
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
index 79d90cf3a2e3adb7caa143aaa6e2dc8c18f24be4..666ccc2fdecbc6eac1c90a402c22c19d099ee11c 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
@@ -39,15 +39,14 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
InfoInFunction << "Constructing pointPatchField<Type>" << endl;
}
- typename pointPatchConstructorTable::iterator cstrIter =
- pointPatchConstructorTablePtr_->find(patchFieldType);
+ auto cstrIter = pointPatchConstructorTablePtr_->cfind(patchFieldType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown patchFieldType type "
<< patchFieldType << nl << nl
- << "Valid patchField types are :" << endl
+ << "Valid patchField types :" << endl
<< pointPatchConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -63,8 +62,8 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
if (pfPtr().constraintType() != p.constraintType())
{
// Use default constraint type
- typename pointPatchConstructorTable::iterator patchTypeCstrIter =
- pointPatchConstructorTablePtr_->find(p.type());
+ auto patchTypeCstrIter =
+ pointPatchConstructorTablePtr_->cfind(p.type());
if (!patchTypeCstrIter.found())
{
@@ -117,14 +116,13 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
word patchFieldType(dict.lookup("type"));
- typename dictionaryConstructorTable::iterator cstrIter
- = dictionaryConstructorTablePtr_->find(patchFieldType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(patchFieldType);
if (!cstrIter.found())
{
if (!disallowGenericPointPatchField)
{
- cstrIter = dictionaryConstructorTablePtr_->find("generic");
+ cstrIter = dictionaryConstructorTablePtr_->cfind("generic");
}
if (!cstrIter.found())
@@ -134,7 +132,7 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
dict
) << "Unknown patchField type " << patchFieldType
<< " for patch type " << p.type() << nl << nl
- << "Valid patchField types are :" << endl
+ << "Valid patchField types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
@@ -157,8 +155,8 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
else
{
// Use default constraint type
- typename dictionaryConstructorTable::iterator patchTypeCstrIter
- = dictionaryConstructorTablePtr_->find(p.type());
+ auto patchTypeCstrIter
+ = dictionaryConstructorTablePtr_->cfind(p.type());
if (!patchTypeCstrIter.found())
{
@@ -193,15 +191,14 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
InfoInFunction << "Constructing pointPatchField<Type>" << endl;
}
- typename patchMapperConstructorTable::iterator cstrIter =
- patchMapperConstructorTablePtr_->find(ptf.type());
+ auto cstrIter = patchMapperConstructorTablePtr_->cfind(ptf.type());
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown patchField type "
<< ptf.type() << nl << nl
- << "Valid patchField types are :" << endl
+ << "Valid patchField types :" << endl
<< patchMapperConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index e111b3306755663e716e8c2f1c6558dcdbec1544..a5092d472e6e25883e21c9a5164beb7ada1d5732 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -37,7 +37,7 @@ License
#include "sigInt.H"
#include "sigQuit.H"
#include "sigSegv.H"
-#include "endian.H"
+#include "foamVersion.H"
#include <cctype>
@@ -54,22 +54,6 @@ Foam::string::size_type Foam::argList::usageMin = 20;
Foam::string::size_type Foam::argList::usageMax = 80;
Foam::word Foam::argList::postProcessOptionName("postProcess");
-// file-scope
-// Hint about machine endian, OpenFOAM label and scalar sizes
-static const std::string archHint =
-(
-#ifdef WM_LITTLE_ENDIAN
- "LSB"
-#elif defined (WM_BIG_ENDIAN)
- "MSB"
-#else
- "???"
-#endif
- ";label=" + std::to_string(8*sizeof(Foam::label))
- + ";scalar=" + std::to_string(8*sizeof(Foam::scalar))
-);
-
-
Foam::argList::initValidTables::initValidTables()
{
argList::addOption
@@ -407,11 +391,11 @@ void Foam::argList::getRootCase()
fileName casePath;
// [-case dir] specified
- HashTable<string>::const_iterator iter = options_.find("case");
+ auto optIter = options_.cfind("case");
- if (iter != options_.end())
+ if (optIter.found())
{
- casePath = iter();
+ casePath = optIter.object();
casePath.clean();
if (casePath.empty() || casePath == ".")
@@ -639,7 +623,7 @@ void Foam::argList::parse
{
IOobject::writeBanner(Info, true)
<< "Build : " << Foam::FOAMbuild << nl
- << "Arch : " << archHint << nl
+ << "Arch : " << Foam::FOAMbuildArch << nl
<< "Exec : " << argListStr_.c_str() << nl
<< "Date : " << dateString.c_str() << nl
<< "Time : " << timeString.c_str() << nl
@@ -650,7 +634,7 @@ void Foam::argList::parse
jobInfo.add("startDate", dateString);
jobInfo.add("startTime", timeString);
jobInfo.add("userName", userName());
- jobInfo.add("foamVersion", word(FOAMversion));
+ jobInfo.add("foamVersion", word(Foam::FOAMversion));
jobInfo.add("code", executable_);
jobInfo.add("argList", argListStr_);
jobInfo.add("currentDir", cwd());
@@ -660,10 +644,10 @@ void Foam::argList::parse
// Add build information - only use the first word
{
std::string build(Foam::FOAMbuild);
- std::string::size_type found = build.find(' ');
- if (found != std::string::npos)
+ std::string::size_type space = build.find(' ');
+ if (space != std::string::npos)
{
- build.resize(found);
+ build.resize(space);
}
jobInfo.add("foamBuild", build);
}
@@ -695,15 +679,12 @@ void Foam::argList::parse
source = options_["decomposeParDict"];
if (isDir(source))
{
- adjustOpt = true;
source = source/"decomposeParDict";
+ adjustOpt = true;
}
- if
- (
- !source.isAbsolute()
- && !(source.size() && source[0] == '.')
- )
+ // Case-relative if not absolute and not "./" etc
+ if (!source.isAbsolute() && !source.startsWith("."))
{
source = rootPath_/globalCase_/source;
adjustOpt = true;
@@ -1185,32 +1166,26 @@ void Foam::argList::printUsage() const
Info<< "\noptions:\n";
- wordList opts = validOptions.sortedToc();
- forAll(opts, optI)
+ const wordList opts = validOptions.sortedToc();
+ for (const word& optionName : opts)
{
- const word& optionName = opts[optI];
-
- HashTable<string>::const_iterator iter = validOptions.find(optionName);
Info<< " -" << optionName;
label len = optionName.size() + 3; // Length includes leading ' -'
- if (iter().size())
+ auto optIter = validOptions.cfind(optionName);
+
+ if (optIter().size())
{
- // Length includes space and between option/param and '<>'
- len += iter().size() + 3;
- Info<< " <" << iter().c_str() << '>';
+ // Length includes space between option/param and '<>'
+ len += optIter().size() + 3;
+ Info<< " <" << optIter().c_str() << '>';
}
- HashTable<string>::const_iterator usageIter =
- optionUsage.find(optionName);
+ auto usageIter = optionUsage.cfind(optionName);
- if (usageIter != optionUsage.end())
+ if (usageIter.found())
{
- printOptionUsage
- (
- len,
- usageIter()
- );
+ printOptionUsage(len, usageIter());
}
else
{
@@ -1220,26 +1195,13 @@ void Foam::argList::printUsage() const
// Place srcDoc/doc/help options at the end
Info<< " -srcDoc";
- printOptionUsage
- (
- 9,
- "display source code in browser"
- );
+ printOptionUsage(9, "display source code in browser" );
Info<< " -doc";
- printOptionUsage
- (
- 6,
- "display application documentation in browser"
- );
+ printOptionUsage(6, "display application documentation in browser");
Info<< " -help";
- printOptionUsage
- (
- 7,
- "print the usage"
- );
-
+ printOptionUsage(7, "print the usage");
printNotes();
@@ -1247,7 +1209,7 @@ void Foam::argList::printUsage() const
<<"Using: OpenFOAM-" << Foam::FOAMversion
<< " (see www.OpenFOAM.com)" << nl
<< "Build: " << Foam::FOAMbuild << nl
- << "Arch: " << archHint << nl
+ << "Arch: " << Foam::FOAMbuildArch << nl
<< endl;
}
@@ -1261,20 +1223,20 @@ void Foam::argList::displayDoc(bool source) const
// For source code: change foo_8C.html to foo_8C_source.html
if (source)
{
- forAll(docExts, extI)
+ for (fileName& ext : docExts)
{
- docExts[extI].replace(".", "_source.");
+ ext.replace(".", "_source.");
}
}
fileName docFile;
bool found = false;
- forAll(docDirs, dirI)
+ for (const fileName& dir : docDirs)
{
- forAll(docExts, extI)
+ for (const fileName& ext : docExts)
{
- docFile = docDirs[dirI]/executable_ + docExts[extI];
+ docFile = dir/executable_ + ext;
docFile.expand();
if (isFile(docFile))
diff --git a/src/OpenFOAM/global/foamVersion.H b/src/OpenFOAM/global/foamVersion.H
index bd3386e786067a65749ab99eed8657457ae4e48b..3b5d9fcb465954b755bbf709288cdbcfb15ce34b 100644
--- a/src/OpenFOAM/global/foamVersion.H
+++ b/src/OpenFOAM/global/foamVersion.H
@@ -32,13 +32,20 @@ Global
Foam::FOAMversion
Description
- OpenFOAM version number static string.
+ OpenFOAM version number as a static string.
Global
Foam::FOAMbuild
Description
- OpenFOAM version number static string with build information
+ OpenFOAM build information as a static string
+
+Global
+ Foam::FOAMbuildArch
+
+Description
+ OpenFOAM build architecture information (endian, label/scalar sizes)
+ as a static string
SourceFiles
global.Cver
@@ -48,6 +55,8 @@ SourceFiles
#ifndef foamVersion_H
#define foamVersion_H
+#include <string>
+
// The directory name for user-resources (located in the HOME directory)
#define WM_USER_RESOURCE_DIRNAME ".OpenFOAM"
@@ -57,6 +66,7 @@ namespace Foam
{
extern const char* const FOAMversion;
extern const char* const FOAMbuild;
+ extern const std::string FOAMbuildArch;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/global/global.Cver b/src/OpenFOAM/global/global.Cver
index a868495556866a6e0a56f4ecb66930ddba1c913b..0c9f3fdf31f307c467a0ab12e184f3de5b529247 100644
--- a/src/OpenFOAM/global/global.Cver
+++ b/src/OpenFOAM/global/global.Cver
@@ -33,10 +33,30 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "foamVersion.H"
+#include "endian.H"
+#include "label.H"
+#include "scalar.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
const char* const Foam::FOAMversion = "VERSION_STRING";
const char* const Foam::FOAMbuild = "BUILD_STRING";
+// Information about machine endian, label and scalar sizes
+const std::string Foam::FOAMbuildArch =
+(
+#ifdef WM_LITTLE_ENDIAN
+ "LSB"
+#elif defined (WM_BIG_ENDIAN)
+ "MSB"
+#else
+ "???"
+#endif
+ ";label=" + std::to_string(8*sizeof(Foam::label))
+ + ";scalar=" + std::to_string(8*sizeof(Foam::scalar))
+);
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Setup an error handler for the global new operator
diff --git a/src/OpenFOAM/global/unitConversion/unitConversion.H b/src/OpenFOAM/global/unitConversion/unitConversion.H
index 499ecd6aab8eb29825c866a1ffaad44ec2cdb69d..1308947e2d9ea63f3ecbfd04b01a4ef12966ea3a 100644
--- a/src/OpenFOAM/global/unitConversion/unitConversion.H
+++ b/src/OpenFOAM/global/unitConversion/unitConversion.H
@@ -53,6 +53,18 @@ inline constexpr scalar radToDeg(const scalar rad) noexcept
return (rad*180.0/M_PI);
}
+//- Multiplication factor for degrees to radians conversion
+inline constexpr scalar degToRad() noexcept
+{
+ return (M_PI/180.0);
+}
+
+//- Multiplication factor for radians to degrees conversion
+inline constexpr scalar radToDeg() noexcept
+{
+ return (180.0/M_PI);
+}
+
//- Conversion from atm to Pa
inline constexpr scalar atmToPa(const scalar atm) noexcept
{
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index 105c69bcd563db2283fe02c9482e8bf973240a92..9f5532575d184625ae517b80f54d594795275704 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -212,15 +212,14 @@ Foam::autoPtr<Foam::graph::writer> Foam::graph::writer::New
<< exit(FatalError);
}
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(graphFormat);
+ auto cstrIter = wordConstructorTablePtr_->cfind(graphFormat);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown graph format " << graphFormat
- << endl << endl
- << "Valid graph formats are : " << endl
+ << "Unknown graph format "
+ << graphFormat << nl << nl
+ << "Valid graph formats :" << endl
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
index 01c0aaa9590a84ab3aea5dfaa18a27f0a75f7504..d4c4cca0d0b433d6fd937398dcd948c82014073a 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
@@ -55,7 +55,7 @@ template<class Type>
Foam::interpolation2DTable<Type>::interpolation2DTable()
:
List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
- boundsHandling_(interpolation2DTable::WARN),
+ bounding_(bounds::normalBounding::WARN),
fileName_("fileNameIsUndefined"),
reader_(nullptr)
{}
@@ -65,12 +65,12 @@ template<class Type>
Foam::interpolation2DTable<Type>::interpolation2DTable
(
const List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& values,
- const boundsHandling bounds,
+ const bounds::normalBounding bounding,
const fileName& fName
)
:
List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(values),
- boundsHandling_(bounds),
+ bounding_(bounding),
fileName_(fName),
reader_(nullptr)
{}
@@ -80,7 +80,7 @@ template<class Type>
Foam::interpolation2DTable<Type>::interpolation2DTable(const fileName& fName)
:
List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
- boundsHandling_(interpolation2DTable::WARN),
+ bounding_(bounds::normalBounding::WARN),
fileName_(fName),
reader_(new openFoamTableReader<Type>(dictionary()))
{
@@ -92,7 +92,15 @@ template<class Type>
Foam::interpolation2DTable<Type>::interpolation2DTable(const dictionary& dict)
:
List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
- boundsHandling_(wordToBoundsHandling(dict.lookup("outOfBounds"))),
+ bounding_
+ (
+ bounds::normalBoundingNames.lookupOrFailsafe
+ (
+ "outOfBounds",
+ dict,
+ bounds::normalBounding::WARN
+ )
+ ),
fileName_(dict.lookup("file")),
reader_(tableReader<Type>::New(dict))
{
@@ -107,7 +115,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
)
:
List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(interpTable),
- boundsHandling_(interpTable.boundsHandling_),
+ bounding_(interpTable.bounding_),
fileName_(interpTable.fileName_),
reader_(interpTable.reader_) // note: steals reader. Used in write().
{}
@@ -130,9 +138,9 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
if (lookupValue < minLimit)
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case interpolation2DTable::ERROR:
+ case bounds::normalBounding::ERROR:
{
FatalErrorInFunction
<< "value (" << lookupValue << ") less than lower "
@@ -140,18 +148,18 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
<< exit(FatalError);
break;
}
- case interpolation2DTable::WARN:
+ case bounds::normalBounding::WARN:
{
WarningInFunction
<< "value (" << lookupValue << ") less than lower "
<< "bound (" << minLimit << ")" << nl
<< " Continuing with the first entry"
<< endl;
- // Behaviour as per 'CLAMP'
+ // Behaviour as per CLAMP
return data.first().second();
break;
}
- case interpolation2DTable::CLAMP:
+ case bounds::normalBounding::CLAMP:
{
return data.first().second();
break;
@@ -160,9 +168,9 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
}
else if (lookupValue >= maxLimit)
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case interpolation2DTable::ERROR:
+ case bounds::normalBounding::ERROR:
{
FatalErrorInFunction
<< "value (" << lookupValue << ") greater than upper "
@@ -170,18 +178,18 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
<< exit(FatalError);
break;
}
- case interpolation2DTable::WARN:
+ case bounds::normalBounding::WARN:
{
WarningInFunction
<< "value (" << lookupValue << ") greater than upper "
<< "bound (" << maxLimit << ")" << nl
<< " Continuing with the last entry"
<< endl;
- // Behaviour as per 'CLAMP'
+ // Behaviour as per CLAMP
return data.last().second();
break;
}
- case interpolation2DTable::CLAMP:
+ case bounds::normalBounding::CLAMP:
{
return data.last().second();
break;
@@ -241,25 +249,25 @@ Foam::label Foam::interpolation2DTable<Type>::Xi
if (bop(valueX, t[limitI].first()))
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case interpolation2DTable::ERROR:
+ case bounds::normalBounding::ERROR:
{
FatalErrorInFunction
<< "value (" << valueX << ") out of bounds"
<< exit(FatalError);
break;
}
- case interpolation2DTable::WARN:
+ case bounds::normalBounding::WARN:
{
WarningInFunction
<< "value (" << valueX << ") out of bounds"
<< endl;
- // Behaviour as per 'CLAMP'
+ // Behaviour as per CLAMP
return limitI;
break;
}
- case interpolation2DTable::CLAMP:
+ case bounds::normalBounding::CLAMP:
{
return limitI;
break;
@@ -267,7 +275,7 @@ Foam::label Foam::interpolation2DTable<Type>::Xi
default:
{
FatalErrorInFunction
- << "Unhandled enumeration " << boundsHandling_
+ << "Unhandled bounding type " << int(bounding_)
<< abort(FatalError);
}
}
@@ -351,79 +359,6 @@ Type Foam::interpolation2DTable<Type>::operator()
}
-template<class Type>
-Foam::word Foam::interpolation2DTable<Type>::boundsHandlingToWord
-(
- const boundsHandling& bound
-) const
-{
- word enumName("warn");
-
- switch (bound)
- {
- case interpolation2DTable::ERROR:
- {
- enumName = "error";
- break;
- }
- case interpolation2DTable::WARN:
- {
- enumName = "warn";
- break;
- }
- case interpolation2DTable::CLAMP:
- {
- enumName = "clamp";
- break;
- }
- }
-
- return enumName;
-}
-
-
-template<class Type>
-typename Foam::interpolation2DTable<Type>::boundsHandling
-Foam::interpolation2DTable<Type>::wordToBoundsHandling
-(
- const word& bound
-) const
-{
- if (bound == "error")
- {
- return interpolation2DTable::ERROR;
- }
- else if (bound == "warn")
- {
- return interpolation2DTable::WARN;
- }
- else if (bound == "clamp")
- {
- return interpolation2DTable::CLAMP;
- }
- else
- {
- WarningInFunction
- << "bad outOfBounds specifier " << bound << " using 'warn'" << endl;
-
- return interpolation2DTable::WARN;
- }
-}
-
-
-template<class Type>
-typename Foam::interpolation2DTable<Type>::boundsHandling
-Foam::interpolation2DTable<Type>::outOfBounds
-(
- const boundsHandling& bound
-)
-{
- boundsHandling prev = boundsHandling_;
- boundsHandling_ = bound;
- return prev;
-}
-
-
template<class Type>
void Foam::interpolation2DTable<Type>::checkOrder() const
{
@@ -453,7 +388,7 @@ template<class Type>
void Foam::interpolation2DTable<Type>::write(Ostream& os) const
{
os.writeEntry("file", fileName_);
- os.writeEntry("outOfBounds", boundsHandlingToWord(boundsHandling_));
+ os.writeEntry("outOfBounds", bounds::normalBoundingNames[bounding_]);
os << *this;
}
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
index e38b0a979a486ea9b26a8ff21c85a3f8af86f8b4..5c4eb31057b1b6f50218ada8eb6293c2a8352298 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
@@ -38,6 +38,7 @@ SourceFiles
#include "List.H"
#include "Tuple2.H"
+#include "tableBounds.H"
#include "tableReader.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,14 +59,6 @@ public:
// Public data types
- //- Enumeration for handling out-of-bound values
- enum boundsHandling
- {
- ERROR, //!< Exit with a FatalError
- WARN, //!< Issue warning and clamp value (default)
- CLAMP //!< Clamp value to the start/end value
- };
-
//- Convenience typedef
typedef List<Tuple2<scalar, List<Tuple2<scalar, Type>>>> table;
@@ -74,8 +67,8 @@ private:
// Private data
- //- Enumeration for handling out-of-bound values
- boundsHandling boundsHandling_;
+ //- Handling for out-of-bound values
+ bounds::normalBounding bounding_;
//- File name
fileName fileName_;
@@ -117,14 +110,14 @@ public:
interpolation2DTable
(
const List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& values,
- const boundsHandling bounds,
+ const bounds::normalBounding bounding,
const fileName& fName
);
//- Construct given the name of the file containing the table of data
interpolation2DTable(const fileName& fName);
- //- Construct by reading the fileName and boundsHandling from dictionary
+ //- Construct by reading file name and outOfBounds from dictionary
interpolation2DTable(const dictionary& dict);
//- Construct copy
@@ -133,15 +126,6 @@ public:
// Member Functions
- //- Return the out-of-bounds handling as a word
- word boundsHandlingToWord(const boundsHandling& bound) const;
-
- //- Return the out-of-bounds handling as an enumeration
- boundsHandling wordToBoundsHandling(const word& bound) const;
-
- //- Set the out-of-bounds handling from enum, return previous setting
- boundsHandling outOfBounds(const boundsHandling& bound);
-
//- Check that list is monotonically increasing
// Exit with a FatalError if there is a problem
void checkOrder() const;
@@ -152,7 +136,7 @@ public:
// Member Operators
- //- Return an element of constant Tuple2<scalar, Type>
+ //- Return an element of constant List<Tuple2<scalar, Type>>
const List<Tuple2<scalar, Type>>& operator[](const label) const;
//- Return an interpolated value
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
index 695e13dca46e1d3902e2739610d522057050b8bb..012e47d2fd6b8ad8cdce8acd1361166751f05989 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
@@ -59,7 +59,7 @@ template<class Type>
Foam::interpolationTable<Type>::interpolationTable()
:
List<Tuple2<scalar, Type>>(),
- boundsHandling_(interpolationTable::WARN),
+ bounding_(bounds::repeatableBounding::WARN),
fileName_("fileNameIsUndefined"),
reader_(nullptr)
{}
@@ -69,12 +69,12 @@ template<class Type>
Foam::interpolationTable<Type>::interpolationTable
(
const List<Tuple2<scalar, Type>>& values,
- const boundsHandling bounds,
+ const bounds::repeatableBounding bounding,
const fileName& fName
)
:
List<Tuple2<scalar, Type>>(values),
- boundsHandling_(bounds),
+ bounding_(bounding),
fileName_(fName),
reader_(nullptr)
{}
@@ -84,7 +84,7 @@ template<class Type>
Foam::interpolationTable<Type>::interpolationTable(const fileName& fName)
:
List<Tuple2<scalar, Type>>(),
- boundsHandling_(interpolationTable::WARN),
+ bounding_(bounds::repeatableBounding::WARN),
fileName_(fName),
reader_(new openFoamTableReader<Type>(dictionary()))
{
@@ -96,7 +96,15 @@ template<class Type>
Foam::interpolationTable<Type>::interpolationTable(const dictionary& dict)
:
List<Tuple2<scalar, Type>>(),
- boundsHandling_(wordToBoundsHandling(dict.lookup("outOfBounds"))),
+ bounding_
+ (
+ bounds::repeatableBoundingNames.lookupOrFailsafe
+ (
+ "outOfBounds",
+ dict,
+ bounds::repeatableBounding::WARN
+ )
+ ),
fileName_(dict.lookup("file")),
reader_(tableReader<Type>::New(dict))
{
@@ -111,7 +119,7 @@ Foam::interpolationTable<Type>::interpolationTable
)
:
List<Tuple2<scalar, Type>>(interpTable),
- boundsHandling_(interpTable.boundsHandling_),
+ bounding_(interpTable.bounding_),
fileName_(interpTable.fileName_),
reader_(interpTable.reader_) // note: steals reader. Used in write().
{}
@@ -120,88 +128,6 @@ Foam::interpolationTable<Type>::interpolationTable
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template<class Type>
-Foam::word Foam::interpolationTable<Type>::boundsHandlingToWord
-(
- const boundsHandling& bound
-) const
-{
- word enumName("warn");
-
- switch (bound)
- {
- case interpolationTable::ERROR:
- {
- enumName = "error";
- break;
- }
- case interpolationTable::WARN:
- {
- enumName = "warn";
- break;
- }
- case interpolationTable::CLAMP:
- {
- enumName = "clamp";
- break;
- }
- case interpolationTable::REPEAT:
- {
- enumName = "repeat";
- break;
- }
- }
-
- return enumName;
-}
-
-
-template<class Type>
-typename Foam::interpolationTable<Type>::boundsHandling
-Foam::interpolationTable<Type>::wordToBoundsHandling
-(
- const word& bound
-) const
-{
- if (bound == "error")
- {
- return interpolationTable::ERROR;
- }
- else if (bound == "warn")
- {
- return interpolationTable::WARN;
- }
- else if (bound == "clamp")
- {
- return interpolationTable::CLAMP;
- }
- else if (bound == "repeat")
- {
- return interpolationTable::REPEAT;
- }
- else
- {
- WarningInFunction
- << "bad outOfBounds specifier " << bound << " using 'warn'" << endl;
-
- return interpolationTable::WARN;
- }
-}
-
-
-template<class Type>
-typename Foam::interpolationTable<Type>::boundsHandling
-Foam::interpolationTable<Type>::outOfBounds
-(
- const boundsHandling& bound
-)
-{
- boundsHandling prev = boundsHandling_;
- boundsHandling_ = bound;
- return prev;
-}
-
-
template<class Type>
void Foam::interpolationTable<Type>::check() const
{
@@ -230,7 +156,7 @@ template<class Type>
void Foam::interpolationTable<Type>::write(Ostream& os) const
{
os.writeEntry("file", fileName_);
- os.writeEntry("outOfBounds", boundsHandlingToWord(boundsHandling_));
+ os.writeEntry("outOfBounds", bounds::repeatableBoundingNames[bounding_]);
if (reader_.valid())
{
reader_->write(os);
@@ -255,33 +181,33 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
if (lookupValue < minLimit)
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case interpolationTable::ERROR:
+ case bounds::repeatableBounding::ERROR:
{
FatalErrorInFunction
<< "value (" << lookupValue << ") underflow" << nl
<< exit(FatalError);
break;
}
- case interpolationTable::WARN:
+ case bounds::repeatableBounding::WARN:
{
WarningInFunction
<< "value (" << lookupValue << ") underflow" << nl
<< " Zero rate of change."
<< endl;
- // behaviour as per 'CLAMP'
+ // Behaviour as per CLAMP
return 0;
break;
}
- case interpolationTable::CLAMP:
+ case bounds::repeatableBounding::CLAMP:
{
return 0;
break;
}
- case interpolationTable::REPEAT:
+ case bounds::repeatableBounding::REPEAT:
{
- // adjust lookupValue to >= minLimit
+ // Adjust lookupValue to >= minLimit
scalar span = maxLimit-minLimit;
lookupValue = fmod(lookupValue-minLimit, span) + minLimit;
break;
@@ -290,33 +216,33 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
}
else if (lookupValue >= maxLimit)
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case interpolationTable::ERROR:
+ case bounds::repeatableBounding::ERROR:
{
FatalErrorInFunction
<< "value (" << lookupValue << ") overflow" << nl
<< exit(FatalError);
break;
}
- case interpolationTable::WARN:
+ case bounds::repeatableBounding::WARN:
{
WarningInFunction
<< "value (" << lookupValue << ") overflow" << nl
<< " Zero rate of change."
<< endl;
- // Behaviour as per 'CLAMP'
+ // Behaviour as per CLAMP
return 0;
break;
}
- case interpolationTable::CLAMP:
+ case bounds::repeatableBounding::CLAMP:
{
return 0;
break;
}
- case interpolationTable::REPEAT:
+ case bounds::repeatableBounding::REPEAT:
{
- // adjust lookupValue <= maxLimit
+ // Adjust lookupValue <= maxLimit
scalar span = maxLimit-minLimit;
lookupValue = fmod(lookupValue-minLimit, span) + minLimit;
break;
@@ -401,16 +327,16 @@ Foam::interpolationTable<Type>::operator[](const label i) const
}
else if (ii < 0)
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case interpolationTable::ERROR:
+ case bounds::repeatableBounding::ERROR:
{
FatalErrorInFunction
<< "index (" << ii << ") underflow" << nl
<< exit(FatalError);
break;
}
- case interpolationTable::WARN:
+ case bounds::repeatableBounding::WARN:
{
WarningInFunction
<< "index (" << ii << ") underflow" << nl
@@ -420,12 +346,12 @@ Foam::interpolationTable<Type>::operator[](const label i) const
ii = 0;
break;
}
- case interpolationTable::CLAMP:
+ case bounds::repeatableBounding::CLAMP:
{
ii = 0;
break;
}
- case interpolationTable::REPEAT:
+ case bounds::repeatableBounding::REPEAT:
{
while (ii < 0)
{
@@ -437,16 +363,16 @@ Foam::interpolationTable<Type>::operator[](const label i) const
}
else if (ii >= n)
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case interpolationTable::ERROR:
+ case bounds::repeatableBounding::ERROR:
{
FatalErrorInFunction
<< "index (" << ii << ") overflow" << nl
<< exit(FatalError);
break;
}
- case interpolationTable::WARN:
+ case bounds::repeatableBounding::WARN:
{
WarningInFunction
<< "index (" << ii << ") overflow" << nl
@@ -456,12 +382,12 @@ Foam::interpolationTable<Type>::operator[](const label i) const
ii = n - 1;
break;
}
- case interpolationTable::CLAMP:
+ case bounds::repeatableBounding::CLAMP:
{
ii = n - 1;
break;
}
- case interpolationTable::REPEAT:
+ case bounds::repeatableBounding::REPEAT:
{
while (ii >= n)
{
@@ -492,31 +418,31 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
if (lookupValue < minLimit)
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case interpolationTable::ERROR:
+ case bounds::repeatableBounding::ERROR:
{
FatalErrorInFunction
<< "value (" << lookupValue << ") underflow" << nl
<< exit(FatalError);
break;
}
- case interpolationTable::WARN:
+ case bounds::repeatableBounding::WARN:
{
WarningInFunction
<< "value (" << lookupValue << ") underflow" << nl
<< " Continuing with the first entry"
<< endl;
- // Behaviour as per 'CLAMP'
+ // Behaviour as per CLAMP
return this->first().second();
break;
}
- case interpolationTable::CLAMP:
+ case bounds::repeatableBounding::CLAMP:
{
return this->first().second();
break;
}
- case interpolationTable::REPEAT:
+ case bounds::repeatableBounding::REPEAT:
{
// adjust lookupValue to >= minLimit
const scalar span = maxLimit-minLimit;
@@ -527,16 +453,16 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
}
else if (lookupValue >= maxLimit)
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case interpolationTable::ERROR:
+ case bounds::repeatableBounding::ERROR:
{
FatalErrorInFunction
<< "value (" << lookupValue << ") overflow" << nl
<< exit(FatalError);
break;
}
- case interpolationTable::WARN:
+ case bounds::repeatableBounding::WARN:
{
WarningInFunction
<< "value (" << lookupValue << ") overflow" << nl
@@ -546,12 +472,12 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
return this->last().second();
break;
}
- case interpolationTable::CLAMP:
+ case bounds::repeatableBounding::CLAMP:
{
return this->last().second();
break;
}
- case interpolationTable::REPEAT:
+ case bounds::repeatableBounding::REPEAT:
{
// adjust lookupValue <= maxLimit
const scalar span = maxLimit-minLimit;
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
index 09f2e74442544a312f849e20fb6c59432dd5b329..e75040703e06943138d3c68e796b1ba93d94b47f 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
@@ -64,6 +64,7 @@ SourceFiles
#include "List.H"
#include "Tuple2.H"
+#include "tableBounds.H"
#include "tableReader.H"
#include "autoPtr.H"
@@ -81,26 +82,10 @@ class interpolationTable
:
public List<Tuple2<scalar, Type>>
{
-public:
-
- // Public data types
-
- //- Enumeration for handling out-of-bound values
- enum boundsHandling
- {
- ERROR, //!< Exit with a FatalError
- WARN, //!< Issue warning and clamp value (default)
- CLAMP, //!< Clamp value to the start/end value
- REPEAT //!< Treat as a repeating list
- };
-
-
-private:
-
// Private data
- //- Enumeration for handling out-of-bound values
- boundsHandling boundsHandling_;
+ //- Handling for out-of-bound values
+ bounds::repeatableBounding bounding_;
//- File name
fileName fileName_;
@@ -108,6 +93,7 @@ private:
//- The actual reader
autoPtr<tableReader<Type>> reader_;
+
// Private Member Functions
//- Read the table of data from file
@@ -125,14 +111,14 @@ public:
interpolationTable
(
const List<Tuple2<scalar, Type>>& values,
- const boundsHandling bounds,
+ const bounds::repeatableBounding bounding,
const fileName& fName
);
//- Construct given the name of the file containing the table of data
interpolationTable(const fileName& fName);
- //- Construct by reading the fileName and boundsHandling from dictionary
+ //- Construct by reading file name and outOfBounds from dictionary
// and read the table from that file.
// This is a specialised constructor used by patchFields
interpolationTable(const dictionary& dict);
@@ -143,15 +129,6 @@ public:
// Member Functions
- //- Return the out-of-bounds handling as a word
- word boundsHandlingToWord(const boundsHandling& bound) const;
-
- //- Return the out-of-bounds handling as an enumeration
- boundsHandling wordToBoundsHandling(const word& bound) const;
-
- //- Set the out-of-bounds handling from enum, return previous setting
- boundsHandling outOfBounds(const boundsHandling& bound);
-
//- Check that list is monotonically increasing
// Exit with a FatalError if there is a problem
void check() const;
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
index 58060e89fe3942789c58003db446b1a4c9c4b482..b3d96d50b0b7864dd4ce2b10b30356b4dfbb1a00 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
@@ -39,16 +39,14 @@ Foam::autoPtr<Foam::tableReader<Type>> Foam::tableReader<Type>::New
"openFoam"
);
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_
- ->find(readerType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(readerType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown reader type " << readerType
- << nl << nl
- << "Valid reader types : " << nl
+ << "Unknown reader type "
+ << readerType << nl << nl
+ << "Valid reader types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -78,8 +76,7 @@ void Foam::tableReader<Type>::write(Ostream& os) const
{
if (this->type() != "openFoam")
{
- os.writeKeyword("readerType")
- << this->type() << token::END_STATEMENT << nl;
+ os.writeEntry("readerType", this->type());
}
}
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
index 59dd7cc0fdfc48b97291aa82ad4fbdc535dbb367..01ee15eabd5bb8c5ac92e0aae9ec41d5b05d572e 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
@@ -27,23 +27,18 @@ License
#include "addToRunTimeSelectionTable.H"
#include "Time.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
defineTypeNameAndDebug(interpolationWeights, 0);
defineRunTimeSelectionTable(interpolationWeights, word);
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-interpolationWeights::interpolationWeights
-(
- const scalarField& samples
-)
+Foam::interpolationWeights::interpolationWeights(const scalarField& samples)
:
samples_(samples)
{}
@@ -51,7 +46,7 @@ interpolationWeights::interpolationWeights
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-autoPtr<interpolationWeights> interpolationWeights::New
+Foam::autoPtr<Foam::interpolationWeights> Foam::interpolationWeights::New
(
const word& type,
const scalarField& samples
@@ -64,16 +59,14 @@ autoPtr<interpolationWeights> interpolationWeights::New
<< type << endl;
}
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(type);
+ auto cstrIter = wordConstructorTablePtr_->cfind(type);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown interpolationWeights type "
- << type
- << endl << endl
- << "Valid interpolationWeights types are :" << endl
+ << type << nl << nl
+ << "Valid interpolationWeights types :" << endl
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -84,12 +77,8 @@ autoPtr<interpolationWeights> interpolationWeights::New
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-interpolationWeights::~interpolationWeights()
+Foam::interpolationWeights::~interpolationWeights()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
index 8e1aa10b79c34d256cbc292d59b2eb3556a14167..ad3de4764ce68b4bb42e5f00c208eebad6b26166 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
@@ -35,14 +35,14 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
const dictionary& preconditionerDict
)
{
- word preconditionerName = preconditionerDict.lookup("preconditioner");
+ const word preconditionerName = preconditionerDict.lookup("preconditioner");
if (sol.matrix().symmetric())
{
- typename symMatrixConstructorTable::iterator constructorIter =
- symMatrixConstructorTablePtr_->find(preconditionerName);
+ auto cstrIter =
+ symMatrixConstructorTablePtr_->cfind(preconditionerName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -50,13 +50,13 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
) << "Unknown symmetric matrix preconditioner "
<< preconditionerName << endl << endl
<< "Valid symmetric matrix preconditioners are :" << endl
- << symMatrixConstructorTablePtr_->toc()
+ << symMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
return autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
(
- constructorIter()
+ cstrIter()
(
sol,
preconditionerDict
@@ -65,10 +65,10 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
}
else if (sol.matrix().asymmetric())
{
- typename asymMatrixConstructorTable::iterator constructorIter =
- asymMatrixConstructorTablePtr_->find(preconditionerName);
+ auto cstrIter =
+ asymMatrixConstructorTablePtr_->cfind(preconditionerName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -76,13 +76,13 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
) << "Unknown asymmetric matrix preconditioner "
<< preconditionerName << endl << endl
<< "Valid asymmetric matrix preconditioners are :" << endl
- << asymMatrixConstructorTablePtr_->toc()
+ << asymMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
return autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
(
- constructorIter()
+ cstrIter()
(
sol,
preconditionerDict
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
index 195871e41fb3b03b49897e84c617ba40041b07cb..758dafff9a518989772484dd56bdf2583dc08ebb 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
@@ -40,22 +40,21 @@ Foam::LduMatrix<Type, DType, LUType>::smoother::New
if (matrix.symmetric())
{
- typename symMatrixConstructorTable::iterator constructorIter =
- symMatrixConstructorTablePtr_->find(smootherName);
+ auto cstrIter = symMatrixConstructorTablePtr_->cfind(smootherName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction(smootherDict)
<< "Unknown symmetric matrix smoother " << smootherName
<< endl << endl
<< "Valid symmetric matrix smoothers are :" << endl
- << symMatrixConstructorTablePtr_->toc()
+ << symMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>
(
- constructorIter()
+ cstrIter()
(
fieldName,
matrix
@@ -64,22 +63,21 @@ Foam::LduMatrix<Type, DType, LUType>::smoother::New
}
else if (matrix.asymmetric())
{
- typename asymMatrixConstructorTable::iterator constructorIter =
- asymMatrixConstructorTablePtr_->find(smootherName);
+ auto cstrIter = asymMatrixConstructorTablePtr_->cfind(smootherName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction(smootherDict)
<< "Unknown asymmetric matrix smoother " << smootherName
<< endl << endl
<< "Valid asymmetric matrix smoothers are :" << endl
- << asymMatrixConstructorTablePtr_->toc()
+ << asymMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>
(
- constructorIter()
+ cstrIter()
(
fieldName,
matrix
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
index 8338abdbf4486ef0eb4d30c4e352b087727ae1f6..6ca7b2a64ce30ed5690e40c6cd2396b69c6d503d 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
@@ -37,7 +37,7 @@ Foam::LduMatrix<Type, DType, LUType>::solver::New
const dictionary& solverDict
)
{
- word solverName = solverDict.lookup("solver");
+ const word solverName = solverDict.lookup("solver");
if (matrix.diagonal())
{
@@ -53,22 +53,21 @@ Foam::LduMatrix<Type, DType, LUType>::solver::New
}
else if (matrix.symmetric())
{
- typename symMatrixConstructorTable::iterator constructorIter =
- symMatrixConstructorTablePtr_->find(solverName);
+ auto cstrIter = symMatrixConstructorTablePtr_->cfind(solverName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction(solverDict)
<< "Unknown symmetric matrix solver " << solverName
<< endl << endl
<< "Valid symmetric matrix solvers are :" << endl
- << symMatrixConstructorTablePtr_->toc()
+ << symMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>
(
- constructorIter()
+ cstrIter()
(
fieldName,
matrix,
@@ -78,22 +77,21 @@ Foam::LduMatrix<Type, DType, LUType>::solver::New
}
else if (matrix.asymmetric())
{
- typename asymMatrixConstructorTable::iterator constructorIter =
- asymMatrixConstructorTablePtr_->find(solverName);
+ auto cstrIter = asymMatrixConstructorTablePtr_->cfind(solverName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction(solverDict)
<< "Unknown asymmetric matrix solver " << solverName
<< endl << endl
<< "Valid asymmetric matrix solvers are :" << endl
- << asymMatrixConstructorTablePtr_->toc()
+ << asymMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>
(
- constructorIter()
+ cstrIter()
(
fieldName,
matrix,
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
index 36d85e76e838094304e452fcfc3029a82bdeeae7..2d85cca0ae013ed04aca1f77c4ffabfe4e717e98 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
@@ -82,10 +82,9 @@ Foam::lduMatrix::preconditioner::New
if (sol.matrix().symmetric())
{
- symMatrixConstructorTable::iterator constructorIter =
- symMatrixConstructorTablePtr_->find(name);
+ auto cstrIter = symMatrixConstructorTablePtr_->cfind(name);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -99,7 +98,7 @@ Foam::lduMatrix::preconditioner::New
return autoPtr<lduMatrix::preconditioner>
(
- constructorIter()
+ cstrIter()
(
sol,
controls
@@ -108,10 +107,9 @@ Foam::lduMatrix::preconditioner::New
}
else if (sol.matrix().asymmetric())
{
- asymMatrixConstructorTable::iterator constructorIter =
- asymMatrixConstructorTablePtr_->find(name);
+ auto cstrIter = asymMatrixConstructorTablePtr_->cfind(name);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -125,7 +123,7 @@ Foam::lduMatrix::preconditioner::New
return autoPtr<lduMatrix::preconditioner>
(
- constructorIter()
+ cstrIter()
(
sol,
controls
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
index 4692df969be7e66286ed3c723bb3d080672d08dd..0edeea6a9cbb285bd411f395c8cd4a42212d8b3f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
@@ -86,10 +86,9 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
if (matrix.symmetric())
{
- symMatrixConstructorTable::iterator constructorIter =
- symMatrixConstructorTablePtr_->find(name);
+ auto cstrIter = symMatrixConstructorTablePtr_->cfind(name);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction(solverControls)
<< "Unknown symmetric matrix smoother "
@@ -101,7 +100,7 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
return autoPtr<lduMatrix::smoother>
(
- constructorIter()
+ cstrIter()
(
fieldName,
matrix,
@@ -113,10 +112,9 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
}
else if (matrix.asymmetric())
{
- asymMatrixConstructorTable::iterator constructorIter =
- asymMatrixConstructorTablePtr_->find(name);
+ auto cstrIter = asymMatrixConstructorTablePtr_->cfind(name);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction(solverControls)
<< "Unknown asymmetric matrix smoother "
@@ -128,7 +126,7 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
return autoPtr<lduMatrix::smoother>
(
- constructorIter()
+ cstrIter()
(
fieldName,
matrix,
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index 5caa6d627ce551bef1b85d9ad1ba9467da987643..0bcd04bf4ee71dc1316a569f7b83a6d31248638f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -66,10 +66,9 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
}
else if (matrix.symmetric())
{
- symMatrixConstructorTable::iterator constructorIter =
- symMatrixConstructorTablePtr_->find(name);
+ auto cstrIter = symMatrixConstructorTablePtr_->cfind(name);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction(solverControls)
<< "Unknown symmetric matrix solver " << name << nl << nl
@@ -80,7 +79,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
return autoPtr<lduMatrix::solver>
(
- constructorIter()
+ cstrIter()
(
fieldName,
matrix,
@@ -93,10 +92,9 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
}
else if (matrix.asymmetric())
{
- asymMatrixConstructorTable::iterator constructorIter =
- asymMatrixConstructorTablePtr_->find(name);
+ auto cstrIter = asymMatrixConstructorTablePtr_->cfind(name);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction(solverControls)
<< "Unknown asymmetric matrix solver " << name << nl << nl
@@ -107,7 +105,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
return autoPtr<lduMatrix::solver>
(
- constructorIter()
+ cstrIter()
(
fieldName,
matrix,
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index d0168688fa29d7666fcc6d773fff039275a0da29..5095e2be6f8fcd53dc707373d3e2c2dd6d3d2209 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -304,17 +304,16 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
lduMeshConstructorTablePtr_
);
- lduMeshConstructorTable::iterator cstrIter =
- lduMeshConstructorTablePtr_->find(agglomeratorType);
+ auto cstrIter = lduMeshConstructorTablePtr_->cfind(agglomeratorType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown GAMGAgglomeration type "
<< agglomeratorType << ".\n"
- << "Valid matrix GAMGAgglomeration types are :"
+ << "Valid matrix GAMGAgglomeration types :"
<< lduMatrixConstructorTablePtr_->sortedToc() << endl
- << "Valid geometric GAMGAgglomeration types are :"
+ << "Valid geometric GAMGAgglomeration types :"
<< lduMeshConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -369,8 +368,8 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
}
else
{
- lduMatrixConstructorTable::iterator cstrIter =
- lduMatrixConstructorTablePtr_->find(agglomeratorType);
+ auto cstrIter =
+ lduMatrixConstructorTablePtr_->cfind(agglomeratorType);
return store(cstrIter()(matrix, controlDict).ptr());
}
@@ -405,15 +404,14 @@ Foam::autoPtr<Foam::GAMGAgglomeration> Foam::GAMGAgglomeration::New
geometryConstructorTablePtr_
);
- geometryConstructorTable::iterator cstrIter =
- geometryConstructorTablePtr_->find(agglomeratorType);
+ auto cstrIter = geometryConstructorTablePtr_->cfind(agglomeratorType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown GAMGAgglomeration type "
<< agglomeratorType << ".\n"
- << "Valid geometric GAMGAgglomeration types are :"
+ << "Valid geometric GAMGAgglomeration types :"
<< geometryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
index 642151da87a517584f65b675026623e2f8bf7b61..96849e559c11dd0e0dbd0053db97e896af79f803 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
@@ -361,15 +361,14 @@ Foam::autoPtr<Foam::GAMGProcAgglomeration> Foam::GAMGProcAgglomeration::New
InfoInFunction << "Constructing GAMGProcAgglomeration" << endl;
}
- GAMGAgglomerationConstructorTable::iterator cstrIter =
- GAMGAgglomerationConstructorTablePtr_->find(type);
+ auto cstrIter = GAMGAgglomerationConstructorTablePtr_->cfind(type);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown GAMGProcAgglomeration type "
<< type << " for GAMGAgglomeration " << agglom.type() << nl << nl
- << "Valid GAMGProcAgglomeration types are :" << endl
+ << "Valid GAMGProcAgglomeration types :" << endl
<< GAMGAgglomerationConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C
index dda2e9024dba6b75d1724ed0e3b7025e895c9ebf..d10610212c0f401f1feaf6bd8261e1877fbffc19 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C
@@ -35,15 +35,14 @@ Foam::autoPtr<Foam::GAMGInterfaceField> Foam::GAMGInterfaceField::New
{
const word coupleType(fineInterface.interfaceFieldType());
- lduInterfaceFieldConstructorTable::iterator cstrIter =
- lduInterfaceFieldConstructorTablePtr_->find(coupleType);
+ auto cstrIter = lduInterfaceFieldConstructorTablePtr_->cfind(coupleType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown GAMGInterfaceField type "
<< coupleType << nl
- << "Valid GAMGInterfaceField types are :"
+ << "Valid GAMGInterfaceField types :"
<< lduInterfaceFieldConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -61,15 +60,14 @@ Foam::autoPtr<Foam::GAMGInterfaceField> Foam::GAMGInterfaceField::New
{
const word coupleType(GAMGCp.type());
- lduInterfaceConstructorTable::iterator cstrIter =
- lduInterfaceConstructorTablePtr_->find(coupleType);
+ auto cstrIter = lduInterfaceConstructorTablePtr_->cfind(coupleType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown GAMGInterfaceField type "
<< coupleType << nl
- << "Valid GAMGInterfaceField types are :"
+ << "Valid GAMGInterfaceField types :"
<< lduInterfaceConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
index 686fe2094e2f37328a0b1be4aac3d737912382a1..284757c98fa7de99a77789b399a249141d6f1621 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
@@ -43,14 +43,13 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
{
const word coupleType(fineInterface.type());
- lduInterfaceConstructorTable::iterator cstrIter =
- lduInterfaceConstructorTablePtr_->find(coupleType);
+ auto cstrIter = lduInterfaceConstructorTablePtr_->cfind(coupleType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown GAMGInterface type " << coupleType << ".\n"
- << "Valid GAMGInterface types are :"
+ << "Valid GAMGInterface types :"
<< lduInterfaceConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -79,14 +78,13 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
Istream& is
)
{
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(coupleType);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(coupleType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown GAMGInterface type " << coupleType << ".\n"
- << "Valid GAMGInterface types are :"
+ << "Valid GAMGInterface types :"
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index 9a8c7f9aea1aa8afe68d48e69c6057deb372fbda..5abac0fa3e2e33f360e2a5104132136f84f994c3 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -35,9 +35,9 @@ namespace Foam
// List of sub-dictionaries to rewrite
static const Foam::List<Foam::word> subDictNames
-(
- Foam::IStringStream("(preconditioner smoother)")()
-);
+{
+ "preconditioner", "smoother"
+};
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
index 69e76fe3b6c7b13528c767beedb776a87910117a..04aaeffd4de9a1d75e96cb9f3902b36a295bd83f 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
@@ -38,16 +38,14 @@ Foam::autoPtr<Foam::facePointPatch> Foam::facePointPatch::New
InfoInFunction << "Constructing facePointPatch" << endl;
}
- polyPatchConstructorTable::iterator cstrIter =
- polyPatchConstructorTablePtr_->find(patch.type());
+ auto cstrIter = polyPatchConstructorTablePtr_->cfind(patch.type());
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown facePointPatch type "
- << patch.type()
- << nl << nl
- << "Valid facePointPatch types are :" << endl
+ << patch.type() << nl << nl
+ << "Valid facePointPatch types :" << endl
<< polyPatchConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
index 82d03af3107f728a770e52990763c1a00c92ea38..7e58126c4d41f7ec07003644c9ebef8439bbbb8d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@@ -1276,7 +1276,7 @@ void Foam::mapDistributeBase::distribute
{
fld.shrink();
- List<T>& fldList = static_cast<List<T>& >(fld);
+ List<T>& fldList = static_cast<List<T>&>(fld);
distribute(fldList, tag);
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 4f3133a038523f9e855ca9d6930a85eaf5884f61..e3cc9d68ff996dee1bb49d982c049a16706cd411 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -167,7 +167,7 @@ void Foam::mapDistribute::distribute
{
fld.shrink();
- List<T>& fldList = static_cast<List<T>& >(fld);
+ List<T>& fldList = static_cast<List<T>&>(fld);
distribute(fldList, dummyTransform, tag);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index 343461da4230dd7193b5024db39e522162eed0d5..4090f6eafa9afacb73ddd8c41aa612ced5dfbabe 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -35,22 +35,23 @@ namespace Foam
defineTypeNameAndDebug(coupledPolyPatch, 0);
const scalar coupledPolyPatch::defaultMatchTol_ = 1e-4;
-
- template<>
- const char* NamedEnum<coupledPolyPatch::transformType, 5>::names[] =
- {
- "unknown",
- "rotational",
- "translational",
- "coincidentFullMatch",
- "noOrdering"
- };
-
- const NamedEnum<coupledPolyPatch::transformType, 5>
- coupledPolyPatch::transformTypeNames;
}
+const Foam::Enum
+<
+ Foam::coupledPolyPatch::transformType
+>
+Foam::coupledPolyPatch::transformTypeNames
+{
+ { transformType::UNKNOWN, "unknown" },
+ { transformType::ROTATIONAL, "rotational" },
+ { transformType::TRANSLATIONAL, "translational" },
+ { transformType::COINCIDENTFULLMATCH, "coincidentFullMatch" },
+ { transformType::NOORDERING, "noOrdering" },
+};
+
+
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void Foam::coupledPolyPatch::writeOBJ(Ostream& os, const point& pt)
@@ -500,9 +501,12 @@ Foam::coupledPolyPatch::coupledPolyPatch
matchTolerance_(dict.lookupOrDefault("matchTolerance", defaultMatchTol_)),
transform_
(
- dict.found("transform")
- ? transformTypeNames.read(dict.lookup("transform"))
- : UNKNOWN
+ transformTypeNames.lookupOrDefault
+ (
+ "transform",
+ dict,
+ transformType::UNKNOWN
+ )
)
{}
@@ -562,10 +566,8 @@ void Foam::coupledPolyPatch::write(Ostream& os) const
polyPatch::write(os);
//if (matchTolerance_ != defaultMatchTol_)
{
- os.writeKeyword("matchTolerance") << matchTolerance_
- << token::END_STATEMENT << nl;
- os.writeKeyword("transform") << transformTypeNames[transform_]
- << token::END_STATEMENT << nl;
+ os.writeEntry("matchTolerance", matchTolerance_);
+ os.writeEntry("transform", transformTypeNames[transform_]);
}
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index 9c761907af5a123f23bc258af81ea03634f4401c..0be8978f7301e7d791a05d968b77c9e67d875ed6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -65,7 +65,7 @@ public:
NOORDERING // unspecified, no automatic ordering
};
- static const NamedEnum<transformType, 5> transformTypeNames;
+ static const Enum<transformType> transformTypeNames;
private:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index 7a26581fe7baa08483851392317370989678fd84..bd14deffc6b8269934234dc334a42f4483806e19 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -279,13 +279,7 @@ Foam::wordList Foam::polyPatch::constraintTypes()
label i = 0;
- for
- (
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->begin();
- cstrIter != dictionaryConstructorTablePtr_->end();
- ++cstrIter
- )
+ forAllConstIters(*dictionaryConstructorTablePtr_, cstrIter)
{
if (constraintType(cstrIter.key()))
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
index 97d8f602c08a5d2fb0da46258eac52c38bd2b131..f8289222d8acbbbb41d115faf0f21eb744407340 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
@@ -43,15 +43,14 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
InfoInFunction << "Constructing polyPatch" << endl;
}
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(patchType);
+ auto cstrIter = wordConstructorTablePtr_->cfind(patchType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown polyPatch type "
<< patchType << " for patch " << name << nl << nl
- << "Valid polyPatch types are :" << endl
+ << "Valid polyPatch types :" << endl
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -105,14 +104,13 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
InfoInFunction << "Constructing polyPatch" << endl;
}
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(patchType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(patchType);
if (!cstrIter.found())
{
if (!disallowGenericPolyPatch)
{
- cstrIter = dictionaryConstructorTablePtr_->find("genericPatch");
+ cstrIter = dictionaryConstructorTablePtr_->cfind("genericPatch");
}
if (!cstrIter.found())
@@ -122,7 +120,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
dict
) << "Unknown polyPatch type "
<< patchType << " for patch " << name << nl << nl
- << "Valid polyPatch types are :" << endl
+ << "Valid polyPatch types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
index 2281285c074a78269f83ceccc8534baf2d20cc33..ae9efcb289d920a7bc65b6672346adf08c14772a 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
@@ -43,8 +43,7 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
const word zoneType(dict.lookup("type"));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(zoneType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(zoneType);
if (!cstrIter.found())
{
@@ -53,7 +52,7 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
dict
) << "Unknown cellZone type "
<< zoneType << nl << nl
- << "Valid cellZone types are:" << nl
+ << "Valid cellZone types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
index b7d1e7a8d91552606863ebb417ba241c24701560..58acaf9ce2e33e7821bdd29ae23c93ced19d3e70 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
@@ -43,8 +43,7 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
const word zoneType(dict.lookup("type"));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(zoneType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(zoneType);
if (!cstrIter.found())
{
@@ -53,7 +52,7 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
dict
) << "Unknown faceZone type "
<< zoneType << nl << nl
- << "Valid faceZone types are:" << nl
+ << "Valid faceZone types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
index e17d645b4ab98ddd7108be1016220bec8690f8f4..a27c65d5b9a2783bf4910574aaf41e89cda15da4 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
@@ -43,8 +43,7 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
const word zoneType(dict.lookup("type"));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(zoneType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(zoneType);
if (!cstrIter.found())
{
@@ -53,7 +52,7 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
dict
) << "Unknown pointZone type "
<< zoneType << nl << nl
- << "Valid pointZone types are:" << nl
+ << "Valid pointZone types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C
index ffc7dd49f16550cf0f80876a3368c62251e51ca7..11392de2dd4ae6de98bde0847a7eee62057a8ec6 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C
@@ -29,37 +29,27 @@ License
Foam::scalar Foam::intersection::planarTol_ = 0.2;
-namespace Foam
+const Foam::Enum
+<
+ Foam::intersection::direction
+>
+Foam::intersection::directionNames_
{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::intersection::direction,
- 2
- >::names[] =
- {
- "vector",
- "contactSphere"
- };
+ { intersection::direction::VECTOR, "vector" },
+ { intersection::direction::CONTACT_SPHERE, "contactSphere" },
+};
- template<>
- const char* Foam::NamedEnum
- <
- Foam::intersection::algorithm,
- 3
- >::names[] =
- {
- "fullRay",
- "halfRay",
- "visible"
- };
-}
-const Foam::NamedEnum<Foam::intersection::direction, 2>
-Foam::intersection::directionNames_;
-
-const Foam::NamedEnum<Foam::intersection::algorithm, 3>
-Foam::intersection::algorithmNames_;
+const Foam::Enum
+<
+ Foam::intersection::algorithm
+>
+Foam::intersection::algorithmNames_
+{
+ { intersection::algorithm::FULL_RAY, "fullRay" },
+ { intersection::algorithm::HALF_RAY, "halfRay" },
+ { intersection::algorithm::VISIBLE, "visible" },
+};
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H
index 6051b36c4254b446b7ee3844850c5e42119f5902..330a985b0178ffd56aa883bd9d45690452177e55 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -28,7 +28,7 @@ Description
Foam::intersection
SourceFiles
- intersection.C
+ intersection.C
\*---------------------------------------------------------------------------*/
@@ -36,7 +36,7 @@ SourceFiles
#define intersection_H
#include "scalar.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -77,10 +77,10 @@ public:
// Static Member Functions
//- Direction names
- static const NamedEnum<direction, 2> directionNames_;
+ static const Enum<direction> directionNames_;
//- Projection algorithm names
- static const NamedEnum<algorithm, 3> algorithmNames_;
+ static const Enum<algorithm> algorithmNames_;
//- Return planar tolerance
static scalar planarTol()
diff --git a/src/OpenFOAM/orientedType/orientedType.C b/src/OpenFOAM/orientedType/orientedType.C
index 4a04453ac09a3da6e0190477bcaef7562c7db649..eac0f9527de1819b4a5c7a7fa4f5657e8201ae3e 100644
--- a/src/OpenFOAM/orientedType/orientedType.C
+++ b/src/OpenFOAM/orientedType/orientedType.C
@@ -27,23 +27,16 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
-{
- template<>
- const char* NamedEnum
- <
- orientedType::orientedOption,
- 3
- >::names[] =
- {
- "oriented",
- "unoriented",
- "unknown"
- };
-}
-
-const Foam::NamedEnum<Foam::orientedType::orientedOption, 3>
- Foam::orientedType::orientedOptionNames;
+const Foam::Enum
+<
+ Foam::orientedType::orientedOption
+>
+Foam::orientedType::orientedOptionNames
+{
+ { orientedOption::ORIENTED, "oriented" },
+ { orientedOption::UNORIENTED, "unoriented" },
+ { orientedOption::UNKNOWN, "unknown" },
+};
bool Foam::orientedType::checkType
@@ -118,14 +111,12 @@ void Foam::orientedType::setOriented(const bool oriented)
void Foam::orientedType::read(const dictionary& dict)
{
- if (dict.found("oriented"))
- {
- oriented_ = orientedOptionNames.read(dict.lookup("oriented"));
- }
- else
- {
- oriented_ = UNKNOWN;
- }
+ oriented_ = orientedOptionNames.lookupOrDefault
+ (
+ "oriented",
+ dict,
+ orientedOption::UNKNOWN
+ );
}
diff --git a/src/OpenFOAM/orientedType/orientedType.H b/src/OpenFOAM/orientedType/orientedType.H
index d050f71dcb5aaeb960f7e2a7b4658d55b04f1b0f..31805f4a0d2c8802a8d4f2b8a07edeb45f8df4a7 100644
--- a/src/OpenFOAM/orientedType/orientedType.H
+++ b/src/OpenFOAM/orientedType/orientedType.H
@@ -38,7 +38,7 @@ SourceFiles
#include "Istream.H"
#include "Ostream.H"
#include "dictionary.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,9 +49,9 @@ namespace Foam
class orientedType;
-Istream& operator>>(Istream&, orientedType&);
+Istream& operator>>(Istream& is, orientedType& ot);
-Ostream& operator<<(Ostream&, const orientedType&);
+Ostream& operator<<(Ostream& os, const orientedType& ot);
/*---------------------------------------------------------------------------*\
Class orientedType Declaration
@@ -71,7 +71,7 @@ public:
UNKNOWN
};
- static const NamedEnum<orientedOption, 3> orientedOptionNames;
+ static const Enum<orientedOption> orientedOptionNames;
private:
diff --git a/src/OpenFOAM/primitives/enums/Enum.C b/src/OpenFOAM/primitives/enums/Enum.C
index 8b4f2100f0d8a03d772619074e8d863d5434c70a..76f1323b8a3c42e82613185f455d6be8b628a740 100644
--- a/src/OpenFOAM/primitives/enums/Enum.C
+++ b/src/OpenFOAM/primitives/enums/Enum.C
@@ -215,10 +215,37 @@ EnumType Foam::Enum<EnumType>::lookupOrDefault
{
return lookup(key, dict);
}
- else
+
+ return deflt;
+}
+
+
+template<class EnumType>
+EnumType Foam::Enum<EnumType>::lookupOrFailsafe
+(
+ const word& key,
+ const dictionary& dict,
+ const EnumType deflt
+) const
+{
+ if (dict.found(key))
{
- return deflt;
+ const word enumName(dict.lookup(key));
+ const label idx = getIndex(enumName);
+
+ if (idx < 0)
+ {
+ IOWarningInFunction(dict)
+ << "bad " << key <<" specifier " << enumName
+ << " using " << getName(deflt) << endl;
+ }
+ else
+ {
+ return EnumType(values_[idx]);
+ }
}
+
+ return deflt;
}
diff --git a/src/OpenFOAM/primitives/enums/Enum.H b/src/OpenFOAM/primitives/enums/Enum.H
index dde620fb26a3e3ab7126325eb2884d32429628d2..b57fc9891ac1c73fe6a883f04fd404e0480e4acf 100644
--- a/src/OpenFOAM/primitives/enums/Enum.H
+++ b/src/OpenFOAM/primitives/enums/Enum.H
@@ -161,6 +161,18 @@ public:
) const;
+ //- Find the key in the dictionary and return the corresponding
+ // enumeration element based on its name.
+ // Return the default value if the key was not found in the dictionary
+ // or if the enumerated name was incorrect (emit warning)
+ EnumType lookupOrFailsafe
+ (
+ const word& key,
+ const dictionary& dict,
+ const EnumType deflt
+ ) const;
+
+
// IO
//- Read a word from Istream and return the corresponding enumeration
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
index b9a8682a0b6117b80f2846e6cf762f170936d079..fe97b5acc2228264919f14c18e7b57fe083a7508 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
@@ -40,8 +40,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
const word Function1Type(coeffsDict.lookup("type"));
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(Function1Type);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(Function1Type);
if (!cstrIter.found())
{
@@ -49,7 +48,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
<< "Unknown Function1 type "
<< Function1Type << " for Function1 "
<< entryName << nl << nl
- << "Valid Function1 types are:" << nl
+ << "Valid Function1 types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
@@ -76,8 +75,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
Function1Type = firstToken.wordToken();
}
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(Function1Type);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(Function1Type);
if (!cstrIter.found())
{
@@ -85,7 +83,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
<< "Unknown Function1 type "
<< Function1Type << " for Function1 "
<< entryName << nl << nl
- << "Valid Function1 types are:" << nl
+ << "Valid Function1 types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 02d3b186eff9a0984f89f63c3feb5882981a4228..eb3bdbf0def573649d56c2cf03cea7f01f71fb41 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -64,11 +64,13 @@ Foam::Function1Types::TableBase<Type>::TableBase
:
Function1<Type>(name),
name_(name),
- boundsHandling_
+ bounding_
(
- wordToBoundsHandling
+ bounds::repeatableBoundingNames.lookupOrFailsafe
(
- dict.lookupOrDefault<word>("outOfBounds", "clamp")
+ "outOfBounds",
+ dict,
+ bounds::repeatableBounding::CLAMP
)
),
interpolationScheme_
@@ -84,7 +86,7 @@ Foam::Function1Types::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
:
Function1<Type>(tbl),
name_(tbl.name_),
- boundsHandling_(tbl.boundsHandling_),
+ bounding_(tbl.bounding_),
interpolationScheme_(tbl.interpolationScheme_),
table_(tbl.table_),
tableSamplesPtr_(tbl.tableSamplesPtr_),
@@ -101,90 +103,6 @@ Foam::Function1Types::TableBase<Type>::~TableBase()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template<class Type>
-Foam::word Foam::Function1Types::TableBase<Type>::boundsHandlingToWord
-(
- const boundsHandling& bound
-) const
-{
- word enumName("warn");
-
- switch (bound)
- {
- case ERROR:
- {
- enumName = "error";
- break;
- }
- case WARN:
- {
- enumName = "warn";
- break;
- }
- case CLAMP:
- {
- enumName = "clamp";
- break;
- }
- case REPEAT:
- {
- enumName = "repeat";
- break;
- }
- }
-
- return enumName;
-}
-
-
-template<class Type>
-typename Foam::Function1Types::TableBase<Type>::boundsHandling
-Foam::Function1Types::TableBase<Type>::wordToBoundsHandling
-(
- const word& bound
-) const
-{
- if (bound == "error")
- {
- return ERROR;
- }
- else if (bound == "warn")
- {
- return WARN;
- }
- else if (bound == "clamp")
- {
- return CLAMP;
- }
- else if (bound == "repeat")
- {
- return REPEAT;
- }
- else
- {
- WarningInFunction
- << "bad outOfBounds specifier " << bound << " using 'warn'"
- << endl;
-
- return WARN;
- }
-}
-
-
-template<class Type>
-typename Foam::Function1Types::TableBase<Type>::boundsHandling
-Foam::Function1Types::TableBase<Type>::outOfBounds
-(
- const boundsHandling& bound
-)
-{
- boundsHandling prev = boundsHandling_;
- boundsHandling_ = bound;
-
- return prev;
-}
-
-
template<class Type>
void Foam::Function1Types::TableBase<Type>::check() const
{
@@ -223,33 +141,33 @@ bool Foam::Function1Types::TableBase<Type>::checkMinBounds
{
if (x < table_.first().first())
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case ERROR:
+ case bounds::repeatableBounding::ERROR:
{
FatalErrorInFunction
<< "value (" << x << ") underflow"
<< exit(FatalError);
break;
}
- case WARN:
+ case bounds::repeatableBounding::WARN:
{
WarningInFunction
<< "value (" << x << ") underflow" << nl
<< endl;
- // Behaviour as per 'CLAMP'
+ // Behaviour as per CLAMP
xDash = table_.first().first();
return true;
break;
}
- case CLAMP:
+ case bounds::repeatableBounding::CLAMP:
{
xDash = table_.first().first();
return true;
break;
}
- case REPEAT:
+ case bounds::repeatableBounding::REPEAT:
{
// adjust x to >= minX
const scalar span =
@@ -282,33 +200,33 @@ bool Foam::Function1Types::TableBase<Type>::checkMaxBounds
{
if (x > table_.last().first())
{
- switch (boundsHandling_)
+ switch (bounding_)
{
- case ERROR:
+ case bounds::repeatableBounding::ERROR:
{
FatalErrorInFunction
<< "value (" << x << ") overflow"
<< exit(FatalError);
break;
}
- case WARN:
+ case bounds::repeatableBounding::WARN:
{
WarningInFunction
<< "value (" << x << ") overflow" << nl
<< endl;
- // Behaviour as per 'CLAMP'
+ // Behaviour as per CLAMP
xDash = table_.last().first();
return true;
break;
}
- case CLAMP:
+ case bounds::repeatableBounding::CLAMP:
{
xDash = table_.last().first();
return true;
break;
}
- case REPEAT:
+ case bounds::repeatableBounding::REPEAT:
{
// adjust x to >= minX
const scalar span =
@@ -427,9 +345,13 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1Types::TableBase<Type>::y() const
template<class Type>
void Foam::Function1Types::TableBase<Type>::writeEntries(Ostream& os) const
{
- if (boundsHandling_ != CLAMP)
+ if (bounding_ != bounds::repeatableBounding::CLAMP)
{
- os.writeEntry("outOfBounds", boundsHandlingToWord(boundsHandling_));
+ os.writeEntry
+ (
+ "outOfBounds",
+ bounds::repeatableBoundingNames[bounding_]
+ );
}
if (interpolationScheme_ != "linear")
{
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index 95c610902671d4ced217694f7233c8ddb00c5a18..f2a26907daffc26905eca3d6f4c48a7d8fd75ffa 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -35,6 +35,7 @@ SourceFiles
#ifndef TableBase_H
#define TableBase_H
+#include "tableBounds.H"
#include "Function1.H"
#include "Tuple2.H"
@@ -57,20 +58,6 @@ class TableBase
:
public Function1<Type>
{
-public:
-
- // Public data types
-
- //- Enumeration for handling out-of-bound values
- enum boundsHandling
- {
- ERROR, //!< Exit with a FatalError
- WARN, //!< Issue warning and clamp value (default)
- CLAMP, //!< Clamp value to the start/end value
- REPEAT //!< Treat as a repeating list
- };
-
-
protected:
// Protected data
@@ -78,8 +65,8 @@ protected:
//- Table name
const word name_;
- //- Enumeration for handling out-of-bound values
- const boundsHandling boundsHandling_;
+ //- Handling for out-of-bound values
+ const bounds::repeatableBounding bounding_;
//- Interpolation type
const word interpolationScheme_;
@@ -108,7 +95,7 @@ protected:
private:
//- Disallow default bitwise assignment
- void operator=(const TableBase<Type>&);
+ void operator=(const TableBase<Type>&) = delete;
public:
@@ -128,15 +115,6 @@ public:
// Member Functions
- //- Return the out-of-bounds handling as a word
- word boundsHandlingToWord(const boundsHandling& bound) const;
-
- //- Return the out-of-bounds handling as an enumeration
- boundsHandling wordToBoundsHandling(const word& bound) const;
-
- //- Set the out-of-bounds handling from enum, return previous setting
- boundsHandling outOfBounds(const boundsHandling& bound);
-
//- Check the table for size and consistency
void check() const;
@@ -164,8 +142,8 @@ public:
//- Write all table data in dictionary format
virtual void writeData(Ostream& os) const;
- //- Write keywords only in dictionary format. Used for non-inline
- // table types
+ //- Write keywords only in dictionary format.
+ // Used for non-inline table types
virtual void writeEntries(Ostream& os) const;
};
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C
similarity index 65%
rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H
rename to src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C
index b4ea3674517664da67a2c2a8c033f899309a1f21..38c811534326ba85167b44a2e23ab36aed90dcac 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H
+++ b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,6 +23,27 @@ License
\*---------------------------------------------------------------------------*/
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+#include "tableBounds.H"
+
+// * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * //
+
+const Foam::Enum<Foam::bounds::normalBounding>
+Foam::bounds::normalBoundingNames
+{
+ { normalBounding::ERROR, "error" },
+ { normalBounding::WARN, "warn" },
+ { normalBounding::CLAMP, "clamp" },
+};
+
+
+const Foam::Enum<Foam::bounds::repeatableBounding>
+Foam::bounds::repeatableBoundingNames
+{
+ { repeatableBounding::ERROR, "error" },
+ { repeatableBounding::WARN, "warn" },
+ { repeatableBounding::CLAMP, "clamp" },
+ { repeatableBounding::REPEAT, "repeat" },
+};
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.H b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.H
new file mode 100644
index 0000000000000000000000000000000000000000..ef3e49e78e6d8ee22d759beb87e940a800f27a94
--- /dev/null
+++ b/src/OpenFOAM/primitives/ranges/tableBounds/tableBounds.H
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Namespace
+ Foam::bounds
+
+Description
+ Namespace for bounding specifications.
+ At the moment, mostly for tables.
+
+SourceFiles
+ tableBounds.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef tableBounds_H
+#define tableBounds_H
+
+#include "Enum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace bounds
+{
+
+ // Enumerations
+
+ //- Enumeration for handling out-of-bound values
+ enum class normalBounding
+ {
+ ERROR, //!< Exit with a FatalError
+ WARN, //!< Issue warning and clamp value (this is a good default)
+ CLAMP //!< Clamp value to the start/end value
+ };
+
+ //- Enumeration for handling out-of-bound values that are repeatable
+ enum class repeatableBounding
+ {
+ ERROR, //!< Exit with a FatalError
+ WARN, //!< Issue warning and clamp value (this is a good default)
+ CLAMP, //!< Clamp value to the start/end value
+ REPEAT //!< Treat as a repeating list
+ };
+
+
+ //- Strings corresponding to the normalBounding
+ extern const Foam::Enum<normalBounding> normalBoundingNames;
+
+ //- Strings corresponding to the repeatableBounding
+ extern const Foam::Enum<repeatableBounding> repeatableBoundingNames;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace bounds
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/strings/word/word.C b/src/OpenFOAM/primitives/strings/word/word.C
index 2f418d721d2540ebb798ad0d2033bf412f294b8c..3d829ae61e73ae46e41f02feaea182aa94b6592a 100644
--- a/src/OpenFOAM/primitives/strings/word/word.C
+++ b/src/OpenFOAM/primitives/strings/word/word.C
@@ -35,10 +35,10 @@ const Foam::word Foam::word::null;
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-Foam::word Foam::word::validated(const std::string& s)
+Foam::word Foam::word::validated(const std::string& s, const bool prefix)
{
std::string::size_type count = 0;
- bool prefix = false;
+ bool extra = false;
// Count number of valid characters and detect if the first character
// happens to be a digit, which we'd like to avoid having since this
@@ -49,10 +49,10 @@ Foam::word Foam::word::validated(const std::string& s)
if (word::valid(c))
{
- if (!count && isdigit(c))
+ if (prefix && !count && isdigit(c))
{
// First valid character was a digit - prefix with '_'
- prefix = true;
+ extra = true;
++count;
}
@@ -60,7 +60,7 @@ Foam::word Foam::word::validated(const std::string& s)
}
}
- if (count == s.size() && !prefix)
+ if (count == s.size() && !extra)
{
return word(s, false); // Already checked, can just return as word
}
@@ -70,7 +70,7 @@ Foam::word Foam::word::validated(const std::string& s)
count = 0;
// Copy valid content.
- if (prefix)
+ if (extra)
{
out[count++] = '_';
}
diff --git a/src/OpenFOAM/primitives/strings/word/word.H b/src/OpenFOAM/primitives/strings/word/word.H
index ebff4c523509b848e6306c4ce87ee8f0968fcfc5..0661255341cc1b4ba11e235935c75aa12eb97889 100644
--- a/src/OpenFOAM/primitives/strings/word/word.H
+++ b/src/OpenFOAM/primitives/strings/word/word.H
@@ -113,8 +113,9 @@ public:
inline static bool valid(char c);
//- Construct a validated word, in which all invalid characters have
- // been stripped out and any leading digit is '_'-prefixed.
- static word validated(const std::string& s);
+ // been stripped out. Normally also prefix any leading digit
+ // with '_' to have words that work nicely as dictionary keywords.
+ static word validated(const std::string& s, const bool prefix=true);
// File-like functions
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 1f6ebca09ae3b9c6d10078187c2a819ec801b099..9eadaf48e23c0e5465e911962f4f2e807e5b80da 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -29,6 +29,7 @@ License
#include "PstreamGlobals.H"
#include "SubList.H"
#include "allReduce.H"
+#include "int.H"
#include <mpi.h>
@@ -42,6 +43,12 @@ License
#define MPI_SCALAR MPI_DOUBLE
#endif
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+// file-scope: min value and default for mpiBufferSize
+static const int minBufferSize = 20000000;
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// NOTE:
@@ -87,33 +94,32 @@ bool Foam::UPstream::init(int& argc, char**& argv)
setParRun(numprocs);
#ifndef SGIMPI
- string bufferSizeName = getEnv("MPI_BUFFER_SIZE");
-
- if (bufferSizeName.size())
{
- int bufferSize = atoi(bufferSizeName.c_str());
+ // Normally use UPstream::mpiBufferSize (optimisationSwitch),
+ // but allow override with the MPI_BUFFER_SIZE env variable
+ // which has an int value
+ int bufSize = 0;
- if (bufferSize)
+ const std::string str = Foam::getEnv("MPI_BUFFER_SIZE");
+ if (str.empty() || !Foam::read(str.c_str(), bufSize) || bufSize <= 0)
{
- MPI_Buffer_attach(new char[bufferSize], bufferSize);
+ bufSize = mpiBufferSize;
}
- }
- else
- {
- FatalErrorInFunction
- << "UPstream::init(int& argc, char**& argv) : "
- << "environment variable MPI_BUFFER_SIZE not defined"
- << Foam::abort(FatalError);
+
+ if (bufSize < minBufferSize)
+ {
+ bufSize = minBufferSize;
+ }
+
+ if (debug)
+ {
+ Pout<< "UPstream::init : mpi-buffer-size " << bufSize << endl;
+ }
+
+ MPI_Buffer_attach(new char[bufSize], bufSize);
}
#endif
- //int processorNameLen;
- //char processorName[MPI_MAX_PROCESSOR_NAME];
- //
- //MPI_Get_processor_name(processorName, &processorNameLen);
- //processorName[processorNameLen] = '\0';
- //Pout<< "Processor name:" << processorName << endl;
-
return true;
}
@@ -126,10 +132,12 @@ void Foam::UPstream::exit(int errnum)
}
#ifndef SGIMPI
- int size;
- char* buff;
- MPI_Buffer_detach(&buff, &size);
- delete[] buff;
+ {
+ int size;
+ char* buff;
+ MPI_Buffer_detach(&buff, &size);
+ delete[] buff;
+ }
#endif
if (PstreamGlobals::outstandingRequests_.size())
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index d1b23832861b1e9e4b5eda5e7bd62676d19870f1..9663cfc2f77f7f11c5241891622a55c3e094f881 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -33,27 +33,16 @@ using Foam::constant::physicoChemical::sigma;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- template<>
- const char*
- NamedEnum
- <
- externalWallHeatFluxTemperatureFvPatchScalarField::operationMode,
- 3
- >::names[] =
- {
- "power",
- "flux",
- "coefficient"
- };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationMode,
- 3
-> Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationModeNames;
+ Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationMode
+>
+Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationModeNames
+{
+ { operationMode::fixedPower, "power" },
+ { operationMode::fixedHeatFlux, "flux" },
+ { operationMode::fixedHeatTransferCoeff, "coefficient" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -92,7 +81,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
:
mixedFvPatchScalarField(p, iF),
temperatureCoupledBase(patch(), dict),
- mode_(operationModeNames.read(dict.lookup("mode"))),
+ mode_(operationModeNames.lookup("mode", dict)),
Q_(0),
relaxation_(dict.lookupOrDefault<scalar>("relaxation", 1)),
emissivity_(dict.lookupOrDefault<scalar>("emissivity", 0)),
@@ -457,17 +446,14 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
{
fvPatchScalarField::write(os);
- os.writeKeyword("mode")
- << operationModeNames[mode_] << token::END_STATEMENT << nl;
+ os.writeEntry("mode", operationModeNames[mode_]);
temperatureCoupledBase::write(os);
switch (mode_)
{
case fixedPower:
{
- os.writeKeyword("Q")
- << Q_ << token::END_STATEMENT << nl;
-
+ os.writeEntry("Q", Q_);
break;
}
case fixedHeatFlux:
@@ -483,14 +469,12 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
if (relaxation_ < 1)
{
- os.writeKeyword("relaxation")
- << relaxation_ << token::END_STATEMENT << nl;
+ os.writeEntry("relaxation", relaxation_);
}
if (emissivity_ > 0)
{
- os.writeKeyword("emissivity")
- << emissivity_ << token::END_STATEMENT << nl;
+ os.writeEntry("emissivity", emissivity_);
}
if (thicknessLayers_.size())
@@ -503,12 +487,11 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
}
}
- os.writeKeyword("qr")<< qrName_ << token::END_STATEMENT << nl;
+ os.writeEntry("qr", qrName_);
if (qrName_ != "none")
{
- os.writeKeyword("qrRelaxation")
- << qrRelaxation_ << token::END_STATEMENT << nl;
+ os.writeEntry("qrRelaxation", qrRelaxation_);
qrPrevious_.writeEntry("qrPrevious", os);
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
index f823eb6fa79ee6f1c4913e90b81cd7554c824a70..00f30e2a6049ce8bb5195b5a5854b51248b78710 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
@@ -127,7 +127,7 @@ public:
fixedHeatTransferCoeff, //!< Fixed heat transfer coefficient
};
- static const NamedEnum<operationMode, 3> operationModeNames;
+ static const Enum<operationMode> operationModeNames;
private:
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index 50c15be701b224cacd6d181e7a04c0dff92085fb..3de675ac0d75b9c9c947e7ea5fc2f4b172bbdd53 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -31,25 +31,17 @@ License
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::temperatureCoupledBase::KMethodType
+>
+Foam::temperatureCoupledBase::KMethodTypeNames_
{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::temperatureCoupledBase::KMethodType,
- 4
- >::names[] =
- {
- "fluidThermo",
- "solidThermo",
- "directionalSolidThermo",
- "lookup"
- };
-}
-
-
-const Foam::NamedEnum<Foam::temperatureCoupledBase::KMethodType, 4>
- Foam::temperatureCoupledBase::KMethodTypeNames_;
+ { KMethodType::mtFluidThermo, "fluidThermo" },
+ { KMethodType::mtSolidThermo, "solidThermo" },
+ { KMethodType::mtDirectionalSolidThermo, "directionalSolidThermo" },
+ { KMethodType::mtLookup, "lookup" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -76,7 +68,7 @@ Foam::temperatureCoupledBase::temperatureCoupledBase
)
:
patch_(patch),
- method_(KMethodTypeNames_.read(dict.lookup("kappaMethod"))),
+ method_(KMethodTypeNames_.lookup("kappaMethod", dict)),
kappaName_(dict.lookupOrDefault<word>("kappa", "none")),
alphaAniName_(dict.lookupOrDefault<word>("alphaAni","none"))
{}
@@ -232,10 +224,9 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
void Foam::temperatureCoupledBase::write(Ostream& os) const
{
- os.writeKeyword("kappaMethod") << KMethodTypeNames_[method_]
- << token::END_STATEMENT << nl;
- os.writeKeyword("kappa") << kappaName_ << token::END_STATEMENT << nl;
- os.writeKeyword("alphaAni") << alphaAniName_ << token::END_STATEMENT << nl;
+ os.writeEntry("kappaMethod", KMethodTypeNames_[method_]);
+ os.writeEntry("kappa", kappaName_);
+ os.writeEntry("alphaAni", alphaAniName_);
}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
index 777f4c6d2ab549bebecf957a862cc59edfb7581c..96c45867985a6462c09bbae2fdf83eb1c58987ab 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -66,7 +66,7 @@ SourceFiles
#define temperatureCoupledBase_H
#include "scalarField.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "fvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -98,7 +98,7 @@ protected:
// Protected data
- static const NamedEnum<KMethodType, 4> KMethodTypeNames_;
+ static const Enum<KMethodType> KMethodTypeNames_;
//- Underlying patch
const fvPatch& patch_;
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index 5257a4c52a066d86191ed9268c9e2acde8f09480..0bd80034def533035a38a78716c3ab9b1fb8bd75 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -153,8 +153,7 @@ Foam::LESModel<BasicTurbulenceModel>::New
Info<< "Selecting LES turbulence model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 0f0cafba0b5e7aa07067da7511a05b0d6b68bb3c..1cdb6fd53bb12e4b14d289c2a2676d4e391fc5d5 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -73,15 +73,14 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
Info<< "Selecting LES delta type " << deltaType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(deltaType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(deltaType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown LESdelta type "
<< deltaType << nl << nl
- << "Valid LESdelta types are :" << endl
+ << "Valid LESdelta types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -102,36 +101,31 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
Info<< "Selecting LES delta type " << deltaType << endl;
- // First on additional ones
- dictionaryConstructorTable::const_iterator cstrIter =
- additionalConstructors.find(deltaType);
-
- if (cstrIter != additionalConstructors.end())
- {
- return autoPtr<LESdelta>(cstrIter()(name, turbulence, dict));
- }
- else
+ // First any additional ones
{
- dictionaryConstructorTable::const_iterator cstrIter =
- dictionaryConstructorTablePtr_->find(deltaType);
+ auto cstrIter = additionalConstructors.cfind(deltaType);
- if (!cstrIter.found())
- {
- FatalErrorInFunction
- << "Unknown LESdelta type "
- << deltaType << nl << nl
- << "Valid LESdelta types are :" << endl
- << additionalConstructors.sortedToc()
- << " and "
- << dictionaryConstructorTablePtr_->sortedToc()
- << exit(FatalError);
- return autoPtr<LESdelta>();
- }
- else
+ if (cstrIter.found())
{
return autoPtr<LESdelta>(cstrIter()(name, turbulence, dict));
}
}
+
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(deltaType);
+
+ if (!cstrIter.found())
+ {
+ FatalErrorInFunction
+ << "Unknown LESdelta type "
+ << deltaType << nl << nl
+ << "Valid LESdelta types :" << endl
+ << additionalConstructors.sortedToc()
+ << " and "
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
+ }
+
+ return autoPtr<LESdelta>(cstrIter()(name, turbulence, dict));
}
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
index dba84f07f8cd1cd34b7161b57602adf5bb0067e7..ae7017eb9168249882f04ef62f4218752dc98fc8 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
@@ -46,15 +46,14 @@ Foam::autoPtr<Foam::LESfilter> Foam::LESfilter::New
{
const word filterType(dict.lookup(filterDictName));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(filterType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(filterType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown LESfilter type "
<< filterType << nl << nl
- << "Valid LESfilter types are :" << endl
+ << "Valid LESfilter types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index a4b283ff785e57edfcb140f87877110e4cc33777..424c286f79e97896f7bd2c422304b952eee104c9 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -143,8 +143,7 @@ Foam::RASModel<BasicTurbulenceModel>::New
Info<< "Selecting RAS turbulence model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
index 8593c72df514cb4093cd619e8737beb4277b30e6..18d5be2cb9c02a1d34ff7fd66370d46878b11539 100644
--- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
+++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
@@ -105,15 +105,14 @@ Foam::TurbulenceModel<Alpha, Rho, BasicTurbulenceModel, TransportModel>::New
Info<< "Selecting turbulence model type " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown TurbulenceModel type "
+ << "Unknown simulationType "
<< modelType << nl << nl
- << "Valid TurbulenceModel types:" << endl
+ << "Valid simulation types:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
index 33bba64b66901df02a36a8c8a77189ae9e7a0572..44e0556bc56412011183aa457878c04fc55249d1 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
@@ -114,15 +114,14 @@ Foam::laminarModel<BasicTurbulenceModel>::New
Info<< "Selecting laminar stress model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown laminarModel type "
<< modelType << nl << nl
- << "Valid laminarModel types:" << endl
+ << "Valid laminarModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/combustionModels/EDC/EDC.C b/src/combustionModels/EDC/EDC.C
index 64d822ee5225657f9c63c05fd4c61a5648143e99..c4b7e0b29f160a3e7cfb16e20382d2d73c8acc15 100644
--- a/src/combustionModels/EDC/EDC.C
+++ b/src/combustionModels/EDC/EDC.C
@@ -39,14 +39,12 @@ Foam::combustionModels::EDC<Type>::EDC
laminar<Type>(modelType, mesh, combustionProperties, phaseName),
version_
(
- EDCversionNames
- [
- this->coeffs().lookupOrDefault
- (
- "version",
- word(EDCversionNames[EDCdefaultVersion])
- )
- ]
+ EDCversionNames.lookupOrDefault
+ (
+ "version",
+ this->coeffs(),
+ EDCdefaultVersion
+ )
),
C1_(this->coeffs().lookupOrDefault("C1", 0.05774)),
C2_(this->coeffs().lookupOrDefault("C2", 0.5)),
@@ -220,14 +218,12 @@ bool Foam::combustionModels::EDC<Type>::read()
{
version_ =
(
- EDCversionNames
- [
- this->coeffs().lookupOrDefault
- (
- "version",
- word(EDCversionNames[EDCdefaultVersion])
- )
- ]
+ EDCversionNames.lookupOrDefault
+ (
+ "version",
+ this->coeffs(),
+ EDCdefaultVersion
+ )
);
C1_ = this->coeffs().lookupOrDefault("C1", 0.05774);
C2_ = this->coeffs().lookupOrDefault("C2", 0.5);
diff --git a/src/combustionModels/EDC/EDC.H b/src/combustionModels/EDC/EDC.H
index d9ed191f9998793afa82df37b77feb62cc65ee6c..a59fc55bcfc3f37d2a9d5f81c18c8e55027d2b9f 100644
--- a/src/combustionModels/EDC/EDC.H
+++ b/src/combustionModels/EDC/EDC.H
@@ -100,7 +100,7 @@ SourceFiles
#define EDC_H
#include "../laminar/laminar.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -118,7 +118,7 @@ enum class EDCversions
v2016
};
-extern const NamedEnum<EDCversions, 4> EDCversionNames;
+extern const Enum<EDCversions> EDCversionNames;
extern const EDCversions EDCdefaultVersion;
const scalar EDCexp1[] = {3, 2, 2, 2};
diff --git a/src/combustionModels/EDC/EDCs.C b/src/combustionModels/EDC/EDCs.C
index 280d6c3db31cc29e31456c80127079b57d2e36d3..bd81ae6834be75feab359566be8cdec2cb341d90 100644
--- a/src/combustionModels/EDC/EDCs.C
+++ b/src/combustionModels/EDC/EDCs.C
@@ -31,31 +31,26 @@ License
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
<
- Foam::combustionModels::EDCversions,
- 4
->::names[] =
+ Foam::combustionModels::EDCversions
+>
+Foam::combustionModels::EDCversionNames
{
- "v1981",
- "v1996",
- "v2005",
- "v2016"
+ { EDCversions::v1981, "v1981" },
+ { EDCversions::v1996, "v1996" },
+ { EDCversions::v2005, "v2005" },
+ { EDCversions::v2016, "v2016" },
};
-const Foam::NamedEnum<Foam::combustionModels::EDCversions, 4>
- Foam::combustionModels::EDCversionNames;
-
const Foam::combustionModels::EDCversions
-Foam::combustionModels::EDCdefaultVersion
-(
- Foam::combustionModels::EDCversions::v2005
-);
+Foam::combustionModels::EDCdefaultVersion(EDCversions::v2005);
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeCombustionTypes(EDC, psiChemistryCombustion, psiCombustionModel);
makeCombustionTypes(EDC, rhoChemistryCombustion, rhoCombustionModel);
+
// ************************************************************************* //
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C
index cefaf8a1274ef217f8a661b58455603f8d3a82f0..2154d2cc948a7f3112980d486b88e336f6f1706d 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C
@@ -42,8 +42,8 @@ Foam::autoPtr<Foam::reactionRateFlameArea> Foam::reactionRateFlameArea::New
Info<< "Selecting reaction rate flame area correlation "
<< reactionRateFlameAreaType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(reactionRateFlameAreaType);
+ auto cstrIter =
+ dictionaryConstructorTablePtr_->cfind(reactionRateFlameAreaType);
if (!cstrIter.found())
{
@@ -51,9 +51,9 @@ Foam::autoPtr<Foam::reactionRateFlameArea> Foam::reactionRateFlameArea::New
(
dict
) << "Unknown reactionRateFlameArea type "
- << reactionRateFlameAreaType << endl << endl
- << "Valid reaction rate flame area types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << reactionRateFlameAreaType << nl << nl
+ << "Valid reaction rate flame area types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C
index 76c2fb76aeb7ee11500bf7700d58c6bee9eac99e..ca7d0616b8d6b7d169eb52a21529a82d0f488fd8 100644
--- a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C
+++ b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C
@@ -53,16 +53,15 @@ Foam::combustionModels::psiCombustionModel::New
Info<< "Selecting combustion model " << combModelName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(combModelName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(combModelName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown psiCombustionModel type "
<< combModelName << endl << endl
- << "Valid combustionModels are : " << endl
- << dictionaryConstructorTablePtr_->toc()
+ << "Valid combustionModel types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C
index 6060d2acc595708c1aa286713a5f2309e9bf0a62..f6ffadc0b6a74e13c266266adeac412c063a344f 100644
--- a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C
+++ b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C
@@ -53,16 +53,15 @@ Foam::combustionModels::rhoCombustionModel::New
Info<< "Selecting combustion model " << combTypeName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(combTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(combTypeName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown rhoCombustionModel type "
<< combTypeName << endl << endl
- << "Valid combustionModels are : " << endl
- << dictionaryConstructorTablePtr_->toc()
+ << "Valid combustionModel types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/conversion/ccm/reader/ccmSolutionTable.H b/src/conversion/ccm/reader/ccmSolutionTable.H
index 1a58d67cc68e49c22399e2980d92c177f6cd6978..cf954872e53ba03210dfcfbc6ab09ee0d885fb85 100644
--- a/src/conversion/ccm/reader/ccmSolutionTable.H
+++ b/src/conversion/ccm/reader/ccmSolutionTable.H
@@ -414,7 +414,7 @@ public:
const fieldTable& tbl
)
{
- os << static_cast<const namesList<fieldEntry>& >(tbl)
+ os << static_cast<const namesList<fieldEntry>&>(tbl)
<< nl
<< "maxCell: " << tbl.maxCellId()
<< " maxFace: " << tbl.maxFaceId();
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
index d9edadcc3f549c865847d713e9ba7674173b8ade..aa4a74a790b2db287583bda7c0c41d193eed60d0 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
@@ -68,15 +68,14 @@ Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
<< exit(FatalError);
}
- IOobjectConstructorTable::iterator cstrIter =
- IOobjectConstructorTablePtr_->find(dynamicFvMeshTypeName);
+ auto cstrIter = IOobjectConstructorTablePtr_->cfind(dynamicFvMeshTypeName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown dynamicFvMesh type "
<< dynamicFvMeshTypeName << nl << nl
- << "Valid dynamicFvMesh types are :" << endl
+ << "Valid dynamicFvMesh types :" << endl
<< IOobjectConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
index 629d16a478f4dd6f342c113a79b63c4251f21b11..934553826668960841df6fb40424024ab1b26fd9 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
@@ -45,15 +45,14 @@ Foam::autoPtr<Foam::cellLooper> Foam::cellLooper::New
const polyMesh& mesh
)
{
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(type);
+ auto cstrIter = wordConstructorTablePtr_->cfind(type);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown set type "
+ << "Unknown cellLooper type "
<< type << nl << nl
- << "Valid cellLooper types : " << endl
+ << "Valid cellLooper types :" << endl
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
index 70a1347169b231358c61ffc706346f9741c103f6..97f35afa23cc26e0342fafeeb620587f72884779 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
@@ -43,7 +43,7 @@ namespace Foam
}
// Angle for polys to be considered splitHexes.
-const Foam::scalar Foam::topoCellLooper::featureCos = Foam::cos(degToRad(10.0));
+const Foam::scalar Foam::topoCellLooper::featureCos = Foam::cos(10.0_deg);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C
index 2097a2c578530f8b2153d650515fcb85261ce979..8ee5a691cfd550491dc2afc5d1c451038e3e3a4a 100644
--- a/src/dynamicMesh/meshCut/directions/directions.C
+++ b/src/dynamicMesh/meshCut/directions/directions.C
@@ -36,23 +36,16 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::directions::directionType
+>
+Foam::directions::directionTypeNames_
{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::directions::directionType,
- 3
- >::names[] =
- {
- "tan1",
- "tan2",
- "normal"
- };
-}
-
-const Foam::NamedEnum<Foam::directions::directionType, 3>
- Foam::directions::directionTypeNames_;
+ { directionType::TAN1, "tan1" },
+ { directionType::TAN2, "tan2" },
+ { directionType::NORMAL, "normal" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -289,9 +282,9 @@ Foam::directions::directions
if (coordSystem != "fieldBased")
{
- forAll(wantedDirs, i)
+ for (const word& wantedName : wantedDirs)
{
- directionType wantedDir = directionTypeNames_[wantedDirs[i]];
+ directionType wantedDir = directionTypeNames_[wantedName];
if (wantedDir == NORMAL)
{
diff --git a/src/dynamicMesh/meshCut/directions/directions.H b/src/dynamicMesh/meshCut/directions/directions.H
index c81c794ae813f951350996eac00cb743616a0275..b667aeb7f244560c19edc1c6ec7effff1b27427b 100644
--- a/src/dynamicMesh/meshCut/directions/directions.H
+++ b/src/dynamicMesh/meshCut/directions/directions.H
@@ -43,7 +43,7 @@ SourceFiles
#include "List.H"
#include "vectorField.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "point.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -82,7 +82,7 @@ public:
private:
- static const NamedEnum<directionType, 3> directionTypeNames_;
+ static const Enum<directionType> directionTypeNames_;
// Private Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index 71623907fde7ea916639400177b0174e958e4248..689d112f67474f523e934de1949d62075750cc14 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -184,7 +184,7 @@ Foam::undoableMeshCutter::undoableMeshCutter
faceRemover_
(
mesh,
- Foam::cos(degToRad(30.0))
+ Foam::cos(30.0_deg)
)
{}
diff --git a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C
index 6a8dbe3640eb9e6f9a22096b40fd7618f69fdb53..cfff04f05f2acc13c6cd72679ff3b1166477fc8c 100644
--- a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C
@@ -107,15 +107,14 @@ Foam::displacementMotionSolver::New
<< exit(FatalError);
}
- displacementConstructorTable::iterator cstrIter =
- displacementConstructorTablePtr_->find(solverTypeName);
+ auto cstrIter = displacementConstructorTablePtr_->cfind(solverTypeName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown solver type "
<< solverTypeName << nl << nl
- << "Valid solver types are:" << endl
+ << "Valid solver types :" << endl
<< displacementConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
index 911c888101a2a4b6866445ea8f5e2f0315a07848..3ff7098ca03041666454e9b9afed1f0cf189bae9 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
@@ -37,15 +37,14 @@ Foam::autoPtr<Foam::solidBodyMotionFunction> Foam::solidBodyMotionFunction::New
Info<< "Selecting solid-body motion function " << motionType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(motionType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(motionType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown solidBodyMotionFunction type "
<< motionType << nl << nl
- << "Valid solidBodyMotionFunctions are : " << endl
+ << "Valid solidBodyMotionFunction types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index a3d8580554165bc93b2dcec69071a7a137663957..054524a29b22ae8bf762caea07760b8e8096b4c2 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -104,14 +104,14 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
const IOdictionary& solverDict
)
{
- const word solverTypeName
+ const word solverName
(
solverDict.found("motionSolver")
? solverDict.lookup("motionSolver")
: solverDict.lookup("solver")
);
- Info<< "Selecting motion solver: " << solverTypeName << endl;
+ Info<< "Selecting motion solver: " << solverName << endl;
const_cast<Time&>(mesh.time()).libs().open
(
@@ -127,15 +127,14 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
<< exit(FatalError);
}
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(solverTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(solverName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown solver type "
- << solverTypeName << nl << nl
- << "Valid solver types are:" << endl
+ << solverName << nl << nl
+ << "Valid solver types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
index f445f1a348d138ee15d6eaf66f943c5ca28b84b9..2569a86ce47c47914f2c5763e6be77ed5f282a84 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
@@ -43,8 +43,7 @@ Foam::autoPtr<Foam::polyMeshModifier> Foam::polyMeshModifier::New
const word modifierType(dict.lookup("type"));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modifierType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modifierType);
if (!cstrIter.found())
{
@@ -53,7 +52,7 @@ Foam::autoPtr<Foam::polyMeshModifier> Foam::polyMeshModifier::New
dict
) << "Unknown polyMeshModifier type "
<< modifierType << nl << nl
- << "Valid polyMeshModifier types are :" << endl
+ << "Valid polyMeshModifier types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
index 357c27678f3ebdf2d635963b73503c88000b20f3..9ea5e44203cc713a08a6ae391e5095516101d325 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
@@ -36,17 +36,18 @@ License
namespace Foam
{
defineTypeNameAndDebug(tetDecomposer, 0);
+}
- template<>
- const char* NamedEnum<tetDecomposer::decompositionType, 2>::names[] =
- {
- "faceCentre",
- "faceDiagonal"
- };
+const Foam::Enum
+<
+ Foam::tetDecomposer::decompositionType
+>
+Foam::tetDecomposer::decompositionTypeNames
+{
+ { decompositionType::FACE_CENTRE_TRIS, "faceCentre" },
+ { decompositionType::FACE_DIAG_TRIS, "faceDiagonal" },
+};
- const NamedEnum<tetDecomposer::decompositionType, 2>
- tetDecomposer::decompositionTypeNames;
-}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
index 540df2dd208eb88607470ed17d9ba24bc86d34b2..4b854fdd124494113f155eb36d74beb99ceff6d1 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
@@ -39,7 +39,7 @@ SourceFiles
#include "PackedBoolList.H"
#include "boolList.H"
#include "typeInfo.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,7 +68,7 @@ public:
FACE_DIAG_TRIS //- Faces decomposed into triangles diagonally
};
- static const NamedEnum<decompositionType, 2> decompositionTypeNames;
+ static const Enum<decompositionType> decompositionTypeNames;
private:
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 52026efb9118122e1e27d1ca251ad2f6bbda95da..7048a5713aba786c0e9c42fdb31664e3e02c283f 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -45,22 +45,18 @@ namespace Foam
slidingInterface,
dictionary
);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::slidingInterface::typeOfMatch,
- 2
- >::names[] =
- {
- "integral",
- "partial"
- };
}
-const Foam::NamedEnum<Foam::slidingInterface::typeOfMatch, 2>
-Foam::slidingInterface::typeOfMatchNames_;
+const Foam::Enum
+<
+ Foam::slidingInterface::typeOfMatch
+>
+Foam::slidingInterface::typeOfMatchNames_
+{
+ { typeOfMatch::INTEGRAL, "integral" },
+ { typeOfMatch::PARTIAL, "partial" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -248,7 +244,7 @@ Foam::slidingInterface::slidingInterface
dict.lookup("slavePatchName"),
mme.mesh().boundaryMesh()
),
- matchType_(typeOfMatchNames_.read((dict.lookup("typeOfMatch")))),
+ matchType_(typeOfMatchNames_.lookup("typeOfMatch", dict)),
coupleDecouple_(dict.lookup("coupleDecouple")),
attached_(dict.lookup("attached")),
projectionAlgo_
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index 6474e985ed12dabf807b92eade61536abb575938..52232d8475e480e7a6f131268ec7a1b240804c30 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -85,7 +85,7 @@ public:
};
//- Direction names
- static const NamedEnum<typeOfMatch, 2> typeOfMatchNames_;
+ static const Enum<typeOfMatch> typeOfMatchNames_;
private:
diff --git a/src/engine/engineMesh/engineMesh/engineMeshNew.C b/src/engine/engineMesh/engineMesh/engineMeshNew.C
index 8d074d8e9ce0824f829f8a85d4a2cf51610b7222..38e23f1b5be2d59db4c8d0e5224ddf2de040dd01 100644
--- a/src/engine/engineMesh/engineMesh/engineMeshNew.C
+++ b/src/engine/engineMesh/engineMesh/engineMeshNew.C
@@ -53,15 +53,14 @@ Foam::autoPtr<Foam::engineMesh> Foam::engineMesh::New
Info<< "Selecting engineMesh " << modelType << endl;
- IOobjectConstructorTable::iterator cstrIter =
- IOobjectConstructorTablePtr_->find(modelType);
+ auto cstrIter = IOobjectConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown engineMesh type "
<< modelType << nl << nl
- << "Valid engineMesh types are :" << endl
+ << "Valid engineMesh types :" << endl
<< IOobjectConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/fileFormats/coordSet/coordSet.C b/src/fileFormats/coordSet/coordSet.C
index c4149dc943582a3a4723846a98c744437016b1c5..bb311a62edd47a2eb239e603a0c5dad190cd91d2 100644
--- a/src/fileFormats/coordSet/coordSet.C
+++ b/src/fileFormats/coordSet/coordSet.C
@@ -27,15 +27,18 @@ License
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
-const Foam::Enum<Foam::coordSet::coordFormat>
- Foam::coordSet::coordFormatNames_
- {
- { coordFormat::XYZ, "xyz" },
- { coordFormat::X, "x" },
- { coordFormat::Y, "y" },
- { coordFormat::Z, "z" },
- { coordFormat::DISTANCE, "distance" }
- };
+const Foam::Enum
+<
+ Foam::coordSet::coordFormat
+>
+Foam::coordSet::coordFormatNames_
+{
+ { coordFormat::XYZ, "xyz" },
+ { coordFormat::X, "x" },
+ { coordFormat::Y, "y" },
+ { coordFormat::Z, "z" },
+ { coordFormat::DISTANCE, "distance" }
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/fire/FIRECore.C b/src/fileFormats/fire/FIRECore.C
index 4cf98960801fec203d0017f4ee69fd4ff270401a..10b15fe7c8288c0151a9b8f965e47f5911315921 100644
--- a/src/fileFormats/fire/FIRECore.C
+++ b/src/fileFormats/fire/FIRECore.C
@@ -27,14 +27,17 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-const Foam::Enum<Foam::fileFormats::FIRECore::fileExt3d>
- Foam::fileFormats::FIRECore::file3dExtensions
- {
- { fileExt3d::POLY_ASCII, "fpma" },
- { fileExt3d::POLY_BINARY, "fpmb" },
- { fileExt3d::POLY_ASCII_Z, "fpmaz" },
- { fileExt3d::POLY_BINARY_Z, "fpmbz" }
- };
+const Foam::Enum
+<
+ Foam::fileFormats::FIRECore::fileExt3d
+>
+Foam::fileFormats::FIRECore::file3dExtensions
+{
+ { fileExt3d::POLY_ASCII, "fpma" },
+ { fileExt3d::POLY_BINARY, "fpmb" },
+ { fileExt3d::POLY_ASCII_Z, "fpmaz" },
+ { fileExt3d::POLY_BINARY_Z, "fpmbz" }
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/sampledSetWriters/writer.C b/src/fileFormats/sampledSetWriters/writer.C
index 64b9743203fedf6e118a25a5dfca202c673deae5..0caac2054838e36d0643bfb1339835cf459edca1 100644
--- a/src/fileFormats/sampledSetWriters/writer.C
+++ b/src/fileFormats/sampledSetWriters/writer.C
@@ -36,15 +36,14 @@ Foam::autoPtr<Foam::writer<Type>> Foam::writer<Type>::New
const word& writeType
)
{
- typename wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(writeType);
+ auto cstrIter = wordConstructorTablePtr_->cfind(writeType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown write type "
<< writeType << nl << nl
- << "Valid write types : " << endl
+ << "Valid write types :" << endl
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/fileFormats/starcd/STARCDCore.C b/src/fileFormats/starcd/STARCDCore.C
index 412738131e200a35e3625a31ed50aacefbfcdf94..d6ff48fc57b1349fe69c0d5288ff9f3da04d4b1d 100644
--- a/src/fileFormats/starcd/STARCDCore.C
+++ b/src/fileFormats/starcd/STARCDCore.C
@@ -33,22 +33,30 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-const Foam::Enum<Foam::fileFormats::STARCDCore::fileHeader>
- Foam::fileFormats::STARCDCore::fileHeaders_
- {
- { fileHeader::HEADER_CEL, "PROSTAR_CELL" },
- { fileHeader::HEADER_VRT, "PROSTAR_VERTEX" },
- { fileHeader::HEADER_BND, "PROSTAR_BOUNDARY" }
- };
+const Foam::Enum
+<
+ Foam::fileFormats::STARCDCore::fileHeader
+>
+Foam::fileFormats::STARCDCore::fileHeaders_
+{
+ { fileHeader::HEADER_CEL, "PROSTAR_CELL" },
+ { fileHeader::HEADER_VRT, "PROSTAR_VERTEX" },
+ { fileHeader::HEADER_BND, "PROSTAR_BOUNDARY" }
+};
+
+
+const Foam::Enum
+<
+ Foam::fileFormats::STARCDCore::fileExt
+>
+Foam::fileFormats::STARCDCore::fileExtensions_
+{
+ { fileExt::CEL_FILE, "cel" },
+ { fileExt::VRT_FILE, "vrt" },
+ { fileExt::BND_FILE, "bnd" },
+ { fileExt::INP_FILE, "inp" }
+};
-const Foam::Enum<Foam::fileFormats::STARCDCore::fileExt>
- Foam::fileFormats::STARCDCore::fileExtensions_
- {
- { fileExt::CEL_FILE, "cel" },
- { fileExt::VRT_FILE, "vrt" },
- { fileExt::BND_FILE, "bnd" },
- { fileExt::INP_FILE, "inp" }
- };
const char* const Foam::fileFormats::STARCDCore::defaultBoundaryName =
"Default_Boundary_Region";
diff --git a/src/fileFormats/vtk/core/foamVtkCore.C b/src/fileFormats/vtk/core/foamVtkCore.C
index be0cffa033ed79ea971d761a6457c5f2b8e25ea1..62612deb57a46b245c1bc909af23f752622bfaa4 100644
--- a/src/fileFormats/vtk/core/foamVtkCore.C
+++ b/src/fileFormats/vtk/core/foamVtkCore.C
@@ -27,7 +27,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-const Foam::Enum<Foam::vtk::fileTag> Foam::vtk::fileTagNames
+const Foam::Enum
+<
+ Foam::vtk::fileTag
+>
+Foam::vtk::fileTagNames
{
{ fileTag::VTK_FILE, "VTKFile" },
{ fileTag::DATA_ARRAY, "DataArray" },
@@ -45,7 +49,11 @@ const Foam::Enum<Foam::vtk::fileTag> Foam::vtk::fileTagNames
};
-const Foam::Enum<Foam::vtk::fileAttr> Foam::vtk::fileAttrNames
+const Foam::Enum
+<
+ Foam::vtk::fileAttr
+>
+Foam::vtk::fileAttrNames
{
{ fileAttr::OFFSET, "offset" },
{ fileAttr::NUMBER_OF_COMPONENTS, "NumberOfComponents" },
@@ -57,7 +65,11 @@ const Foam::Enum<Foam::vtk::fileAttr> Foam::vtk::fileAttrNames
};
-const Foam::Enum<Foam::vtk::dataArrayAttr> Foam::vtk::dataArrayAttrNames
+const Foam::Enum
+<
+ Foam::vtk::dataArrayAttr
+>
+Foam::vtk::dataArrayAttrNames
{
{ dataArrayAttr::POINTS, "Points" },
{ dataArrayAttr::OFFSETS, "offsets" },
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.C b/src/fileFormats/vtk/output/foamVtkOutput.C
index 7e18f7231438a71916e30bbe4ed8335030e1022e..454f8ac3ddd744de2edefe00c1c503b9a4289d50 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.C
+++ b/src/fileFormats/vtk/output/foamVtkOutput.C
@@ -36,18 +36,24 @@ License
// * * * * * * * * * * * * * * * Static Data * * * * * * * * * * * * * * * * //
-const Foam::Enum<Foam::vtk::fileTag>
+const Foam::Enum
+<
+ Foam::vtk::fileTag
+>
Foam::vtk::legacy::contentNames
{
- { vtk::fileTag::POLY_DATA, "POLYDATA" },
+ { vtk::fileTag::POLY_DATA, "POLYDATA" },
{ vtk::fileTag::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
};
-const Foam::Enum<Foam::vtk::fileTag>
+const Foam::Enum
+<
+ Foam::vtk::fileTag
+>
Foam::vtk::legacy::dataTypeNames
{
- { vtk::fileTag::CELL_DATA, "CELL_DATA" },
+ { vtk::fileTag::CELL_DATA, "CELL_DATA" },
{ vtk::fileTag::POINT_DATA, "POINT_DATA" }
};
diff --git a/src/fileFormats/vtk/read/vtkUnstructuredReader.C b/src/fileFormats/vtk/read/vtkUnstructuredReader.C
index f29d57995ce3fc4909e69bc203995d75791591fb..2510aca05750ce97b88d91756e4f2dd6248d3273 100644
--- a/src/fileFormats/vtk/read/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/read/vtkUnstructuredReader.C
@@ -37,36 +37,47 @@ namespace Foam
defineTypeNameAndDebug(vtkUnstructuredReader, 1);
}
-const Foam::Enum<Foam::vtkUnstructuredReader::vtkDataType>
- Foam::vtkUnstructuredReader::vtkDataTypeNames
- {
- { vtkDataType::VTK_INT, "int" },
- { vtkDataType::VTK_UINT, "unsigned_int" },
- { vtkDataType::VTK_LONG, "long" },
- { vtkDataType::VTK_ULONG, "unsigned_long" },
- { vtkDataType::VTK_FLOAT, "float" },
- { vtkDataType::VTK_DOUBLE, "double" },
- { vtkDataType::VTK_STRING, "string" },
- { vtkDataType::VTK_ID, "vtkIdType" }
- };
-
-const Foam::Enum<Foam::vtkUnstructuredReader::vtkDataSetType>
- Foam::vtkUnstructuredReader::vtkDataSetTypeNames
- {
- { vtkDataSetType::VTK_FIELD, "FIELD" },
- { vtkDataSetType::VTK_SCALARS, "SCALARS" },
- { vtkDataSetType::VTK_VECTORS, "VECTORS" }
- };
+const Foam::Enum
+<
+ Foam::vtkUnstructuredReader::vtkDataType
+>
+Foam::vtkUnstructuredReader::vtkDataTypeNames
+{
+ { vtkDataType::VTK_INT, "int" },
+ { vtkDataType::VTK_UINT, "unsigned_int" },
+ { vtkDataType::VTK_LONG, "long" },
+ { vtkDataType::VTK_ULONG, "unsigned_long" },
+ { vtkDataType::VTK_FLOAT, "float" },
+ { vtkDataType::VTK_DOUBLE, "double" },
+ { vtkDataType::VTK_STRING, "string" },
+ { vtkDataType::VTK_ID, "vtkIdType" }
+};
+
+
+const Foam::Enum
+<
+ Foam::vtkUnstructuredReader::vtkDataSetType
+>
+Foam::vtkUnstructuredReader::vtkDataSetTypeNames
+{
+ { vtkDataSetType::VTK_FIELD, "FIELD" },
+ { vtkDataSetType::VTK_SCALARS, "SCALARS" },
+ { vtkDataSetType::VTK_VECTORS, "VECTORS" }
+};
-const Foam::Enum<Foam::vtkUnstructuredReader::parseMode>
- Foam::vtkUnstructuredReader::parseModeNames
- {
- { parseMode::NOMODE, "NOMODE" },
- { parseMode::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
- { parseMode::POLYDATA, "POLYDATA" },
- { parseMode::CELL_DATA, "CELL_DATA" },
- { parseMode::POINT_DATA, "POINT_DATA" }
- };
+
+const Foam::Enum
+<
+ Foam::vtkUnstructuredReader::parseMode
+>
+Foam::vtkUnstructuredReader::parseModeNames
+{
+ { parseMode::NOMODE, "NOMODE" },
+ { parseMode::UNSTRUCTURED_GRID, "UNSTRUCTURED_GRID" },
+ { parseMode::POLYDATA, "POLYDATA" },
+ { parseMode::CELL_DATA, "CELL_DATA" },
+ { parseMode::POINT_DATA, "POINT_DATA" }
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
index ce5a5d148b1483de699e88014e87bb7dd94fb0a0..6851c76951cb16e6b69f2e71617d79ae1c3e0824 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
@@ -52,15 +52,14 @@ Foam::autoPtr<Foam::SRF::SRFModel> Foam::SRF::SRFModel::New
Info<< "Selecting SRFModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown SRFModel type "
<< modelType << nl << nl
- << "Valid SRFModel types are :" << nl
+ << "Valid SRFModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C
index f63fd852bf2dd26a5e01ba5f792e2647b827514c..76042ef02419735ae4363825c05eec369bd79bd9 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C
@@ -70,10 +70,10 @@ Foam::autoPtr<Foam::fv::option> Foam::fv::option::New
const fvMesh& mesh
)
{
- word modelType(coeffs.lookup("type"));
+ const word modelType(coeffs.lookup("type"));
Info<< indent
- << "Selecting finite volume options model type " << modelType << endl;
+ << "Selecting finite volume options type " << modelType << endl;
const_cast<Time&>(mesh.time()).libs().open
(
@@ -82,14 +82,14 @@ Foam::autoPtr<Foam::fv::option> Foam::fv::option::New
dictionaryConstructorTablePtr_
);
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown Model type " << modelType << nl << nl
- << "Valid model types are:" << nl
+ << "Unknown fvOption model type "
+ << modelType << nl << nl
+ << "Valid fvOption types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
index e45f4a2964d2c38122b68806d84aa9e98c3e3c37..811023faaaee87ef90a82e4c4fb3662f58b09c5b 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
@@ -40,8 +40,7 @@ Foam::autoPtr<Foam::porosityModel> Foam::porosityModel::New
Info<< "Porosity region " << name << ":" << nl
<< " selecting model: " << modelType << endl;
- meshConstructorTable::iterator cstrIter =
- meshConstructorTablePtr_->find(modelType);
+ auto cstrIter = meshConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
index 0f205cd057023fbe454a872a336ba70ff17e33f6..27f2d4f98f5e19c802acbcf806b1f09b7f818bd1 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
@@ -102,8 +102,7 @@ Foam::fvPatchField<Type>::NewCalculatedType
const fvPatch& p
)
{
- typename patchConstructorTable::iterator patchTypeCstrIter =
- patchConstructorTablePtr_->find(p.type());
+ auto patchTypeCstrIter = patchConstructorTablePtr_->cfind(p.type());
if (patchTypeCstrIter.found())
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
index 9719903efc9c37a9667755f7114c466c7f6e3d1a..3ddb6408dd528c9e473e6a4fcfea6e4c14e49d3c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
@@ -30,25 +30,15 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- template<>
- const char* NamedEnum
- <
- fanPressureFvPatchScalarField::fanFlowDirection,
- 2
- >::names[] =
- {
- "in",
- "out"
- };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::fanPressureFvPatchScalarField::fanFlowDirection,
- 2
-> Foam::fanPressureFvPatchScalarField::fanFlowDirectionNames_;
+ Foam::fanPressureFvPatchScalarField::fanFlowDirection
+>
+Foam::fanPressureFvPatchScalarField::fanFlowDirectionNames_
+{
+ { fanFlowDirection::ffdIn, "in" },
+ { fanFlowDirection::ffdOut, "out" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -94,7 +84,7 @@ Foam::fanPressureFvPatchScalarField::fanPressureFvPatchScalarField
:
totalPressureFvPatchScalarField(p, iF, dict),
fanCurve_(dict),
- direction_(fanFlowDirectionNames_.read(dict.lookup("direction"))),
+ direction_(fanFlowDirectionNames_.lookup("direction", dict)),
nonDimensional_(dict.lookupOrDefault<Switch>("nonDimensional", false)),
rpm_(dict.lookupOrDefault<scalar>("rpm", 0.0)),
dm_(dict.lookupOrDefault<scalar>("dm", 0.0))
@@ -205,10 +195,8 @@ void Foam::fanPressureFvPatchScalarField::write(Ostream& os) const
{
totalPressureFvPatchScalarField::write(os);
fanCurve_.write(os);
- os.writeKeyword("direction")
- << fanFlowDirectionNames_[direction_] << token::END_STATEMENT << nl;
- os.writeKeyword("nonDimensional") << nonDimensional_
- << token::END_STATEMENT << nl;
+ os.writeEntry("direction", fanFlowDirectionNames_[direction_]);
+ os.writeEntry("nonDimensional", nonDimensional_);
os.writeEntry("rpm", rpm_);
os.writeEntry("dm", dm_);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
index 60780a0cd8c4b18d1d631e276ca528d346547f44..fa8f07cdb06fce3fc91c2daa3f5f12e919c45034 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
@@ -123,8 +123,8 @@ public:
ffdOut
};
- //- Fan flow directions names
- static const NamedEnum<fanFlowDirection, 2> fanFlowDirectionNames_;
+ //- Fan flow direction names
+ static const Enum<fanFlowDirection> fanFlowDirectionNames_;
private:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index 4b25603ce045c166af4b3ca3377e147b6f8b1efe..4d986bd2914c237eade76b3b03bb05ced71e82b6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -35,27 +35,25 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeType
+>
+Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeTypeNames_
{
- template<>
- const char* NamedEnum
- <
- waveSurfacePressureFvPatchScalarField::ddtSchemeType,
- 3
- >::names[] =
{
- fv::EulerDdtScheme<scalar>::typeName_(),
- fv::CrankNicolsonDdtScheme<scalar>::typeName_(),
+ ddtSchemeType::tsEuler,
+ fv::EulerDdtScheme<scalar>::typeName_()
+ },
+ {
+ ddtSchemeType::tsCrankNicolson,
+ fv::CrankNicolsonDdtScheme<scalar>::typeName_()
+ },
+ {
+ ddtSchemeType::tsBackward,
fv::backwardDdtScheme<scalar>::typeName_()
- };
-}
-
-
-const Foam::NamedEnum
-<
- Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeType,
- 3
-> Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeTypeNames_;
+ },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H
index ef8214ee36a43e5019df73b988fc43f52bbf5b96..3706827143f242673271dad94b2876785e6d8530 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H
@@ -79,7 +79,7 @@ SourceFiles
#define waveSurfacePressureFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -121,7 +121,7 @@ private:
word rhoName_;
//- Time scheme type names
- static const NamedEnum<ddtSchemeType, 3> ddtSchemeTypeNames_;
+ static const Enum<ddtSchemeType> ddtSchemeTypeNames_;
public:
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
index bf62d071dc2469c1d99832e4ac8c62c85ea88645..866c8a48a52d303d2e42bdc3990597c8cda5d6e3 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
@@ -42,21 +42,19 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
<< endl;
}
- typename patchConstructorTable::iterator cstrIter =
- patchConstructorTablePtr_->find(patchFieldType);
+ auto cstrIter = patchConstructorTablePtr_->cfind(patchFieldType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown patchField type "
<< patchFieldType << nl << nl
- << "Valid patchField types are :" << endl
+ << "Valid patchField types :" << endl
<< patchConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
- typename patchConstructorTable::iterator patchTypeCstrIter =
- patchConstructorTablePtr_->find(p.type());
+ auto patchTypeCstrIter = patchConstructorTablePtr_->cfind(p.type());
if
(
@@ -116,14 +114,13 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
<< endl;
}
- typename dictionaryConstructorTable::iterator cstrIter
- = dictionaryConstructorTablePtr_->find(patchFieldType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(patchFieldType);
if (!cstrIter.found())
{
if (!disallowGenericFvPatchField)
{
- cstrIter = dictionaryConstructorTablePtr_->find("generic");
+ cstrIter = dictionaryConstructorTablePtr_->cfind("generic");
}
if (!cstrIter.found())
@@ -133,7 +130,7 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
dict
) << "Unknown patchField type " << patchFieldType
<< " for patch type " << p.type() << nl << nl
- << "Valid patchField types are :" << endl
+ << "Valid patchField types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
@@ -145,8 +142,8 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
|| word(dict.lookup("patchType")) != p.type()
)
{
- typename dictionaryConstructorTable::iterator patchTypeCstrIter
- = dictionaryConstructorTablePtr_->find(p.type());
+ auto patchTypeCstrIter
+ = dictionaryConstructorTablePtr_->cfind(p.type());
if (patchTypeCstrIter.found() && patchTypeCstrIter() != cstrIter())
{
@@ -178,14 +175,13 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
InfoInFunction << "Constructing fvPatchField<Type>" << endl;
}
- typename patchMapperConstructorTable::iterator cstrIter =
- patchMapperConstructorTablePtr_->find(ptf.type());
+ auto cstrIter = patchMapperConstructorTablePtr_->cfind(ptf.type());
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown patchField type " << ptf.type() << nl << nl
- << "Valid patchField types are :" << endl
+ << "Valid patchField types :" << endl
<< patchMapperConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
index fcfbb1dae1edfd6b6174cc1f5f0eacd83fa5d053..383d613a2249e2c17f952750f9d1e1bf8ccddc46 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
@@ -100,8 +100,7 @@ Foam::fvsPatchField<Type>::NewCalculatedType
const fvPatch& p
)
{
- typename patchConstructorTable::iterator patchTypeCstrIter =
- patchConstructorTablePtr_->find(p.type());
+ auto patchTypeCstrIter = patchConstructorTablePtr_->cfind(p.type());
if (patchTypeCstrIter.found())
{
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
index 12af314f87581998f7e9af3380e269247ca2cb2d..5bcd17570ea0ac94cc5047d9eed74a68160dd4af 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
@@ -39,15 +39,14 @@ Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
InfoInFunction << "Constructing fvsPatchField<Type>" << endl;
}
- typename patchConstructorTable::iterator cstrIter =
- patchConstructorTablePtr_->find(patchFieldType);
+ auto cstrIter = patchConstructorTablePtr_->cfind(patchFieldType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown patchField type "
<< patchFieldType << nl << nl
- << "Valid patchField types are :" << endl
+ << "Valid patchField types :" << endl
<< patchConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -58,8 +57,7 @@ Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
|| actualPatchType != p.type()
)
{
- typename patchConstructorTable::iterator patchTypeCstrIter =
- patchConstructorTablePtr_->find(p.type());
+ auto patchTypeCstrIter = patchConstructorTablePtr_->cfind(p.type());
if (patchTypeCstrIter.found())
{
@@ -104,14 +102,13 @@ Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
const word patchFieldType(dict.lookup("type"));
- typename dictionaryConstructorTable::iterator cstrIter
- = dictionaryConstructorTablePtr_->find(patchFieldType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(patchFieldType);
if (!cstrIter.found())
{
if (!disallowGenericFvsPatchField)
{
- cstrIter = dictionaryConstructorTablePtr_->find("generic");
+ cstrIter = dictionaryConstructorTablePtr_->cfind("generic");
}
if (!cstrIter.found())
@@ -121,7 +118,7 @@ Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
dict
) << "Unknown patchField type " << patchFieldType
<< " for patch type " << p.type() << nl << nl
- << "Valid patchField types are :" << endl
+ << "Valid patchField types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
@@ -133,8 +130,8 @@ Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
|| word(dict.lookup("patchType")) != p.type()
)
{
- typename dictionaryConstructorTable::iterator patchTypeCstrIter
- = dictionaryConstructorTablePtr_->find(p.type());
+ auto patchTypeCstrIter
+ = dictionaryConstructorTablePtr_->cfind(p.type());
if (patchTypeCstrIter.found() && patchTypeCstrIter() != cstrIter())
{
@@ -166,20 +163,18 @@ Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
InfoInFunction << "Constructing fvsPatchField<Type>" << endl;
}
- typename patchMapperConstructorTable::iterator cstrIter =
- patchMapperConstructorTablePtr_->find(ptf.type());
+ auto cstrIter = patchMapperConstructorTablePtr_->cfind(ptf.type());
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown patchField type " << ptf.type() << nl << nl
- << "Valid patchField types are :" << endl
+ << "Valid patchField types :" << endl
<< patchMapperConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
- typename patchMapperConstructorTable::iterator
- patchTypeCstrIter = patchMapperConstructorTablePtr_->find(p.type());
+ auto patchTypeCstrIter = patchMapperConstructorTablePtr_->cfind(p.type());
if (patchTypeCstrIter.found())
{
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index a8539a5c48a54230a765964a1898950d8272d35c..ca63afc7882048563465dfed8cccefcc412496af 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -79,15 +79,15 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
const word schemeName(schemeData);
- typename IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(schemeName);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(schemeName);
if (!cstrIter.found())
{
FatalIOErrorInFunction
(
schemeData
- ) << "Unknown convection scheme " << schemeName << nl << nl
+ ) << "Unknown convection scheme "
+ << schemeName << nl << nl
<< "Valid convection schemes are :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
@@ -125,15 +125,15 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
const word schemeName(schemeData);
- typename MultivariateConstructorTable::iterator cstrIter =
- MultivariateConstructorTablePtr_->find(schemeName);
+ auto cstrIter = MultivariateConstructorTablePtr_->cfind(schemeName);
if (!cstrIter.found())
{
FatalIOErrorInFunction
(
schemeData
- ) << "Unknown convection scheme " << schemeName << nl << nl
+ ) << "Unknown convection scheme "
+ << schemeName << nl << nl
<< "Valid convection schemes are :" << endl
<< MultivariateConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
index d9c7091e6b34c9a9d6627dc1547b03a780ce548a..ffdc4c25b8bfc5c9c2019f969248e2306460c957 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
@@ -66,15 +66,15 @@ tmp<d2dt2Scheme<Type>> d2dt2Scheme<Type>::New
const word schemeName(schemeData);
- typename IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(schemeName);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(schemeName);
if (!cstrIter.found())
{
FatalIOErrorInFunction
(
schemeData
- ) << "Unknown d2dt2 scheme " << schemeName << nl << nl
+ ) << "Unknown d2dt2 scheme "
+ << schemeName << nl << nl
<< "Valid d2dt2 schemes are :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index f5e11840b9532a84435e96ad5a039f4c63266006..fd4f502ed991ea0fa282ebee81da93fac88470fc 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -66,15 +66,15 @@ tmp<ddtScheme<Type>> ddtScheme<Type>::New
const word schemeName(schemeData);
- typename IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(schemeName);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(schemeName);
if (!cstrIter.found())
{
FatalIOErrorInFunction
(
schemeData
- ) << "Unknown ddt scheme " << schemeName << nl << nl
+ ) << "Unknown ddt scheme "
+ << schemeName << nl << nl
<< "Valid ddt schemes are :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
index af586b63a52d5dc82058ef44baca4ec1ef60bc41..8c71aafcb3dc3b1b2422729a040a1e048113980a 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
@@ -67,8 +67,7 @@ tmp<divScheme<Type>> divScheme<Type>::New
const word schemeName(schemeData);
- typename IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(schemeName);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(schemeName);
if (!cstrIter.found())
{
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 4358fab0292d57f5afdad77c85b9cc0f8dc6de26..1a055779f19bcd493cd7ebeae40feb01e736f595 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -54,15 +54,15 @@ Foam::tmp<Foam::fv::gradScheme<Type>> Foam::fv::gradScheme<Type>::New
const word schemeName(schemeData);
- typename IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(schemeName);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(schemeName);
if (!cstrIter.found())
{
FatalIOErrorInFunction
(
schemeData
- ) << "Unknown grad scheme " << schemeName << nl << nl
+ ) << "Unknown grad scheme "
+ << schemeName << nl << nl
<< "Valid grad schemes are :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
index f7832287548e0f83df605e5dd11f89514cd938b1..0a774bdf5dcf6a8f2680a829b2fc7f1bb0937ea0 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -65,15 +65,15 @@ tmp<laplacianScheme<Type, GType>> laplacianScheme<Type, GType>::New
const word schemeName(schemeData);
- typename IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(schemeName);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(schemeName);
if (!cstrIter.found())
{
FatalIOErrorInFunction
(
schemeData
- ) << "Unknown laplacian scheme " << schemeName << nl << nl
+ ) << "Unknown laplacian scheme "
+ << schemeName << nl << nl
<< "Valid laplacian schemes are :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index 5644e7a6b1a4998986354d967af12385b69e7307..d5422e729d5a6b66488e43ff41e24371b62ef8dc 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -67,10 +67,9 @@ tmp<snGradScheme<Type>> snGradScheme<Type>::New
const word schemeName(schemeData);
- typename MeshConstructorTable::iterator constructorIter =
- MeshConstructorTablePtr_->find(schemeName);
+ auto cstrIter = MeshConstructorTablePtr_->cfind(schemeName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -82,7 +81,7 @@ tmp<snGradScheme<Type>> snGradScheme<Type>::New
<< exit(FatalIOError);
}
- return constructorIter()(mesh, schemeData);
+ return cstrIter()(mesh, schemeData);
}
diff --git a/src/finiteVolume/functionObjects/volRegion/volRegion.C b/src/finiteVolume/functionObjects/volRegion/volRegion.C
index ab2f65fcfb06a49e6075d78055be88f115255539..34efa8a1e65f546f55f77cbe8de25ce0c84b3da9 100644
--- a/src/finiteVolume/functionObjects/volRegion/volRegion.C
+++ b/src/finiteVolume/functionObjects/volRegion/volRegion.C
@@ -37,19 +37,16 @@ namespace functionObjects
}
}
-template<>
-const char*
-Foam::NamedEnum
-<
- Foam::functionObjects::volRegion::regionTypes,
- 2
->::names[] = {"cellZone", "all"};
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::volRegion::regionTypes,
- 2
-> Foam::functionObjects::volRegion::regionTypeNames_;
+ Foam::functionObjects::volRegion::regionTypes
+>
+Foam::functionObjects::volRegion::regionTypeNames_
+{
+ { regionTypes::vrtCellZone, "cellZone" },
+ { regionTypes::vrtAll, "all" },
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -79,9 +76,12 @@ Foam::functionObjects::volRegion::volRegion
mesh_(mesh),
regionType_
(
- dict.found("regionType")
- ? regionTypeNames_.read(dict.lookup("regionType"))
- : vrtAll
+ regionTypeNames_.lookupOrDefault
+ (
+ "regionType",
+ dict,
+ regionTypes::vrtAll
+ )
),
regionName_(polyMesh::defaultRegion),
regionID_(-1)
@@ -144,7 +144,7 @@ bool Foam::functionObjects::volRegion::read
{
FatalIOErrorInFunction(dict)
<< "Unknown region type. Valid region types are:"
- << regionTypeNames_.toc()
+ << regionTypeNames_.sortedToc()
<< exit(FatalIOError);
}
}
diff --git a/src/finiteVolume/functionObjects/volRegion/volRegion.H b/src/finiteVolume/functionObjects/volRegion/volRegion.H
index d466a131410b2793a5b113e5c48cf283dd0d9111..f95504684d9d5e922c35b7a7169f02d40b76eab2 100644
--- a/src/finiteVolume/functionObjects/volRegion/volRegion.H
+++ b/src/finiteVolume/functionObjects/volRegion/volRegion.H
@@ -71,7 +71,7 @@ SourceFiles
#define functionObjects_volRegion_H
#include "writeFile.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -111,7 +111,7 @@ public:
};
//- Region type names
- static const NamedEnum<regionTypes, 2> regionTypeNames_;
+ static const Enum<regionTypes> regionTypeNames_;
protected:
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index 77c05e08631b54abd5ff7c2fa13d53a11bfbfb11..579387eaecf3f593f6795c34c0cdd1b6e709f01b 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -70,13 +70,7 @@ Foam::wordList Foam::fvPatch::constraintTypes()
label i = 0;
- for
- (
- polyPatchConstructorTable::iterator cstrIter =
- polyPatchConstructorTablePtr_->begin();
- cstrIter != polyPatchConstructorTablePtr_->end();
- ++cstrIter
- )
+ forAllConstIters(*polyPatchConstructorTablePtr_, cstrIter)
{
if (constraintType(cstrIter.key()))
{
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
index 468b9b88f60a798e5aa4564e54ba3c8c1f61d2b1..a916503f98ebecad87a8dc4f3ec2809ef6948b06 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
@@ -40,14 +40,13 @@ Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
InfoInFunction << "Constructing fvPatch" << endl;
}
- polyPatchConstructorTable::iterator cstrIter =
- polyPatchConstructorTablePtr_->find(patch.type());
+ auto cstrIter = polyPatchConstructorTablePtr_->cfind(patch.type());
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown fvPatch type " << patch.type() << nl
- << "Valid fvPatch types are :"
+ << "Valid fvPatch types :"
<< polyPatchConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
index 349d356497049896916094d32bc5439b7961a2e0..e7357ff4d41b02b85356fc174d57060645f5bc5b 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
@@ -56,19 +56,18 @@ Foam::autoPtr<Foam::patchDistMethod> Foam::patchDistMethod::New
const labelHashSet& patchIDs
)
{
- word patchDistMethodType(dict.lookup("method"));
+ const word methodType(dict.lookup("method"));
- Info<< "Selecting patchDistMethod " << patchDistMethodType << endl;
+ Info<< "Selecting patchDistMethod " << methodType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(patchDistMethodType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown patchDistMethodType type "
- << patchDistMethodType << endl << endl
- << "Valid patchDistMethod types are : " << endl
+ << "Unknown patchDistMethod type "
+ << methodType << endl << endl
+ << "Valid patchDistMethod types : " << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -86,19 +85,18 @@ Foam::autoPtr<Foam::patchDistMethod> Foam::patchDistMethod::New
const word& defaultPatchDistMethod
)
{
- word patchDistMethodType = defaultPatchDistMethod;
- dict.readIfPresent("method", patchDistMethodType);
+ word methodType = defaultPatchDistMethod;
+ dict.readIfPresent("method", methodType);
- Info<< "Selecting patchDistMethod " << patchDistMethodType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(patchDistMethodType);
+ Info<< "Selecting patchDistMethod " << methodType << endl;
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown patchDistMethodType type "
- << patchDistMethodType << endl << endl
- << "Valid patchDistMethod types are : " << endl
+ << methodType << endl << endl
+ << "Valid patchDistMethod types : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
index decc033fe599292987a00d67694d43807a0c7218..14f3f86f6d51da2f6f52dc2884012e703e9e79bf 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
@@ -35,8 +35,7 @@ Foam::autoPtr<Foam::interpolation<Type>> Foam::interpolation<Type>::New
const GeometricField<Type, fvPatchField, volMesh>& psi
)
{
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(interpolationType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(interpolationType);
if (!cstrIter.found())
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index fae9dddca3969a6a78968f78f9d45cff92aac7ee..d2c301c8dc0871c5a5a7219c190864dcebd0b53f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -58,10 +58,9 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
const word schemeName(schemeData);
- typename MeshConstructorTable::iterator constructorIter =
- MeshConstructorTablePtr_->find(schemeName);
+ auto cstrIter = MeshConstructorTablePtr_->cfind(schemeName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -73,7 +72,7 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
<< exit(FatalIOError);
}
- return constructorIter()(mesh, schemeData);
+ return cstrIter()(mesh, schemeData);
}
@@ -107,10 +106,9 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
const word schemeName(schemeData);
- typename MeshFluxConstructorTable::iterator constructorIter =
- MeshFluxConstructorTablePtr_->find(schemeName);
+ auto cstrIter = MeshFluxConstructorTablePtr_->cfind(schemeName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -122,7 +120,7 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
<< exit(FatalIOError);
}
- return constructorIter()(mesh, faceFlux, schemeData);
+ return cstrIter()(mesh, faceFlux, schemeData);
}
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index ea3017016ba04be9ce6a4cbc076892f9360522a9..e9400fbfee6e191fb900a6edf7783a414a165431 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -68,10 +68,9 @@ Foam::multivariateSurfaceInterpolationScheme<Type>::New
const word schemeName(schemeData);
- typename IstreamConstructorTable::iterator constructorIter =
- IstreamConstructorTablePtr_->find(schemeName);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(schemeName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -82,7 +81,7 @@ Foam::multivariateSurfaceInterpolationScheme<Type>::New
<< exit(FatalIOError);
}
- return constructorIter()(mesh, vtfs, faceFlux, schemeData);
+ return cstrIter()(mesh, vtfs, faceFlux, schemeData);
}
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 0fbf63650b1034e24cca8fe46fcfb9791a6965fa..b35c82f8a7b7952c550352ec4fac6d163ddcfd78 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -58,10 +58,9 @@ Foam::surfaceInterpolationScheme<Type>::New
InfoInFunction << "Discretisation scheme = " << schemeName << endl;
}
- typename MeshConstructorTable::iterator constructorIter =
- MeshConstructorTablePtr_->find(schemeName);
+ auto cstrIter = MeshConstructorTablePtr_->cfind(schemeName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -73,7 +72,7 @@ Foam::surfaceInterpolationScheme<Type>::New
<< exit(FatalIOError);
}
- return constructorIter()(mesh, schemeData);
+ return cstrIter()(mesh, schemeData);
}
@@ -106,10 +105,9 @@ Foam::surfaceInterpolationScheme<Type>::New
<< "Discretisation scheme = " << schemeName << endl;
}
- typename MeshFluxConstructorTable::iterator constructorIter =
- MeshFluxConstructorTablePtr_->find(schemeName);
+ auto cstrIter = MeshFluxConstructorTablePtr_->cfind(schemeName);
- if (!constructorIter.found())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -121,7 +119,7 @@ Foam::surfaceInterpolationScheme<Type>::New
<< exit(FatalIOError);
}
- return constructorIter()(mesh, faceFlux, schemeData);
+ return cstrIter()(mesh, faceFlux, schemeData);
}
@@ -241,8 +239,7 @@ Foam::surfaceInterpolationScheme<Type>::dotInterpolate
<< "Interpolating "
<< vf.type() << " "
<< vf.name()
- << " from cells to faces "
- "without explicit correction"
+ << " from cells to faces without explicit correction"
<< endl;
}
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index 8bcf452ce958d85f3667a14245eba71b62ec902c..80ef9247da65644cf6324e9f616321403ff7a841 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -50,13 +50,16 @@ namespace functionObjects
}
}
-const Foam::Enum<Foam::functionObjects::externalCoupled::stateEnd>
- Foam::functionObjects::externalCoupled::stateEndNames_
- {
- { stateEnd::REMOVE, "remove" },
- { stateEnd::DONE, "done" }
- // 'IGNORE' is internal use only and thus without a name
- };
+const Foam::Enum
+<
+ Foam::functionObjects::externalCoupled::stateEnd
+>
+Foam::functionObjects::externalCoupled::stateEndNames_
+{
+ { stateEnd::REMOVE, "remove" },
+ { stateEnd::DONE, "done" }
+ // 'IGNORE' is internal use only and thus without a name
+};
Foam::word Foam::functionObjects::externalCoupled::lockName = "OpenFOAM";
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
index efd22faf1188c49104df1657b8a3e8eb46d060ab..f42858f1f6915f4fdfcaae20be30197ba8eb5446 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
@@ -37,18 +37,16 @@ const Foam::word Foam::functionObjects::fieldAverageItem::EXT_PRIME2MEAN
"Prime2Mean"
);
-template<>
-const char* Foam::NamedEnum
-<
- Foam::functionObjects::fieldAverageItem::baseType,
- 2
->::names[] = { "iteration", "time"};
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::fieldAverageItem::baseType,
- 2
-> Foam::functionObjects::fieldAverageItem::baseTypeNames_;
+ Foam::functionObjects::fieldAverageItem::baseType
+>
+Foam::functionObjects::fieldAverageItem::baseTypeNames_
+{
+ { baseType::ITER, "iteration" },
+ { baseType::TIME, "time" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
index d0b900f0e8b6386ab59f53efcc4abc814cfe3636..d683cafea7a4ca39745d86c147e15988c6c79431 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
@@ -50,7 +50,7 @@ SourceFiles
#ifndef fieldAverageItem_H
#define fieldAverageItem_H
-#include "NamedEnum.H"
+#include "Enum.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -119,7 +119,7 @@ private:
word prime2MeanFieldName_;
//- Averaging base type names
- static const NamedEnum<baseType, 2> baseTypeNames_;
+ static const Enum<baseType> baseTypeNames_;
//- Averaging base type
baseType base_;
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
index 65e4e21abcb46bd79ce500c4ed152c0fa08f131d..a057aba5762ec8767a0a91e9e73f081adf03d016 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
@@ -47,7 +47,7 @@ Foam::functionObjects::fieldAverageItem::fieldAverageItem(Istream& is)
fieldName_ = entry.keyword();
mean_ = readBool(entry.lookup("mean"));
prime2Mean_ = readBool(entry.lookup("prime2Mean"));
- base_ = baseTypeNames_[entry.lookup("base")];
+ base_ = baseTypeNames_.lookup("base", entry);
window_ = entry.lookupOrDefault<scalar>("window", -1.0);
windowName_ = entry.lookupOrDefault<word>("windowName", "");
@@ -77,7 +77,7 @@ Foam::Istream& Foam::functionObjects::operator>>
faItem.fieldName_ = entry.keyword();
faItem.mean_ = readBool(entry.lookup("mean"));
faItem.prime2Mean_ = readBool(entry.lookup("prime2Mean"));
- faItem.base_ = faItem.baseTypeNames_[entry.lookup("base")];
+ faItem.base_ = faItem.baseTypeNames_.lookup("base", entry);
faItem.window_ = entry.lookupOrDefault<scalar>("window", -1.0);
faItem.windowName_ = entry.lookupOrDefault<word>("windowName", "");
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/functionObjects/field/fieldMinMax/fieldMinMax.C
index 491b05fb61f183bfde807f2f0e47a2f611ddfdb6..35d68b92f0a5876b16aaf1a26edb2a9fe4376d7a 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -38,18 +38,15 @@ namespace functionObjects
}
}
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::fieldMinMax::modeType,
- 2
->::names[] = {"magnitude", "component"};
-
-const Foam::NamedEnum
-<
- Foam::functionObjects::fieldMinMax::modeType,
- 2
-> Foam::functionObjects::fieldMinMax::modeTypeNames_;
+ Foam::functionObjects::fieldMinMax::modeType
+>
+Foam::functionObjects::fieldMinMax::modeTypeNames_
+{
+ { modeType::mdMag, "magnitude" },
+ { modeType::mdCmpt, "component" },
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -126,7 +123,7 @@ bool Foam::functionObjects::fieldMinMax::read(const dictionary& dict)
location_ = dict.lookupOrDefault<Switch>("location", true);
- mode_ = modeTypeNames_[dict.lookupOrDefault<word>("mode", "magnitude")];
+ mode_ = modeTypeNames_.lookupOrDefault("mode", dict, modeType::mdMag);
dict.lookup("fields") >> fieldSet_;
return true;
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
index 1871fdbfe9b8fdc2474986ba32ddb29eb967af95..588dc5c7fdd7ee22c41a43c601b583821fe6db54 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -78,7 +78,7 @@ SourceFiles
#define functionObjects_fieldMinMax_H
#include "Switch.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "fvMeshFunctionObject.H"
#include "writeFile.H"
#include "vector.H"
@@ -115,7 +115,7 @@ protected:
// Protected data
//- Mode type names
- static const NamedEnum<modeType, 2> modeTypeNames_;
+ static const Enum<modeType> modeTypeNames_;
//- Switch to write location of min/max values
Switch location_;
diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C b/src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C
index 270859347ed65636cd10654622edc84a984dd7ab..b665ee289649098609b17d999dbb161187633dfb 100644
--- a/src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C
+++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C
@@ -43,15 +43,14 @@ Foam::functionObjects::fieldValue::New
Info<< "Selecting " << typeName << " " << modelType << endl;
}
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown " << typeName << " type "
<< modelType << nl << nl
- << "Valid " << typeName << " types are:" << nl
+ << "Valid " << typeName << " types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index ca24bdad368348cce2d594a8c14ea327cd21bb27..68291255d13db596b559b5ff0b58f43b0023a5f0 100644
--- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -40,24 +40,19 @@ namespace fieldValues
}
}
-template<>
-const char* Foam::NamedEnum
+
+const Foam::Enum
<
- Foam::functionObjects::fieldValues::fieldValueDelta::operationType,
- 5
->::names[] =
+ Foam::functionObjects::fieldValues::fieldValueDelta::operationType
+>
+Foam::functionObjects::fieldValues::fieldValueDelta::operationTypeNames_
{
- "add",
- "subtract",
- "min",
- "max",
- "average"
+ { operationType::opAdd, "add" },
+ { operationType::opSubtract, "subtract" },
+ { operationType::opMin, "min" },
+ { operationType::opMax, "max" },
+ { operationType::opAverage, "average" },
};
-const Foam::NamedEnum
-<
- Foam::functionObjects::fieldValues::fieldValueDelta::operationType,
- 5
-> Foam::functionObjects::fieldValues::fieldValueDelta::operationTypeNames_;
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
@@ -151,7 +146,7 @@ bool Foam::functionObjects::fieldValues::fieldValueDelta::read
).ptr()
);
- operation_ = operationTypeNames_.read(dict.lookup("operation"));
+ operation_ = operationTypeNames_.lookup("operation", dict);
return true;
}
diff --git a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
index 038ef142fcec64fc174640896a136df4e39e3245..b4701247c75f6e6ab8e44f311d66c3adb31552a3 100644
--- a/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
+++ b/src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -85,6 +85,7 @@ SourceFiles
#include "stateFunctionObject.H"
#include "writeFile.H"
#include "fieldValue.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -116,7 +117,7 @@ public:
};
//- Operation type names
- static const NamedEnum<operationType, 5> operationTypeNames_;
+ static const Enum<operationType> operationTypeNames_;
private:
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
index 3d39aa4655d3b13b5637d85ca81a796d00b8cc41..f0eb481dd77f1f8dbb769e04b9ca02d7d8920a7b 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@@ -49,75 +49,54 @@ namespace fieldValues
}
}
-template<>
-const char* Foam::NamedEnum
-<
- Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypes,
- 4
->::names[] =
-{
- "faceZone",
- "patch",
- "surface",
- "sampledSurface"
-};
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::fieldValues::surfaceFieldValue::operationType,
- 17
->::names[] =
+ Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypes
+>
+Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypeNames_
{
- "none",
- "sum",
- "weightedSum",
- "sumMag",
- "sumDirection",
- "sumDirectionBalance",
- "average",
- "weightedAverage",
- "areaAverage",
- "weightedAreaAverage",
- "areaIntegrate",
- "weightedAreaIntegrate",
- "min",
- "max",
- "CoV",
- "areaNormalAverage",
- "areaNormalIntegrate"
+ { regionTypes::stFaceZone, "faceZone" },
+ { regionTypes::stPatch, "patch" },
+ { regionTypes::stSurface, "surface" },
+ { regionTypes::stSampledSurface, "sampledSurface" },
};
-template<>
-const char* Foam::NamedEnum
+
+const Foam::Enum
<
- Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationType,
- 2
->::names[] =
+ Foam::functionObjects::fieldValues::surfaceFieldValue::operationType
+>
+Foam::functionObjects::fieldValues::surfaceFieldValue::operationTypeNames_
{
- "none",
- "sqrt"
+ { operationType::opNone, "none" },
+ { operationType::opSum, "sum" },
+ { operationType::opWeightedSum, "weightedSum" },
+ { operationType::opSumMag, "sumMag" },
+ { operationType::opSumDirection, "sumDirection" },
+ { operationType::opSumDirectionBalance, "sumDirectionBalance" },
+ { operationType::opAverage, "average" },
+ { operationType::opWeightedAverage, "weightedAverage" },
+ { operationType::opAreaAverage, "areaAverage" },
+ { operationType::opWeightedAreaAverage, "weightedAreaAverage" },
+ { operationType::opAreaIntegrate, "areaIntegrate" },
+ { operationType::opWeightedAreaIntegrate, "weightedAreaIntegrate" },
+ { operationType::opMin, "min" },
+ { operationType::opMax, "max" },
+ { operationType::opCoV, "CoV" },
+ { operationType::opAreaNormalAverage, "areaNormalAverage" },
+ { operationType::opAreaNormalIntegrate, "areaNormalIntegrate" },
};
-
-const Foam::NamedEnum
-<
- Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypes,
- 4
-> Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypeNames_;
-
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::fieldValues::surfaceFieldValue::operationType,
- 17
-> Foam::functionObjects::fieldValues::surfaceFieldValue::operationTypeNames_;
-
-const Foam::NamedEnum
-<
- Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationType,
- 2
+ Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationType
>
-Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationTypeNames_;
+Foam::functionObjects::fieldValues::surfaceFieldValue::postOperationTypeNames_
+{
+ { postOperationType::postOpNone, "none" },
+ { postOperationType::postOpSqrt, "sqrt" },
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -832,12 +811,16 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::surfaceFieldValue
)
:
fieldValue(name, runTime, dict, typeName),
- regionType_(regionTypeNames_.read(dict.lookup("regionType"))),
- operation_(operationTypeNames_.read(dict.lookup("operation"))),
+ regionType_(regionTypeNames_.lookup("regionType", dict)),
+ operation_(operationTypeNames_.lookup("operation", dict)),
postOperation_
(
- postOperationTypeNames_
- [dict.lookupOrDefault<word>("postOperation", "none")]
+ postOperationTypeNames_.lookupOrDefault
+ (
+ "postOperation",
+ dict,
+ postOperationType::postOpNone
+ )
),
weightFieldName_("none"),
writeArea_(dict.lookupOrDefault("writeArea", false)),
@@ -859,12 +842,16 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::surfaceFieldValue
)
:
fieldValue(name, obr, dict, typeName),
- regionType_(regionTypeNames_.read(dict.lookup("regionType"))),
- operation_(operationTypeNames_.read(dict.lookup("operation"))),
+ regionType_(regionTypeNames_.lookup("regionType", dict)),
+ operation_(operationTypeNames_.lookup("operation", dict)),
postOperation_
(
- postOperationTypeNames_
- [dict.lookupOrDefault<word>("postOperation", "none")]
+ postOperationTypeNames_.lookupOrDefault
+ (
+ "postOperation",
+ dict,
+ postOperationType::postOpNone
+ )
),
weightFieldName_("none"),
writeArea_(dict.lookupOrDefault("writeArea", false)),
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
index a58b27b8a0b55170f214eae7999d2685b1458494..4cf6b7c5153c658cff1b13f097d64a0a8c706754 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
@@ -156,7 +156,7 @@ SourceFiles
#define functionObjects_surfaceFieldValue_H
#include "fieldValue.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "meshedSurf.H"
#include "surfaceMesh.H"
#include "fvsPatchField.H"
@@ -198,7 +198,7 @@ public:
};
//- Region type names
- static const NamedEnum<regionTypes, 4> regionTypeNames_;
+ static const Enum<regionTypes> regionTypeNames_;
//- Operation type enumeration
@@ -224,7 +224,7 @@ public:
};
//- Operation type names
- static const NamedEnum<operationType, 17> operationTypeNames_;
+ static const Enum<operationType> operationTypeNames_;
//- Post-operation type enumeration
@@ -235,7 +235,7 @@ public:
};
//- Operation type names
- static const NamedEnum<postOperationType, 2> postOperationTypeNames_;
+ static const Enum<postOperationType> postOperationTypeNames_;
private:
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
index fa77d962b08eefb0fe4e8382fbc52c73dc696ef8..912b6459bbf137d7009296b3551c4e4d3be9e005 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
@@ -43,35 +43,27 @@ namespace fieldValues
}
}
-template<>
-const char*
-Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::fieldValues::volFieldValue::operationType,
- 13
->::names[] =
+ Foam::functionObjects::fieldValues::volFieldValue::operationType
+>
+Foam::functionObjects::fieldValues::volFieldValue::operationTypeNames_
{
- "none",
- "sum",
- "weightedSum",
- "sumMag",
- "average",
- "weightedAverage",
- "volAverage",
- "weightedVolAverage",
- "volIntegrate",
- "weightedVolIntegrate",
- "min",
- "max",
- "CoV"
+ { operationType::opNone, "none" },
+ { operationType::opSum, "sum" },
+ { operationType::opWeightedSum, "weightedSum" },
+ { operationType::opSumMag, "sumMag" },
+ { operationType::opAverage, "average" },
+ { operationType::opWeightedAverage, "weightedAverage" },
+ { operationType::opVolAverage, "volAverage" },
+ { operationType::opWeightedVolAverage, "weightedVolAverage" },
+ { operationType::opVolIntegrate, "volIntegrate" },
+ { operationType::opWeightedVolIntegrate, "weightedVolIntegrate" },
+ { operationType::opMin, "min" },
+ { operationType::opMax, "max" },
+ { operationType::opCoV, "CoV" },
};
-const Foam::NamedEnum
-<
- Foam::functionObjects::fieldValues::volFieldValue::operationType,
- 13
-> Foam::functionObjects::fieldValues::volFieldValue::operationTypeNames_;
-
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -198,7 +190,7 @@ Foam::functionObjects::fieldValues::volFieldValue::volFieldValue
:
fieldValue(name, runTime, dict, typeName),
volRegion(fieldValue::mesh_, dict),
- operation_(operationTypeNames_.read(dict.lookup("operation"))),
+ operation_(operationTypeNames_.lookup("operation", dict)),
weightFieldName_("none")
{
read(dict);
@@ -215,7 +207,7 @@ Foam::functionObjects::fieldValues::volFieldValue::volFieldValue
:
fieldValue(name, obr, dict, typeName),
volRegion(fieldValue::mesh_, dict),
- operation_(operationTypeNames_.read(dict.lookup("operation"))),
+ operation_(operationTypeNames_.lookup("operation", dict)),
weightFieldName_("none")
{
read(dict);
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
index db9b34bc1e0ff2b6fa1c2fcd7e7eb95d686d6b5c..f2730c526f87b7deaf16603a1670a8e9d3ec081d 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
@@ -153,7 +153,7 @@ public:
};
//- Operation type names
- static const NamedEnum<operationType, 13> operationTypeNames_;
+ static const Enum<operationType> operationTypeNames_;
protected:
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 462aa40557f23eaa1880361755ff69de1706c2e5..cac7ab686adca278c5b5b32e5c6d914666675af0 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -52,24 +52,20 @@ namespace functionObjects
dictionary
);
}
-template<>
-const char* NamedEnum
+}
+
+const Foam::Enum
<
- functionObjects::fluxSummary::modeType,
- 5
->::names[] =
+ Foam::functionObjects::fluxSummary::modeType
+>
+Foam::functionObjects::fluxSummary::modeTypeNames_
{
- "faceZone",
- "faceZoneAndDirection",
- "cellZoneAndDirection",
- "surface",
- "surfaceAndDirection"
+ { modeType::mdFaceZone , "faceZone" },
+ { modeType::mdFaceZoneAndDirection, "faceZoneAndDirection" },
+ { modeType::mdCellZoneAndDirection, "cellZoneAndDirection" },
+ { modeType::mdSurface, "surface" },
+ { modeType::mdSurfaceAndDirection, "surfaceAndDirection" },
};
-}
-
-
-const Foam::NamedEnum<Foam::functionObjects::fluxSummary::modeType, 5>
-Foam::functionObjects::fluxSummary::modeTypeNames_;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -823,7 +819,7 @@ bool Foam::functionObjects::fluxSummary::read(const dictionary& dict)
fvMeshFunctionObject::read(dict);
writeFile::read(dict);
- mode_ = modeTypeNames_.read(dict.lookup("mode"));
+ mode_ = modeTypeNames_.lookup("mode", dict);
phiName_ = dict.lookupOrDefault<word>("phi", "phi");
scaleFactor_ = dict.lookupOrDefault<scalar>("scaleFactor", 1.0);
tolerance_ = dict.lookupOrDefault<scalar>("tolerance", 0.8);
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.H b/src/functionObjects/field/fluxSummary/fluxSummary.H
index 287c6a3782fda55e7cab16deb00dbdb6411d5232..8c5a3a5a755f40def7d8da14f1e5ae69e998cf3b 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.H
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.H
@@ -124,7 +124,7 @@ public:
};
//- Mode type names
- static const NamedEnum<modeType, 5> modeTypeNames_;
+ static const Enum<modeType> modeTypeNames_;
protected:
diff --git a/src/functionObjects/field/setFlow/setFlow.C b/src/functionObjects/field/setFlow/setFlow.C
index 0d61bbff3f450b4f96c584bf8ebd9346397bd68e..7d3353ab64ad19316a8a8ef6a4415c55f08a3d8c 100644
--- a/src/functionObjects/field/setFlow/setFlow.C
+++ b/src/functionObjects/field/setFlow/setFlow.C
@@ -48,7 +48,10 @@ namespace functionObjects
}
-const Foam::Enum<Foam::functionObjects::setFlow::modeType>
+const Foam::Enum
+<
+ Foam::functionObjects::setFlow::modeType
+>
Foam::functionObjects::setFlow::modeTypeNames
{
{ functionObjects::setFlow::modeType::FUNCTION, "function" },
diff --git a/src/functionObjects/field/setFlow/setFlow.H b/src/functionObjects/field/setFlow/setFlow.H
index 26425d8092781a2b526ab94b49de0bb05d1142bc..1a96940bb16a3ccafc9126d155e418ef1f1e289b 100644
--- a/src/functionObjects/field/setFlow/setFlow.H
+++ b/src/functionObjects/field/setFlow/setFlow.H
@@ -110,7 +110,7 @@ class setFlow
VORTEX3D
};
- static const Foam::Enum<modeType> modeTypeNames;
+ static const Enum<modeType> modeTypeNames;
// Private Data
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
index b09c20ad5f37a58d61e5ee2347933f361683be13..214aa9896a82014fe8b79fac09f1efbe09d5030e 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -45,51 +45,39 @@ namespace functionObjects
}
}
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::turbulenceFields::compressibleField,
- 9
->::names[] =
+ Foam::functionObjects::turbulenceFields::compressibleField
+>
+Foam::functionObjects::turbulenceFields::compressibleFieldNames_
{
- "k",
- "epsilon",
- "omega",
- "mut",
- "muEff",
- "alphat",
- "alphaEff",
- "R",
- "devRhoReff"
+ { compressibleField::cfK, "k" },
+ { compressibleField::cfEpsilon, "epsilon" },
+ { compressibleField::cfOmega, "omega" },
+ { compressibleField::cfMut, "mut" },
+ { compressibleField::cfMuEff, "muEff" },
+ { compressibleField::cfAlphat, "alphat" },
+ { compressibleField::cfAlphaEff, "alphaEff" },
+ { compressibleField::cfR, "R" },
+ { compressibleField::cfDevRhoReff, "devRhoReff" },
};
-const Foam::NamedEnum
-<
- Foam::functionObjects::turbulenceFields::compressibleField,
- 9
-> Foam::functionObjects::turbulenceFields::compressibleFieldNames_;
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::turbulenceFields::incompressibleField,
- 7
->::names[] =
+ Foam::functionObjects::turbulenceFields::incompressibleField
+>
+Foam::functionObjects::turbulenceFields::incompressibleFieldNames_
{
- "k",
- "epsilon",
- "omega",
- "nut",
- "nuEff",
- "R",
- "devReff"
+ { incompressibleField::ifK, "k" },
+ { incompressibleField::ifEpsilon, "epsilon" },
+ { incompressibleField::ifOmega, "omega" },
+ { incompressibleField::ifNut, "nut" },
+ { incompressibleField::ifNuEff, "nuEff" },
+ { incompressibleField::ifR, "R" },
+ { incompressibleField::ifDevReff, "devReff" },
};
-const Foam::NamedEnum
-<
- Foam::functionObjects::turbulenceFields::incompressibleField,
- 7
-> Foam::functionObjects::turbulenceFields::incompressibleFieldNames_;
const Foam::word Foam::functionObjects::turbulenceFields::modelName
(
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
index 5798fc3f75673a0472b56f23b06e1fc757f7e3a1..dc6e168abd4ac738e06ced35791ce94052c022e2 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.H
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -90,7 +90,7 @@ SourceFiles
#include "fvMeshFunctionObject.H"
#include "HashSet.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "volFieldsFwd.H"
#include "Switch.H"
@@ -123,7 +123,7 @@ public:
cfR,
cfDevRhoReff
};
- static const NamedEnum<compressibleField, 9> compressibleFieldNames_;
+ static const Enum<compressibleField> compressibleFieldNames_;
enum incompressibleField
{
@@ -135,7 +135,7 @@ public:
ifR,
ifDevReff
};
- static const NamedEnum<incompressibleField, 7> incompressibleFieldNames_;
+ static const Enum<incompressibleField> incompressibleFieldNames_;
static const word modelName;
diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
index 1bd8614b6889766d77889416a8ad35db89c11740..68818625dc6bb80384b3e3a5715f89cef5eb3fb4 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
@@ -47,46 +47,27 @@ License
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::functionObjects::fieldVisualisationBase::colourByType
+>
+Foam::functionObjects::fieldVisualisationBase::colourByTypeNames
{
- template<>
- const char* NamedEnum
- <
- functionObjects::fieldVisualisationBase::colourByType,
- 2
- >::names[] =
- {
- "colour",
- "field"
- };
-
- template<>
- const char* NamedEnum
- <
- functionObjects::fieldVisualisationBase::colourMapType,
- 4
- >::names[] =
- {
- "rainbow",
- "blueWhiteRed",
- "fire",
- "greyscale"
- };
-}
-
-const Foam::NamedEnum
- <
- Foam::functionObjects::fieldVisualisationBase::colourByType,
- 2
- >
- Foam::functionObjects::fieldVisualisationBase::colourByTypeNames;
-
-const Foam::NamedEnum
- <
- Foam::functionObjects::fieldVisualisationBase::colourMapType,
- 4
- >
- Foam::functionObjects::fieldVisualisationBase::colourMapTypeNames;
+ { colourByType::cbColour, "colour" },
+ { colourByType::cbField, "field" },
+};
+
+const Foam::Enum
+<
+ Foam::functionObjects::fieldVisualisationBase::colourMapType
+>
+Foam::functionObjects::fieldVisualisationBase::colourMapTypeNames
+{
+ { colourMapType::cmRainbow, "rainbow" },
+ { colourMapType::cmBlueWhiteRed, "blueWhiteRed" },
+ { colourMapType::cmFire, "fire" },
+ { colourMapType::cmGreyscale, "greyscale" },
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -100,8 +81,7 @@ void Foam::functionObjects::fieldVisualisationBase::setColourMap
lut->SetNumberOfColors(nColours);
- vtkSmartPointer<vtkColorTransferFunction> ctf =
- vtkSmartPointer<vtkColorTransferFunction>::New();
+ auto ctf = vtkSmartPointer<vtkColorTransferFunction>::New();
switch (colourMap_)
{
@@ -163,8 +143,7 @@ void Foam::functionObjects::fieldVisualisationBase::addScalarBar
return;
}
- vtkSmartPointer<vtkScalarBarActor> sbar =
- vtkSmartPointer<vtkScalarBarActor>::New();
+ auto sbar = vtkSmartPointer<vtkScalarBarActor>::New();
sbar->SetLookupTable(lut);
sbar->SetNumberOfLabels(scalarBar_.numberOfLabels_);
@@ -174,8 +153,7 @@ void Foam::functionObjects::fieldVisualisationBase::addScalarBar
// - Default scalar bar title text is scales by the scalar bar box
// dimensions so if the title is a long string, the text is shrunk to fit
// Instead, suppress title and set the title using a vtkTextActor
- vtkSmartPointer<vtkTextActor> titleActor =
- vtkSmartPointer<vtkTextActor>::New();
+ auto titleActor = vtkSmartPointer<vtkTextActor>::New();
sbar->SetTitle(" ");
titleActor->SetInput(scalarBar_.title_.c_str());
titleActor->GetTextProperty()->SetFontFamilyToArial();
@@ -282,8 +260,7 @@ void Foam::functionObjects::fieldVisualisationBase::setField
case cbField:
{
// Create look-up table for colours
- vtkSmartPointer<vtkLookupTable> lut =
- vtkSmartPointer<vtkLookupTable>::New();
+ auto lut = vtkSmartPointer<vtkLookupTable>::New();
setColourMap(lut);
lut->SetVectorMode(vtkScalarsToColors::MAGNITUDE);
@@ -337,9 +314,8 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
vtkRenderer* renderer
) const
{
- vtkSmartPointer<vtkGlyph3D> glyph = vtkSmartPointer<vtkGlyph3D>::New();
- vtkSmartPointer<vtkPolyDataMapper> glyphMapper =
- vtkSmartPointer<vtkPolyDataMapper>::New();
+ auto glyph = vtkSmartPointer<vtkGlyph3D>::New();
+ auto glyphMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
glyphMapper->SetInputConnection(glyph->GetOutputPort());
glyph->SetInputData(data);
@@ -358,8 +334,7 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
else if (data->GetCellData()->HasArray(scaleFieldNameChar) == 1)
{
// Need to convert cell data to point data
- vtkSmartPointer<vtkCellDataToPointData> cellToPoint =
- vtkSmartPointer<vtkCellDataToPointData>::New();
+ auto cellToPoint = vtkSmartPointer<vtkCellDataToPointData>::New();
cellToPoint->SetInputData(data);
cellToPoint->Update();
vtkDataSet* pds = cellToPoint->GetOutput();
@@ -380,8 +355,7 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
if (nComponents == 1)
{
- vtkSmartPointer<vtkSphereSource> sphere =
- vtkSmartPointer<vtkSphereSource>::New();
+ auto sphere = vtkSmartPointer<vtkSphereSource>::New();
sphere->SetCenter(0, 0, 0);
sphere->SetRadius(0.5);
@@ -428,8 +402,7 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
}
else if (nComponents == 3)
{
- vtkSmartPointer<vtkArrowSource> arrow =
- vtkSmartPointer<vtkArrowSource>::New();
+ auto arrow = vtkSmartPointer<vtkArrowSource>::New();
arrow->SetTipResolution(10);
arrow->SetTipRadius(0.1);
arrow->SetTipLength(0.35);
@@ -516,7 +489,7 @@ Foam::functionObjects::fieldVisualisationBase::fieldVisualisationBase
colourMap_(cmRainbow),
range_()
{
- colourBy_ = colourByTypeNames.read(dict.lookup("colourBy"));
+ colourBy_ = colourByTypeNames.lookup("colourBy", dict);
switch (colourBy_)
{
@@ -531,7 +504,7 @@ Foam::functionObjects::fieldVisualisationBase::fieldVisualisationBase
if (dict.found("colourMap"))
{
- colourMap_ = colourMapTypeNames.read(dict.lookup("colourMap"));
+ colourMap_ = colourMapTypeNames.lookup("colourMap", dict);
}
const dictionary& sbarDict = dict.subDict("scalarBar");
diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
index 0ae8c6a608075c16eb359e1c18ef1d8a9864cbe1..3df00661a1e60cfed02277694663d80e4f58ac12 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
@@ -37,7 +37,7 @@ SourceFiles
#include "dictionary.H"
#include "Tuple2.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "vector.H"
#include "HashPtrTable.H"
#include "Function1.H"
@@ -78,7 +78,7 @@ public:
cbField
};
- static const NamedEnum<colourByType, 2> colourByTypeNames;
+ static const Enum<colourByType> colourByTypeNames;
enum colourMapType
{
@@ -88,7 +88,7 @@ public:
cmGreyscale
};
- static const NamedEnum<colourMapType, 4> colourMapTypeNames;
+ static const Enum<colourMapType> colourMapTypeNames;
private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
index 357997df256a3c4ccf33d3f00c7df966c3bd8324..f4fe22be99e03b169322697010f59dfd735b73a3 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
@@ -120,13 +120,11 @@ addGeometryToScene
if (fName.ext() == "vtk")
{
- vtkSmartPointer<vtkPolyDataReader> points =
- vtkSmartPointer<vtkPolyDataReader>::New();
+ auto points = vtkSmartPointer<vtkPolyDataReader>::New();
points->SetFileName(fName.c_str());
points->Update();
- vtkSmartPointer<vtkPolyDataMapper> mapper =
- vtkSmartPointer<vtkPolyDataMapper>::New();
+ auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
actor_->SetMapper(mapper);
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C
index b1a9093f63f26029e742fc70d73f686fe540a42f..2d7fc46940061554aa6a782089bfef9a8ee7a686 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C
@@ -101,13 +101,11 @@ addGeometryToScene
if (fName.ext() == "vtk")
{
- vtkSmartPointer<vtkPolyDataReader> lines =
- vtkSmartPointer<vtkPolyDataReader>::New();
+ auto lines = vtkSmartPointer<vtkPolyDataReader>::New();
lines->SetFileName(fName.c_str());
lines->Update();
- vtkSmartPointer<vtkPolyDataMapper> mapper =
- vtkSmartPointer<vtkPolyDataMapper>::New();
+ auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
setField(position, fieldName_, mapper, renderer, lines->GetOutput());
actor_->SetMapper(mapper);
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C
index 343985afa296001dd71043b983fd45a6f82aae65..22b9c7570e500c4cfcdefac2f2bbe8ea4d5b6446 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C
@@ -101,8 +101,7 @@ addGeometryToScene
if (representation_ == rtGlyph)
{
- vtkSmartPointer<vtkPolyDataReader> surf =
- vtkSmartPointer<vtkPolyDataReader>::New();
+ auto surf = vtkSmartPointer<vtkPolyDataReader>::New();
surf->SetFileName(fName.c_str());
surf->Update();
@@ -121,15 +120,13 @@ addGeometryToScene
{
if (fName.ext() == "vtk")
{
- vtkSmartPointer<vtkPolyDataReader> surf =
- vtkSmartPointer<vtkPolyDataReader>::New();
+ auto surf = vtkSmartPointer<vtkPolyDataReader>::New();
surf->SetFileName(fName.c_str());
surf->Update();
addFeatureEdges(renderer, surf->GetOutput());
- vtkSmartPointer<vtkPolyDataMapper> mapper =
- vtkSmartPointer<vtkPolyDataMapper>::New();
+ auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
mapper->SetInputConnection(surf->GetOutputPort());
setField(position, fieldName_, mapper, renderer, surf->GetOutput());
diff --git a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C
index 2e9ac28b658a68bed82bce6b8deda3c27f4120fb..2bc15a840d15f2c8b0cfb0ed71511eb3ff65aa47 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.C
@@ -32,27 +32,16 @@ License
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-namespace Foam
-{
- template<>
- const char* NamedEnum
- <
- functionObjects::runTimePostPro::geometryBase::renderModeType,
- 3
- >::names[] =
- {
- "flat",
- "gouraud",
- "phong"
- };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::runTimePostPro::geometryBase::renderModeType,
- 3
+ Foam::functionObjects::runTimePostPro::geometryBase::renderModeType
>
- Foam::functionObjects::runTimePostPro::geometryBase::renderModeTypeNames;
+Foam::functionObjects::runTimePostPro::geometryBase::renderModeTypeNames
+{
+ { renderModeType::rmFlat, "flat" },
+ { renderModeType::rmGouraud, "gouraud" },
+ { renderModeType::rmPhong, "phong" },
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -104,7 +93,7 @@ Foam::functionObjects::runTimePostPro::geometryBase::geometryBase
{
if (dict.found("renderMode"))
{
- renderMode_ = renderModeTypeNames.read(dict.lookup("renderMode"));
+ renderMode_ = renderModeTypeNames.lookup("renderMode", dict);
}
if (dict.found("opacity"))
diff --git a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H
index 714c5de0df3ed41f8b158b247aae05e337d574d9..bf27d3cb0f39b22afa64894c1e66352ca3b1b45a 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/geometryBase.H
@@ -39,7 +39,7 @@ SourceFiles
#include "vector.H"
#include "Function1.H"
#include "HashPtrTable.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -75,7 +75,7 @@ public:
rmPhong //!< Phong shading
};
- static const NamedEnum<renderModeType, 3> renderModeTypeNames;
+ static const Enum<renderModeType> renderModeTypeNames;
private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.C b/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.C
index 19be822aa7bc4b2fc657a1029a062c40a1da68a7..7c6889322210aa3fc00c94e1f9a73699a3acf943 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/geometrySurface.C
@@ -79,11 +79,9 @@ void Foam::functionObjects::runTimePostPro::geometrySurface::addGeometryToScene
const Field<point>& surfPoints = surf.points();
const Field<vector>& surfFaceNormals = surf.faceNormals();
- vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
- vtkSmartPointer<vtkCellArray> triangles =
- vtkSmartPointer<vtkCellArray>::New();
- vtkSmartPointer<vtkDoubleArray> faceNormals =
- vtkSmartPointer<vtkDoubleArray>::New();
+ auto points = vtkSmartPointer<vtkPoints>::New();
+ auto triangles = vtkSmartPointer<vtkCellArray>::New();
+ auto faceNormals = vtkSmartPointer<vtkDoubleArray>::New();
faceNormals->SetNumberOfComponents(3);
@@ -97,8 +95,7 @@ void Foam::functionObjects::runTimePostPro::geometrySurface::addGeometryToScene
{
const Foam::face& f = surf[i];
- vtkSmartPointer<vtkTriangle> triangle =
- vtkSmartPointer<vtkTriangle>::New();
+ auto triangle = vtkSmartPointer<vtkTriangle>::New();
triangle->GetPointIds()->SetId(0, f[0]);
triangle->GetPointIds()->SetId(1, f[1]);
triangle->GetPointIds()->SetId(2, f[2]);
@@ -114,14 +111,12 @@ void Foam::functionObjects::runTimePostPro::geometrySurface::addGeometryToScene
surf.clearOut();
- vtkSmartPointer<vtkPolyData> polyData =
- vtkSmartPointer<vtkPolyData>::New();
+ auto polyData = vtkSmartPointer<vtkPolyData>::New();
polyData->SetPoints(points);
polyData->SetPolys(triangles);
polyData->GetCellData()->SetNormals(faceNormals);
- vtkSmartPointer<vtkPolyDataMapper> mapper =
- vtkSmartPointer<vtkPolyDataMapper>::New();
+ auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
mapper->ScalarVisibilityOff();
mapper->SetInputData(polyData);
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pathline.C b/src/functionObjects/graphics/runTimePostProcessing/pathline.C
index aedd860827b9d7d2d74ffbc1af594d1cf0d6fd98..770356a70ce8767fbef5fec282555e1ccb61ffd4 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pathline.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pathline.C
@@ -48,27 +48,19 @@ namespace runTimePostPro
defineRunTimeSelectionTable(pathline, dictionary);
}
}
-
-template<>
-const char* NamedEnum
-<
- functionObjects::runTimePostPro::pathline::representationType,
- 4
->::names[] =
-{
- "none",
- "line",
- "tube",
- "vector"
-};
}
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::runTimePostPro::pathline::representationType,
- 4
+ Foam::functionObjects::runTimePostPro::pathline::representationType
>
- Foam::functionObjects::runTimePostPro::pathline::representationTypeNames;
+Foam::functionObjects::runTimePostPro::pathline::representationTypeNames
+{
+ { representationType::rtNone, "none" },
+ { representationType::rtLine, "line" },
+ { representationType::rtTube, "tube" },
+ { representationType::rtVector, "vector" },
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -104,8 +96,7 @@ void Foam::functionObjects::runTimePostPro::pathline::addLines
}
case rtTube:
{
- vtkSmartPointer<vtkTubeFilter> tubes =
- vtkSmartPointer<vtkTubeFilter>::New();
+ auto tubes = vtkSmartPointer<vtkTubeFilter>::New();
tubes->SetInputData(data);
tubes->SetRadius(tubeRadius_);
tubes->SetNumberOfSides(20);
@@ -138,7 +129,7 @@ Foam::functionObjects::runTimePostPro::pathline::pathline
geometryBase(parent, dict, colours),
representation_
(
- representationTypeNames.read(dict.lookup("representation"))
+ representationTypeNames.lookup("representation", dict)
),
tubeRadius_(0.0),
lineColour_(nullptr)
@@ -192,15 +183,14 @@ Foam::functionObjects::runTimePostPro::pathline::New
Info<< "Selecting pathline " << pathlineType << endl;
}
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(pathlineType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(pathlineType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown pathline type "
<< pathlineType << nl << nl
- << "Valid pathline types are:" << endl
+ << "Valid pathline types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pathline.H b/src/functionObjects/graphics/runTimePostProcessing/pathline.H
index 209a2887cd80840633f2d155026195f9e792ef99..fb4893cb7eecf4463dac7a068b942ac94a35208e 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pathline.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/pathline.H
@@ -35,7 +35,7 @@ SourceFiles
#define functionObjects_runTimePostPro_pathline_H
#include "geometryBase.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,7 +71,7 @@ public:
rtVector
};
- static const NamedEnum<representationType, 4> representationTypeNames;
+ static const Enum<representationType> representationTypeNames;
private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.C b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
index 94c289d1f7b06177863624cd937e5de74f9bd212..42742962888b0de578a1fed1c10cdeab51ae23fc 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
@@ -48,24 +48,17 @@ namespace runTimePostPro
defineRunTimeSelectionTable(pointData, dictionary);
}
}
-template<>
-const char* NamedEnum
-<
- functionObjects::runTimePostPro::pointData::representationType,
- 2
->::names[] =
-{
- "sphere",
- "vector"
-};
}
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::runTimePostPro::pointData::representationType,
- 2
+ Foam::functionObjects::runTimePostPro::pointData::representationType
>
- Foam::functionObjects::runTimePostPro::pointData::representationTypeNames;
+Foam::functionObjects::runTimePostPro::pointData::representationTypeNames
+{
+ { representationType::rtSphere, "sphere" },
+ { representationType::rtVector, "vector" },
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -106,7 +99,7 @@ Foam::functionObjects::runTimePostPro::pointData::pointData
geometryBase(parent, dict, colours),
representation_
(
- representationTypeNames.read(dict.lookup("representation"))
+ representationTypeNames.lookup("representation", dict)
),
maxGlyphLength_(readScalar(dict.lookup("maxGlyphLength"))),
pointColour_(nullptr)
@@ -150,15 +143,14 @@ Foam::autoPtr<Foam::functionObjects::runTimePostPro::pointData> Foam::functionOb
Info<< "Selecting pointData " << pointDataType << endl;
}
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(pointDataType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(pointDataType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown pointData type "
<< pointDataType << nl << nl
- << "Valid pointData types are:" << endl
+ << "Valid pointData types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.H b/src/functionObjects/graphics/runTimePostProcessing/pointData.H
index 41c425e4aadad567548efbf03440605807574f47..73f7b5f61d1a2651c76e0f246cf05346ebafcc3f 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.H
@@ -35,7 +35,7 @@ SourceFiles
#define functionObjects_runTimePostPro_pointData_H
#include "geometryBase.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,7 +69,7 @@ public:
rtVector //!< Vector
};
- static const NamedEnum<representationType, 2> representationTypeNames;
+ static const Enum<representationType> representationTypeNames;
private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C b/src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C
index fe97eba4b3b1f707b1e64f3d19cacb493578b30c..1a2e917101683b5b3ec6fa43b2bdd0e7339fbc91 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C
@@ -150,8 +150,7 @@ bool Foam::functionObjects::runTimePostProcessing::write()
sigFpe::unset(false);
// Initialise render window
- vtkSmartPointer<vtkRenderWindow> renderWindow =
- vtkSmartPointer<vtkRenderWindow>::New();
+ auto renderWindow = vtkSmartPointer<vtkRenderWindow>::New();
renderWindow->OffScreenRenderingOn();
renderWindow->SetSize(output_.width_, output_.height_);
renderWindow->SetAAFrames(10);
@@ -159,7 +158,7 @@ bool Foam::functionObjects::runTimePostProcessing::write()
renderWindow->SetMultiSamples(0);
// renderWindow->PolygonSmoothingOn();
- vtkSmartPointer<vtkRenderer> renderer = vtkSmartPointer<vtkRenderer>::New();
+ auto renderer = vtkSmartPointer<vtkRenderer>::New();
scene_.initialise(renderer, output_.name_);
renderWindow->AddRenderer(renderer);
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.C b/src/functionObjects/graphics/runTimePostProcessing/scene.C
index cd74326a16d22dbcad20b585fb58cda0516a058b..d984e9f03bbea9d8ef5becaf8814d64dc334f4c4 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.C
@@ -186,20 +186,19 @@ void Foam::functionObjects::runTimePostPro::scene::initialise
renderer->SetOcclusionRatio(0);
// Set the camera
- vtkSmartPointer<vtkCamera> camera = vtkSmartPointer<vtkCamera>::New();
+ auto camera = vtkSmartPointer<vtkCamera>::New();
camera->SetParallelProjection(parallelProjection_);
renderer->SetActiveCamera(camera);
// Add the lights
- vtkSmartPointer<vtkLightKit> lightKit = vtkSmartPointer<vtkLightKit>::New();
+ auto lightKit = vtkSmartPointer<vtkLightKit>::New();
lightKit->AddLightsToRenderer(renderer);
if (!clipBox_.empty())
{
const point& min = clipBox_.min();
const point& max = clipBox_.max();
- vtkSmartPointer<vtkCubeSource> clipBox =
- vtkSmartPointer<vtkCubeSource>::New();
+ auto clipBox = vtkSmartPointer<vtkCubeSource>::New();
clipBox->SetXLength(max.x() - min.x());
clipBox->SetYLength(max.y() - min.y());
clipBox->SetZLength(max.z() - min.z());
@@ -209,8 +208,7 @@ void Foam::functionObjects::runTimePostPro::scene::initialise
min.y() + 0.5*(max.y() - min.y()),
min.z() + 0.5*(max.z() - min.z())
);
- vtkSmartPointer<vtkPolyDataMapper> clipMapper =
- vtkSmartPointer<vtkPolyDataMapper>::New();
+ auto clipMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
clipMapper->SetInputConnection(clipBox->GetOutputPort());
clipBoxActor_ = vtkSmartPointer<vtkActor>::New();
@@ -401,8 +399,7 @@ void Foam::functionObjects::runTimePostPro::scene::saveImage
renderWindow->Render();
// Set up off-screen rendering
- vtkSmartPointer<vtkWindowToImageFilter> windowToImageFilter =
- vtkSmartPointer<vtkWindowToImageFilter>::New();
+ auto windowToImageFilter = vtkSmartPointer<vtkWindowToImageFilter>::New();
windowToImageFilter->SetInput(renderWindow);
@@ -414,7 +411,7 @@ void Foam::functionObjects::runTimePostPro::scene::saveImage
windowToImageFilter->Update();
// Save the image
- vtkSmartPointer<vtkPNGWriter> writer = vtkSmartPointer<vtkPNGWriter>::New();
+ auto writer = vtkSmartPointer<vtkPNGWriter>::New();
fileName fName(prefix/outputName_ + '.' + frameIndexStr() + ".png");
writer->SetFileName(fName.c_str());
writer->SetInputConnection(windowToImageFilter->GetOutputPort());
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.H b/src/functionObjects/graphics/runTimePostProcessing/scene.H
index 127fcb6db6909bd0e94645efae5f1d2cc95bb05a..407896dc4ca2656fb5802628e8364e5b8647fdbe 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.H
@@ -62,7 +62,7 @@ SourceFiles
#include "vector.H"
#include "point.H"
#include "boundBox.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "HashPtrTable.H"
#include "vector.H"
diff --git a/src/functionObjects/graphics/runTimePostProcessing/surface.C b/src/functionObjects/graphics/runTimePostProcessing/surface.C
index 5c0383c4abeff1c54fc29adfdcb9f65a1b69159f..fe58ffc99a189f20bda65e5e7bdf4f709c3172eb 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/surface.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/surface.C
@@ -48,27 +48,21 @@ namespace runTimePostPro
defineRunTimeSelectionTable(surface, dictionary);
}
}
-template<>
-const char* NamedEnum
-<
- functionObjects::runTimePostPro::surface::representationType,
- 5
->::names[] =
-{
- "none",
- "wireframe",
- "surface",
- "surfaceWithEdges",
- "glyph"
-};
}
-const Foam::NamedEnum
+
+const Foam::Enum
<
- Foam::functionObjects::runTimePostPro::surface::representationType,
- 5
+ Foam::functionObjects::runTimePostPro::surface::representationType
>
- Foam::functionObjects::runTimePostPro::surface::representationTypeNames;
+Foam::functionObjects::runTimePostPro::surface::representationTypeNames
+{
+ { representationType::rtNone, "none" },
+ { representationType::rtWireframe, "wireframe" },
+ { representationType::rtSurface, "surface" },
+ { representationType::rtSurfaceWithEdges, "surfaceWithEdges" },
+ { representationType::rtGlyph, "glyph" },
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -120,8 +114,7 @@ void Foam::functionObjects::runTimePostPro::surface::addFeatureEdges
return;
}
- vtkSmartPointer<vtkFeatureEdges> featureEdges =
- vtkSmartPointer<vtkFeatureEdges>::New();
+ auto featureEdges = vtkSmartPointer<vtkFeatureEdges>::New();
featureEdges->SetInputData(data);
featureEdges->BoundaryEdgesOn();
featureEdges->FeatureEdgesOn();
@@ -131,8 +124,7 @@ void Foam::functionObjects::runTimePostPro::surface::addFeatureEdges
featureEdges->ColoringOff();
featureEdges->Update();
- vtkSmartPointer<vtkPolyDataMapper> mapper =
- vtkSmartPointer<vtkPolyDataMapper>::New();
+ auto mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
mapper->SetInputConnection(featureEdges->GetOutputPort());
mapper->ScalarVisibilityOff();
@@ -157,7 +149,7 @@ Foam::functionObjects::runTimePostPro::surface::surface
geometryBase(parent, dict, colours),
representation_
(
- representationTypeNames.read(dict.lookup("representation"))
+ representationTypeNames.lookup("representation", dict)
),
featureEdges_(false),
surfaceColour_(nullptr),
@@ -217,15 +209,14 @@ Foam::functionObjects::runTimePostPro::surface::New
Info<< "Selecting surface " << surfaceType << endl;
}
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(surfaceType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(surfaceType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown surface type "
<< surfaceType << nl << nl
- << "Valid surface types are:" << endl
+ << "Valid surface types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/functionObjects/graphics/runTimePostProcessing/surface.H b/src/functionObjects/graphics/runTimePostProcessing/surface.H
index e1510cab89e4600b252109df478ab0081dc01b03..3913087aa8da266a9d74c32d92ced10a740bb10a 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/surface.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/surface.H
@@ -35,7 +35,7 @@ SourceFiles
#define functionObjects_runTimePostPro_surface_H
#include "geometryBase.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "runTimeSelectionTables.H"
#include "vtkSmartPointer.h"
@@ -74,7 +74,7 @@ public:
rtGlyph
};
- static const NamedEnum<representationType, 5> representationTypeNames;
+ static const Enum<representationType> representationTypeNames;
private:
diff --git a/src/functionObjects/graphics/runTimePostProcessing/text.C b/src/functionObjects/graphics/runTimePostProcessing/text.C
index fc395f571793f03739a1648e41daf172f86ec9d6..f83d31118f94d82cb63159a0dc047a933d86df6b 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/text.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/text.C
@@ -81,7 +81,7 @@ void Foam::functionObjects::runTimePostPro::text::addGeometryToScene
return;
}
- vtkSmartPointer<vtkTextActor> actor = vtkSmartPointer<vtkTextActor>::New();
+ auto actor = vtkSmartPointer<vtkTextActor>::New();
// Concatenate string with timeStamp if true
string textAndTime = string_;
diff --git a/src/functionObjects/utilities/abort/abort.C b/src/functionObjects/utilities/abort/abort.C
index ef2b3cbf39b35e7888812c52c5ec29c22f35c1e6..93055ef5519311f3acc69262008abb25b220408c 100644
--- a/src/functionObjects/utilities/abort/abort.C
+++ b/src/functionObjects/utilities/abort/abort.C
@@ -48,24 +48,18 @@ namespace functionObjects
}
}
-template<>
-const char* Foam::NamedEnum
+
+const Foam::Enum
<
- Foam::functionObjects::abort::actionType,
- 3
->::names[] =
+ Foam::Time::stopAtControls
+>
+Foam::functionObjects::abort::actionNames_
{
- "noWriteNow",
- "writeNow",
- "nextWrite"
+ { Time::stopAtControls::saNoWriteNow, "noWriteNow" },
+ { Time::stopAtControls::saWriteNow, "writeNow" },
+ { Time::stopAtControls::saNextWrite, "nextWrite" },
};
-const Foam::NamedEnum
-<
- Foam::functionObjects::abort::actionType,
- 3
-> Foam::functionObjects::abort::actionTypeNames_;
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -94,7 +88,7 @@ Foam::functionObjects::abort::abort
functionObject(name),
time_(runTime),
abortFile_("$FOAM_CASE/" + name),
- action_(nextWrite)
+ action_(Time::stopAtControls::saNextWrite)
{
abortFile_.expand();
read(dict);
@@ -116,14 +110,12 @@ bool Foam::functionObjects::abort::read(const dictionary& dict)
{
functionObject::read(dict);
- if (dict.found("action"))
- {
- action_ = actionTypeNames_.read(dict.lookup("action"));
- }
- else
- {
- action_ = nextWrite;
- }
+ action_ = actionNames_.lookupOrDefault
+ (
+ "action",
+ dict,
+ Time::stopAtControls::saNextWrite
+ );
if (dict.readIfPresent("file", abortFile_))
{
@@ -143,9 +135,9 @@ bool Foam::functionObjects::abort::execute()
{
switch (action_)
{
- case noWriteNow :
+ case Time::saNoWriteNow :
{
- if (time_.stopAt(Time::saNoWriteNow))
+ if (time_.stopAt(action_))
{
Info<< "USER REQUESTED ABORT (timeIndex="
<< time_.timeIndex()
@@ -155,9 +147,9 @@ bool Foam::functionObjects::abort::execute()
break;
}
- case writeNow :
+ case Time::saWriteNow :
{
- if (time_.stopAt(Time::saWriteNow))
+ if (time_.stopAt(action_))
{
Info<< "USER REQUESTED ABORT (timeIndex="
<< time_.timeIndex()
@@ -167,9 +159,9 @@ bool Foam::functionObjects::abort::execute()
break;
}
- case nextWrite :
+ case Time::saNextWrite :
{
- if (time_.stopAt(Time::saNextWrite))
+ if (time_.stopAt(action_))
{
Info<< "USER REQUESTED ABORT (timeIndex="
<< time_.timeIndex()
@@ -178,6 +170,11 @@ bool Foam::functionObjects::abort::execute()
}
break;
}
+
+ default:
+ {
+ // Invalid choices already filtered out by Enum
+ }
}
}
diff --git a/src/functionObjects/utilities/abort/abort.H b/src/functionObjects/utilities/abort/abort.H
index d9c16c8a23855355cb80a95c33f42f694692a3e2..3106f857cc68ddaa8f94d5a07efda928d30352d2 100644
--- a/src/functionObjects/utilities/abort/abort.H
+++ b/src/functionObjects/utilities/abort/abort.H
@@ -45,7 +45,7 @@ SourceFiles
#define functionObjects_abort_H
#include "functionObject.H"
-#include "NamedEnum.H"
+#include "Time.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -62,33 +62,19 @@ class abort
:
public functionObject
{
-public:
-
- // Public data
-
- //- Enumeration defining the type of action
- enum actionType
- {
- noWriteNow, //!< stop immediately without writing data
- writeNow, //!< write data and stop immediately
- nextWrite //!< stop the next time data are written
- };
-
-private:
-
// Private data
+ //- A subset of Time stopAtControls
+ static const Enum<Time::stopAtControls> actionNames_;
+
//- Reference to the Time
const Time& time_;
//- The fully-qualified name of the abort file
fileName abortFile_;
- //- Action type names
- static const NamedEnum<actionType, 3> actionTypeNames_;
-
//- The type of action
- actionType action_;
+ Time::stopAtControls action_;
// Private Member Functions
@@ -97,10 +83,10 @@ private:
void removeFile() const;
//- Disallow default bitwise copy construct
- abort(const abort&);
+ abort(const abort&) = delete;
//- Disallow default bitwise assignment
- void operator=(const abort&);
+ void operator=(const abort&) = delete;
public:
@@ -127,7 +113,7 @@ public:
// Member Functions
//- Read the dictionary settings
- virtual bool read(const dictionary&);
+ virtual bool read(const dictionary& dict);
//- Execute, check existence of abort file and take action
virtual bool execute();
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
index 4967d50143b029a498bc938d4508f4d3d18bfead..8bc3ac5e468ef8d3634c41c11d4dc3347d5d1752 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
@@ -47,32 +47,21 @@ namespace runTimeControls
}
}
}
-template<>
-const char* Foam::NamedEnum
-<
- Foam
- ::functionObjects
- ::runTimeControls
- ::equationInitialResidualCondition
- ::operatingMode,
- 2
->::names[] =
-{
- "minimum",
- "maximum"
-};
-const Foam::NamedEnum
+const Foam::Enum
<
Foam
::functionObjects
::runTimeControls
::equationInitialResidualCondition
- ::operatingMode,
- 2
+ ::operatingMode
>
Foam::functionObjects::runTimeControls::equationInitialResidualCondition::
- operatingModeNames;
+operatingModeNames
+{
+ { operatingMode::omMin, "minimum" },
+ { operatingMode::omMax, "maximum" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -90,7 +79,7 @@ equationInitialResidualCondition
fieldNames_(dict.lookup("fields")),
value_(readScalar(dict.lookup("value"))),
timeStart_(dict.lookupOrDefault("timeStart", -GREAT)),
- mode_(operatingModeNames.read(dict.lookup("mode")))
+ mode_(operatingModeNames.lookup("mode", dict))
{
if (fieldNames_.size())
{
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H
index 85dc192476be5248add6e48b2b2dc3e9c5307223..849342ad55a4393d8195767b58ee6fc298ebaa2f 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H
@@ -37,7 +37,7 @@ SourceFiles
#define functionObjects_runTimeControls_equationInitialResidualCondition_H
#include "runTimeCondition.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -64,7 +64,7 @@ public:
omMax //!< Maximum
};
- static const NamedEnum<operatingMode, 2> operatingModeNames;
+ static const Enum<operatingMode> operatingModeNames;
protected:
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
index e848a310871413f5505861d75b9e4f52a92ca314..e7b2062fb5585d7e86304a6e1b121d6eb8389d31 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
@@ -57,27 +57,19 @@ namespace runTimeControls
}
}
-template<>
-const char* Foam::NamedEnum
-<
- Foam::functionObjects::runTimeControls::minMaxCondition::modeType,
- 2
->::names[] =
-{
- "minimum",
- "maximum"
-};
-
-const Foam::NamedEnum
+const Foam::Enum
<
Foam
::functionObjects
::runTimeControls
::minMaxCondition
- ::modeType,
- 2
+ ::modeType
>
- Foam::functionObjects::runTimeControls::minMaxCondition::modeTypeNames_;
+Foam::functionObjects::runTimeControls::minMaxCondition::modeTypeNames_
+{
+ { modeType::mdMin, "minimum" },
+ { modeType::mdMax, "maximum" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -92,7 +84,7 @@ Foam::functionObjects::runTimeControls::minMaxCondition::minMaxCondition
:
runTimeCondition(name, obr, dict, state),
functionObjectName_(dict.lookup("functionObject")),
- mode_(modeTypeNames_.read(dict.lookup("mode"))),
+ mode_(modeTypeNames_.lookup("mode", dict)),
fieldNames_(dict.lookup("fields")),
value_(readScalar(dict.lookup("value")))
{}
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H
index 27cbe4356d7cc552635af48515bd8c6bc5fdaebc..ef95f935cd4e6162ca64cd7b68237e0830895878 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H
@@ -38,7 +38,7 @@ SourceFiles
#define functionObjects_runTimeControls_minMaxCondition_H
#include "runTimeCondition.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,7 +68,7 @@ public:
mdMax //!< Maximum
};
- static const NamedEnum<modeType, 2> modeTypeNames_;
+ static const Enum<modeType> modeTypeNames_;
protected:
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H
index a207a8a49eeb0ebc1157b942dfc20849b831b8d4..c68069e468513f879106172eaf24ac074ccef505 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H
@@ -37,7 +37,6 @@ SourceFiles
#define functionObjects_runTimeConditions_minTimeStepCondition_H
#include "runTimeCondition.H"
-#include "NamedEnum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C
index 85192b98ec60e97ef431f429cecf8c51db575dcd..5f5d878bae8a946208efc30a1025c1a9bd7aece6 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C
@@ -36,19 +36,18 @@ Foam::functionObjects::runTimeControls::runTimeCondition::New
stateFunctionObject& state
)
{
- word conditionType(dict.lookup("type"));
+ const word conditionType(dict.lookup("type"));
Info<< "Selecting runTimeCondition " << conditionType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(conditionType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(conditionType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown runTimeCondition type "
<< conditionType << nl << nl
- << "Valid runTimeCondition types are:" << nl
+ << "Valid runTimeCondition types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.C b/src/functionObjects/utilities/writeObjects/writeObjects.C
index eade94640241e57bd18c4fc9af480457cf0752c5..de380505523ad04e00e9741ad5c7e78f02fd24c5 100644
--- a/src/functionObjects/utilities/writeObjects/writeObjects.C
+++ b/src/functionObjects/utilities/writeObjects/writeObjects.C
@@ -45,24 +45,17 @@ namespace functionObjects
}
}
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
<
- Foam::functionObjects::writeObjects::writeOption,
- 3
->::names[] =
+ Foam::functionObjects::writeObjects::writeOption
+>
+Foam::functionObjects::writeObjects::writeOptionNames_
{
- "autoWrite",
- "noWrite",
- "anyWrite"
+ { writeOption::AUTO_WRITE, "autoWrite" },
+ { writeOption::NO_WRITE, "noWrite" },
+ { writeOption::ANY_WRITE, "anyWrite" },
};
-const Foam::NamedEnum
-<
- Foam::functionObjects::writeObjects::writeOption,
- 3
-> Foam::functionObjects::writeObjects::writeOptionNames_;
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -114,14 +107,12 @@ bool Foam::functionObjects::writeObjects::read(const dictionary& dict)
dict.lookup("objects") >> objectNames_;
}
- if (dict.found("writeOption"))
- {
- writeOption_ = writeOptionNames_.read(dict.lookup("writeOption"));
- }
- else
- {
- writeOption_ = ANY_WRITE;
- }
+ writeOption_ = writeOptionNames_.lookupOrDefault
+ (
+ "writeOption",
+ dict,
+ writeOption::ANY_WRITE
+ );
return true;
}
diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.H b/src/functionObjects/utilities/writeObjects/writeObjects.H
index 0858772e1f413a9920dbc7d2ccb4ba4efc09dacd..f86364a1b70a37f411db3d729b649764acc636bb 100644
--- a/src/functionObjects/utilities/writeObjects/writeObjects.H
+++ b/src/functionObjects/utilities/writeObjects/writeObjects.H
@@ -84,8 +84,8 @@ SourceFiles
#define functionObjects_writeObjects_H
#include "functionObject.H"
-#include "wordReList.H"
-#include "NamedEnum.H"
+#include "wordRes.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -119,7 +119,7 @@ public:
ANY_WRITE
};
- static const NamedEnum<writeOption, 3> writeOptionNames_;
+ static const Enum<writeOption> writeOptionNames_;
private:
@@ -138,10 +138,10 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
- writeObjects(const writeObjects&);
+ writeObjects(const writeObjects&) = delete;
//- Disallow default bitwise assignment
- void operator=(const writeObjects&);
+ void operator=(const writeObjects&) = delete;
public:
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
index 161c424b26aa1271eb202728f11064d37df9852e..c197e03ce88e53a57a9f337411a8e622f62378f1 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
@@ -54,15 +54,14 @@ Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New
Info<< "Selecting motion diffusion: " << motionType << endl;
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(motionType);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(motionType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown diffusion type "
<< motionType << nl << nl
- << "Valid diffusion types are :" << endl
+ << "Valid diffusion types :" << nl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C
index c59808a21b5da47c1ddb9529d4a0bc313af6350d..5210b6e2862b159790e462094d2cc7d30f9bd5c8 100644
--- a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C
+++ b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C
@@ -32,7 +32,6 @@ License
namespace Foam
{
defineTypeNameAndDebug(motionInterpolation, 0);
-
defineRunTimeSelectionTable(motionInterpolation, Istream);
}
@@ -74,15 +73,14 @@ Foam::motionInterpolation::New(const fvMesh& mesh, Istream& entry)
Info<< "Selecting motion interpolation: " << type << endl;
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(type);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(type);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown interpolation type "
<< type << nl << nl
- << "Valid interpolation types are :" << endl
+ << "Valid interpolation types :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 52d68a6fb6b3b74537fd08875eaa8405a5fd7ad8..85d3cd19fd82f6f5f85058dbaee1f39394a9f1cc 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -30,31 +30,23 @@ License
#include "fvMesh.H"
#include "displacementMotionSolver.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template<>
-const char*
-NamedEnum<surfaceDisplacementPointPatchVectorField::projectMode, 3>::
-names[] =
+const Foam::Enum
+<
+ Foam::surfaceDisplacementPointPatchVectorField::projectMode
+>
+Foam::surfaceDisplacementPointPatchVectorField::projectModeNames_
{
- "nearest",
- "pointNormal",
- "fixedNormal"
+ { projectMode::NEAREST, "nearest" },
+ { projectMode::POINTNORMAL, "pointNormal" },
+ { projectMode::FIXEDNORMAL, "fixedNormal" },
};
-const NamedEnum<surfaceDisplacementPointPatchVectorField::projectMode, 3>
- surfaceDisplacementPointPatchVectorField::projectModeNames_;
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void surfaceDisplacementPointPatchVectorField::calcProjection
+void Foam::surfaceDisplacementPointPatchVectorField::calcProjection
(
vectorField& displacement
) const
@@ -300,7 +292,7 @@ void surfaceDisplacementPointPatchVectorField::calcProjection
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
surfaceDisplacementPointPatchVectorField
(
const pointPatch& p,
@@ -315,7 +307,7 @@ surfaceDisplacementPointPatchVectorField
{}
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
surfaceDisplacementPointPatchVectorField
(
const pointPatch& p,
@@ -326,7 +318,7 @@ surfaceDisplacementPointPatchVectorField
fixedValuePointPatchVectorField(p, iF, dict),
velocity_(dict.lookup("velocity")),
surfacesDict_(dict.subDict("geometry")),
- projectMode_(projectModeNames_.read(dict.lookup("projectMode"))),
+ projectMode_(projectModeNames_.lookup("projectMode", dict)),
projectDir_(dict.lookup("projectDirection")),
wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
@@ -342,7 +334,7 @@ surfaceDisplacementPointPatchVectorField
}
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
surfaceDisplacementPointPatchVectorField
(
const surfaceDisplacementPointPatchVectorField& ppf,
@@ -361,7 +353,7 @@ surfaceDisplacementPointPatchVectorField
{}
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
surfaceDisplacementPointPatchVectorField
(
const surfaceDisplacementPointPatchVectorField& ppf
@@ -377,7 +369,7 @@ surfaceDisplacementPointPatchVectorField
{}
-surfaceDisplacementPointPatchVectorField::
+Foam::surfaceDisplacementPointPatchVectorField::
surfaceDisplacementPointPatchVectorField
(
const surfaceDisplacementPointPatchVectorField& ppf,
@@ -396,8 +388,8 @@ surfaceDisplacementPointPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-const searchableSurfaces&
-surfaceDisplacementPointPatchVectorField::surfaces() const
+const Foam::searchableSurfaces&
+Foam::surfaceDisplacementPointPatchVectorField::surfaces() const
{
if (surfacesPtr_.empty())
{
@@ -423,7 +415,7 @@ surfaceDisplacementPointPatchVectorField::surfaces() const
}
-void surfaceDisplacementPointPatchVectorField::updateCoeffs()
+void Foam::surfaceDisplacementPointPatchVectorField::updateCoeffs()
{
if (this->updated())
{
@@ -469,38 +461,33 @@ void surfaceDisplacementPointPatchVectorField::updateCoeffs()
}
-void surfaceDisplacementPointPatchVectorField::write(Ostream& os) const
+void Foam::surfaceDisplacementPointPatchVectorField::write(Ostream& os) const
{
fixedValuePointPatchVectorField::write(os);
- os.writeKeyword("velocity") << velocity_
- << token::END_STATEMENT << nl;
- os.writeKeyword("geometry") << surfacesDict_
- << token::END_STATEMENT << nl;
- os.writeKeyword("projectMode") << projectModeNames_[projectMode_]
- << token::END_STATEMENT << nl;
- os.writeKeyword("projectDirection") << projectDir_
- << token::END_STATEMENT << nl;
- os.writeKeyword("wedgePlane") << wedgePlane_
- << token::END_STATEMENT << nl;
+ os.writeEntry("velocity", velocity_);
+ os.writeEntry("geometry", surfacesDict_);
+ os.writeEntry("projectMode", projectModeNames_[projectMode_]);
+ os.writeEntry("projectDirection", projectDir_);
+ os.writeEntry("wedgePlane", wedgePlane_);
+
if (frozenPointsZone_ != word::null)
{
- os.writeKeyword("frozenPointsZone") << frozenPointsZone_
- << token::END_STATEMENT << nl;
+ os.writeEntry("frozenPointsZone", frozenPointsZone_);
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+namespace Foam
+{
+
makePointPatchTypeField
(
fixedValuePointPatchVectorField,
surfaceDisplacementPointPatchVectorField
);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
index c5db3f0c6a6783aad17a39088fde883c52186e6c..652794efa798e8e7abb32cae2e3d4a5dd84de60e 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
@@ -60,6 +60,7 @@ SourceFiles
#include "pointPatchFields.H"
#include "fixedValuePointPatchFields.H"
#include "searchableSurfaces.H"
+#include "Enum.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -92,7 +93,7 @@ private:
// Private data
//- Project mode names
- static const NamedEnum<projectMode, 3> projectModeNames_;
+ static const Enum<projectMode> projectModeNames_;
//- Maximum velocity
const vector velocity_;
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 6eee20eb32c0a8b4f2ae546c6a1da0e2f8aa66a3..a85df2a86373406e533eda6df1e4ec4ba3e46a64 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -30,30 +30,23 @@ License
#include "fvMesh.H"
#include "displacementMotionSolver.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template<>
-const char*
-NamedEnum<surfaceSlipDisplacementPointPatchVectorField::projectMode, 3>::
-names[] =
+const Foam::Enum
+<
+ Foam::surfaceSlipDisplacementPointPatchVectorField::projectMode
+>
+Foam::surfaceSlipDisplacementPointPatchVectorField::projectModeNames_
{
- "nearest",
- "pointNormal",
- "fixedNormal"
+ { projectMode::NEAREST, "nearest" },
+ { projectMode::POINTNORMAL, "pointNormal" },
+ { projectMode::FIXEDNORMAL, "fixedNormal" },
};
-const NamedEnum<surfaceSlipDisplacementPointPatchVectorField::projectMode, 3>
- surfaceSlipDisplacementPointPatchVectorField::projectModeNames_;
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void surfaceSlipDisplacementPointPatchVectorField::calcProjection
+void Foam::surfaceSlipDisplacementPointPatchVectorField::calcProjection
(
vectorField& displacement
) const
@@ -299,7 +292,7 @@ void surfaceSlipDisplacementPointPatchVectorField::calcProjection
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
surfaceSlipDisplacementPointPatchVectorField
(
const pointPatch& p,
@@ -313,7 +306,7 @@ surfaceSlipDisplacementPointPatchVectorField
{}
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
surfaceSlipDisplacementPointPatchVectorField
(
const pointPatch& p,
@@ -323,14 +316,14 @@ surfaceSlipDisplacementPointPatchVectorField
:
pointPatchVectorField(p, iF, dict),
surfacesDict_(dict.subDict("geometry")),
- projectMode_(projectModeNames_.read(dict.lookup("projectMode"))),
+ projectMode_(projectModeNames_.lookup("projectMode", dict)),
projectDir_(dict.lookup("projectDirection")),
wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
{}
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
surfaceSlipDisplacementPointPatchVectorField
(
const surfaceSlipDisplacementPointPatchVectorField& ppf,
@@ -348,7 +341,7 @@ surfaceSlipDisplacementPointPatchVectorField
{}
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
surfaceSlipDisplacementPointPatchVectorField
(
const surfaceSlipDisplacementPointPatchVectorField& ppf
@@ -363,7 +356,7 @@ surfaceSlipDisplacementPointPatchVectorField
{}
-surfaceSlipDisplacementPointPatchVectorField::
+Foam::surfaceSlipDisplacementPointPatchVectorField::
surfaceSlipDisplacementPointPatchVectorField
(
const surfaceSlipDisplacementPointPatchVectorField& ppf,
@@ -381,8 +374,8 @@ surfaceSlipDisplacementPointPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-const searchableSurfaces&
-surfaceSlipDisplacementPointPatchVectorField::surfaces() const
+const Foam::searchableSurfaces&
+Foam::surfaceSlipDisplacementPointPatchVectorField::surfaces() const
{
if (surfacesPtr_.empty())
{
@@ -408,7 +401,7 @@ surfaceSlipDisplacementPointPatchVectorField::surfaces() const
}
-void surfaceSlipDisplacementPointPatchVectorField::evaluate
+void Foam::surfaceSlipDisplacementPointPatchVectorField::evaluate
(
const Pstream::commsTypes commsType
)
@@ -428,36 +421,34 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
}
-void surfaceSlipDisplacementPointPatchVectorField::write(Ostream& os) const
+void Foam::surfaceSlipDisplacementPointPatchVectorField::write
+(
+ Ostream& os
+) const
{
pointPatchVectorField::write(os);
- os.writeKeyword("geometry") << surfacesDict_
- << token::END_STATEMENT << nl;
- os.writeKeyword("projectMode") << projectModeNames_[projectMode_]
- << token::END_STATEMENT << nl;
- os.writeKeyword("projectDirection") << projectDir_
- << token::END_STATEMENT << nl;
- os.writeKeyword("wedgePlane") << wedgePlane_
- << token::END_STATEMENT << nl;
+ os.writeEntry("geometry", surfacesDict_);
+ os.writeEntry("projectMode", projectModeNames_[projectMode_]);
+ os.writeEntry("projectDirection", projectDir_);
+ os.writeEntry("wedgePlane", wedgePlane_);
if (frozenPointsZone_ != word::null)
{
- os.writeKeyword("frozenPointsZone") << frozenPointsZone_
- << token::END_STATEMENT << nl;
+ os.writeEntry("frozenPointsZone", frozenPointsZone_);
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+namespace Foam
+{
+
makePointPatchTypeField
(
pointPatchVectorField,
surfaceSlipDisplacementPointPatchVectorField
);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
index 1e1cc4838e7f169687a1d7e16f640b22d352d4cb..d6de719e545fe3b11385c6d3f7f7b093e05d4ea2 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
@@ -86,7 +86,7 @@ private:
// Private data
//- Project mode names
- static const NamedEnum<projectMode, 3> projectModeNames_;
+ static const Enum<projectMode> projectModeNames_;
//- Names of surfaces
const dictionary surfacesDict_;
diff --git a/src/fvOptions/cellSetOption/cellSetOption.C b/src/fvOptions/cellSetOption/cellSetOption.C
index 929b457a7ee93995ba7c0f182c7fa243671d94bb..28d058622123457f106ebd1971ab36526ed89262 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.C
+++ b/src/fvOptions/cellSetOption/cellSetOption.C
@@ -34,24 +34,22 @@ namespace Foam
{
defineTypeNameAndDebug(cellSetOption, 0);
}
-
- template<> const char* NamedEnum
- <
- fv::cellSetOption::selectionModeType,
- 4
- >::names[] =
- {
- "points",
- "cellSet",
- "cellZone",
- "all"
- };
-
- const NamedEnum<fv::cellSetOption::selectionModeType, 4>
- fv::cellSetOption::selectionModeTypeNames_;
}
+const Foam::Enum
+<
+ Foam::fv::cellSetOption::selectionModeType
+>
+Foam::fv::cellSetOption::selectionModeTypeNames_
+{
+ { selectionModeType::smPoints, "points" },
+ { selectionModeType::smCellSet, "cellSet" },
+ { selectionModeType::smCellZone, "cellZone" },
+ { selectionModeType::smAll, "all" },
+};
+
+
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void Foam::fv::cellSetOption::setSelection(const dictionary& dict)
@@ -82,7 +80,7 @@ void Foam::fv::cellSetOption::setSelection(const dictionary& dict)
FatalErrorInFunction
<< "Unknown selectionMode "
<< selectionModeTypeNames_[selectionMode_]
- << ". Valid selectionMode types are "
+ << ". Valid selectionMode types : "
<< selectionModeTypeNames_
<< exit(FatalError);
}
@@ -210,7 +208,7 @@ Foam::fv::cellSetOption::cellSetOption
duration_(0.0),
selectionMode_
(
- selectionModeTypeNames_.read(coeffs_.lookup("selectionMode"))
+ selectionModeTypeNames_.lookup("selectionMode", coeffs_)
),
cellSetName_("none"),
V_(0.0)
diff --git a/src/fvOptions/cellSetOption/cellSetOption.H b/src/fvOptions/cellSetOption/cellSetOption.H
index 6dd94847c7bae739fb22bc7f37fee181a3d75805..312768a0f44b9629157370e7a3e8397e1a20057b 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.H
+++ b/src/fvOptions/cellSetOption/cellSetOption.H
@@ -84,9 +84,8 @@ public:
smAll
};
- //- Word list of selection mode type names
- static const NamedEnum<selectionModeType, 4>
- selectionModeTypeNames_;
+ //- List of selection mode type names
+ static const Enum<selectionModeType> selectionModeTypeNames_;
protected:
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index 2fdfeddd133e6e1328228b4375ad87b3d3dff441..32446b4fb29586bafdb23677cbe3917a8ba8529f 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -43,18 +43,17 @@ namespace Foam
dictionary
);
}
-
- template<>
- const char* NamedEnum<fv::fixedTemperatureConstraint::temperatureMode, 2>::
- names[] =
- {
- "uniform",
- "lookup"
- };
}
-const Foam::NamedEnum<Foam::fv::fixedTemperatureConstraint::temperatureMode, 2>
- Foam::fv::fixedTemperatureConstraint::temperatureModeNames_;
+const Foam::Enum
+<
+ Foam::fv::fixedTemperatureConstraint::temperatureMode
+>
+Foam::fv::fixedTemperatureConstraint::temperatureModeNames_
+{
+ { temperatureMode::tmUniform, "uniform" },
+ { temperatureMode::tmLookup, "lookup" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -68,7 +67,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
)
:
cellSetOption(name, modelType, dict, mesh),
- mode_(temperatureModeNames_.read(coeffs_.lookup("mode"))),
+ mode_(temperatureModeNames_.lookup("mode", coeffs_)),
Tuniform_(nullptr),
TName_("T")
{
@@ -89,7 +88,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
}
default:
{
- // error handling done by NamedEnum
+ // Error handling already done by Enum
}
}
@@ -139,7 +138,7 @@ void Foam::fv::fixedTemperatureConstraint::constrain
}
default:
{
- // error handling done by NamedEnum
+ // Error handling already done by Enum
}
}
}
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index a7c702944bef9f530d18523fd05d08ada446b0dc..00c83396eb2110588201b89e51f848ebeeeb6b05 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -60,7 +60,7 @@ SourceFiles
#define fixedTemperatureConstraint_H
#include "cellSetOption.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "Function1.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -90,7 +90,7 @@ public:
//- String representation of temperatureMode enums
- static const NamedEnum<temperatureMode, 2> temperatureModeNames_;
+ static const Enum<temperatureMode> temperatureModeNames_;
protected:
diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C
index 545601905589ac45075fc4ecbd3b0efa1880391f..e25aa741c941fb896e9e4d197d600485e56c197c 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@@ -65,9 +65,10 @@ void Foam::fv::interRegionOption::setMapper()
(
mesh_,
nbrMesh,
- meshToMesh::interpolationMethodNames_.read
+ meshToMesh::interpolationMethodNames_.lookup
(
- coeffs_.lookup("interpolationMethod")
+ "interpolationMethod",
+ coeffs_
),
false // not interpolating patches
)
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
index 0bc5217e98d55757faf856e0e03e97ada298cfdc..c05736e3c6e07ae186f2393bf2b19fb5ee21975c 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -57,28 +57,16 @@ namespace fv
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
-namespace Foam
-{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::fv::
- directionalPressureGradientExplicitSource::
- pressureDropModel,
- 3
- >::names[] =
- {
- "volumetricFlowRateTable",
- "constant",
- "DarcyForchheimer"
- };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::fv::directionalPressureGradientExplicitSource::pressureDropModel,
- 3
-> Foam::fv::directionalPressureGradientExplicitSource::PressureDropModelNames_;
+ Foam::fv::directionalPressureGradientExplicitSource::pressureDropModel
+>
+Foam::fv::directionalPressureGradientExplicitSource::pressureDropModelNames_
+{
+ { pressureDropModel::pVolumetricFlowRateTable, "volumetricFlowRateTable" },
+ { pressureDropModel::pConstant, "constant" },
+ { pressureDropModel::pDarcyForchheimer, "DarcyForchheimer" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -178,7 +166,7 @@ directionalPressureGradientExplicitSource
)
:
cellSetOption(sourceName, modelType, dict, mesh),
- model_(PressureDropModelNames_.read(coeffs_.lookup("model"))),
+ model_(pressureDropModelNames_.lookup("model", coeffs_)),
gradP0_(cells_.size(), Zero),
dGradP_(cells_.size(), Zero),
gradPporous_(cells_.size(), Zero),
@@ -236,7 +224,7 @@ directionalPressureGradientExplicitSource
<< "Did not find mode " << model_
<< nl
<< "Please set 'model' to one of "
- << PressureDropModelNames_
+ << pressureDropModelNames_
<< exit(FatalError);
}
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
index d53f1dc76cde0ba567b6d2a34d1b0427abfc338a..d4cfaf63a89f71f814ed0dd6c6db5300ebf2dc5c 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
@@ -126,9 +126,9 @@ private:
// Private data
- static const NamedEnum<pressureDropModel, 3> PressureDropModelNames_;
+ static const Enum<pressureDropModel> pressureDropModelNames_;
- //- Pressure drop model
+ //- Pressure drop model
pressureDropModel model_;
//- Pressure gradient before correction
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C
index a9b037a8ae5cfdcdc7f5cf47be2a8b6c00bc9fad..8f4f4715674e24767ca8622fe9eae503cd303e02 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C
@@ -73,21 +73,20 @@ Foam::autoPtr<Foam::profileModel> Foam::profileModel::New
const dictionary& dict
)
{
- const word& modelName(dict.dictName());
+ const word& modelName = dict.dictName();
const word modelType(dict.lookup("type"));
Info<< " - creating " << modelType << " profile " << modelName << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown profile model type " << modelType
- << nl << nl
- << "Valid model types are :" << nl
+ << "Unknown profile model type "
+ << modelType << nl << nl
+ << "Valid model types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index bf8594073bb207229c3ebca119b0551584e99dff..c36123833a3010471984b4dd75492cc0b829f301 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -41,28 +41,30 @@ namespace Foam
defineTypeNameAndDebug(rotorDiskSource, 0);
addToRunTimeSelectionTable(option, rotorDiskSource, dictionary);
}
+}
- template<> const char* NamedEnum<fv::rotorDiskSource::geometryModeType, 2>::
- names[] =
- {
- "auto",
- "specified"
- };
- const NamedEnum<fv::rotorDiskSource::geometryModeType, 2>
- fv::rotorDiskSource::geometryModeTypeNames_;
+const Foam::Enum
+<
+ Foam::fv::rotorDiskSource::geometryModeType
+>
+Foam::fv::rotorDiskSource::geometryModeTypeNames_
+{
+ { geometryModeType::gmAuto, "auto" },
+ { geometryModeType::gmSpecified, "specified" },
+};
- template<> const char* NamedEnum<fv::rotorDiskSource::inletFlowType, 3>::
- names[] =
- {
- "fixed",
- "surfaceNormal",
- "local"
- };
- const NamedEnum<fv::rotorDiskSource::inletFlowType, 3>
- fv::rotorDiskSource::inletFlowTypeNames_;
-}
+const Foam::Enum
+<
+ Foam::fv::rotorDiskSource::inletFlowType
+>
+Foam::fv::rotorDiskSource::inletFlowTypeNames_
+{
+ { inletFlowType::ifFixed, "fixed" },
+ { inletFlowType::ifSurfaceNormal, "surfaceNormal" },
+ { inletFlowType::ifLocal, "local" },
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -267,7 +269,7 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
vector refDir(Zero);
geometryModeType gm =
- geometryModeTypeNames_.read(coeffs_.lookup("geometryMode"));
+ geometryModeTypeNames_.lookup("geometryMode", coeffs_);
switch (gm)
{
@@ -596,7 +598,7 @@ bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
coeffs_.lookup("nBlades") >> nBlades_;
- inletFlow_ = inletFlowTypeNames_.read(coeffs_.lookup("inletFlowType"));
+ inletFlow_ = inletFlowTypeNames_.lookup("inletFlowType", coeffs_);
coeffs_.lookup("tipEffect") >> tipEffect_;
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index 2ff034676ad9902e773351ebc92590daaf181f37..ea8b3be22a957c7e31df1426a2422a1e09f593fe 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -103,7 +103,7 @@ SourceFiles
#include "cellSetOption.H"
#include "cylindricalCS.H"
#include "cylindrical.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "bladeModel.H"
#include "profileModelList.H"
#include "volFieldsFwd.H"
@@ -134,7 +134,7 @@ public:
gmAuto,
gmSpecified
};
- static const NamedEnum<geometryModeType, 2> geometryModeTypeNames_;
+ static const Enum<geometryModeType> geometryModeTypeNames_;
enum inletFlowType
{
@@ -142,7 +142,7 @@ public:
ifSurfaceNormal,
ifLocal
};
- static const NamedEnum<inletFlowType, 3> inletFlowTypeNames_;
+ static const Enum<inletFlowType> inletFlowTypeNames_;
protected:
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
index 683e356b238998310d0fb63758608a52f9d74084..a8c5d41858977dc4d0a49961daf7158e26626450 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
@@ -204,7 +204,7 @@ Foam::targetCoeffTrim::targetCoeffTrim
nIter_(50),
tol_(1e-8),
relax_(1.0),
- dTheta_(degToRad(0.1)),
+ dTheta_(0.1_deg),
alpha_(1.0)
{
read(dict);
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
index 92b0b09f5ce515059d18ca99f97a510890f6fd88..3aef03cc409f928613e2e3067a98299cedf81b62 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
@@ -37,15 +37,14 @@ Foam::autoPtr<Foam::trimModel> Foam::trimModel::New
Info<< " Selecting " << typeName << " " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown " << typeName << " type "
<< modelType << nl << nl
- << "Valid " << typeName << " types are:" << nl
+ << "Valid " << typeName << " types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index 7867633b8dfdf4407efee3bfa442f88a674d601a..057614e094822c5141ef3dffc9895255eabcc223 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -36,17 +36,6 @@ License
namespace Foam
{
- template<>
- const char* NamedEnum
- <
- fv::solidificationMeltingSource::thermoMode,
- 2
- >::names[] =
- {
- "thermo",
- "lookup"
- };
-
namespace fv
{
defineTypeNameAndDebug(solidificationMeltingSource, 0);
@@ -60,8 +49,15 @@ namespace Foam
}
}
-const Foam::NamedEnum<Foam::fv::solidificationMeltingSource::thermoMode, 2>
- Foam::fv::solidificationMeltingSource::thermoModeTypeNames_;
+const Foam::Enum
+<
+ Foam::fv::solidificationMeltingSource::thermoMode
+>
+Foam::fv::solidificationMeltingSource::thermoModeTypeNames_
+{
+ { thermoMode::mdThermo, "thermo" },
+ { thermoMode::mdLookup, "lookup" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -191,7 +187,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
Tmelt_(readScalar(coeffs_.lookup("Tmelt"))),
L_(readScalar(coeffs_.lookup("L"))),
relax_(coeffs_.lookupOrDefault("relax", 0.9)),
- mode_(thermoModeTypeNames_.read(coeffs_.lookup("thermoMode"))),
+ mode_(thermoModeTypeNames_.lookup("thermoMode", coeffs_)),
rhoRef_(readScalar(coeffs_.lookup("rhoRef"))),
TName_(coeffs_.lookupOrDefault<word>("T", "T")),
CpName_(coeffs_.lookupOrDefault<word>("Cp", "Cp")),
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
index d1ea36c07cfa6bdf78cdc5b3bd756a42b9554c31..7c3b576a30a3e2fc55398ff62f8ad07f91bb9aac 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -97,7 +97,7 @@ SourceFiles
#include "fvMesh.H"
#include "volFields.H"
#include "cellSetOption.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -122,7 +122,7 @@ public:
mdLookup
};
- static const NamedEnum<thermoMode, 2> thermoModeTypeNames_;
+ static const Enum<thermoMode> thermoModeTypeNames_;
private:
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
index d1e924d36f69e79807c6ba5fe4cac62e7fc62595..baaec145680a62c2c9a58f4a99b20ad860e2264e 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
@@ -36,7 +36,7 @@ bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict)
coeffs_.readIfPresent("relax", relax_);
- mode_ = thermoModeTypeNames_.read(coeffs_.lookup("thermoMode"));
+ mode_ = thermoModeTypeNames_.lookup("thermoMode", coeffs_);
coeffs_.lookup("rhoRef") >> rhoRef_;
coeffs_.readIfPresent("T", TName_);
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index c48eccb11ead82c73a223b0d6d9e189cbd58c415..3cf82a868cf5ce60bd19d4ff98651e67f3a401ef 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -32,9 +32,9 @@ License
template<class Type>
const Foam::wordList Foam::fv::SemiImplicitSource<Type>::volumeModeTypeNames_
-(
- IStringStream("(absolute specific)")()
-);
+{
+ "absolute", "specific"
+};
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index af0894d4f496ffa035a30e3b8dd3e120506aae7a..fe7fa6a32a72d1023b722311ab4ae2fb36a0d5a5 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -41,21 +41,17 @@ namespace Foam
dictionary
);
}
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::fv::tabulatedNTUHeatTransfer::geometryModeType,
- 2
- >::names[] =
- {
- "calculated",
- "user"
- };
}
-const Foam::NamedEnum<Foam::fv::tabulatedNTUHeatTransfer::geometryModeType, 2>
-Foam::fv::tabulatedNTUHeatTransfer::geometryModelNames_;
+const Foam::Enum
+<
+ Foam::fv::tabulatedNTUHeatTransfer::geometryModeType
+>
+Foam::fv::tabulatedNTUHeatTransfer::geometryModelNames_
+{
+ { geometryModeType::gmCalculated, "calculated" },
+ { geometryModeType::gmUser, "user" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -93,8 +89,7 @@ void Foam::fv::tabulatedNTUHeatTransfer::initialiseGeometry()
{
if (Ain_ < 0)
{
- geometryMode_ =
- geometryModelNames_.read(coeffs_.lookup("geometryMode"));
+ geometryMode_ = geometryModelNames_.lookup("geometryMode", coeffs_);
Info<< "Region " << mesh_.name() << " " << type() << " " << name_ << " "
<< geometryModelNames_[geometryMode_] << " geometry:" << nl;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
index 0f087fd3287014a1d5405ea46663741aa54b9caf..a0fd5591934f9841d8e14624bbf9b7dde93211e9 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
@@ -107,7 +107,7 @@ SeeAlso
#include "interRegionHeatTransferModel.H"
#include "autoPtr.H"
#include "interpolation2DTable.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -135,7 +135,7 @@ public:
gmUser
};
- static const NamedEnum<geometryModeType, 2> geometryModelNames_;
+ static const Enum<geometryModeType> geometryModelNames_;
private:
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
index 43488462bdf0afb7bf78ad97a6714ca4c48b31ea..549932dfe2cc5c98e0bec049614db2acfb27c72a 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
@@ -39,15 +39,14 @@ Foam::BinaryCollisionModel<CloudType>::New
Info<< "Selecting BinaryCollisionModel " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown BinaryCollisionModel type "
<< modelType << nl << nl
- << "Valid BinaryCollisionModel types are:" << nl
+ << "Valid BinaryCollisionModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
index fb67a50e0a700895c70eedfd89a42cb60825b61c..70f9d09e80c94ececc43e1325b055894ad286a06 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
@@ -39,15 +39,14 @@ Foam::InflowBoundaryModel<CloudType>::New
Info<< "Selecting InflowBoundaryModel " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown InflowBoundaryModel type "
<< modelType << nl << nl
- << "Valid InflowBoundaryModel types are:" << nl
+ << "Valid InflowBoundaryModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
index 55a134367eab362c76cb7e480d50840b0a83906c..62545116095b8bac5e9f284537bc36ad6f795d23 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
@@ -39,15 +39,14 @@ Foam::WallInteractionModel<CloudType>::New
Info<< "Selecting WallInteractionModel " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown WallInteractionModel type "
<< modelType << nl << nl
- << "Valid WallInteractionModel types are:" << nl
+ << "Valid WallInteractionModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
index 9fa9d5c334cb5aa6c469346d27454cf9647f08a3..aa596e689879f345a7f579fdd3964b3efbc836e2 100644
--- a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
@@ -37,14 +37,14 @@ Foam::autoPtr<Foam::distributionModel> Foam::distributionModel::New
Info<< "Selecting distribution model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown distribution model type " << modelType << nl << nl
- << "Valid distribution model types are:" << nl
+ << "Unknown distribution model type "
+ << modelType << nl << nl
+ << "Valid distribution model types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
index 1c84dc5ae9ddfac2c9c3717314f70c3675eb4d7e..c6fbb3e6328150f7aa564f188b1dddc4e15397c4 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
@@ -41,15 +41,14 @@ Foam::IntegrationScheme<Type>::New
Info<< "Selecting " << phiName << " integration scheme "
<< schemeName << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(schemeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(schemeName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown integration scheme type "
<< schemeName << nl << nl
- << "Valid integration scheme types are:" << nl
+ << "Valid integration scheme types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 3041ab5c541b0a4fadc41b3dd936b7b436e9e801..27f74158e21886720aea7fbac9d4b3ed33776862 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -27,24 +27,17 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::phaseProperties::phaseType
+>
+Foam::phaseProperties::phaseTypeNames
{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::phaseProperties::phaseType,
- 4
- >::names[] =
- {
- "gas",
- "liquid",
- "solid",
- "unknown"
- };
-}
-
-const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
- Foam::phaseProperties::phaseTypeNames;
+ { phaseType::GAS, "gas" },
+ { phaseType::LIQUID, "liquid" },
+ { phaseType::SOLID, "solid" },
+ { phaseType::UNKNOWN, "unknown" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 2d775a741540b5ce8af13b9139617c2b3f565023..87b6882d6c06d17b881786ce82d5eaef5139fb01 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -36,7 +36,7 @@ SourceFiles
#ifndef phaseProperties_H
#define phaseProperties_H
-#include "NamedEnum.H"
+#include "Enum.H"
#include "Tuple2.H"
#include "PtrList.H"
#include "volFields.H"
@@ -74,7 +74,7 @@ public:
};
//- Corresponding word representations for phase type enumerations
- static const NamedEnum<phaseType, 4> phaseTypeNames;
+ static const Enum<phaseType> phaseTypeNames;
private:
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
index 1b115c6c264853c6457401b3fabc1da2c5086c5e..0fe50e2e75402666249728f326d2bc99c7ad6a68 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
@@ -40,15 +40,14 @@ Foam::CloudFunctionObject<CloudType>::New
Info<< " Selecting cloud function " << modelName << " of type "
<< objectType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(objectType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(objectType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown cloud function type "
<< objectType << nl << nl
- << "Valid cloud function types are:" << nl
+ << "Valid cloud function types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
index 8548abfc76cf2659a61ba5aa9b73b26292a6d818..5c8b778c91fbfdf93729bf30454b49bf2d8ef399 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
@@ -35,20 +35,20 @@ Foam::CollisionModel<CloudType>::New
CloudType& owner
)
{
- word modelType(dict.lookup("collisionModel"));
+ const word modelType(dict.lookup("collisionModel"));
Info<< "Selecting collision model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown collision model type " << modelType
- << ", constructor not in hash table" << nl << nl
- << " Valid collision model types are:" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Unknown collisionModel type "
+ << modelType << nl << nl
+ << "Valid collisionModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<CollisionModel<CloudType>>(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
index f98062e8e1f5fade9c96b0ba2af46f68d2c382c9..6f8a2d1b420af8585eaf18ffb41f64d8baa6c63f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
@@ -35,21 +35,20 @@ Foam::PairModel<CloudType>::New
CloudType& owner
)
{
- word PairModelType(dict.lookup("pairModel"));
+ const word modelType(dict.lookup("pairModel"));
- Info<< "Selecting pair model " << PairModelType << endl;
+ Info<< "Selecting pair model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(PairModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown pair model type "
- << PairModelType
- << ", constructor not in hash table" << nl << nl
- << " Valid pair model types are:" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Unknown pairModel type "
+ << modelType << nl << nl
+ << "Valid pairModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<PairModel<CloudType>>(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
index 21b9f57318ddee14f3445f0d24aca267183c6a52..936163a3fece8c6f86e72c915bc5834397baad84 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
@@ -35,20 +35,20 @@ Foam::WallModel<CloudType>::New
CloudType& owner
)
{
- word WallModelType(dict.lookup("wallModel"));
+ const word modelType(dict.lookup("wallModel"));
- Info<< "Selecting wall model " << WallModelType << endl;
+ Info<< "Selecting wall model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(WallModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown wall model type type " << WallModelType
- << ", constructor not in hash table" << nl << nl
- << " Valid wall model types are:" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Unknown wallModel type "
+ << modelType << nl << nl
+ << "Valid wallModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<WallModel<CloudType>>(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
index f8c1f4f5388f707ba24a76f0a2fe44baf58094a7..990da5b40f48f0a38c662fb574a42e221b430239 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
@@ -39,15 +39,14 @@ Foam::DispersionModel<CloudType>::New
Info<< "Selecting dispersion model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown dispersion model type "
+ << "Unknown dispersionModel type "
<< modelType << nl << nl
- << "Valid dispersion model types are:" << nl
+ << "Valid dispersionModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
index b60c2e0031d6ff0bfba0b3ebb828130bc0371655..3fde72fdd1ce14b4b423dbc7ae85b094913fe860 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
@@ -39,16 +39,16 @@ Foam::InjectionModel<CloudType>::New
Info<< "Selecting injection model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown injection model type "
+ << "Unknown injectionModel type "
<< modelType << nl << nl
- << "Valid injection model types are:" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Valid injectionModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<InjectionModel<CloudType>>(cstrIter()(dict, owner));
@@ -67,16 +67,16 @@ Foam::InjectionModel<CloudType>::New
{
Info<< "Selecting injection model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown injection model type "
<< modelType << nl << nl
- << "Valid injection model types are:" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Valid injection model types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
index a4f1db04b5fa9380b6e852333a0a6991ea644305..2e801a88dc9bc9f8789f8df7d833dd754f3838b4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
@@ -39,16 +39,14 @@ Foam::ParticleForce<CloudType>::New
{
Info<< " Selecting particle force " << forceType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(forceType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(forceType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown particle force type "
- << forceType
- << ", constructor not in hash table" << nl << nl
- << " Valid particle force types are:" << nl
+ << forceType << nl << nl
+ << "Valid particle force types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
index 7c04d40d98a53e0ca51b1a6720cc2da9a310fc96..c6af1d2378660d29664b7cc5995d0163ffe3f194 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
@@ -32,12 +32,10 @@ License
template<class CloudType>
Foam::wordList Foam::PatchInteractionModel<CloudType>::interactionTypeNames_
-(
- IStringStream
- (
- "(rebound stick escape)"
- )()
-);
+{
+ "rebound", "stick", "escape"
+};
+
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
index 19611a30b8e53f16350fda8b1267721a3f989f5b..381fe58e29f048dadfc5db89181431f42a7c5a9a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
@@ -39,15 +39,14 @@ Foam::PatchInteractionModel<CloudType>::New
Info<< "Selecting patch interaction model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown patch interaction model type "
<< modelType << nl << nl
- << "Valid patch interaction model types are:" << nl
+ << "Valid patch interaction model types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
index 3364416bbbed6396ee6a92646dffc9b7581b2bc3..c35eece9699454df200d20f31ccb94ea67d178f5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
@@ -35,20 +35,21 @@ Foam::StochasticCollisionModel<CloudType>::New
CloudType& owner
)
{
- word modelType(dict.lookup("stochasticCollisionModel"));
+ const word modelType(dict.lookup("stochasticCollisionModel"));
Info<< "Selecting stochastic collision model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter =
+ dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown model type type "
- << modelType << ", constructor not in hash table" << nl << nl
- << " Valid model types are:" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Unknown stochasticCollisionModel type "
+ << modelType << nl << nl
+ << "Valid stochasticCollisionModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<StochasticCollisionModel<CloudType>>
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
index 7344b41f77cb7ae52b6715f3e44d5309e032620e..07331049c72a070e02cc1482326310de824ed9a3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
@@ -39,15 +39,14 @@ Foam::SurfaceFilmModel<CloudType>::New
Info<< "Selecting surface film model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown surface film model type "
+ << "Unknown surfaceFilmModel type "
<< modelType << nl << nl
- << "Valid surface film model types are:" << nl
+ << "Valid surfaceFilmModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index c64b12115af2129e11721d0fb08bcec011c459ca..b26b326d6efc13ad144b9093b890145d6eb65d20 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -84,20 +84,19 @@ Foam::AveragingMethod<Type>::New
const fvMesh& mesh
)
{
- word averageType(dict.lookup(typeName));
+ const word averageType(dict.lookup(typeName));
//Info<< "Selecting averaging method "
// << averageType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(averageType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(averageType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown averaging method " << averageType
- << ", constructor not in hash table" << nl << nl
- << " Valid averaging methods are:" << nl
+ << "Unknown averaging method "
+ << averageType << nl << nl
+ << "Valid averaging methods :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C
index d958d1a146a2019721d62399f0da617ef22ea996..5298d93b1abfdaa4ee7ce092f6941369872d9013 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C
@@ -60,15 +60,14 @@ Foam::CorrectionLimitingMethod::New
Info<< "Selecting correction limiter " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown correction limiter type " << modelType
- << ", constructor not in hash table" << nl << nl
- << " Valid correction limiter types are:" << nl
+ << "Unknown correction limiter type "
+ << modelType << nl << nl
+ << "Valid correction limiter types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C
index 8d7836cb2bd2d1010e0737fa3a9ed536daa4448a..fd2a6cb3751eb9b415593d739a5a03db1bf1dd77 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C
@@ -84,15 +84,14 @@ Foam::DampingModel<CloudType>::New
Info<< "Selecting damping model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown damping model type " << modelType
- << ", constructor not in hash table" << nl << nl
- << " Valid damping model types are:" << nl
+ << "Unknown damping model type "
+ << modelType << nl << nl
+ << "Valid damping model types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C
index c8b02261b8492a35859c9e2427aca0ec5a28899e..d929247b2e03a350d8242ae253e27d36cbcfe30e 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C
@@ -88,15 +88,14 @@ Foam::IsotropyModel<CloudType>::New
Info<< "Selecting isotropy model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown isotropy model type " << modelType
- << ", constructor not in hash table" << nl << nl
- << " Valid isotropy model types are:" << nl
+ << "Unknown isotropy model type "
+ << modelType << nl << nl
+ << "Valid isotropy model types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C
index 136c13eff44296e295b866d695cce9414902db33..0307220208d1ea4dbfdd3195a7dcedc1b5356696 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C
@@ -86,15 +86,14 @@ Foam::PackingModel<CloudType>::New
Info<< "Selecting packing model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown packing model type " << modelType
- << ", constructor not in hash table" << nl << nl
- << " Valid packing model types are:" << nl
+ << "Unknown packing model type "
+ << modelType << nl << nl
+ << "Valid packing model types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
index 29e95f3095b86d00d59fdad49d9bf964f93f9633..8fca6accbcba1ddd8642ce7edb6ee61556bb21f4 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
@@ -63,19 +63,18 @@ Foam::autoPtr<Foam::ParticleStressModel> Foam::ParticleStressModel::New
const dictionary& dict
)
{
- word modelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting particle stress model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown particle stress model type " << modelType
- << ", constructor not in hash table" << nl << nl
- << " Valid particle stress model types are:" << nl
+ << "Unknown particle stress model type "
+ << modelType << nl << nl
+ << "Valid particle stress model types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C
index 6502846403fdb8716190f0862aeb2630801eff3f..849955027866a629687db41d85c5645f1343b75f 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C
@@ -65,19 +65,18 @@ Foam::autoPtr<Foam::TimeScaleModel> Foam::TimeScaleModel::New
const dictionary& dict
)
{
- word modelType(dict.lookup("type"));
+ const word modelType(dict.lookup("type"));
Info<< "Selecting time scale model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown time scale model type " << modelType
- << ", constructor not in hash table" << nl << nl
- << " Valid time scale model types are:" << nl
+ << "Unknown time scale model type "
+ << modelType << nl << nl
+ << "Valid time scale model types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
index 3ed57d2d480ef767e3bf0490dacfc6904be2a1c9..6d226d6b1e9ee07d49a1b593d7da65e890aa9025 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
@@ -39,15 +39,14 @@ Foam::CompositionModel<CloudType>::New
Info<< "Selecting composition model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown composition model type "
+ << "Unknown compositionModel type "
<< modelType << nl << nl
- << "Valid composition model types are:" << nl
+ << "Valid compositionModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index 425236a295d80addb5ac563c1991c163f7532c5b..1a037fe3c7ecf293e22f07bd4b9e706496b92f67 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -30,15 +30,9 @@ License
template<class CloudType>
const Foam::wordList Foam::PhaseChangeModel<CloudType>::
enthalpyTransferTypeNames
-(
- IStringStream
- (
- "("
- "latentHeat "
- "enthalpyDifference"
- ")"
- )()
-);
+{
+ "latentHeat", "enthalpyDifference"
+};
// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
index 8f85b5298e49d052fe7646d1fa88c7879987eb89..3e8abf239792a5e2354b3d6c57b811aeed2441dd 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
@@ -39,15 +39,14 @@ Foam::PhaseChangeModel<CloudType>::New
Info<< "Selecting phase change model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown phase change model type "
+ << "Unknown phaseChangeModel type "
<< modelType << nl << nl
- << "Valid phase change model types are:" << nl
+ << "Valid phaseChangeModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
index 195a955fbf4d4699417a496f52b9c94fc396e75c..2bfb98886f7aa636d34808110db1fa6fbd18a969 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
@@ -39,15 +39,14 @@ Foam::DevolatilisationModel<CloudType>::New
Info<< "Selecting devolatilisation model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown devolatilisation model type "
+ << "Unknown devolatilisationModel type "
<< modelType << nl << nl
- << "Valid devolatilisation model types are:" << nl
+ << "Valid devolatilisationModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
index f57f768e95ab5a3731c6140fdaf5712c97e039c4..9888a13c6fe24fa9dfb2aa169b8d07a735193755 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
@@ -39,15 +39,14 @@ Foam::SurfaceReactionModel<CloudType>::New
Info<< "Selecting surface reaction model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown surface reaction model type "
+ << "Unknown surfaceReactionModel type "
<< modelType << nl << nl
- << "Valid surface reaction model types are:" << nl
+ << "Valid surfaceReactionModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
index 6396e4c6988f68a1594e7d336177f3b95805b08e..c0f72be44fb4a3f2fcaed19459b082cf594c495d 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
@@ -39,15 +39,14 @@ Foam::HeatTransferModel<CloudType>::New
Info<< "Selecting heat transfer model " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown heat transfer model type "
+ << "Unknown heatTransferModel type "
<< modelType << nl << nl
- << "Valid heat transfer model types are:" << nl
+ << "Valid heatTransferModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index c8adea407c39a08ae258f9a3fc7a77ce052bffd6..6f9ccfe51ee29ef8cc75e5f05b0ac094b8f40e4f 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -34,12 +34,9 @@ using namespace Foam::constant::mathematical;
template<class CloudType>
Foam::wordList Foam::ThermoSurfaceFilm<CloudType>::interactionTypeNames_
-(
- IStringStream
- (
- "(absorb bounce splashBai)"
- )()
-);
+{
+ "absorb", "bounce", "splashBai"
+};
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
index fdc1b1bfd8cdf50d9bac8d103f3c867fa7758893..f5ddf770093eecaa7e67ae134f7153e7993ef69b 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
@@ -41,15 +41,14 @@ Foam::autoPtr<Foam::energyScalingFunction> Foam::energyScalingFunction::New
<< scalingType << " for "
<< name << " potential energy." << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(scalingType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(scalingType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown energyScalingFunction type "
<< scalingType << nl << nl
- << "Valid energyScalingFunctions are:" << nl
+ << "Valid energyScalingFunction types:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
index a6ed6c1e2c9ea5e99050c2efd23bbc4f9d5af64a..22bc439d78e41d93e63c25f9e095e63c6f1b018d 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
@@ -40,15 +40,14 @@ Foam::autoPtr<Foam::pairPotential> Foam::pairPotential::New
<< potentialType << " for "
<< name << " interaction." << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(potentialType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(potentialType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown pairPotential type "
<< potentialType << nl << nl
- << "Valid pairPotentials are:" << nl
+ << "Valid pairPotential types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
index 55d1f6864abffa3c015856c39fc66d81c32d5cda..3570517f8d32644fb5a0d9179f97cfb8f829972e 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
@@ -38,15 +38,14 @@ Foam::autoPtr<Foam::tetherPotential> Foam::tetherPotential::New
Info<< nl << "Selecting tether potential " << potentialType
<< " for " << name << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(potentialType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(potentialType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown tetherPotential type "
<< potentialType << nl << nl
- << "Valid tetherPotentials are:" << nl
+ << "Valid tetherPotential types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C
index 55628958411eb68939fa1a4ff457ce4668906d57..2ac000be1259721e922328141b24778b13d82148 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C
@@ -35,21 +35,20 @@ Foam::AtomizationModel<CloudType>::New
CloudType& owner
)
{
- word AtomizationModelType(dict.lookup("atomizationModel"));
+ const word modelType(dict.lookup("atomizationModel"));
- Info<< "Selecting AtomizationModel " << AtomizationModelType << endl;
+ Info<< "Selecting atomizationModel " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(AtomizationModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown AtomizationModelType type "
- << AtomizationModelType
- << ", constructor not in hash table" << nl << nl
- << " Valid AtomizationModel types are:" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Unknown atomizationModel type "
+ << modelType
+ << "Valid atomizationModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<AtomizationModel<CloudType>>(cstrIter()(dict, owner));
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C
index 25a1e75d69315f32f39902d6bd696bad894aea1b..3189306a8687d5f53eac4672bb43e2c824327e45 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C
@@ -35,21 +35,20 @@ Foam::BreakupModel<CloudType>::New
CloudType& owner
)
{
- word BreakupModelType(dict.lookup("breakupModel"));
+ const word modelType(dict.lookup("breakupModel"));
- Info<< "Selecting BreakupModel " << BreakupModelType << endl;
+ Info<< "Selecting breakupModel " << modelType << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(BreakupModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown BreakupModelType type "
- << BreakupModelType
- << ", constructor not in hash table" << nl << nl
- << " Valid BreakupModel types are:" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Unknown breakupModel type "
+ << modelType << nl << nl
+ << "Valid breakupModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<BreakupModel<CloudType>>(cstrIter()(dict, owner));
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/lumpedPointMovement.C
index b12a3ef9419f846195751a3d0503f99faecb83e4..1f61bc1c36349b924ff3a7ae8cc74bc41fad25e6 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/lumpedPointMovement.C
@@ -38,12 +38,15 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-const Foam::Enum<Foam::lumpedPointMovement::outputFormatType>
- Foam::lumpedPointMovement::formatNames
- {
- { outputFormatType::PLAIN, "plain" },
- { outputFormatType::DICTIONARY, "dictionary" }
- };
+const Foam::Enum
+<
+ Foam::lumpedPointMovement::outputFormatType
+>
+Foam::lumpedPointMovement::formatNames
+{
+ { outputFormatType::PLAIN, "plain" },
+ { outputFormatType::DICTIONARY, "dictionary" }
+};
const Foam::word
diff --git a/src/lumpedPointMotion/lumpedPointState.C b/src/lumpedPointMotion/lumpedPointState.C
index 511c756697458f335aaf5e722e536a10423b0419..0ef9f5a48fd9b16eb62f56dc81c3650806dc56e8 100644
--- a/src/lumpedPointMotion/lumpedPointState.C
+++ b/src/lumpedPointMotion/lumpedPointState.C
@@ -33,12 +33,15 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-const Foam::Enum<Foam::lumpedPointState::inputFormatType>
- Foam::lumpedPointState::formatNames
- {
- { inputFormatType::PLAIN, "plain" },
- { inputFormatType::DICTIONARY, "dictionary" }
- };
+const Foam::Enum
+<
+ Foam::lumpedPointState::inputFormatType
+>
+Foam::lumpedPointState::formatNames
+{
+ { inputFormatType::PLAIN, "plain" },
+ { inputFormatType::DICTIONARY, "dictionary" }
+};
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
@@ -175,12 +178,12 @@ void Foam::lumpedPointState::relax
if (prev.degrees_)
{
// Was degrees, now radians
- convert = degToRad(1);
+ convert = degToRad();
}
else
{
// Was radians, now degrees
- convert = radToDeg(1);
+ convert = radToDeg();
}
}
diff --git a/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C b/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C
index fd5301739420ba21184512f216c5e1c15bac26b9..04ea707fa81a7effa281fe6290fe8c1af6c51a20 100644
--- a/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C
+++ b/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C
@@ -87,15 +87,14 @@ Foam::autoPtr<Foam::blockEdge> Foam::blockEdge::New
const word edgeType(is);
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(edgeType);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(edgeType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown blockEdge type "
<< edgeType << nl << nl
- << "Valid blockEdge types are" << endl
+ << "Valid blockEdge types :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
diff --git a/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C b/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C
index cec92a091a9c237b46c5f529305362934dcd0c6b..dd194b52c405508f039352731c0c1de5148a3b71 100644
--- a/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C
+++ b/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C
@@ -84,15 +84,14 @@ Foam::autoPtr<Foam::blockFace> Foam::blockFace::New
const word faceType(is);
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(faceType);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(faceType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown blockFace type "
<< faceType << nl << nl
- << "Valid blockFace types are" << endl
+ << "Valid blockFace types :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
diff --git a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
index 3593a69ec8735408ba39cf05f1f48f613f41065d..e40ff63751e2647b744d58f3b0774b6491066c69 100644
--- a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
+++ b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
@@ -78,15 +78,14 @@ Foam::autoPtr<Foam::blockVertex> Foam::blockVertex::New
{
const word faceType(firstToken.wordToken());
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(faceType);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(faceType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown blockVertex type "
<< faceType << nl << nl
- << "Valid blockVertex types are" << endl
+ << "Valid blockVertex types :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
diff --git a/src/mesh/blockMesh/blocks/block/block.C b/src/mesh/blockMesh/blocks/block/block.C
index 96e8c5d4c1077c083da3943bbc2c1f70b94bfc2b..dc842131a281384c66f7ffad3305e6fc3fd26899 100644
--- a/src/mesh/blockMesh/blocks/block/block.C
+++ b/src/mesh/blockMesh/blocks/block/block.C
@@ -78,8 +78,7 @@ Foam::autoPtr<Foam::block> Foam::block::New
const word blockOrCellShapeType(is);
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(blockOrCellShapeType);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(blockOrCellShapeType);
if (!cstrIter.found())
{
diff --git a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C
index 439707ddff573824962e95f80a9f33a211e1642b..0fbd199b7b4c9419b1f237511c5da1fb079f3bd8 100644
--- a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C
+++ b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C
@@ -70,7 +70,7 @@ Foam::Istream& Foam::operator>>(Istream& is, gradingDescriptors& gds)
is.putBack(t);
// Read the list for gradingDescriptors
- is >> static_cast<List<gradingDescriptor>& >(gds);
+ is >> static_cast<List<gradingDescriptor>&>(gds);
// Check state of Istream
is.check(FUNCTION_NAME);
diff --git a/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
index 570a4518d3d7fa32e262b9215270069aba5bc539..a70ba047e33ddc540f087b1dea1e93d945f12844 100644
--- a/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
+++ b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
@@ -36,15 +36,14 @@ Foam::autoPtr<Foam::extrudeModel> Foam::extrudeModel::New
Info<< "Selecting extrudeModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown extrudeModel type "
<< modelType << nl << nl
- << "Valid extrudeModel types are :" << nl
+ << "Valid extrudeModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
index 5b945d5164d5e256fe34aa458be405e666a20cbd..4da5721d72eb8a2e8f318aff0e7f7acf2560a56b 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
@@ -141,8 +141,7 @@ Foam::externalDisplacementMeshMover::New
{
Info<< "Selecting externalDisplacementMeshMover " << type << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(type);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(type);
if (!cstrIter.found())
{
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index d09b9a95dfa6a37886bb3df20547dc8f649aeda8..92eedd79ab043597b4683f1d69c8c4c56938652c 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -63,55 +63,45 @@ License
namespace Foam
{
defineTypeNameAndDebug(meshRefinement, 0);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::meshRefinement::IOdebugType,
- 5
- >::names[] =
- {
- "mesh",
- "intersections",
- "featureSeeds",
- "attraction",
- "layerInfo"
- };
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::meshRefinement::IOoutputType,
- 1
- >::names[] =
- {
- "layerInfo"
- };
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::meshRefinement::IOwriteType,
- 5
- >::names[] =
- {
- "mesh",
- "noRefinement",
- "scalarLevels",
- "layerSets",
- "layerFields"
- };
-
}
-const Foam::NamedEnum<Foam::meshRefinement::IOdebugType, 5>
-Foam::meshRefinement::IOdebugTypeNames;
-const Foam::NamedEnum<Foam::meshRefinement::IOoutputType, 1>
-Foam::meshRefinement::IOoutputTypeNames;
+const Foam::Enum
+<
+ Foam::meshRefinement::debugType
+>
+Foam::meshRefinement::debugTypeNames
+{
+ { debugType::MESH, "mesh" },
+ { debugType::OBJINTERSECTIONS, "intersections" },
+ { debugType::FEATURESEEDS, "featureSeeds" },
+ { debugType::ATTRACTION, "attraction" },
+ { debugType::LAYERINFO, "layerInfo" },
+};
+
+
+const Foam::Enum
+<
+ Foam::meshRefinement::outputType
+>
+Foam::meshRefinement::outputTypeNames
+{
+ { outputType::OUTPUTLAYERINFO, "layerInfo" }
+};
+
-const Foam::NamedEnum<Foam::meshRefinement::IOwriteType, 5>
-Foam::meshRefinement::IOwriteTypeNames;
+const Foam::Enum
+<
+ Foam::meshRefinement::writeType
+>
+Foam::meshRefinement::writeTypeNames
+{
+ { writeType::WRITEMESH, "mesh" },
+ { writeType::NOWRITEREFINEMENT, "noRefinement" },
+ { writeType::WRITELEVELS, "scalarLevels" },
+ { writeType::WRITELAYERSETS, "layerSets" },
+ { writeType::WRITELAYERFIELDS, "layerFields" },
+};
Foam::meshRefinement::writeType Foam::meshRefinement::writeLevel_;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index 3500a3aef13090a724d6d8a2d57607249757e7e7..f0a9af23d1f31d5348ffd085c2105d00b7807ce6 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -82,64 +82,43 @@ class snapParameters;
class meshRefinement
{
-
public:
// Public data types
- //- Enumeration for what to debug
- enum IOdebugType
- {
- IOMESH,
- IOOBJINTERSECTIONS,
- IOFEATURESEEDS,
- IOATTRACTION,
- IOLAYERINFO
- };
-
- static const NamedEnum<IOdebugType, 5> IOdebugTypeNames;
+ //- Enumeration for what to debug. Used as a bit-pattern.
enum debugType
{
- MESH = 1<<IOMESH,
- OBJINTERSECTIONS = 1<<IOOBJINTERSECTIONS,
- FEATURESEEDS = 1<<IOFEATURESEEDS,
- ATTRACTION = 1<< IOATTRACTION,
- LAYERINFO = 1<<IOLAYERINFO
+ MESH = (1 << 0),
+ OBJINTERSECTIONS = (1 << 1),
+ FEATURESEEDS = (1 << 2),
+ ATTRACTION = (1 << 3),
+ LAYERINFO = (1 << 4)
};
- //- Enumeration for what to output
- enum IOoutputType
- {
- IOOUTPUTLAYERINFO
- };
+ static const Enum<debugType> debugTypeNames;
- static const NamedEnum<IOoutputType, 1> IOoutputTypeNames;
+ //- Enumeration for what to output. Used as a bit-pattern.
enum outputType
{
- OUTPUTLAYERINFO = 1<<IOOUTPUTLAYERINFO
+ OUTPUTLAYERINFO = (1 << 0)
};
- //- Enumeration for what to write
- enum IOwriteType
- {
- IOWRITEMESH,
- IONOWRITEREFINEMENT,
- IOWRITELEVELS,
- IOWRITELAYERSETS,
- IOWRITELAYERFIELDS
- };
+ static const Enum<outputType> outputTypeNames;
- static const NamedEnum<IOwriteType, 5> IOwriteTypeNames;
+ //- Enumeration for what to write. Used as a bit-pattern.
enum writeType
{
- WRITEMESH = 1<<IOWRITEMESH,
- NOWRITEREFINEMENT = 1<<IONOWRITEREFINEMENT,
- WRITELEVELS = 1<<IOWRITELEVELS,
- WRITELAYERSETS = 1<<IOWRITELAYERSETS,
- WRITELAYERFIELDS = 1<<IOWRITELAYERFIELDS
+ WRITEMESH = (1 << 0),
+ NOWRITEREFINEMENT = (1 << 1),
+ WRITELEVELS = (1 << 2),
+ WRITELAYERSETS = (1 << 3),
+ WRITELAYERFIELDS = (1 << 4)
};
- //- Enumeration for how the userdata is to be mapped upon refinement.
+ static const Enum<writeType> writeTypeNames;
+
+ //- Enumeration for how userdata is to be mapped upon refinement.
enum mapType
{
MASTERONLY = 1, //!< maintain master only
@@ -1476,10 +1455,13 @@ public:
static void outputLevel(const outputType);
- //- Helper: convert wordList into bit pattern using provided
- // NamedEnum
- template<class Enum>
- static int readFlags(const Enum& namedEnum, const wordList&);
+ //- Helper: convert wordList into bit pattern using provided Enum
+ template<class EnumContainer>
+ static int readFlags
+ (
+ const EnumContainer& namedEnum,
+ const wordList& words
+ );
};
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index cae319df792425f4efdac6a93c0e832b6c6364a3..931501b342d5a485b24c61240160a582730573b6 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -148,14 +148,14 @@ Foam::label Foam::meshRefinement::createBaffle
// {
// return true;
// }
-// else if (mag(n1&n2) > cos(degToRad(30)))
+// else if (mag(n1&n2) > cos(30.0_deg))
// {
// // Both normals aligned. Check that test vector perpendicularish to
// // surface normal
// scalar magTestDir = mag(testDir);
// if (magTestDir > VSMALL)
// {
-// if (mag(n1&(testDir/magTestDir)) < cos(degToRad(45)))
+// if (mag(n1&(testDir/magTestDir)) < cos(45.0_deg))
// {
// //Pout<< "** disabling baffling face "
// // << mesh_.faceCentres()[faceI] << endl;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
index d7b175703b225756de5a4496a00a2fcc4595c128..6b301662ee3136b3d471f9e9d6c3ca1440462822 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
@@ -526,7 +526,7 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement
// const indexedOctree<treeDataTriSurface>& tree = s.tree();
//
//
-// const scalar searchCos(Foam::cos(degToRad(30)));
+// const scalar searchCos = Foam::cos(30.0_deg);
//
// // Normals for ray shooting and inside/outside detection
// vectorField nearNormal;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index c9dba90ec094ae0bbdd49209a30caceff50065b2..f46eaf6ca8395e7f2fb4c9a797ba12ea143270a1 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -1632,7 +1632,7 @@ bool Foam::meshRefinement::isNormalGap
d /= magD;
// Check average normal with respect to intersection locations
- if (mag(avg&d) > Foam::cos(degToRad(45)))
+ if (mag(avg&d) > Foam::cos(45.0_deg))
{
return true;
}
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
index 64a59adea491c5f9d6e8224ef256c296edcbe457..ceaf09f50c4aa8ca18ca67d8fdce7159645525eb 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -252,21 +252,20 @@ void Foam::meshRefinement::reorderPatchFields
}
-template<class Enum>
+template<class EnumContainer>
int Foam::meshRefinement::readFlags
(
- const Enum& namedEnum,
+ const EnumContainer& namedEnum,
const wordList& words
)
{
int flags = 0;
- forAll(words, i)
+ for (const word& w : words)
{
- int index = namedEnum[words[i]];
- int val = 1<<index;
- flags |= val;
+ flags |= namedEnum[w];
}
+
return flags;
}
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
index 2e1fb9541125dcf14cd5302de1195b183dd6c856..d65d7e0eac8a01d194aa8f7d1404e3606df7342a 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C
@@ -31,41 +31,29 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::surfaceZonesInfo::areaSelectionAlgo
+>
+Foam::surfaceZonesInfo::areaSelectionAlgoNames
{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::surfaceZonesInfo::areaSelectionAlgo,
- 4
- >::names[] =
- {
- "inside",
- "outside",
- "insidePoint",
- "none"
- };
-}
-const Foam::NamedEnum<Foam::surfaceZonesInfo::areaSelectionAlgo, 4>
- Foam::surfaceZonesInfo::areaSelectionAlgoNames;
-
-
-namespace Foam
+ { areaSelectionAlgo::INSIDE, "inside" },
+ { areaSelectionAlgo::OUTSIDE, "outside" },
+ { areaSelectionAlgo::INSIDEPOINT, "insidePoint" },
+ { areaSelectionAlgo::NONE, "none" },
+};
+
+
+const Foam::Enum
+<
+ Foam::surfaceZonesInfo::faceZoneType
+>
+Foam::surfaceZonesInfo::faceZoneTypeNames
{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::surfaceZonesInfo::faceZoneType,
- 3
- >::names[] =
- {
- "internal",
- "baffle",
- "boundary"
- };
-}
-const Foam::NamedEnum<Foam::surfaceZonesInfo::faceZoneType, 3>
- Foam::surfaceZonesInfo::faceZoneTypeNames;
+ { faceZoneType::INTERNAL, "internal" },
+ { faceZoneType::BAFFLE, "baffle" },
+ { faceZoneType::BOUNDARY, "boundary" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
index a6af0f24113f74154cbf7b0dd73f9833a77c9e61..c99c7251ed8dd9d393edf4adfa1ef0a72add8faf 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
@@ -34,7 +34,7 @@ SourceFiles
#ifndef surfaceZonesInfo_H
#define surfaceZonesInfo_H
-#include "NamedEnum.H"
+#include "Enum.H"
#include "point.H"
#include "word.H"
#include "PtrList.H"
@@ -68,7 +68,7 @@ public:
NONE
};
- static const NamedEnum<areaSelectionAlgo, 4> areaSelectionAlgoNames;
+ static const Enum<areaSelectionAlgo> areaSelectionAlgoNames;
//- What to do with faceZone faces
enum faceZoneType
@@ -78,7 +78,7 @@ public:
BOUNDARY
};
- static const NamedEnum<faceZoneType, 3> faceZoneTypeNames;
+ static const Enum<faceZoneType> faceZoneTypeNames;
private:
diff --git a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
index 768618bf5e0aa399c0d192d08331f48b3db3c45e..1e2999a155cd85702162beffc1ee339cd8848341 100644
--- a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
+++ b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
@@ -35,25 +35,17 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-template<>
-const char*
-NamedEnum<shellSurfaces::refineMode, 3>::
-names[] =
+const Foam::Enum
+<
+ Foam::shellSurfaces::refineMode
+>
+Foam::shellSurfaces::refineModeNames_
{
- "inside",
- "outside",
- "distance"
+ { refineMode::INSIDE, "inside" },
+ { refineMode::OUTSIDE, "outside" },
+ { refineMode::DISTANCE, "distance" },
};
-const NamedEnum<shellSurfaces::refineMode, 3> shellSurfaces::refineModeNames_;
-
-} // End namespace Foam
-
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -617,7 +609,7 @@ Foam::shellSurfaces::shellSurfaces
unmatchedKeys.erase(ePtr->keyword());
shells_[shellI] = geomI;
- modes_[shellI] = refineModeNames_.read(dict.lookup("mode"));
+ modes_[shellI] = refineModeNames_.lookup("mode", dict);
// Read pairs of distance+level
setAndCheckLevels(shellI, dict.lookup("levels"));
diff --git a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
index 2b3c5b3df6aef1d6e3b9e685e044002ca785a07b..93ff45b52e6909183f780280bf8410c0862c8993 100644
--- a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
+++ b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H
@@ -37,6 +37,7 @@ SourceFiles
#define shellSurfaces_H
#include "searchableSurface.H"
+#include "Enum.H"
#include "Tuple2.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -97,7 +98,7 @@ private:
// Private data
//- refineMode names
- static const NamedEnum<refineMode, 3> refineModeNames_;
+ static const Enum<refineMode> refineModeNames_;
// Private Member Functions
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index 05adb3e125063a55f32e26afdcf448d0f79ee98b..140b4f0c2db430376bae5fe8f3ab89779da4fa83 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -1134,7 +1134,7 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
// }
//}
- const scalar oppositeCos = Foam::cos(Foam::degToRad(135));
+ const scalar oppositeCos = Foam::cos(135.0_deg);
forAllConstIter(cellSet, transitionCells, iter)
{
@@ -1861,8 +1861,8 @@ void Foam::snappyRefineDriver::mergePatchFaces
{
meshRefiner_.mergePatchFacesUndo
(
- Foam::cos(degToRad(45.0)),
- Foam::cos(degToRad(45.0)),
+ Foam::cos(45.0_deg),
+ Foam::cos(45.0_deg),
meshRefiner_.meshedPatches(),
motionDict,
labelList(mesh.nFaces(), -1)
@@ -1873,8 +1873,8 @@ void Foam::snappyRefineDriver::mergePatchFaces
// Still merge refined boundary faces if all four are on same patch
meshRefiner_.mergePatchFaces
(
- Foam::cos(degToRad(45.0)),
- Foam::cos(degToRad(45.0)),
+ Foam::cos(45.0_deg),
+ Foam::cos(45.0_deg),
4, // only merge faces split into 4
meshRefiner_.meshedPatches()
);
@@ -1885,7 +1885,7 @@ void Foam::snappyRefineDriver::mergePatchFaces
meshRefiner_.checkData();
}
- meshRefiner_.mergeEdgesUndo(Foam::cos(degToRad(45.0)), motionDict);
+ meshRefiner_.mergeEdgesUndo(Foam::cos(45.0_deg), motionDict);
if (debug)
{
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 1e5552f4d14ad90e8d8a1a28b5920cdd078fc5c6..39a637d84c66f23a13aa0c82258df7936736c16d 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -1117,7 +1117,7 @@ void Foam::snappySnapDriver::detectNearSurfaces
//// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//
//{
- // const scalar cos45 = Foam::cos(degToRad(45));
+ // const scalar cos45 = Foam::cos(45.0_deg);
// vector n(cos45, cos45, cos45);
// n /= mag(n);
//
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 2846704f8013072ea36ba45ba6851759c4d9d301..8f9ec62cc7528cad0edbe6e252d2df6b5d9038b4 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -2839,7 +2839,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
// Detect baffle edges. Assume initial mesh will have 0,90 or 180
// (baffle) degree angles so smoothing should make 0,90
// to be less than 90. Choose reasonable value
- const scalar baffleFeatureCos = Foam::cos(degToRad(110));
+ const scalar baffleFeatureCos = Foam::cos(110.0_deg);
autoPtr<OBJstream> baffleEdgeStr;
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index ad1df281542465cd3f4038deefaf39dddaa340b9..6253c95f9be1669907b9017fdae5a86529abedc3 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -83,18 +83,13 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::wordTointerpolationMethod
{
interpolationMethod method = imDirect;
- wordList methods
- (
- IStringStream
- (
- "("
- "directAMI "
- "mapNearestAMI "
- "faceAreaWeightAMI "
- "partialFaceAreaWeightAMI"
- ")"
- )()
- );
+ const wordList methods
+ {
+ "directAMI",
+ "mapNearestAMI",
+ "faceAreaWeightAMI",
+ "partialFaceAreaWeightAMI"
+ };
if (im == "directAMI")
{
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
index 76b39fa700c495041e358e677a0b4126181b27e6..9511881b8a6c5de535168209590ed717ee60d457 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
@@ -301,7 +301,7 @@ void Foam::AMIMethod<SourcePatch, TargetPatch>::appendNbrFaces
scalar cosI = n1 & n2;
- if (cosI > Foam::cos(degToRad(89.0)))
+ if (cosI > Foam::cos(89.0_deg))
{
faceIDs.append(nbrFacei);
}
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
index c43a03c950c184c54975943071adfb2cef436014..840cbdb9ce29a1a3d2a5bc2cd5a0d4d6b2f93274 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
@@ -44,16 +44,16 @@ Foam::AMIMethod<SourcePatch, TargetPatch>::New
Info<< "Selecting AMIMethod " << methodName << endl;
}
- typename componentsConstructorTable::iterator cstrIter =
- componentsConstructorTablePtr_->find(methodName);
+ auto cstrIter = componentsConstructorTablePtr_->cfind(methodName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown AMIMethod type "
<< methodName << nl << nl
- << "Valid AMIMethod types are:" << nl
- << componentsConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Valid AMIMethod types:" << nl
+ << componentsConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<AMIMethod<SourcePatch, TargetPatch>>
diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
index 617a85a0a080e166acd08e4258297a153368f523..4d215af6de3a37fa4ca1054a0d9a2416040ba1b1 100644
--- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
+++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
@@ -27,21 +27,19 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::faceAreaIntersect::triangulationMode
+>
+Foam::faceAreaIntersect::triangulationModeNames_
{
- template<>
- const char* NamedEnum<faceAreaIntersect::triangulationMode, 2>::names[] =
- {
- "fan",
- "mesh"
- };
-}
-
-const Foam::NamedEnum<Foam::faceAreaIntersect::triangulationMode, 2>
- Foam::faceAreaIntersect::triangulationModeNames_;
+ { triangulationMode::tmFan, "fan" },
+ { triangulationMode::tmMesh, "mesh" },
+};
Foam::scalar Foam::faceAreaIntersect::tol = 1e-6;
+
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
void Foam::faceAreaIntersect::triSliceWithPlane
diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
index 8b44fd5c8284328adc4a9e133a4875e8f6dbd3b2..450d343d644fb32733831a747746668e2c5f6e4b 100644
--- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
+++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
@@ -42,7 +42,7 @@ SourceFiles
#include "plane.H"
#include "face.H"
#include "triPoints.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -63,7 +63,7 @@ public:
tmMesh
};
- static const NamedEnum<triangulationMode, 2> triangulationModeNames_;
+ static const Enum<triangulationMode> triangulationModeNames_;
private:
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
index feb473421cf83a52549f9fb373ae609621f332f6..a1e939abad048d9783b563567dcd66d091f1a947 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
@@ -42,7 +42,7 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
{
FatalIOErrorInFunction(dict)
<< "Unknown coordinateRotation type " << rotType << nl << nl
- << "Valid coordinateRotation types are :" << nl
+ << "Valid coordinateRotation types :" << nl
<< objectRegistryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
@@ -64,7 +64,7 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
{
FatalIOErrorInFunction(dict)
<< "Unknown coordinateRotation type " << rotType << nl << nl
- << "Valid coordinateRotation types are :" << nl
+ << "Valid coordinateRotation types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
index 3ebc07d442f4c6cb88cbfa4c310135e21fa67653..481f15f71bf40ac00b90da5b7a63146fb4f8f8bf 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
@@ -113,12 +113,12 @@ Foam::cylindrical::cylindrical(const tensorField& R)
Foam::cylindrical::cylindrical(const dictionary& dict)
:
Rptr_(),
- origin_(),
- e3_()
+ origin_(Zero),
+ e3_(Zero)
{
FatalErrorInFunction
<< " cylindrical can not be constructed from dictionary "
- << " use the construtctor : "
+ << " use the constructor : "
"("
" const dictionary&, const objectRegistry&"
")"
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
index 2baca6682cb40efa323b9ea43affbede922cd8a3..b8502d8aabf99a5048048048625e9cfe80854eeb 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
@@ -69,7 +69,7 @@ class cylindrical
{
// Private data
- //- AutoPtr to transformation tensor
+ //- An autoPtr to the transformation tensor
autoPtr<tensorField> Rptr_;
//- Origin of the coordinate system
diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C
index bb4b860e86b3a1f18a5096ad1a26469a57741b11..486a12bc8901c69c0fe77cb77a67588fac92c973 100644
--- a/src/meshTools/coordinateSystems/coordinateSystemNew.C
+++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C
@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
dict
) << "Unknown coordinateSystem type "
<< coordType << nl << nl
- << "Valid coordinateSystem types are :" << nl
+ << "Valid coordinateSystem types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/meshTools/edgeMesh/edgeMeshIO.C b/src/meshTools/edgeMesh/edgeMeshIO.C
index a187cb2d6c24eeaac1f47de3bc9352bd7c99241e..f04f03456fac7aa661e6d456c5454fc243c129a0 100644
--- a/src/meshTools/edgeMesh/edgeMeshIO.C
+++ b/src/meshTools/edgeMesh/edgeMeshIO.C
@@ -96,14 +96,13 @@ void Foam::edgeMesh::write
const word ext = name.ext();
- writefileExtensionMemberFunctionTable::iterator mfIter =
- writefileExtensionMemberFunctionTablePtr_->find(ext);
+ auto mfIter = writefileExtensionMemberFunctionTablePtr_->cfind(ext);
if (!mfIter.found())
{
FatalErrorInFunction
<< "Unknown file extension " << ext << nl << nl
- << "Valid types are :" << endl
+ << "Valid types :" << endl
<< writefileExtensionMemberFunctionTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/meshTools/edgeMesh/edgeMeshNew.C b/src/meshTools/edgeMesh/edgeMeshNew.C
index fa488d6f556cb196298103f338562d6767732e93..60ed8096e9c344ea501bad9a1bcaf71c5e6b67d5 100644
--- a/src/meshTools/edgeMesh/edgeMeshNew.C
+++ b/src/meshTools/edgeMesh/edgeMeshNew.C
@@ -33,15 +33,14 @@ Foam::autoPtr<Foam::edgeMesh> Foam::edgeMesh::New
const word& ext
)
{
- fileExtensionConstructorTable::iterator cstrIter =
- fileExtensionConstructorTablePtr_->find(ext);
+ auto cstrIter = fileExtensionConstructorTablePtr_->cfind(ext);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown file extension " << ext
<< " for file " << name << nl << nl
- << "Valid extensions are :" << nl
+ << "Valid extensions :" << nl
<< fileExtensionConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index 24c13c35594c8f6a4e813954dd9ebde87b7be292..43adc8695d8f63505fc8640b8888c7b6f25366d6 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -40,60 +40,52 @@ License
namespace Foam
{
defineTypeNameAndDebug(extendedEdgeMesh, 0);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::extendedEdgeMesh::pointStatus,
- 4
- >::names[] =
- {
- "convex",
- "concave",
- "mixed",
- "nonFeature"
- };
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::extendedEdgeMesh::edgeStatus,
- 6
- >::names[] =
- {
- "external",
- "internal",
- "flat",
- "open",
- "multiple",
- "none"
- };
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::extendedEdgeMesh::sideVolumeType,
- 4
- >::names[] =
- {
- "inside",
- "outside",
- "both",
- "neither"
- };
}
-const Foam::NamedEnum<Foam::extendedEdgeMesh::pointStatus, 4>
- Foam::extendedEdgeMesh::pointStatusNames_;
-const Foam::NamedEnum<Foam::extendedEdgeMesh::edgeStatus, 6>
- Foam::extendedEdgeMesh::edgeStatusNames_;
+const Foam::Enum
+<
+ Foam::extendedEdgeMesh::pointStatus
+>
+Foam::extendedEdgeMesh::pointStatusNames_
+{
+ { pointStatus::CONVEX, "convex" },
+ { pointStatus::CONCAVE, "concave" },
+ { pointStatus::MIXED, "mixed" },
+ { pointStatus::NONFEATURE, "nonFeature" },
+};
+
+
+const Foam::Enum
+<
+ Foam::extendedEdgeMesh::edgeStatus
+>
+Foam::extendedEdgeMesh::edgeStatusNames_
+{
+ { edgeStatus::EXTERNAL, "external" },
+ { edgeStatus::INTERNAL, "internal" },
+ { edgeStatus::FLAT, "flat" },
+ { edgeStatus::OPEN, "open" },
+ { edgeStatus::MULTIPLE, "multiple" },
+ { edgeStatus::NONE, "none" },
+
+};
+
+
+const Foam::Enum
+<
+ Foam::extendedEdgeMesh::sideVolumeType
+>
+Foam::extendedEdgeMesh::sideVolumeTypeNames_
+{
+ { sideVolumeType::INSIDE, "inside" },
+ { sideVolumeType::OUTSIDE, "outside" },
+ { sideVolumeType::BOTH, "both" },
+ { sideVolumeType::NEITHER, "neither" },
+};
-const Foam::NamedEnum<Foam::extendedEdgeMesh::sideVolumeType, 4>
- Foam::extendedEdgeMesh::sideVolumeTypeNames_;
-Foam::scalar Foam::extendedEdgeMesh::cosNormalAngleTol_ =
- Foam::cos(degToRad(0.1));
+Foam::scalar Foam::extendedEdgeMesh::cosNormalAngleTol_ = Foam::cos(0.1_deg);
Foam::label Foam::extendedEdgeMesh::convexStart_ = 0;
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index 71a4b8177956ce89717000e58253504985d8fb97..649d7d6b134ee9aa68879a83c5e54ea70ab0078f 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
@@ -100,7 +100,7 @@ public:
NONFEATURE //!< Not a feature point
};
- static const Foam::NamedEnum<pointStatus, 4> pointStatusNames_;
+ static const Enum<pointStatus> pointStatusNames_;
enum edgeStatus
{
@@ -112,7 +112,7 @@ public:
NONE //!< Unclassified (consistency with surfaceFeatures)
};
- static const Foam::NamedEnum<edgeStatus, 6> edgeStatusNames_;
+ static const Enum<edgeStatus> edgeStatusNames_;
//- Normals point to the outside
enum sideVolumeType
@@ -123,7 +123,7 @@ public:
NEITHER = 3 //!< not sure when this may be used
};
- static const Foam::NamedEnum<sideVolumeType, 4> sideVolumeTypeNames_;
+ static const Enum<sideVolumeType> sideVolumeTypeNames_;
//- Angular closeness tolerance for treating normals as the same
static scalar cosNormalAngleTol_;
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C
index c960f1037052371d406f3c89465f79c16de8f83f..b83678f40ba892fcdd15a6d25a38a5dc94e91a17 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C
@@ -42,15 +42,14 @@ Foam::autoPtr<Foam::extendedEdgeMesh> Foam::extendedEdgeMesh::New
const word& ext
)
{
- fileExtensionConstructorTable::iterator cstrIter =
- fileExtensionConstructorTablePtr_->find(ext);
+ auto cstrIter = fileExtensionConstructorTablePtr_->cfind(ext);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown file extension " << ext
<< " for file " << name << nl << nl
- << "Valid extensions are :" << nl
+ << "Valid extensions :" << nl
<< fileExtensionConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index ac6be7983dea5bccb7d1745be44b25d05fa0af97..6f114e545b3fc11c9be299bb8b50a64727df7fdf 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -48,41 +48,34 @@ License
namespace Foam
{
defineTypeNameAndDebug(mappedPatchBase, 0);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::mappedPatchBase::sampleMode,
- 6
- >::names[] =
- {
- "nearestCell",
- "nearestPatchFace",
- "nearestPatchFaceAMI",
- "nearestPatchPoint",
- "nearestFace",
- "nearestOnlyCell"
- };
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::mappedPatchBase::offsetMode,
- 3
- >::names[] =
- {
- "uniform",
- "nonuniform",
- "normal"
- };
}
-const Foam::NamedEnum<Foam::mappedPatchBase::sampleMode, 6>
- Foam::mappedPatchBase::sampleModeNames_;
-
-const Foam::NamedEnum<Foam::mappedPatchBase::offsetMode, 3>
- Foam::mappedPatchBase::offsetModeNames_;
+const Foam::Enum
+<
+ Foam::mappedPatchBase::sampleMode
+>
+Foam::mappedPatchBase::sampleModeNames_
+{
+ { sampleMode::NEARESTCELL, "nearestCell" },
+ { sampleMode::NEARESTPATCHFACE, "nearestPatchFace" },
+ { sampleMode::NEARESTPATCHFACEAMI, "nearestPatchFaceAMI" },
+ { sampleMode::NEARESTPATCHPOINT, "nearestPatchPoint" },
+ { sampleMode::NEARESTFACE, "nearestFace" },
+ { sampleMode::NEARESTONLYCELL, "nearestOnlyCell" },
+};
+
+
+const Foam::Enum
+<
+ Foam::mappedPatchBase::offsetMode
+>
+Foam::mappedPatchBase::offsetModeNames_
+{
+ { offsetMode::UNIFORM, "uniform" },
+ { offsetMode::NONUNIFORM, "nonuniform" },
+ { offsetMode::NORMAL, "normal" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -1042,7 +1035,7 @@ Foam::mappedPatchBase::mappedPatchBase
:
patch_(pp),
sampleRegion_(dict.lookupOrDefault<word>("sampleRegion", "")),
- mode_(sampleModeNames_.read(dict.lookup("sampleMode"))),
+ mode_(sampleModeNames_.lookup("sampleMode", dict)),
samplePatch_(dict.lookupOrDefault<word>("samplePatch", "")),
coupleGroup_(dict),
offsetMode_(UNIFORM),
@@ -1068,7 +1061,7 @@ Foam::mappedPatchBase::mappedPatchBase
if (dict.found("offsetMode"))
{
- offsetMode_ = offsetModeNames_.read(dict.lookup("offsetMode"));
+ offsetMode_ = offsetModeNames_.lookup("offsetMode", dict);
switch (offsetMode_)
{
@@ -1387,17 +1380,14 @@ Foam::pointIndexHit Foam::mappedPatchBase::facePoint
void Foam::mappedPatchBase::write(Ostream& os) const
{
- os.writeKeyword("sampleMode") << sampleModeNames_[mode_]
- << token::END_STATEMENT << nl;
+ os.writeEntry("sampleMode", sampleModeNames_[mode_]);
if (!sampleRegion_.empty())
{
- os.writeKeyword("sampleRegion") << sampleRegion_
- << token::END_STATEMENT << nl;
+ os.writeEntry("sampleRegion", sampleRegion_);
}
if (!samplePatch_.empty())
{
- os.writeKeyword("samplePatch") << samplePatch_
- << token::END_STATEMENT << nl;
+ os.writeEntry("samplePatch", samplePatch_);
}
coupleGroup_.write(os);
@@ -1412,15 +1402,13 @@ void Foam::mappedPatchBase::write(Ostream& os) const
}
else
{
- os.writeKeyword("offsetMode") << offsetModeNames_[offsetMode_]
- << token::END_STATEMENT << nl;
+ os.writeEntry("offsetMode", offsetModeNames_[offsetMode_]);
switch (offsetMode_)
{
case UNIFORM:
{
- os.writeKeyword("offset") << offset_ << token::END_STATEMENT
- << nl;
+ os.writeEntry("offset", offset_);
break;
}
case NONUNIFORM:
@@ -1430,8 +1418,7 @@ void Foam::mappedPatchBase::write(Ostream& os) const
}
case NORMAL:
{
- os.writeKeyword("distance") << distance_ << token::END_STATEMENT
- << nl;
+ os.writeEntry("distance", distance_);
break;
}
}
@@ -1440,8 +1427,7 @@ void Foam::mappedPatchBase::write(Ostream& os) const
{
if (AMIReverse_)
{
- os.writeKeyword("flipNormals") << AMIReverse_
- << token::END_STATEMENT << nl;
+ os.writeEntry("flipNormals", AMIReverse_);
}
if (!surfDict_.empty())
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
index 1fe40bfc354b4868dd831dfe8de32010b05f3687..3539832918a34d22bdee54ae6fce649abbe8bec6 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
@@ -111,25 +111,25 @@ public:
//- Mesh items to sample
enum sampleMode
{
- NEARESTCELL, // nearest cell containing sample
- NEARESTPATCHFACE, // nearest face on selected patch
- NEARESTPATCHFACEAMI, // nearest patch face + AMI interpolation
- NEARESTPATCHPOINT, // nearest point on selected patch
- NEARESTFACE, // nearest face
- NEARESTONLYCELL // nearest cell (even if not containing cell)
+ NEARESTCELL, //!< nearest cell containing sample
+ NEARESTPATCHFACE, //!< nearest face on selected patch
+ NEARESTPATCHFACEAMI, //!< nearest patch face + AMI interpolation
+ NEARESTPATCHPOINT, //!< nearest point on selected patch
+ NEARESTFACE, //!< nearest face
+ NEARESTONLYCELL //!< nearest cell (even if not containing cell)
};
//- How to project face centres
enum offsetMode
{
- UNIFORM, // single offset vector
- NONUNIFORM, // per-face offset vector
- NORMAL // use face normal + distance
+ UNIFORM, //!< single offset vector
+ NONUNIFORM, //!< per-face offset vector
+ NORMAL //!< use face normal + distance
};
- static const NamedEnum<sampleMode, 6> sampleModeNames_;
+ static const Enum<sampleMode> sampleModeNames_;
- static const NamedEnum<offsetMode, 3> offsetModeNames_;
+ static const Enum<offsetMode> offsetModeNames_;
//- Helper class for finding nearest
diff --git a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.C b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.C
index ac9b9daab0b949ef3b621438451dc3bafbe0b7b4..2b1a224a7585dd793be312c99cd0da658914e1c2 100644
--- a/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.C
+++ b/src/meshTools/searchableSurfaces/searchableSurface/searchableSurface.C
@@ -43,15 +43,14 @@ Foam::autoPtr<Foam::searchableSurface> Foam::searchableSurface::New
const dictionary& dict
)
{
- dictConstructorTable::iterator cstrIter =
- dictConstructorTablePtr_->find(searchableSurfaceType);
+ auto cstrIter = dictConstructorTablePtr_->cfind(searchableSurfaceType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown searchableSurface type " << searchableSurfaceType
- << endl << endl
- << "Valid searchableSurface types : " << endl
+ << "Unknown searchableSurface type "
+ << searchableSurfaceType << nl << nl
+ << "Valid searchableSurface types :" << endl
<< dictConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
index 4fdb93b1b827d069bc5bfb47f9555580351fa01e..5a9b3a3f630224affaa56501b5640827d5a2f6eb 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
@@ -36,19 +36,6 @@ namespace Foam
defineTypeNameAndDebug(faceToCell, 0);
addToRunTimeSelectionTable(topoSetSource, faceToCell, word);
addToRunTimeSelectionTable(topoSetSource, faceToCell, istream);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::faceToCell::faceAction,
- 4
- >::names[] =
- {
- "neighbour",
- "owner",
- "any",
- "all"
- };
}
@@ -60,8 +47,17 @@ Foam::topoSetSource::addToUsageTable Foam::faceToCell::usage_
" of the faces in the faceSet or where all faces are in the faceSet\n\n"
);
-const Foam::NamedEnum<Foam::faceToCell::faceAction, 4>
- Foam::faceToCell::faceActionNames_;
+const Foam::Enum
+<
+ Foam::faceToCell::faceAction
+>
+Foam::faceToCell::faceActionNames_
+{
+ { faceAction::NEIGHBOUR, "neighbour" },
+ { faceAction::OWNER, "owner" },
+ { faceAction::ANY, "any" },
+ { faceAction::ALL, "all" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -175,7 +171,7 @@ Foam::faceToCell::faceToCell
:
topoSetSource(mesh),
setName_(dict.lookup("set")),
- option_(faceActionNames_.read(dict.lookup("option")))
+ option_(faceActionNames_.lookup("option", dict))
{}
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
index 95d856d88a9922667debe269adcee88cdf901d7b..59564ac2a1edf07944474e284f6dd02922e59264 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
@@ -36,7 +36,7 @@ SourceFiles
#define faceToCell_H
#include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -63,7 +63,7 @@ public:
private:
- static const NamedEnum<faceAction, 4> faceActionNames_;
+ static const Enum<faceAction> faceActionNames_;
//- Add usage string
diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
index a9c9158af339e813dfd0ea409f45222d3c5f7924..7640e0519229eaef3e7554e144fc31d02733d8ce 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
@@ -35,17 +35,6 @@ namespace Foam
defineTypeNameAndDebug(faceZoneToCell, 0);
addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, word);
addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, istream);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::faceZoneToCell::faceAction,
- 2
- >::names[] =
- {
- "master",
- "slave"
- };
}
@@ -58,8 +47,15 @@ Foam::topoSetSource::addToUsageTable Foam::faceZoneToCell::usage_
);
-const Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>
- Foam::faceZoneToCell::faceActionNames_;
+const Foam::Enum
+<
+ Foam::faceZoneToCell::faceAction
+>
+Foam::faceZoneToCell::faceActionNames_
+{
+ { faceAction::MASTER, "master" },
+ { faceAction::SLAVE, "slave" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -132,7 +128,7 @@ Foam::faceZoneToCell::faceZoneToCell
:
topoSetSource(mesh),
zoneName_(dict.lookup("name")),
- option_(faceActionNames_.read(dict.lookup("option")))
+ option_(faceActionNames_.lookup("option", dict))
{}
diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
index 50172717a6380f990de223873ee9bbffe7cc6aac..5c8dcb61a5b909e787fa29fc98a1567c90327498 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
@@ -63,7 +63,7 @@ private:
// Private data
- static const NamedEnum<faceAction, 2> faceActionNames_;
+ static const Enum<faceAction> faceActionNames_;
//- Add usage string
static addToUsageTable usage_;
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index 467e894f8cc990b635b30965164d4526091ee1ed..cfafa4d2e7191a614d3049532a9c97d3b21652bb 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -36,17 +36,6 @@ namespace Foam
defineTypeNameAndDebug(pointToCell, 0);
addToRunTimeSelectionTable(topoSetSource, pointToCell, word);
addToRunTimeSelectionTable(topoSetSource, pointToCell, istream);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::pointToCell::pointAction,
- 2
- >::names[] =
- {
- "any",
- "edge"
- };
}
@@ -58,8 +47,15 @@ Foam::topoSetSource::addToUsageTable Foam::pointToCell::usage_
" in the pointSet\n\n"
);
-const Foam::NamedEnum<Foam::pointToCell::pointAction, 2>
- Foam::pointToCell::pointActionNames_;
+const Foam::Enum
+<
+ Foam::pointToCell::pointAction
+>
+Foam::pointToCell::pointActionNames_
+{
+ { pointAction::ANY, "any" },
+ { pointAction::EDGE, "edge" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -132,7 +128,7 @@ Foam::pointToCell::pointToCell
:
topoSetSource(mesh),
setName_(dict.lookup("set")),
- option_(pointActionNames_.read(dict.lookup("option")))
+ option_(pointActionNames_.lookup("option", dict))
{}
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
index 96f02f18bf64c475f8526e82403c45e3b6627ba7..4be629c5d7bd90543a134f2f21a77950c109b38b 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
@@ -36,7 +36,7 @@ SourceFiles
#define pointToCell_H
#include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,7 +65,7 @@ private:
//- Add usage string
static addToUsageTable usage_;
- static const NamedEnum<pointAction, 2> pointActionNames_;
+ static const Enum<pointAction> pointActionNames_;
//- Name of set to use
word setName_;
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
index a6c033a84d391a74ca1f4d14b57552fc19521532..1c1b4bf1744feecf33e94bccc4e9b4d360f345fe 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
@@ -55,7 +55,7 @@ Foam::topoSetSource::addToUsageTable Foam::shapeToCell::usage_
// Angle for polys to be considered splitHexes.
-Foam::scalar Foam::shapeToCell::featureCos = Foam::cos(degToRad(10.0));
+Foam::scalar Foam::shapeToCell::featureCos = Foam::cos(10.0_deg);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
index 64e04fe756375feaa16fb3b774a7e8b7730f00ed..cd5e68520f5fd3fb73f5e3292f1e29f9df5cf689 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
@@ -37,17 +37,6 @@ namespace Foam
defineTypeNameAndDebug(cellToFace, 0);
addToRunTimeSelectionTable(topoSetSource, cellToFace, word);
addToRunTimeSelectionTable(topoSetSource, cellToFace, istream);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::cellToFace::cellAction,
- 2
- >::names[] =
- {
- "all",
- "both"
- };
}
@@ -59,8 +48,15 @@ Foam::topoSetSource::addToUsageTable Foam::cellToFace::usage_
" -both: faces where both neighbours are in the cellSet\n\n"
);
-const Foam::NamedEnum<Foam::cellToFace::cellAction, 2>
- Foam::cellToFace::cellActionNames_;
+const Foam::Enum
+<
+ Foam::cellToFace::cellAction
+>
+Foam::cellToFace::cellActionNames_
+{
+ { cellAction::ALL, "all" },
+ { cellAction::BOTH, "both" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -177,7 +173,7 @@ Foam::cellToFace::cellToFace
:
topoSetSource(mesh),
setName_(dict.lookup("set")),
- option_(cellActionNames_.read(dict.lookup("option")))
+ option_(cellActionNames_.lookup("option", dict))
{}
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
index d49917a63c75e4e49c59edf6ee1c0f2642d31eeb..f0fcca37bf6530dbe060b163ee041c5d7da93998 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
@@ -40,7 +40,7 @@ SourceFiles
#define cellToFace_H
#include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,7 +69,7 @@ private:
//- Add usage string
static addToUsageTable usage_;
- static const NamedEnum<cellAction, 2> cellActionNames_;
+ static const Enum<cellAction> cellActionNames_;
//- Name of set to use
word setName_;
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
index ff2f99c253bd2bce0c6a20058fe96564a12452b0..9891680204523287aa28450eb349845c424989c9 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
@@ -36,7 +36,6 @@ SourceFiles
#define normalToFace_H
#include "topoSetSource.H"
-#include "NamedEnum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index e85becdabb43d904443cf6f8e0079e75631fd046..31e5322a39e28c21d5df2b69e7c2b41aacd8f2de 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -36,18 +36,6 @@ namespace Foam
defineTypeNameAndDebug(pointToFace, 0);
addToRunTimeSelectionTable(topoSetSource, pointToFace, word);
addToRunTimeSelectionTable(topoSetSource, pointToFace, istream);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::pointToFace::pointAction,
- 3
- >::names[] =
- {
- "any",
- "all",
- "edge"
- };
}
@@ -61,8 +49,16 @@ Foam::topoSetSource::addToUsageTable Foam::pointToFace::usage_
" -two consecutive points (an edge) in the pointSet\n\n"
);
-const Foam::NamedEnum<Foam::pointToFace::pointAction, 3>
- Foam::pointToFace::pointActionNames_;
+const Foam::Enum
+<
+ Foam::pointToFace::pointAction
+>
+Foam::pointToFace::pointActionNames_
+{
+ { pointAction::ANY, "any" },
+ { pointAction::ALL, "all" },
+ { pointAction::EDGE, "edge" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -173,7 +169,7 @@ Foam::pointToFace::pointToFace
:
topoSetSource(mesh),
setName_(dict.lookup("set")),
- option_(pointActionNames_.read(dict.lookup("option")))
+ option_(pointActionNames_.lookup("option", dict))
{}
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
index e31bc65086f02e96086085e25bfbe57c778d48ca..03e09a25ddbbf1c43e1d43509d17db4288313590 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
@@ -36,7 +36,7 @@ SourceFiles
#define pointToFace_H
#include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,7 +68,7 @@ private:
//- Add usage string
static addToUsageTable usage_;
- static const NamedEnum<pointAction, 3> pointActionNames_;
+ static const Enum<pointAction> pointActionNames_;
//- Name of set to use
word setName_;
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
index 27d55c7813877068d36659dbcceef7cf3b8cf5a7..244dc1bba1b53e4041abba8689ee425761bc836e 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
@@ -36,16 +36,6 @@ namespace Foam
defineTypeNameAndDebug(cellToPoint, 0);
addToRunTimeSelectionTable(topoSetSource, cellToPoint, word);
addToRunTimeSelectionTable(topoSetSource, cellToPoint, istream);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::cellToPoint::cellAction,
- 1
- >::names[] =
- {
- "all"
- };
}
@@ -56,8 +46,14 @@ Foam::topoSetSource::addToUsageTable Foam::cellToPoint::usage_
" Select all points of cells in the cellSet\n\n"
);
-const Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>
- Foam::cellToPoint::cellActionNames_;
+const Foam::Enum
+<
+ Foam::cellToPoint::cellAction
+>
+Foam::cellToPoint::cellActionNames_
+{
+ { cellAction::ALL, "all" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -111,7 +107,7 @@ Foam::cellToPoint::cellToPoint
:
topoSetSource(mesh),
setName_(dict.lookup("set")),
- option_(cellActionNames_.read(dict.lookup("option")))
+ option_(cellActionNames_.lookup("option", dict))
{}
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
index 5b0e75eb3da429c5a849c05f2a5d68d99b3da325..d19be4f1941fc24fd738c3ce834138fac9dd7698 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
@@ -36,7 +36,7 @@ SourceFiles
#define cellToPoint_H
#include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -64,7 +64,7 @@ private:
//- Add usage string
static addToUsageTable usage_;
- static const NamedEnum<cellAction, 1> cellActionNames_;
+ static const Enum<cellAction> cellActionNames_;
//- Name of set to use
word setName_;
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
index 7b17632b6646d56dc7c50330434f29b169220245..6e8392f885196cab5adfe4e5a282e09af6ec46ce 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
@@ -36,19 +36,8 @@ namespace Foam
defineTypeNameAndDebug(faceToPoint, 0);
addToRunTimeSelectionTable(topoSetSource, faceToPoint, word);
addToRunTimeSelectionTable(topoSetSource, faceToPoint, istream);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::faceToPoint::faceAction,
- 1
- >::names[] =
- {
- "all"
- };
}
-
Foam::topoSetSource::addToUsageTable Foam::faceToPoint::usage_
(
faceToPoint::typeName,
@@ -56,8 +45,14 @@ Foam::topoSetSource::addToUsageTable Foam::faceToPoint::usage_
" Select all points of faces in the faceSet\n\n"
);
-const Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>
- Foam::faceToPoint::faceActionNames_;
+const Foam::Enum
+<
+ Foam::faceToPoint::faceAction
+>
+Foam::faceToPoint::faceActionNames_
+{
+ { faceAction::ALL, "all" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -105,7 +100,7 @@ Foam::faceToPoint::faceToPoint
:
topoSetSource(mesh),
setName_(dict.lookup("set")),
- option_(faceActionNames_.read(dict.lookup("option")))
+ option_(faceActionNames_.lookup("option", dict))
{}
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
index 6ab5e86b729a1e6a10d4e7cabe807cda2800b03b..99c598e150ec7394e8da12ecb0cdca4d14ca2943 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
@@ -36,7 +36,7 @@ SourceFiles
#define faceToPoint_H
#include "topoSetSource.H"
-#include "NamedEnum.H"
+#include "Enum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -64,7 +64,7 @@ private:
//- Add usage string
static addToUsageTable usage_;
- static const NamedEnum<faceAction, 1> faceActionNames_;
+ static const Enum<faceAction> faceActionNames_;
//- Name of set to use
word setName_;
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C
index b20ddfbd49bd7f69b6306ad95ada79e748d2006d..40c20d21de95516e5e18a8a3ae3bb07a0ac324c8 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.C
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.C
@@ -34,31 +34,27 @@ namespace Foam
defineTypeNameAndDebug(topoSetSource, 0);
defineRunTimeSelectionTable(topoSetSource, word);
defineRunTimeSelectionTable(topoSetSource, istream);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::topoSetSource::setAction,
- 8
- >::names[] =
- {
- "clear",
- "new",
- "invert",
- "add",
- "delete",
- "subset",
- "list",
- "remove"
- };
}
Foam::HashTable<Foam::string>* Foam::topoSetSource::usageTablePtr_ = nullptr;
-const Foam::NamedEnum<Foam::topoSetSource::setAction, 8>
- Foam::topoSetSource::actionNames_;
+const Foam::Enum
+<
+ Foam::topoSetSource::setAction
+>
+Foam::topoSetSource::actionNames_
+{
+ { setAction::CLEAR, "clear" },
+ { setAction::NEW, "new" },
+ { setAction::INVERT, "invert" },
+ { setAction::ADD, "add" },
+ { setAction::DELETE, "delete" },
+ { setAction::SUBSET, "subset" },
+ { setAction::LIST, "list" },
+ { setAction::REMOVE, "remove" },
+};
const Foam::string Foam::topoSetSource::illegalSource_
@@ -77,15 +73,14 @@ Foam::autoPtr<Foam::topoSetSource> Foam::topoSetSource::New
const dictionary& dict
)
{
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(topoSetSourceType);
+ auto cstrIter = wordConstructorTablePtr_->cfind(topoSetSourceType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown topoSetSource type " << topoSetSourceType
- << endl << endl
- << "Valid topoSetSource types : " << endl
+ << "Unknown topoSetSource type "
+ << topoSetSourceType << nl << nl
+ << "Valid topoSetSource types :" << endl
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -101,15 +96,14 @@ Foam::autoPtr<Foam::topoSetSource> Foam::topoSetSource::New
Istream& is
)
{
- istreamConstructorTable::iterator cstrIter =
- istreamConstructorTablePtr_->find(topoSetSourceType);
+ auto cstrIter = istreamConstructorTablePtr_->cfind(topoSetSourceType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown topoSetSource type " << topoSetSourceType
- << endl << endl
- << "Valid topoSetSource types : " << endl
+ << "Unknown topoSetSource type "
+ << topoSetSourceType << nl << nl
+ << "Valid topoSetSource types :" << endl
<< istreamConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/sets/topoSetSource/topoSetSource.H
index 5bef2158195ccd502f2317171b45d92b6b563612..0957df277dc87c6e4273cc364d2c478bc3a52e9a 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.H
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.H
@@ -45,7 +45,7 @@ SourceFiles
#include "typeInfo.H"
#include "runTimeSelectionTables.H"
#include "autoPtr.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "HashTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -132,7 +132,7 @@ protected:
private:
- static const NamedEnum<setAction, 8> actionNames_;
+ static const Enum<setAction> actionNames_;
static const string illegalSource_;
@@ -140,10 +140,10 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
- topoSetSource(const topoSetSource&);
+ topoSetSource(const topoSetSource&) = delete;
//- Disallow default bitwise assignment
- void operator=(const topoSetSource&);
+ void operator=(const topoSetSource&) = delete;
public:
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index ca2e6d7bbc8cc4d4669881d7811f66592598a692..b7e574ddcddd1475eb42d301ee0472454fa8e141 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -51,15 +51,14 @@ Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
writeOption w
)
{
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(setType);
+ auto cstrIter = wordConstructorTablePtr_->cfind(setType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown set type " << setType
- << endl << endl
- << "Valid set types : " << endl
+ << "Unknown set type "
+ << setType << nl << nl
+ << "Valid set types :" << endl
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -77,15 +76,14 @@ Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
writeOption w
)
{
- sizeConstructorTable::iterator cstrIter =
- sizeConstructorTablePtr_->find(setType);
+ auto cstrIter = sizeConstructorTablePtr_->cfind(setType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown set type " << setType
- << endl << endl
- << "Valid set types : " << endl
+ << "Unknown set type "
+ << setType << nl << nl
+ << "Valid set types :" << endl
<< sizeConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -103,15 +101,14 @@ Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
writeOption w
)
{
- setConstructorTable::iterator cstrIter =
- setConstructorTablePtr_->find(setType);
+ auto cstrIter = setConstructorTablePtr_->cfind(setType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown set type " << setType
- << endl << endl
- << "Valid set types : " << endl
+ << "Unknown set type "
+ << setType << nl << nl
+ << "Valid set types :" << endl
<< setConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index 07e5b5cd5130a33131b69d202770e2c6211693e1..b8cc1834247668bba5744ab81856df00986d0d39 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -36,23 +36,19 @@ License
namespace Foam
{
defineTypeNameAndDebug(booleanSurface, 0);
+}
-template<>
-const char* Foam::NamedEnum
+const Foam::Enum
<
- Foam::booleanSurface::booleanOpType,
- 4
->::names[] =
+ Foam::booleanSurface::booleanOpType
+>
+Foam::booleanSurface::booleanOpTypeNames
{
- "union",
- "intersection",
- "difference",
- "all"
+ { booleanOpType::UNION, "union" },
+ { booleanOpType::INTERSECTION, "intersection" },
+ { booleanOpType::DIFFERENCE, "difference" },
+ { booleanOpType::ALL, "all" },
};
-}
-
-const Foam::NamedEnum<Foam::booleanSurface::booleanOpType, 4>
-Foam::booleanSurface::booleanOpTypeNames;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
index 1bc0d0f0592b593071de3dada1445adfe5682404..6b044bacb70d066b982623c4cbdcb659a8bab036 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
@@ -172,7 +172,7 @@ public:
// Static data
- static const NamedEnum<booleanOpType, 4> booleanOpTypeNames;
+ static const Enum<booleanOpType> booleanOpTypeNames;
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index 851898de7e637901c95797808f3b54d51529d3e6..cc77026b9260250858ed23fc249ec3dd785a689f 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -41,10 +41,10 @@ License
namespace Foam
{
defineTypeNameAndDebug(edgeIntersections, 0);
-
-scalar edgeIntersections::alignedCos_ = cos(degToRad(89.0));
}
+Foam::scalar Foam::edgeIntersections::alignedCos_ = Foam::cos(89.0_deg);
+
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 8c552335d462c8f3757de0d7120fa471ae0745d4..c38da917f025972ce9cc66de04903940d0419d51 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -41,7 +41,10 @@ namespace Foam
defineTypeNameAndDebug(surfaceIntersection, 0);
}
-const Foam::Enum<Foam::surfaceIntersection::intersectionType>
+const Foam::Enum
+<
+ Foam::surfaceIntersection::intersectionType
+>
Foam::surfaceIntersection::selfIntersectionNames
{
{ intersectionType::SELF, "self" },
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index c727121a60144f4854e012946b37f35c50500496..a251d856a3eef9813db41c1a616cd397be8571ff 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -41,7 +41,7 @@ namespace Foam
{
defineTypeNameAndDebug(surfaceFeatures, 0);
- const scalar surfaceFeatures::parallelTolerance = sin(degToRad(1.0));
+ const scalar surfaceFeatures::parallelTolerance = sin(1.0_deg);
//! \cond fileScope
diff --git a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
index d40c00877671782dcd92cfd5df4c7c9b75769281..a653f53bae09b1857ec7cc88e5ef3ce80431c5dd 100644
--- a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
+++ b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
@@ -30,11 +30,17 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-const Foam::Enum<Foam::triSurfaceLoader::loadingOption>
+const Foam::Enum
+<
+ Foam::triSurfaceLoader::loadingOption
+>
Foam::triSurfaceLoader::loadingOptionNames
-(
- SINGLE_REGION, { "single", "file", "offset", "merge" }
-);
+{
+ { loadingOption::SINGLE_REGION, "single" },
+ { loadingOption::FILE_REGION, "file" },
+ { loadingOption::OFFSET_REGION, "offset" },
+ { loadingOption::MERGE_REGION, "merge" }
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
index 9ef72576fae0b8de66f4e6218ce6716f43439f4d..8eb4dca33007eb6e061b7479ec4fb364b50cee28 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
@@ -35,22 +35,19 @@ namespace Foam
{
defineTypeNameAndDebug(cellCellStencil, 0);
defineRunTimeSelectionTable(cellCellStencil, mesh);
-
- template<>
- const char* NamedEnum
- <
- cellCellStencil::cellType,
- 3
- >::names[] =
- {
- "calculated",
- "interpolated",
- "hole"
- };
}
-const Foam::NamedEnum<Foam::cellCellStencil::cellType, 3>
-Foam::cellCellStencil::cellTypeNames_;
+const Foam::Enum
+<
+ Foam::cellCellStencil::cellType
+>
+Foam::cellCellStencil::cellTypeNames_
+{
+ { cellType::CALCULATED, "calculated" },
+ { cellType::INTERPOLATED, "interpolated" },
+ { cellType::HOLE, "hole" },
+};
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -71,18 +68,16 @@ Foam::autoPtr<Foam::cellCellStencil> Foam::cellCellStencil::New
InfoInFunction << "Constructing cellCellStencil" << endl;
}
- word type(dict.lookup("method"));
-
+ const word stencilType(dict.lookup("method"));
- meshConstructorTable::iterator cstrIter =
- meshConstructorTablePtr_->find(type);
+ auto cstrIter = meshConstructorTablePtr_->cfind(stencilType);
if (cstrIter == meshConstructorTablePtr_->end())
{
FatalErrorInFunction
<< "Unknown cellCellStencil type "
- << type << nl << nl
- << "Valid cellCellStencil types are" << endl
+ << stencilType << nl << nl
+ << "Valid cellCellStencil types :" << endl
<< meshConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
index 327bce87cf3c1c28f0c9bd0bb6672ee8fde8735c..b46f5339932f504f7e94e431a75ea92cdec9110a 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
@@ -81,7 +81,7 @@ protected:
// Protected data
//- Mode type names
- static const NamedEnum<cellType, 3> cellTypeNames_;
+ static const Enum<cellType> cellTypeNames_;
//- Reference to the mesh
const fvMesh& mesh_;
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C
index 8ede3a729438b2323dbf1fd4498a727e9e7341e2..57ac5fb352c946239ef4e88da3c6380674556fea 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C
@@ -56,15 +56,14 @@ Foam::decompositionConstraint::New
{
Info<< "Selecting decompositionConstraint " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalIOErrorInFunction(dict)
<< "Unknown decompositionConstraint type "
<< modelType << nl << nl
- << "Valid decompositionConstraint types:" << endl
+ << "Valid decompositionConstraint types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index 984851df718c7b9ab96107d1e97aadb720f292ee..a66acf8dbd331f260d3dae05e611261eb531018c 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -180,19 +180,18 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
const dictionary& decompositionDict
)
{
- word methodType(decompositionDict.lookup("method"));
+ const word methodType(decompositionDict.lookup("method"));
Info<< "Selecting decompositionMethod " << methodType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(methodType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown decompositionMethod "
<< methodType << nl << nl
- << "Valid decompositionMethods are : " << endl
+ << "Valid decompositionMethods : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index ae6f0b8c7ab31f26b6da7d09a1a2f5a13e1e85f1..8ceb27f37ccc34a0154eceaf319e17c750e755d6 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -51,23 +51,19 @@ namespace Foam
distributedTriSurfaceMesh,
dict
);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::distributedTriSurfaceMesh::distributionType,
- 3
- >::names[] =
- {
- "follow",
- "independent",
- "frozen"
- };
}
-const Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>
- Foam::distributedTriSurfaceMesh::distributionTypeNames_;
+const Foam::Enum
+<
+ Foam::distributedTriSurfaceMesh::distributionType
+>
+Foam::distributedTriSurfaceMesh::distributionTypeNames_
+{
+ { distributionType::FOLLOW, "follow" },
+ { distributionType::INDEPENDENT, "independent" },
+ { distributionType::FROZEN, "frozen" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -83,7 +79,7 @@ bool Foam::distributedTriSurfaceMesh::read()
Pstream::scatterList(procBb_);
// Distribution type
- distType_ = distributionTypeNames_.read(dict_.lookup("distributionType"));
+ distType_ = distributionTypeNames_.lookup("distributionType", dict_);
// Merge distance
mergeDist_ = readScalar(dict_.lookup("mergeDistance"));
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
index 03451e72e2607b5072a7096bcdf6534faf039314..8294da4a0ca1b72175d4eaa46d95f1ba78e181c2 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
@@ -87,7 +87,7 @@ public:
FROZEN = 2
};
- static const NamedEnum<distributionType, 3> distributionTypeNames_;
+ static const Enum<distributionType> distributionTypeNames_;
private:
diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C
index 72f06f764926b51827022e7dac27afe84bff0343..9ebd3e518b3a6704009d19adc10c11b768012b5e 100644
--- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C
+++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C
@@ -33,15 +33,14 @@ Foam::autoPtr<Foam::noiseModel> Foam::noiseModel::New(const dictionary& dict)
Info<< "Selecting noiseModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown noiseModel type "
<< modelType << nl << nl
- << "Valid noiseModel types are:" << nl
+ << "Valid noiseModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/randomProcesses/windowModels/windowModel/windowModelNew.C b/src/randomProcesses/windowModels/windowModel/windowModelNew.C
index 7b1c8a7e7214e255d12235d581b0c6496e1515af..fad8be3d92411eb748bccad79ac3933b5dd6b963 100644
--- a/src/randomProcesses/windowModels/windowModel/windowModelNew.C
+++ b/src/randomProcesses/windowModels/windowModel/windowModelNew.C
@@ -37,15 +37,14 @@ Foam::autoPtr<Foam::windowModel> Foam::windowModel::New
Info<< "Selecting windowModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown windowModel type "
<< modelType << nl << nl
- << "Valid windowModel types are:" << nl
+ << "Valid windowModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
index 1fcabf5243a53f4b51ee64908704ddc8bbad97ce..b372995659d8cae39ee35d67c69a69de16fc56f7 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -30,27 +30,16 @@ License
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
-namespace Foam
-{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::energyRegionCoupledFvPatchScalarField::kappaMethodType,
- 3
- >::names[] =
- {
- "solid",
- "fluid",
- "undefined"
- };
-}
-
-
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::energyRegionCoupledFvPatchScalarField::kappaMethodType,
- 3
-> Foam::energyRegionCoupledFvPatchScalarField::methodTypeNames_;
+ Foam::energyRegionCoupledFvPatchScalarField::kappaMethodType
+>
+Foam::energyRegionCoupledFvPatchScalarField::methodTypeNames_
+{
+ { kappaMethodType::SOLID, "solid" },
+ { kappaMethodType::FLUID, "fluid" },
+ { kappaMethodType::UNDEFINED, "undefined" },
+};
// * * * * * * * * * * * * * * * * Private members * * * * * * * * * * * * *//
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
index 877d40583de06fc6aaf575a005f3abb42273a753..0aed50e6b70076378b02ce41258c042307d3a3c7 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.H
@@ -41,7 +41,7 @@ SourceFiles
#include "regionCoupledBaseFvPatch.H"
#include "LduInterfaceField.H"
#include "fvPatchField.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "basicThermo.H"
#include "coupledFvPatchField.H"
@@ -77,16 +77,16 @@ private:
//- Local reference to region couple patch
const regionCoupledBaseFvPatch& regionCoupledPatch_;
- //- Methof to extract kappa
- static const NamedEnum<kappaMethodType, 3> methodTypeNames_;
+ //- Method to extract kappa
+ static const Enum<kappaMethodType> methodTypeNames_;
//- How to get K
mutable kappaMethodType method_;
- //- AutoPtr to nbr thermo
+ //- An autoPtr to nbr thermo
mutable const basicThermo* nbrThermoPtr_;
- //- AutoPtr to my thermo
+ //- An autoPtr to my thermo
mutable const basicThermo* thermoPtr_;
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
index 85db5ce6c807270094f52878ccbee47285b4337f..2eb2bf58240d38c96a10fe2c24faa5919b54251d 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
@@ -63,14 +63,14 @@ autoPtr<pyrolysisModel> pyrolysisModel::New
Info<< "Selecting pyrolysisModel " << modelType << endl;
- meshConstructorTable::iterator cstrIter =
- meshConstructorTablePtr_->find(modelType);
+ auto cstrIter = meshConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown pyrolysisModel type " << modelType
- << nl << nl << "Valid pyrolisisModel types are:" << nl
+ << "Unknown pyrolysisModel type "
+ << modelType << nl << nl
+ << "Valid pyrolysisModel types :" << nl
<< meshConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -91,14 +91,14 @@ autoPtr<pyrolysisModel> pyrolysisModel::New
Info<< "Selecting pyrolysisModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown pyrolysisModel type " << modelType
- << nl << nl << "Valid pyrolisisModel types are:" << nl
+ << "Unknown pyrolysisModel type "
+ << modelType << nl << nl
+ << "Valid pyrolysisModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
index 7d585e7e2d72b4593d59d927b3b1b479fb351424..75d1694a71c3780533c92babb88c54554939cb8f 100644
--- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
@@ -39,15 +39,14 @@ Foam::regionModels::regionModelFunctionObject::New
Info<< " " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown region model function type "
<< modelType << nl << nl
- << "Valid region model function types are:" << nl
+ << "Valid region model function types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
index 67baf4f6c1fea15fcd2569929c301ddbe9172378..8b36192035c506f11292e13fe444a930f2625375 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
@@ -46,15 +46,16 @@ autoPtr<filmThermoModel> filmThermoModel::New
Info<< " Selecting filmThermoModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter =
+ dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown filmThermoModel type " << modelType << nl << nl
- << "Valid filmThermoModel types are:" << nl
- << dictionaryConstructorTablePtr_->toc()
+ << "Unknown filmThermoModel type "
+ << modelType << nl << nl
+ << "Valid filmThermoModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
index a138fa6a68895c625316e6c60e54f6a46648b367..a27014fc3feeb4ba1ed90c43528cdceb5a06f654 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
@@ -46,15 +46,15 @@ autoPtr<filmTurbulenceModel> filmTurbulenceModel::New
Info<< " Selecting filmTurbulenceModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown filmTurbulenceModel type " << modelType
- << nl << nl << "Valid filmTurbulenceModel types are:" << nl
- << dictionaryConstructorTablePtr_->toc()
+ << "Unknown filmTurbulenceModel type "
+ << modelType << nl << nl
+ << "Valid filmTurbulenceModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
index 4ce1b6608ded317913b31371d48650c506ea4d4e..4ebc37462a8516e64e5a5e136390fccf0479f09c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
@@ -45,15 +45,14 @@ autoPtr<force> force::New
{
Info<< " " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
- FatalErrorInFunction
- << "Unknown force type " << modelType
- << nl << nl << "Valid force types are:" << nl
- << dictionaryConstructorTablePtr_->toc()
+ FatalErrorInFunction << "Unknown force type "
+ << modelType << nl << nl
+ << "Valid force types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
index b06590a55c4e239ab2e9d2cf2f9780eaae2a1ff7..19d56b4e63012957ed60351365b47f433381a802 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
@@ -45,15 +45,15 @@ autoPtr<injectionModel> injectionModel::New
{
Info<< " " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown injectionModel type " << modelType
- << nl << nl << "Valid injectionModel types are:" << nl
- << dictionaryConstructorTablePtr_->toc()
+ << "Unknown injectionModel type "
+ << modelType << nl << nl
+ << "Valid injectionModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
index 781f1778efb313cd0f6ea3bbd353937f5c4623ac..ef7d7e69d65452fba7d369c73e9629f858f3c062 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
@@ -42,19 +42,19 @@ autoPtr<filmRadiationModel> filmRadiationModel::New
const dictionary& dict
)
{
- word modelType(dict.lookup("radiationModel"));
+ const word modelType(dict.lookup("radiationModel"));
Info<< " Selecting radiationModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown radiationModel type " << modelType << nl << nl
- << "Valid filmRadiationModel types are:" << nl
- << dictionaryConstructorTablePtr_->toc()
+ << "Unknown radiationModel type "
+ << modelType << nl << nl
+ << "Valid filmRadiationModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
index 25be0a0c28dc1bd315b8bd234c9b3d345b7c0183..7e9635a3ac1be9453103ac529ac95e284ee16a97 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
@@ -43,19 +43,19 @@ autoPtr<filmViscosityModel> filmViscosityModel::New
volScalarField& mu
)
{
- word modelType(dict.lookup("filmViscosityModel"));
+ const word modelType(dict.lookup("filmViscosityModel"));
Info<< " Selecting filmViscosityModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown filmViscosityModel type " << modelType
- << nl << nl << "Valid filmViscosityModel types are:" << nl
- << dictionaryConstructorTablePtr_->toc()
+ << "Unknown filmViscosityModel type "
+ << modelType << nl << nl
+ << "Valid filmViscosityModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
index 52b1870390d7047ef97be99fadb8974a0a78ba38..6adfe592473827021b1b6c59b096ccd1126bebcc 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
@@ -42,19 +42,19 @@ autoPtr<heatTransferModel> heatTransferModel::New
const dictionary& dict
)
{
- word modelType(dict.lookup("heatTransferModel"));
+ const word modelType(dict.lookup("heatTransferModel"));
Info<< " Selecting heatTransferModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown heatTransferModel type " << modelType << nl << nl
- << "Valid heatTransferModel types are:" << nl
- << dictionaryConstructorTablePtr_->toc()
+ << "Unknown heatTransferModel type "
+ << modelType << nl << nl
+ << "Valid heatTransferModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
index add63599f3421895b6a0e4963171aba264433ae2..476222fdac81ad5cc0f5b7a0f664f433dd70cf19 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
@@ -42,19 +42,19 @@ autoPtr<phaseChangeModel> phaseChangeModel::New
const dictionary& dict
)
{
- word modelType(dict.lookup("phaseChangeModel"));
+ const word modelType(dict.lookup("phaseChangeModel"));
Info<< " Selecting phaseChangeModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown phaseChangeModel type " << modelType
- << nl << nl << "Valid phaseChangeModel types are:" << nl
- << dictionaryConstructorTablePtr_->toc()
+ << "Unknown phaseChangeModel type "
+ << modelType << nl << nl
+ << "Valid phaseChangeModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
index 9d4360d8ce2617a95fe577a52ea20bc87e5b402d..94628ee4652607530a6afb86f5ef890f246b85f5 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
@@ -44,7 +44,6 @@ SourceFiles
#include "volFieldsFwd.H"
#include "DimensionedField.H"
#include "labelList.H"
-#include "NamedEnum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
index 91b7639d9c00f58e1e553ec926d685dd70a1ceac..e6251116e794c67492269b966dd6b252b6cb3829 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
@@ -66,15 +66,15 @@ autoPtr<surfaceFilmModel> surfaceFilmModel::New
Info<< "Selecting surfaceFilmModel " << modelType << endl;
- meshConstructorTable::iterator cstrIter =
- meshConstructorTablePtr_->find(modelType);
+ auto cstrIter = meshConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown surfaceFilmModel type " << modelType
- << nl << nl << "Valid surfaceFilmModel types are:" << nl
- << meshConstructorTablePtr_->toc()
+ << "Unknown surfaceFilmModel type "
+ << modelType << nl << nl
+ << "Valid surfaceFilmModel types :" << nl
+ << meshConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
index 6a9f88a1f09c564d39b5f5edcf9459c295a4d918..ee6831c9ee4fcc6d8235a4de43371856b38628e0 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
@@ -61,16 +61,15 @@ autoPtr<thermalBaffleModel> thermalBaffleModel::New(const fvMesh& mesh)
);
}
- meshConstructorTable::iterator cstrIter =
- meshConstructorTablePtr_->find(modelType);
+ auto cstrIter = meshConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown thermalBaffleModel type " << modelType
- << nl << nl
- << "Valid thermalBaffleModel types are:" << nl
+ << "Unknown thermalBaffleModel type "
+ << modelType << nl << nl
+ << "Valid thermalBaffleModel types :" << nl
<< meshConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -88,16 +87,14 @@ autoPtr<thermalBaffleModel> thermalBaffleModel::New
word modelType =
dict.lookupOrDefault<word>("thermalBaffleModel", "thermalBaffle");
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
-
FatalErrorInFunction
- << "Unknown thermalBaffleModel type " << modelType
- << nl << nl
- << "Valid thermalBaffleModel types are:" << nl
+ << "Unknown thermalBaffleModel type "
+ << modelType << nl << nl
+ << "Valid thermalBaffleModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
index 8c91320221a3377d64f0569e3c5ea4a77edb4c11..ce5a12d6cf3dc986ebf9da27ccfb5a334d648166 100644
--- a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
+++ b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
@@ -48,8 +48,7 @@ Foam::autoPtr<Foam::renumberMethod> Foam::renumberMethod::New
//Info<< "Selecting renumberMethod " << methodType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(methodType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodType);
if (!cstrIter.found())
{
diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
index 20ba5e14239cc12493295c6c6bf30cb856796cdc..d13772c1000f56a71cc1d7d080624df1c0c95651 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -76,15 +76,14 @@ Foam::autoPtr<Foam::RBD::rigidBody> Foam::RBD::rigidBody::New
{
const word bodyType(dict.lookup("type"));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(bodyType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(bodyType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown rigidBody type "
<< bodyType << nl << nl
- << "Valid rigidBody types are : " << endl
+ << "Valid rigidBody types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/rigidBodyDynamics/joints/joint/joint.C b/src/rigidBodyDynamics/joints/joint/joint.C
index f5a89e9b72019a4520d377562b7cb55481065223..92204ffebd87a192ca78ab91d833632a768123b2 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.C
+++ b/src/rigidBodyDynamics/joints/joint/joint.C
@@ -53,15 +53,14 @@ Foam::autoPtr<Foam::RBD::joint> Foam::RBD::joint::New
{
const word bodyType(dict.lookup("type"));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(bodyType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(bodyType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown joint type "
<< bodyType << nl << nl
- << "Valid joint types are : " << endl
+ << "Valid joint types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C
index ba95967324a7833686d9a41572838e0fd6183a9a..dd2356982a175c70f0feff2557fbd364d568ef8e 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C
@@ -37,15 +37,14 @@ Foam::RBD::restraint::New
{
const word restraintType(dict.lookup("type"));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(restraintType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(restraintType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown restraint type "
<< restraintType << nl << nl
- << "Valid restraint types are : " << endl
+ << "Valid restraint types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C
index 0a24730e7ebd29ebe8a5cc6744def0d7ed26d8db..10909d79fb9e18b7af492b1fec425234cc703c81 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C
@@ -33,19 +33,18 @@ Foam::autoPtr<Foam::RBD::rigidBodySolver> Foam::RBD::rigidBodySolver::New
const dictionary& dict
)
{
- word rigidBodySolverType(dict.lookup("type"));
+ const word solverType(dict.lookup("type"));
- Info<< "Selecting rigidBodySolver " << rigidBodySolverType << endl;
+ Info<< "Selecting rigidBodySolver " << solverType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(rigidBodySolverType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(solverType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown rigidBodySolverType type "
- << rigidBodySolverType << endl << endl
- << "Valid rigidBodySolver types are : " << endl
+ << solverType << nl << nl
+ << "Valid rigidBodySolver types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C
index c315dfc76b7e2b6457dd9b0b45ce3bb6d9bc95d7..d5ae8a9e1ab29dc0bc819c9f20f7837e3156ba7e 100644
--- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C
+++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C
@@ -39,16 +39,16 @@ Foam::autoPtr<Foam::meshToMeshMethod> Foam::meshToMeshMethod::New
Info<< "Selecting AMIMethod " << methodName << endl;
}
- componentsConstructorTable::iterator cstrIter =
- componentsConstructorTablePtr_->find(methodName);
+ auto cstrIter = componentsConstructorTablePtr_->cfind(methodName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown meshToMesh type "
<< methodName << nl << nl
- << "Valid meshToMesh types are:" << nl
- << componentsConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Valid meshToMesh types :" << nl
+ << componentsConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<meshToMeshMethod>(cstrIter()(src, tgt));
diff --git a/src/sampling/meshToMesh/meshToMesh.C b/src/sampling/meshToMesh/meshToMesh.C
index 3ac9607fff03b38202aead924dc51e40be570894..0e39240d435968980fd24efe741ed2cc3d50aaab 100644
--- a/src/sampling/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMesh/meshToMesh.C
@@ -33,23 +33,23 @@ License
namespace Foam
{
defineTypeNameAndDebug(meshToMesh, 0);
+}
+
- template<>
- const char* Foam::NamedEnum
- <
- Foam::meshToMesh::interpolationMethod,
- 4
- >::names[] =
+const Foam::Enum
+<
+ Foam::meshToMesh::interpolationMethod
+>
+Foam::meshToMesh::interpolationMethodNames_
+{
+ { interpolationMethod::imDirect, "direct" },
+ { interpolationMethod::imMapNearest, "mapNearest" },
+ { interpolationMethod::imCellVolumeWeight, "cellVolumeWeight" },
{
- "direct",
- "mapNearest",
- "cellVolumeWeight",
+ interpolationMethod::imCorrectedCellVolumeWeight,
"correctedCellVolumeWeight"
- };
-
- const NamedEnum<meshToMesh::interpolationMethod, 4>
- meshToMesh::interpolationMethodNames_;
-}
+ },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
diff --git a/src/sampling/meshToMesh/meshToMesh.H b/src/sampling/meshToMesh/meshToMesh.H
index 62b5781979ac1f27135f4dd589630fdd015e4958..fb5b4c0d494f201ec533d265d5cd5384aa56ae74 100644
--- a/src/sampling/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMesh/meshToMesh.H
@@ -46,7 +46,7 @@ SourceFiles
#include "treeBoundBox.H"
#include "mapDistribute.H"
#include "volFieldsFwd.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "AMIPatchToPatchInterpolation.H"
#include "pointList.H"
@@ -74,8 +74,7 @@ public:
imCorrectedCellVolumeWeight
};
- static const NamedEnum<interpolationMethod, 4>
- interpolationMethodNames_;
+ static const Enum<interpolationMethod> interpolationMethodNames_;
private:
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index 6e7ad85748521697915a5392fbf0845927ed8b26..78694160f3577a9ec06f99141755a70e2c54949d 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -448,8 +448,7 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
{
const word sampleType(dict.lookup("type"));
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(sampleType);
+ auto cstrIter = wordConstructorTablePtr_->cfind(sampleType);
if (!cstrIter.found())
{
diff --git a/src/sampling/sampledSurface/readers/surfaceReaderNew.C b/src/sampling/sampledSurface/readers/surfaceReaderNew.C
index 9a360611f38a55650086e7f2aae1568051352995..53be1c7a0e7eef8cf70452c1d0f9e3a1f51a2bf1 100644
--- a/src/sampling/sampledSurface/readers/surfaceReaderNew.C
+++ b/src/sampling/sampledSurface/readers/surfaceReaderNew.C
@@ -33,8 +33,7 @@ Foam::autoPtr<Foam::surfaceReader> Foam::surfaceReader::New
const fileName& fName
)
{
- fileNameConstructorTable::iterator cstrIter =
- fileNameConstructorTablePtr_->find(readerType);
+ auto cstrIter = fileNameConstructorTablePtr_->cfind(readerType);
if (!cstrIter.found())
{
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
index b075331031339f79facc888298c84c71e55c1c4b..8082337550fb8f232ee62ab17afcb40ca25883df 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
@@ -61,15 +61,14 @@ Foam::autoPtr<Foam::sampledSurface> Foam::sampledSurface::New
Info<< "Selecting sampledType " << sampleType << endl;
}
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(sampleType);
+ auto cstrIter = wordConstructorTablePtr_->cfind(sampleType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown sample type "
<< sampleType << nl << nl
- << "Valid sample types : " << endl
+ << "Valid sample types :" << endl
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index f79bdf3a6813e971d43a7b452ad5487bf1123afa..50fe214cbe8e4f8cd4894e3c1e8d49b41fb6dca9 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -35,6 +35,18 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+const Foam::Enum
+<
+ Foam::sampledTriSurfaceMesh::samplingSource
+>
+Foam::sampledTriSurfaceMesh::samplingSourceNames_
+{
+ { samplingSource::cells, "cells" },
+ { samplingSource::insideCells, "insideCells" },
+ { samplingSource::boundaryFaces, "boundaryFaces" },
+};
+
+
namespace Foam
{
defineTypeNameAndDebug(sampledTriSurfaceMesh, 0);
@@ -45,18 +57,6 @@ namespace Foam
word
);
- template<>
- const char* NamedEnum<sampledTriSurfaceMesh::samplingSource, 3>::names[] =
- {
- "cells",
- "insideCells",
- "boundaryFaces"
- };
-
- const NamedEnum<sampledTriSurfaceMesh::samplingSource, 3>
- sampledTriSurfaceMesh::samplingSourceNames_;
-
-
//- Private class for finding nearest
// Comprising:
// - global index
@@ -685,7 +685,7 @@ Foam::sampledTriSurfaceMesh::sampledTriSurfaceMesh
false
)
),
- sampleSource_(samplingSourceNames_[dict.lookup("source")]),
+ sampleSource_(samplingSourceNames_.lookup("source", dict)),
needsUpdate_(true),
keepIds_(dict.lookupOrDefault<Switch>("keepIds", false)),
originalIds_(),
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
index b46d7649f6bc9ed80b0ac98bfb41bcd3fd138a6d..c94f90cd3fbfea6a33da745be897d8976cfa2812 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
@@ -108,7 +108,7 @@ private:
// Private data
- static const NamedEnum<samplingSource, 3> samplingSourceNames_;
+ static const Enum<samplingSource> samplingSourceNames_;
//- Surface to sample on
const triSurfaceMesh surface_;
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
index 384192756d1beeabe484600a3c2e77fef2ebaf17..3ecb1836b615653759672f2ee0c2a9e3d0e680cb 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
@@ -38,29 +38,30 @@ namespace Foam
// Create write methods
defineSurfaceWriterWriteFields(nastranSurfaceWriter);
-
- template<>
- const char* NamedEnum<nastranSurfaceWriter::writeFormat, 3>::names[] =
- {
- "short",
- "long",
- "free"
- };
+}
- const NamedEnum<nastranSurfaceWriter::writeFormat, 3>
- nastranSurfaceWriter::writeFormatNames_;
+const Foam::Enum
+<
+ Foam::nastranSurfaceWriter::writeFormat
+>
+Foam::nastranSurfaceWriter::writeFormatNames_
+{
+ { writeFormat::wfShort, "short" },
+ { writeFormat::wfLong, "long" },
+ { writeFormat::wfFree, "free" },
+};
- template<>
- const char* NamedEnum<nastranSurfaceWriter::dataFormat, 2>::names[] =
- {
- "PLOAD2",
- "PLOAD4"
- };
- const NamedEnum<nastranSurfaceWriter::dataFormat, 2>
- nastranSurfaceWriter::dataFormatNames_;
-}
+const Foam::Enum
+<
+ Foam::nastranSurfaceWriter::dataFormat
+>
+Foam::nastranSurfaceWriter::dataFormatNames_
+{
+ { dataFormat::dfPLOAD2, "PLOAD2" },
+ { dataFormat::dfPLOAD4, "PLOAD4" },
+};
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -405,18 +406,17 @@ Foam::nastranSurfaceWriter::nastranSurfaceWriter()
Foam::nastranSurfaceWriter::nastranSurfaceWriter(const dictionary& options)
:
surfaceWriter(),
- writeFormat_(wfLong),
+ writeFormat_(writeFormat::wfLong),
fieldMap_(),
scale_(options.lookupOrDefault("scale", 1.0)),
separator_("")
{
- if (options.found("format"))
- {
- writeFormat_ = writeFormatNames_.read
- (
- options.lookup("format")
- );
- }
+ writeFormat_ = writeFormatNames_.lookupOrDefault
+ (
+ "format",
+ options,
+ writeFormat::wfLong
+ );
if (writeFormat_ == wfFree)
{
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
index 921182af987ff1bf1eae33cca473ee450903fe3a..2106dc1b4c5ce134fc2aa623e60675121bbd12f7 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
@@ -56,7 +56,7 @@ SourceFiles
#define nastranSurfaceWriter_H
#include "surfaceWriter.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "OFstream.H"
#include "HashTable.H"
@@ -93,8 +93,8 @@ private:
// Private data
- static const NamedEnum<writeFormat, 3> writeFormatNames_;
- static const NamedEnum<dataFormat, 2> dataFormatNames_;
+ static const Enum<writeFormat> writeFormatNames_;
+ static const Enum<dataFormat> dataFormatNames_;
//- Write option
writeFormat writeFormat_;
diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.C b/src/sampling/sampledSurface/writers/surfaceWriter.C
index 355f6431bf220155dcc4fc87a080f20516e90a24..801ef79215371d92d9f5fe2dbef0aa5ea119b4b8 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.C
@@ -54,8 +54,7 @@ namespace Foam
Foam::autoPtr<Foam::surfaceWriter>
Foam::surfaceWriter::New(const word& writeType)
{
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(writeType);
+ auto cstrIter = wordConstructorTablePtr_->cfind(writeType);
if (!cstrIter.found())
{
@@ -86,8 +85,7 @@ Foam::autoPtr<Foam::surfaceWriter>
Foam::surfaceWriter::New(const word& writeType, const dictionary& optDict)
{
// find constructors with dictionary options
- wordDictConstructorTable::iterator cstrIter =
- wordDictConstructorTablePtr_->find(writeType);
+ auto cstrIter = wordDictConstructorTablePtr_->cfind(writeType);
if (!cstrIter.found())
{
diff --git a/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C b/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C
index dffee65df23af2f3487849b4d546dc8953d796a5..29de6a852334402f77a5b0ba64708f0031b4e353 100644
--- a/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C
+++ b/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C
@@ -78,8 +78,7 @@ Foam::surfMeshSampler::New
{
const word sampleType(dict.lookup("type"));
- wordConstructorTable::iterator cstrIter =
- wordConstructorTablePtr_->find(sampleType);
+ auto cstrIter = wordConstructorTablePtr_->cfind(sampleType);
if (!cstrIter.found())
{
diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurface.C b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
index b6bc9d87d85d9b1c7fedd136b3a6af111a840516..ef95c86318e6f5de75991c72ef2726c2a876d356 100644
--- a/src/sampling/surface/triSurfaceMesh/discreteSurface.C
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
@@ -35,21 +35,21 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::discreteSurface::samplingSource
+>
+Foam::discreteSurface::samplingSourceNames_
{
- defineTypeNameAndDebug(discreteSurface, 0);
-
- template<>
- const char* NamedEnum<discreteSurface::samplingSource, 3>::names[] =
- {
- "cells",
- "insideCells",
- "boundaryFaces"
- };
+ { samplingSource::cells, "cells" },
+ { samplingSource::insideCells, "insideCells" },
+ { samplingSource::boundaryFaces, "boundaryFaces" },
+};
- const NamedEnum<discreteSurface::samplingSource, 3>
- discreteSurface::samplingSourceNames_;
+namespace Foam
+{
+ defineTypeNameAndDebug(discreteSurface, 0);
//- Private class for finding nearest
// Comprising:
@@ -686,7 +686,7 @@ Foam::discreteSurface::discreteSurface
false
)
),
- sampleSource_(samplingSourceNames_[dict.lookup("source")]),
+ sampleSource_(samplingSourceNames_.lookup("source", dict)),
needsUpdate_(true),
keepIds_(dict.lookupOrDefault<Switch>("keepIds", false)),
originalIds_(),
diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurface.H b/src/sampling/surface/triSurfaceMesh/discreteSurface.H
index 5114a0974d5d1e62f3c7a9f1c8e05bc38453e1a3..9f59550b5322bc469554a2af18aba01b59aa7a0b 100644
--- a/src/sampling/surface/triSurfaceMesh/discreteSurface.H
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurface.H
@@ -107,7 +107,7 @@ private:
// Private data
- static const NamedEnum<samplingSource, 3> samplingSourceNames_;
+ static const Enum<samplingSource> samplingSourceNames_;
//- Reference to mesh
const polyMesh& mesh_;
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
index 6200cdcc673b0c9fb8035ed5789cf166fa250c4f..a80ea68ce8d8fb56b41a640330f96dbc92210ba9 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
@@ -40,15 +40,14 @@ Foam::sixDoFRigidBodyMotionConstraint::New
sDoFRBMCDict.lookup("sixDoFRigidBodyMotionConstraint")
);
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(constraintType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(constraintType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown sixDoFRigidBodyMotionConstraint type "
<< constraintType << nl << nl
- << "Valid sixDoFRigidBodyMotionConstraints are : " << endl
+ << "Valid sixDoFRigidBodyMotionConstraint types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
index 864e8eee8c5ef055488f6ba7cd32ef63e7519097..33f2da687ccdcf9f0125fe9d2f3fd9c0917f0d40 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
@@ -39,15 +39,14 @@ Foam::sixDoFRigidBodyMotionRestraint::New
sDoFRBMRDict.lookup("sixDoFRigidBodyMotionRestraint")
);
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(restraintType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(restraintType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown sixDoFRigidBodyMotionRestraint type "
<< restraintType << nl << nl
- << "Valid sixDoFRigidBodyMotionRestraint types are : " << endl
+ << "Valid sixDoFRigidBodyMotionRestraint types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C
index 44e4f0b58eec38e92d80a61e8ba8406d1a226b0b..706583a560c78882c0a30c0d76bf0e4e232a058a 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C
@@ -33,19 +33,18 @@ Foam::autoPtr<Foam::sixDoFSolver> Foam::sixDoFSolver::New
sixDoFRigidBodyMotion& body
)
{
- word sixDoFSolverType(dict.lookup("type"));
+ word solverType(dict.lookup("type"));
- Info<< "Selecting sixDoFSolver " << sixDoFSolverType << endl;
+ Info<< "Selecting sixDoFSolver " << solverType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(sixDoFSolverType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(solverType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown sixDoFSolverType type "
- << sixDoFSolverType << endl << endl
- << "Valid sixDoFSolver types are : " << endl
+ << "Unknown sixDoFSolver type "
+ << solverType << nl << nl
+ << "Valid sixDoFSolver types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 41d0418a3b7d38a1935d59c9f87fe3f69a5d2fa4..a2efe775e6a7bec91c8046439efb778e61e2845c 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -127,7 +127,7 @@ void Foam::MeshedSurface<Face>::write
InfoInFunction << "Writing to " << name << endl;
}
- auto mfIter = writefileExtensionMemberFunctionTablePtr_->find(ext);
+ auto mfIter = writefileExtensionMemberFunctionTablePtr_->cfind(ext);
if (!mfIter.found())
{
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
index 7d345191ff8539fe5590cdb8cd39ee0e28618b6d..ae18f3b9bbb673c513ab14d3af073d67fac0ed90 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
@@ -38,7 +38,7 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
InfoInFunction << "Constructing MeshedSurface" << endl;
}
- auto cstrIter = fileExtensionConstructorTablePtr_->find(ext);
+ auto cstrIter = fileExtensionConstructorTablePtr_->cfind(ext);
if (!cstrIter.found())
{
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index b5dbdb6c99d3a23dda30fbe7177723c4350898c0..dd15f9d31fbb646e3ce068894b9b447f224f3b85 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
@@ -78,7 +78,7 @@ void Foam::MeshedSurfaceProxy<Face>::write
InfoInFunction << "Writing to " << name << endl;
}
- auto mfIter = writefileExtensionMemberFunctionTablePtr_->find(ext);
+ auto mfIter = writefileExtensionMemberFunctionTablePtr_->cfind(ext);
if (!mfIter.found())
{
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index b54f3c4ce1da3a572c956b7c4ba96c1c53add50c..ab426dc13d12e91c946db4f95be5337aacc49298 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -113,7 +113,7 @@ void Foam::UnsortedMeshedSurface<Face>::write
const word ext = name.ext();
- auto mfIter = writefileExtensionMemberFunctionTablePtr_->find(ext);
+ auto mfIter = writefileExtensionMemberFunctionTablePtr_->cfind(ext);
if (!mfIter.found())
{
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
index 6f50b238975201c096eff579cb5da7c54b0340d9..89861883503eace0c1ee6a6e08140aa74743e618 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
@@ -37,7 +37,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
InfoInFunction << "Constructing UnsortedMeshedSurface" << endl;
}
- auto cstrIter = fileExtensionConstructorTablePtr_->find(ext);
+ auto cstrIter = fileExtensionConstructorTablePtr_->cfind(ext);
if (!cstrIter.found())
{
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
index b926f96802d0510054cc5287c773dda39a0b87c4..71b3751c8c40739dd9d4db596b4a979d17c5f62e 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
@@ -26,7 +26,7 @@ License
#include "STARCDsurfaceFormatCore.H"
#include "clock.H"
#include "regExp.H"
-#include "IStringStream.H"
+#include "IFstream.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -47,7 +47,7 @@ Foam::fileFormats::STARCDsurfaceFormatCore::readInpCellTable
return lookup;
}
- regExp ctnameRE
+ const regExp ctnameRE
(
" *CTNA[^ ]*" // keyword - min 4 chars
"[[:space:]]+" // space delimited
@@ -64,13 +64,11 @@ Foam::fileFormats::STARCDsurfaceFormatCore::readInpCellTable
if (ctnameRE.match(line, groups))
{
const label tableId = atoi(groups[0].c_str());
+ const word tableName = word::validated(groups[1]);
- // strip bad chars
- string::stripInvalid<word>(groups[1]);
-
- if (!groups[1].empty())
+ if (!tableName.empty())
{
- lookup.insert(tableId, groups[1]);
+ lookup.insert(tableId, tableName);
}
}
}
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C
index 3ba0e8e5c1c13ff77ba5173ea09bf31860b371ec..56d3d985fb5f55b2b38661b52f987de7b70dd103 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C
@@ -42,15 +42,14 @@ Foam::barotropicCompressibilityModel::New
Info<< "Selecting compressibility model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown barotropicCompressibilityModel type "
<< modelType << nl << nl
- << "Valid barotropicCompressibilityModels are : " << endl
+ << "Valid barotropicCompressibilityModel types : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
index 56817cd219d5406aebcfef2e76755009d4fba844..0d6be8b710bd834ce05cc0e1ea8558c665e34fba 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
@@ -38,7 +38,7 @@ typename Table::iterator Foam::basicThermo::lookupThermo
)
{
// Lookup the thermo package
- typename Table::iterator cstrIter = tablePtr->find(thermoTypeName);
+ auto cstrIter = tablePtr->find(thermoTypeName);
// Print error message if package not found in the table
if (!cstrIter.found())
@@ -180,7 +180,7 @@ typename Table::iterator Foam::basicThermo::lookupThermo
Info<< "Selecting thermodynamics package " << thermoTypeName << endl;
- typename Table::iterator cstrIter = tablePtr->find(thermoTypeName);
+ auto cstrIter = tablePtr->find(thermoTypeName);
if (!cstrIter.found())
{
@@ -217,7 +217,7 @@ Foam::autoPtr<Thermo> Foam::basicThermo::New
)
);
- typename Thermo::fvMeshConstructorTable::iterator cstrIter =
+ auto cstrIter =
lookupThermo<Thermo, typename Thermo::fvMeshConstructorTable>
(
thermoDict,
@@ -236,7 +236,7 @@ Foam::autoPtr<Thermo> Foam::basicThermo::New
const word& phaseName
)
{
- typename Thermo::dictionaryConstructorTable::iterator cstrIter =
+ auto cstrIter =
lookupThermo<Thermo, typename Thermo::dictionaryConstructorTable>
(
dict,
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C
index bdc0a3e2a7f1101f1a29aa448f631317b8825090..6f676d88939041f0bbd168ec3e05f7ed12aab514 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C
@@ -70,22 +70,20 @@ Foam::chemistryReductionMethod<CompType, ThermoType>::New
dictionary MRdict(dict.subDict("reduction"));
- word chemistryReductionMethodTypeName =
+ word methodName =
word(MRdict.lookup("method")) + '<'
+ word(dict.subDict("chemistryType").lookup("chemistryThermo")) + ','
+ thermoTypeName + '>';
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(chemistryReductionMethodTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodName);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown chemistryReductionMethodType type "
- << chemistryReductionMethodTypeName
- << endl << endl
- << "Valid chemistryReductionMethodType types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << "Unknown chemistryReductionMethod type "
+ << methodName << nl << nl
+ << "Valid chemistryReductionMethod types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C
index a7f9268d3edc19945ddedc1778bcfb33b34162c0..46c1a3e17cdd6805f3aa4bc52a6a441933a438f9 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C
@@ -70,22 +70,20 @@ Foam::chemistryTabulationMethod<CompType, ThermoType>::New
dictionary tabdict(dict.subDict("tabulation"));
- word chemistryTabulationMethodName =
+ const word methodName =
word(tabdict.lookup("method")) + '<'
+ word(dict.subDict("chemistryType").lookup("chemistryThermo")) + ','
+ thermoTypeName + '>';
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(chemistryTabulationMethodName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown chemistryTabulationMethodType type "
- << chemistryTabulationMethodName
- << endl << endl
- << "Valid chemistryTabulationMethodType types are :" << endl
- << dictionaryConstructorTablePtr_->toc()
+ << methodName << nl << nl
+ << "Valid chemistryTabulationMethodType types :" << endl
+ << dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
index b0e72f1c5ecdc3a19cf0422615eadef52efeb7d9..0b58ed3ec867dc3f677cba55a34559d1e020f01c 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
@@ -123,15 +123,17 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
+ thermoTypeName + ">>";
}
- typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter =
- ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName);
+ auto cstrIter = ChemistryModel::fvMeshConstructorTablePtr_->cfind
+ (
+ chemistryTypeName
+ );
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown " << ChemistryModel::typeName << " type " << nl
<< "chemistryType" << chemistryTypeDict << nl << nl
- << "Valid " << ChemistryModel ::typeName << " types are:"
+ << "Valid " << ChemistryModel ::typeName << " types :"
<< nl << nl;
// Get the list of all the suitable chemistry packages available
@@ -179,15 +181,17 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
Info<< "Selecting chemistry type " << chemistryTypeName << endl;
- typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter =
- ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName);
+ auto cstrIter = ChemistryModel::fvMeshConstructorTablePtr_->cfind
+ (
+ chemistryTypeName
+ );
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown " << ChemistryModel::typeName << " type "
<< chemistryTypeName << nl << nl
- << "Valid ChemistryModel types are:" << nl
+ << "Valid ChemistryModel types :" << nl
<< ChemistryModel::fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
index 74c87d4dd5d44a5f03e12629b11624140c152697..74d7f074e67cf33a51e4949be45c976654568328 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
@@ -50,8 +50,7 @@ Foam::autoPtr<Foam::laminarFlameSpeed> Foam::laminarFlameSpeed::New
Info<< "Selecting laminar flame speed correlation " << corrType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(corrType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(corrType);
if (!cstrIter.found())
{
@@ -60,7 +59,7 @@ Foam::autoPtr<Foam::laminarFlameSpeed> Foam::laminarFlameSpeed::New
propDict
) << "Unknown laminarFlameSpeed type "
<< corrType << nl << nl
- << "Valid laminarFlameSpeed types are :" << endl
+ << "Valid laminarFlameSpeed types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
index b2fdb85d1632b48b63af64a36ac1dff199fefc2e..46491be971585a77c79649281bef15f8f97cbfaf 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
@@ -32,110 +32,105 @@ using namespace Foam::constant;
const Foam::List<Foam::Tuple2<Foam::scalar, Foam::scalar>>
Foam::radiation::blackBodyEmission::emissivePowerTable
-(
- IStringStream
- (
- "("
- "( 1000 0.00032)"
- "( 1100 0.00091)"
- "( 1200 0.00213)"
- "( 1300 0.00432)"
- "( 1400 0.00779)"
- "( 1500 0.01280)"
- "( 1600 0.01972)"
- "( 1700 0.02853)"
- "( 1800 0.03934)"
- "( 1900 0.05210)"
- "( 2000 0.06672)"
- "( 2100 0.08305)"
- "( 2200 0.10088)"
- "( 2300 0.12002)"
- "( 2400 0.14025)"
- "( 2500 0.16135)"
- "( 2600 0.18311)"
- "( 2700 0.20535)"
- "( 2800 0.22788)"
- "( 2900 0.25055)"
- "( 3000 0.27322)"
- "( 3100 0.29576)"
- "( 3200 0.31809)"
- "( 3300 0.34009)"
- "( 3400 0.36172)"
- "( 3500 0.38290)"
- "( 3600 0.40359)"
- "( 3700 0.42375)"
- "( 3800 0.44336)"
- "( 3900 0.46240)"
- "( 4000 0.48085)"
- "( 4100 0.49872)"
- "( 4200 0.51599)"
- "( 4300 0.53267)"
- "( 4400 0.54877)"
- "( 4500 0.56429)"
- "( 4600 0.57925)"
- "( 4700 0.59366)"
- "( 4800 0.60753)"
- "( 4900 0.62088)"
- "( 5000 0.63372)"
- "( 5100 0.64606)"
- "( 5200 0.65794)"
- "( 5300 0.66935)"
- "( 5400 0.68033)"
- "( 5500 0.69087)"
- "( 5600 0.70101)"
- "( 5700 0.71076)"
- "( 5800 0.72012)"
- "( 5900 0.72913)"
- "( 6000 0.73778)"
- "( 6100 0.74610)"
- "( 6200 0.75410)"
- "( 6300 0.76180)"
- "( 6400 0.76920)"
- "( 6500 0.77631)"
- "( 6600 0.78316)"
- "( 6700 0.78975)"
- "( 6800 0.79609)"
- "( 6900 0.80219)"
- "( 7000 0.80807)"
- "( 7100 0.81373)"
- "( 7200 0.81918)"
- "( 7300 0.82443)"
- "( 7400 0.82949)"
- "( 7500 0.83436)"
- "( 7600 0.83906)"
- "( 7700 0.84359)"
- "( 7800 0.84796)"
- "( 7900 0.85218)"
- "( 8000 0.85625)"
- "( 8100 0.86017)"
- "( 8200 0.86396)"
- "( 8300 0.86762)"
- "( 8400 0.87115)"
- "( 8500 0.87456)"
- "( 8600 0.87786)"
- "( 8700 0.88105)"
- "( 8800 0.88413)"
- "( 8900 0.88711)"
- "( 9000 0.88999)"
- "( 9100 0.89277)"
- "( 9200 0.89547)"
- "( 9300 0.89807)"
- "( 9400 0.90060)"
- "( 9500 0.90304)"
- "( 9600 0.90541)"
- "( 9700 0.90770)"
- "( 9800 0.90992)"
- "( 9900 0.91207)"
- "(10000 0.91415)"
- "(12000 0.94505)"
- "(15000 0.96893)"
- "(20000 0.98555)"
- "(30000 0.99529)"
- "(40000 0.99792)"
- "(50000 0.99890)"
- ")"
- )()
-);
+{
+ { 1000, 0.00032 },
+ { 1100, 0.00091 },
+ { 1200, 0.00213 },
+ { 1300, 0.00432 },
+ { 1400, 0.00779 },
+ { 1500, 0.01280 },
+ { 1600, 0.01972 },
+ { 1700, 0.02853 },
+ { 1800, 0.03934 },
+ { 1900, 0.05210 },
+ { 2000, 0.06672 },
+ { 2100, 0.08305 },
+ { 2200, 0.10088 },
+ { 2300, 0.12002 },
+ { 2400, 0.14025 },
+ { 2500, 0.16135 },
+ { 2600, 0.18311 },
+ { 2700, 0.20535 },
+ { 2800, 0.22788 },
+ { 2900, 0.25055 },
+ { 3000, 0.27322 },
+ { 3100, 0.29576 },
+ { 3200, 0.31809 },
+ { 3300, 0.34009 },
+ { 3400, 0.36172 },
+ { 3500, 0.38290 },
+ { 3600, 0.40359 },
+ { 3700, 0.42375 },
+ { 3800, 0.44336 },
+ { 3900, 0.46240 },
+ { 4000, 0.48085 },
+ { 4100, 0.49872 },
+ { 4200, 0.51599 },
+ { 4300, 0.53267 },
+ { 4400, 0.54877 },
+ { 4500, 0.56429 },
+ { 4600, 0.57925 },
+ { 4700, 0.59366 },
+ { 4800, 0.60753 },
+ { 4900, 0.62088 },
+ { 5000, 0.63372 },
+ { 5100, 0.64606 },
+ { 5200, 0.65794 },
+ { 5300, 0.66935 },
+ { 5400, 0.68033 },
+ { 5500, 0.69087 },
+ { 5600, 0.70101 },
+ { 5700, 0.71076 },
+ { 5800, 0.72012 },
+ { 5900, 0.72913 },
+ { 6000, 0.73778 },
+ { 6100, 0.74610 },
+ { 6200, 0.75410 },
+ { 6300, 0.76180 },
+ { 6400, 0.76920 },
+ { 6500, 0.77631 },
+ { 6600, 0.78316 },
+ { 6700, 0.78975 },
+ { 6800, 0.79609 },
+ { 6900, 0.80219 },
+ { 7000, 0.80807 },
+ { 7100, 0.81373 },
+ { 7200, 0.81918 },
+ { 7300, 0.82443 },
+ { 7400, 0.82949 },
+ { 7500, 0.83436 },
+ { 7600, 0.83906 },
+ { 7700, 0.84359 },
+ { 7800, 0.84796 },
+ { 7900, 0.85218 },
+ { 8000, 0.85625 },
+ { 8100, 0.86017 },
+ { 8200, 0.86396 },
+ { 8300, 0.86762 },
+ { 8400, 0.87115 },
+ { 8500, 0.87456 },
+ { 8600, 0.87786 },
+ { 8700, 0.88105 },
+ { 8800, 0.88413 },
+ { 8900, 0.88711 },
+ { 9000, 0.88999 },
+ { 9100, 0.89277 },
+ { 9200, 0.89547 },
+ { 9300, 0.89807 },
+ { 9400, 0.90060 },
+ { 9500, 0.90304 },
+ { 9600, 0.90541 },
+ { 9700, 0.90770 },
+ { 9800, 0.90992 },
+ { 9900, 0.91207 },
+ { 10000, 0.91415 },
+ { 12000, 0.94505 },
+ { 15000, 0.96893 },
+ { 20000, 0.98555 },
+ { 30000, 0.99529 },
+ { 40000, 0.99792 },
+ { 50000, 0.99890 }
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -149,7 +144,7 @@ Foam::radiation::blackBodyEmission::blackBodyEmission
table_
(
emissivePowerTable,
- interpolationTable<scalar>::CLAMP,
+ bounds::repeatableBounding::CLAMP,
"blackBodyEmissivePower"
),
C1_("C1", dimensionSet(1, 4, 3, 0, 0, 0, 0), 3.7419e-16),
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
index 9b730c22286be55b13a4bcda8c43e3d22d0e4cbf..21fc0f4f226c1b252bf4bccf03d9575711e8162e 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
@@ -57,15 +57,14 @@ Foam::radiation::radiationModel::New
Info<< "Selecting radiationModel " << modelType << endl;
- TConstructorTable::iterator cstrIter =
- TConstructorTablePtr_->find(modelType);
+ auto cstrIter = TConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown radiationModel type "
<< modelType << nl << nl
- << "Valid radiationModel types are:" << nl
+ << "Valid radiationModel types :" << nl
<< TConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -85,15 +84,14 @@ Foam::radiation::radiationModel::New
Info<< "Selecting radiationModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown radiationModel type "
<< modelType << nl << nl
- << "Valid radiationModel types are:" << nl
+ << "Valid radiationModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
index 0705302b45fba59949be83c30a866415109f2a96..82b6e9b0c214360a5f8ae6ae2368f5ece7949eb1 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
@@ -39,16 +39,16 @@ Foam::radiation::absorptionEmissionModel::New
Info<< "Selecting absorptionEmissionModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown absorptionEmissionModel type "
<< modelType << nl << nl
- << "Valid absorptionEmissionModel types are :" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Valid absorptionEmissionModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
return autoPtr<absorptionEmissionModel>(cstrIter()(dict, mesh));
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
index 369c9788a24bf4d194335739f72c9f09eb8ba110..12569bda35106906d2b0026a5db9155243426a55 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
@@ -30,26 +30,16 @@ License
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
-namespace Foam
-{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::radiation::boundaryRadiationPropertiesPatch::methodType,
- 3
- >::names[] =
- {
- "solidRadiation",
- "lookup",
- "model"
- };
-}
-
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::radiation::boundaryRadiationPropertiesPatch::methodType,
- 3
-> Foam::radiation::boundaryRadiationPropertiesPatch::methodTypeNames_;
+ Foam::radiation::boundaryRadiationPropertiesPatch::methodType
+>
+Foam::radiation::boundaryRadiationPropertiesPatch::methodTypeNames_
+{
+ { methodType::SOLIDRADIATION, "solidRadiation" },
+ { methodType::LOOKUP, "lookup" },
+ { methodType::MODEL, "model" }
+};
// * * * * * * * * * * * * * * * * Private functions * * * * * * * * * * * * //
@@ -84,7 +74,7 @@ boundaryRadiationPropertiesPatch
const dictionary& dict
)
:
- method_(methodTypeNames_.read(dict.lookup("mode"))),
+ method_(methodTypeNames_.lookup("mode", dict)),
dict_(dict),
absorptionEmission_(nullptr),
transmissivity_(nullptr),
@@ -411,20 +401,15 @@ void Foam::radiation::boundaryRadiationPropertiesPatch::write
Ostream& os
) const
{
- os.writeKeyword("mode") << methodTypeNames_[method_]
- << token::END_STATEMENT << nl;
+ os.writeEntry("mode", methodTypeNames_[method_]);
switch (method_)
{
case MODEL:
{
- word modelType
- (
- word(dict_.lookup("absorptionEmissionModel"))
- );
+ word modelType(dict_.lookup("absorptionEmissionModel"));
- os.writeKeyword("absorptionEmissionModel") << modelType
- << token::END_STATEMENT << nl;
+ os.writeEntry("absorptionEmissionModel", modelType);
word modelCoeffs(modelType + word("Coeffs"));
os.writeKeyword(modelCoeffs);
@@ -433,8 +418,7 @@ void Foam::radiation::boundaryRadiationPropertiesPatch::write
modelType = word(dict_.lookup("transmissivityModel"));
- os.writeKeyword("transmissivityModel") << modelType
- << token::END_STATEMENT << nl;
+ os.writeEntry("transmissivityModel", modelType);
modelCoeffs = modelType + word("Coeffs");
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H
index 59ad9a4415a5b4af74df11d7b4f2da73f2942ff7..a663b253d352f3df58a2f9fd199e0af218204e69 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.H
@@ -41,7 +41,7 @@ SourceFiles
#define boundaryRadiationPropertiesPatch_H
#include "scalarField.H"
-#include "NamedEnum.H"
+#include "Enum.H"
#include "fvPatch.H"
#include "calculatedFvPatchFields.H"
#include "transmissivityModel.H"
@@ -74,7 +74,7 @@ private:
// Private data
- static const NamedEnum<methodType, 3> methodTypeNames_;
+ static const Enum<methodType> methodTypeNames_;
//- How to get property
const methodType method_;
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C
index ab825045bccf44624b03d8a364ea479746794d0c..c742a18f6fb23577d7d0ed71e48fa3a1e36b77f6 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C
@@ -38,15 +38,14 @@ Foam::autoPtr<Foam::radiation::scatterModel> Foam::radiation::scatterModel::New
Info<< "Selecting scatterModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown scatterModel type "
<< modelType << nl << nl
- << "Valid scatterModel types are :" << nl
+ << "Valid scatterModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
index dea53edd9195d98168676ae6492853348a212918..7c720f5ab0a5981c915035471f22a2709e1eb73e 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
@@ -35,36 +35,34 @@ using namespace Foam::constant;
namespace Foam
{
defineTypeNameAndDebug(solarCalculator, 0);
-
- template<>
- const char* NamedEnum
- <
- solarCalculator::sunDirModel,
- 2
- >::names[] =
- {
- "sunDirConstant",
- "sunDirTracking"
- };
-
- template<>
- const char* NamedEnum
- <
- solarCalculator::sunLModel,
- 3
- >::names[] =
- {
- "sunLoadConstant",
- "sunLoadFairWeatherConditions",
- "sunLoadTheoreticalMaximum"
- };
}
-const Foam::NamedEnum<Foam::solarCalculator::sunDirModel, 2>
- Foam::solarCalculator::sunDirectionModelTypeNames_;
-const Foam::NamedEnum<Foam::solarCalculator::sunLModel, 3>
- Foam::solarCalculator::sunLoadModelTypeNames_;
+const Foam::Enum
+<
+ Foam::solarCalculator::sunDirModel
+>
+Foam::solarCalculator::sunDirectionModelTypeNames_
+{
+ { sunDirModel::mSunDirConstant, "sunDirConstant" },
+ { sunDirModel::mSunDirTracking, "sunDirTracking" },
+};
+
+
+const Foam::Enum
+<
+ Foam::solarCalculator::sunLModel
+>
+Foam::solarCalculator::sunLoadModelTypeNames_
+{
+ { sunLModel::mSunLoadConstant, "sunLoadConstant" },
+ {
+ sunLModel::mSunLoadFairWeatherConditions,
+ "sunLoadFairWeatherConditions"
+ },
+ { sunLModel::mSunLoadTheoreticalMaximum, "sunLoadTheoreticalMaximum" },
+};
+
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -271,11 +269,11 @@ Foam::solarCalculator::solarCalculator
C_(readScalar(dict.lookup("C"))),
sunDirectionModel_
(
- sunDirectionModelTypeNames_.read(dict.lookup("sunDirectionModel"))
+ sunDirectionModelTypeNames_.lookup("sunDirectionModel", dict)
),
sunLoadModel_
(
- sunLoadModelTypeNames_.read(dict.lookup("sunLoadModel"))
+ sunLoadModelTypeNames_.lookup("sunLoadModel", dict)
),
coord_()
{
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
index 9eeb5bfc4db695f0a463b17d8bc68c8797ed6f5a..fb9b8eb6a76fd63728a627b69ca3b9d9ad397ccf 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
@@ -126,10 +126,10 @@ public:
protected:
//- Sun direction models
- static const NamedEnum<sunDirModel, 2> sunDirectionModelTypeNames_;
+ static const Enum<sunDirModel> sunDirectionModelTypeNames_;
//- Sun load models
- static const NamedEnum<sunLModel, 3> sunLoadModelTypeNames_;
+ static const Enum<sunLModel> sunLoadModelTypeNames_;
private:
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
index 763a6b4886bdbfe60732fb8002318ec8a5318407..aa12edffeef9d64a8a0ad164c45cd488c2dc4481 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
@@ -38,7 +38,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::checkThermo
{
if (isA<singleStepReactingMixture<ThermoType>>(thermo))
{
- return dynamic_cast<const singleStepReactingMixture<ThermoType>& >
+ return dynamic_cast<const singleStepReactingMixture<ThermoType>&>
(
thermo
);
@@ -50,7 +50,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::checkThermo
<< "Please select a thermo package based on "
<< "singleStepReactingMixture" << exit(FatalError);
- return dynamic_cast<const singleStepReactingMixture<ThermoType>& >
+ return dynamic_cast<const singleStepReactingMixture<ThermoType>&>
(
thermo
);
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C
index 18718705913ae292d2c4bcd39e675e47bc2e4cc7..18fc90ada9f2d02b2ff66a7a0f74b111052cc665 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C
@@ -44,16 +44,16 @@ Foam::radiation::sootModel::New
Info<< "Selecting sootModel " << modelType << endl;
}
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown sootModel type "
<< modelType << nl << nl
- << "Valid sootModel types are :" << nl
- << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+ << "Valid sootModel types :" << nl
+ << dictionaryConstructorTablePtr_->sortedToc()
+ << exit(FatalError);
}
const label tempOpen = modelType.find('<');
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C
index 07298ef596c48f8a029e93e10cf2d72607a7d88e..da82c756f9a7f5265cfbe440f566effdeb9630a0 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C
@@ -39,15 +39,14 @@ transmissivityModel::New
Info<< "Selecting transmissivityModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown transmissivityModel type "
<< modelType << nl << nl
- << "Valid transmissivityModel types are :" << nl
+ << "Valid transmissivityModel types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
index c0d9e3f7af89ff845d235835b2d46c2cb92b844d..69032a116947e1910aad891ba53f829b03957a49 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
@@ -37,22 +37,21 @@ Foam::chemistryReader<ThermoType>::New
{
// Let the chemistry reader type default to CHEMKIN
// for backward compatibility
- word chemistryReaderTypeName("chemkinReader");
+ word readerName("chemkinReader");
// otherwise use the specified reader
- thermoDict.readIfPresent("chemistryReader", chemistryReaderTypeName);
+ thermoDict.readIfPresent("chemistryReader", readerName);
- Info<< "Selecting chemistryReader " << chemistryReaderTypeName << endl;
+ Info<< "Selecting chemistryReader " << readerName << endl;
- typename dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(chemistryReaderTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(readerName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown chemistryReader type "
- << chemistryReaderTypeName << nl << nl
- << "Valid chemistryReader types are:" << nl
+ << readerName << nl << nl
+ << "Valid chemistryReader types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
index 5ac8e03ef3abc3414c38d06ecd6b6688ec57777e..43f1010465f60e70c8563c58db84a3e9f7da0167 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
@@ -116,8 +116,7 @@ New
Info<< "chemistryTypeName " << chemistryTypeName << endl;
- fvMeshConstructorTable::iterator cstrIter =
- fvMeshConstructorTablePtr_->find(chemistryTypeName);
+ auto cstrIter = fvMeshConstructorTablePtr_->cfind(chemistryTypeName);
if (!cstrIter.found())
{
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index a389e33b0808e780c696892a45b4d442c4b5fb99..12fd3462b48a968cb8c001b83619083f547c1822 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -157,7 +157,7 @@ pyrolysisChemistryModel
Info<< indent << "Number of gases = " << nGases_ << nl;
forAll(this->reactions_, i)
{
- Info<< dynamic_cast<const solidReaction<SolidThermo>& >
+ Info<< dynamic_cast<const solidReaction<SolidThermo>&>
(
this->reactions_[i]
) << nl;
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
index 47664c4fc92b0fcf17e452edf53391aaeb5cb684..4a8d094133057677ba460442fb4e61b5161f6aee 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
@@ -41,14 +41,14 @@ solidChemistryModel
Ys_(this->solidThermo().composition().Y()),
reactions_
(
- dynamic_cast<const reactingMixture<SolidThermo>& >
+ dynamic_cast<const reactingMixture<SolidThermo>&>
(
this->solidThermo()
)
),
solidThermo_
(
- dynamic_cast<const reactingMixture<SolidThermo>& >
+ dynamic_cast<const reactingMixture<SolidThermo>&>
(
this->solidThermo()
).speciesData()
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index 645cc4fc806b2b11734b0690ab481863da23bf31..8f0330cea9995f36cf6b551dda070ebebb101401 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -366,15 +366,14 @@ Foam::Reaction<ReactionThermo>::New
{
const word& reactionTypeName = dict.lookup("type");
- typename dictionaryConstructorTable::iterator cstrIter
- = dictionaryConstructorTablePtr_->find(reactionTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(reactionTypeName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown reaction type "
<< reactionTypeName << nl << nl
- << "Valid reaction types are :" << nl
+ << "Valid reaction types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
index f454eb7bf8ab24a9482e4cf9cde99c6097872c5a..e0dec535cfd56618909dc800a75e7efc8504c761 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
@@ -95,14 +95,14 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
InfoInFunction << "Constructing liquidProperties" << endl;
}
- ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(name);
+ auto cstrIter = ConstructorTablePtr_->cfind(name);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown liquidProperties type "
<< name << nl << nl
- << "Valid liquidProperties types are:" << nl
+ << "Valid liquidProperties types :" << nl
<< ConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -121,7 +121,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
InfoInFunction << "Constructing liquidProperties" << endl;
}
- const word& liquidPropertiesTypeName = dict.dictName();
+ const word& liquidType = dict.dictName();
if (dict.found("defaultCoeffs"))
{
@@ -129,19 +129,18 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
if (Switch(dict.lookup("defaultCoeffs")))
{
- return New(liquidPropertiesTypeName);
+ return New(liquidType);
}
else
{
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(liquidPropertiesTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(liquidType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown liquidProperties type "
- << liquidPropertiesTypeName << nl << nl
- << "Valid liquidProperties types are:" << nl
+ << liquidType << nl << nl
+ << "Valid liquidProperties types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -150,22 +149,21 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
(
cstrIter()
(
- dict.optionalSubDict(liquidPropertiesTypeName + "Coeffs")
+ dict.optionalSubDict(liquidType + "Coeffs")
)
);
}
}
else
{
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(liquidPropertiesTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(liquidType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown liquidProperties type "
- << liquidPropertiesTypeName << nl << nl
- << "Valid liquidProperties types are:" << nl
+ << liquidType << nl << nl
+ << "Valid liquidProperties types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C
index f27570bf7b3b501ddc2d701d2c275b2443a9a41c..89c4de9b2e8a50750050d5ca38c7869a2ef485a8 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C
@@ -38,14 +38,14 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
InfoInFunction << "Constructing solidProperties" << endl;
}
- ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(name);
+ auto cstrIter = ConstructorTablePtr_->cfind(name);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown solidProperties type "
<< name << nl << nl
- << "Valid solidProperties types are:" << nl
+ << "Valid solidProperties types :" << nl
<< ConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
@@ -84,15 +84,14 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
}
else
{
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(solidType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(solidType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown solidProperties type "
<< solidType << nl << nl
- << "Valid solidProperties types are:" << nl
+ << "Valid solidProperties types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index f26d2426812c47ecb2ab3aec4c02a3301e91cefe..d88b584de1d73db97ae9d9da2697235f2fe44de4 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -50,18 +50,16 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
<< endl;
}
- const word thermophysicalFunctionType(is);
+ const word functionType(is);
- IstreamConstructorTable::iterator cstrIter =
- IstreamConstructorTablePtr_->find(thermophysicalFunctionType);
+ auto cstrIter = IstreamConstructorTablePtr_->cfind(functionType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown thermophysicalFunction type "
- << thermophysicalFunctionType
- << nl << nl
- << "Valid thermophysicalFunction types are :" << endl
+ << functionType << nl << nl
+ << "Valid thermophysicalFunction types :" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
@@ -82,17 +80,15 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
<< endl;
}
- const word thermophysicalFunctionType(dict.lookup("functionType"));
+ const word functionType(dict.lookup("functionType"));
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(thermophysicalFunctionType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(functionType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown thermophysicalFunction type "
- << thermophysicalFunctionType
- << nl << nl
+ << functionType << nl << nl
<< "Valid thermophysicalFunction types are :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< abort(FatalError);
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C
index d82d3f2a2486591f87a5638f7ae1ff75f1f6bc99..52570ede1089bbbcfcbdd23051d3c440579f13e5 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C
@@ -61,7 +61,7 @@ Foam::thermophysicalProperties::New
InfoInFunction << "Constructing thermophysicalProperties" << endl;
}
- ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(name);
+ auto cstrIter = ConstructorTablePtr_->cfind(name);
if (!cstrIter.found())
{
@@ -88,17 +88,16 @@ Foam::thermophysicalProperties::New
InfoInFunction << "Constructing thermophysicalProperties" << endl;
}
- const word& thermophysicalPropertiesTypeName = dict.dictName();
+ const word& propertiesTypeName = dict.dictName();
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(thermophysicalPropertiesTypeName);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(propertiesTypeName);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown thermophysicalProperties type "
- << thermophysicalPropertiesTypeName << nl << nl
- << "Valid thermophysicalProperties types are:" << nl
+ << propertiesTypeName << nl << nl
+ << "Valid thermophysicalProperties types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index b8d21877b02b6da056c816ac4ac2ce225f8e8389..e12b63b72534ec5048951f78aa98f4c20870fa5b 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -33,29 +33,20 @@ License
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
-namespace Foam
+const Foam::Enum
+<
+ Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massTransferMode
+>
+Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massModeTypeNames_
{
- template<>
- const char* Foam::NamedEnum
- <
- Foam::
- humidityTemperatureCoupledMixedFvPatchScalarField::
- massTransferMode,
- 4
- >::names[] =
+ { massTransferMode::mtConstantMass, "constantMass" },
+ { massTransferMode::mtCondensation, "condensation" },
+ { massTransferMode::mtEvaporation, "evaporation" },
{
- "constantMass",
- "condensation",
- "evaporation",
+ massTransferMode::mtCondensationAndEvaporation,
"condensationAndEvaporation"
- };
-}
-
-const Foam::NamedEnum
-<
- Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massTransferMode,
- 4
-> Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massModeTypeNames_;
+ },
+};
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
@@ -256,7 +247,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
if (dict.found("mode"))
{
- mode_ = massModeTypeNames_.read(dict.lookup("mode"));
+ mode_ = massModeTypeNames_.lookup("mode", dict);
fluid_ = true;
}
@@ -492,7 +483,7 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::updateCoeffs()
scalarField liquidRho(patch().size(), 0.0);
fixedGradientFvPatchField<scalar>& Yp =
- const_cast<fixedGradientFvPatchField<scalar>& >
+ const_cast<fixedGradientFvPatchField<scalar>&>
(
refCast
<
@@ -746,17 +737,15 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
if (fluid_)
{
- os.writeKeyword("mode")<< massModeTypeNames_[mode_]
- << token::END_STATEMENT <<nl;
+ os.writeEntry("mode", massModeTypeNames_[mode_]);
writeEntryIfDifferent<word>(os, "specie", "none", specieName_);
- os.writeKeyword("carrierMolWeight")<< Mcomp_
- << token::END_STATEMENT <<nl;
+ os.writeEntry("carrierMolWeight", Mcomp_);
- os.writeKeyword("L")<< L_ << token::END_STATEMENT << nl;
- os.writeKeyword("Tvap")<< Tvap_ << token::END_STATEMENT << nl;
- os.writeKeyword("fluid")<< fluid_ << token::END_STATEMENT << nl;
+ os.writeEntry("L", L_);
+ os.writeEntry("Tvap", Tvap_);
+ os.writeEntry("fluid", fluid_);
mass_.writeEntry("mass", os);
if (mode_ == mtConstantMass)
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
index 3f5b1c0eead451bad20441aae85071336c87b63e..258af191cc49421364394d3088007a36256945d3 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
@@ -188,7 +188,7 @@ private:
// Private data
- static const NamedEnum<massTransferMode, 4> massModeTypeNames_;
+ static const Enum<massTransferMode> massModeTypeNames_;
//- Operating mode
massTransferMode mode_;
diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
index df4dcff09e6538bc8eb0d0f6b323c39a124a37c9..482036bbbbabf68ba4bae2be6cb83e249adf2753 100644
--- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
+++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
@@ -41,15 +41,14 @@ Foam::autoPtr<Foam::viscosityModel> Foam::viscosityModel::New
Info<< "Selecting incompressible transport model " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(modelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown viscosityModel type "
<< modelType << nl << nl
- << "Valid viscosityModels are : " << endl
+ << "Valid viscosityModels :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C
index f017fccca8f7e206fcaaacd55718c5ef5d358fb1..7fcc2629e9449dc4ed2122a579542a7ee2db383a 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.C
+++ b/src/transportModels/interfaceProperties/interfaceProperties.C
@@ -30,12 +30,7 @@ License
#include "fvcDiv.H"
#include "fvcGrad.H"
#include "fvcSnGrad.H"
-
-// * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
-
-const Foam::scalar Foam::interfaceProperties::convertToRad =
- Foam::constant::mathematical::pi/180.0;
-
+#include "unitConversion.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -72,7 +67,7 @@ void Foam::interfaceProperties::correctContactAngle
fvsPatchVectorField& nHatp = nHatb[patchi];
const scalarField theta
(
- convertToRad*acap.theta(U_.boundaryField()[patchi], nHatp)
+ degToRad() * acap.theta(U_.boundaryField()[patchi], nHatp)
);
const vectorField nf
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.H b/src/transportModels/interfaceProperties/interfaceProperties.H
index 81c08948cadd7d6a6db00ad709a74c84ba19490d..88d0f823614fc6e803246443b717da346559b318 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.H
+++ b/src/transportModels/interfaceProperties/interfaceProperties.H
@@ -96,10 +96,6 @@ class interfaceProperties
public:
- //- Conversion factor for degrees into radians
- static const scalar convertToRad;
-
-
// Constructors
//- Construct from volume fraction field gamma and IOdictionary
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
index 6b2aa962cb97a3219d1ec168fcb0fd8435540240..7abdb1a75d3f2b3a887f5c44782f0774e3c21213 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
@@ -38,20 +38,18 @@ Foam::autoPtr<Foam::surfaceTensionModel> Foam::surfaceTensionModel::New
{
const dictionary& sigmaDict = surfaceTensionModel::sigmaDict(dict);
- word surfaceTensionModelType(sigmaDict.lookup("type"));
+ const word modelType(sigmaDict.lookup("type"));
- Info<< "Selecting surfaceTensionModel "
- << surfaceTensionModelType << endl;
+ Info<< "Selecting surfaceTensionModel " << modelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(surfaceTensionModelType);
+ auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalErrorInFunction
- << "Unknown surfaceTensionModelType type "
- << surfaceTensionModelType << endl << endl
- << "Valid surfaceTensionModel types are : " << endl
+ << "Unknown surfaceTensionModel type "
+ << modelType << nl << nl
+ << "Valid surfaceTensionModel types :" << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 78bd0115271c8e7c032a9be641bcafec1aa5f17b..75763c8301cbe3e4856a47b5b2ba0faeda0b90c4 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -33,27 +33,19 @@ License
namespace Foam
{
defineTypeNameAndDebug(alphaContactAngleFvPatchScalarField, 0);
-
- template<>
- const char* Foam::NamedEnum
- <
- Foam::alphaContactAngleFvPatchScalarField::limitControls,
- 4
- >::names[] =
- {
- "none",
- "gradient",
- "zeroGradient",
- "alpha"
- };
}
-
-const Foam::NamedEnum
+const Foam::Enum
<
- Foam::alphaContactAngleFvPatchScalarField::limitControls,
- 4
-> Foam::alphaContactAngleFvPatchScalarField::limitControlNames_;
+ Foam::alphaContactAngleFvPatchScalarField::limitControls
+>
+Foam::alphaContactAngleFvPatchScalarField::limitControlNames_
+{
+ { limitControls::lcNone, "none" },
+ { limitControls::lcGradient, "gradient" },
+ { limitControls::lcZeroGradient, "zeroGradient" },
+ { limitControls::lcAlpha, "alpha" },
+};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -77,7 +69,7 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(p, iF),
- limit_(limitControlNames_.read(dict.lookup("limit")))
+ limit_(limitControlNames_.lookup("limit", dict))
{
if (dict.found("gradient"))
{
@@ -166,8 +158,7 @@ void Foam::alphaContactAngleFvPatchScalarField::write
) const
{
fixedGradientFvPatchScalarField::write(os);
- os.writeKeyword("limit")
- << limitControlNames_[limit_] << token::END_STATEMENT << nl;
+ os.writeEntry("limit", limitControlNames_[limit_]);
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
index fdc46b9e0f40012282b01a4db9eb7b7bb664ce43..d07f107c08b823c8262df518239732d8106a2448 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
@@ -92,7 +92,7 @@ public:
lcAlpha
};
- static const NamedEnum<limitControls, 4> limitControlNames_;
+ static const Enum<limitControls> limitControlNames_;
limitControls limit_;
// Constructors
diff --git a/src/waveModels/waveModel/waveModelNew.C b/src/waveModels/waveModel/waveModelNew.C
index b47ea482171c2443d14a69cd99d43c3f4d851888..95315fa4a66d546a82c557d9be3cb671c711fe94 100644
--- a/src/waveModels/waveModel/waveModelNew.C
+++ b/src/waveModels/waveModel/waveModelNew.C
@@ -62,15 +62,14 @@ Foam::autoPtr<Foam::waveModel> Foam::waveModel::New
Info<< "Selecting waveModel " << modelType << endl;
- patchConstructorTable::iterator cstrIter =
- patchConstructorTablePtr_->find(modelType);
+ auto cstrIter = patchConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
FatalIOErrorInFunction(waveDict)
<< "Unknown waveModel type "
<< modelType << nl << nl
- << "Valid waveModel types are:" << nl
+ << "Valid waveModel types :" << nl
<< patchConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
diff --git a/tutorials/combustion/chemFoam/gri/validation/createGraph b/tutorials/combustion/chemFoam/gri/validation/createGraph
index d0fb9cc013134e48bab35527cf51e043822d2de6..1ef428f28dc7fb1f4d4d545c5da93f7ffaf10dca 100755
--- a/tutorials/combustion/chemFoam/gri/validation/createGraph
+++ b/tutorials/combustion/chemFoam/gri/validation/createGraph
@@ -1,10 +1,9 @@
#!/bin/sh
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "gnuplot not found - skipping graph creation" >&2
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
gnuplot<<EOF
set terminal postscript eps color enhanced "Helveicta,20"
diff --git a/tutorials/combustion/chemFoam/h2/validation/createGraph b/tutorials/combustion/chemFoam/h2/validation/createGraph
index bbb36218fac3bac5a198efc63ab7b3e3406c750a..29c39828f378a6bb83bf40f6de96a19929df1fab 100755
--- a/tutorials/combustion/chemFoam/h2/validation/createGraph
+++ b/tutorials/combustion/chemFoam/h2/validation/createGraph
@@ -1,10 +1,10 @@
#!/bin/sh
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
gnuplot<<EOF
set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/combustion/chemFoam/ic8h18/validation/createGraph b/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
index 4606eac7d3fba5bd5211c216e9bbfe5458b43868..0c6d9b3d3d5b71c74cbae3aaea9edbfc2db467d4 100755
--- a/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
+++ b/tutorials/combustion/chemFoam/ic8h18/validation/createGraph
@@ -1,10 +1,10 @@
#!/bin/sh
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
gnuplot<<EOF
set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
index d406960eff0e42c544b00cb521d4f53bbedb5d33..43e3c36e10e910f240ba3fc82ae5174b669e6464 100755
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph
@@ -1,10 +1,10 @@
#!/bin/sh
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
gnuplot<<EOF
set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/combustion/chemFoam/nc7h16/validation/createGraph b/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
index b2f8a4d9451e8f6f5e655385d0caaf41af56f011..5564fffd7ba0c664de695cd9d62a1d1e3ecdb403 100755
--- a/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
+++ b/tutorials/combustion/chemFoam/nc7h16/validation/createGraph
@@ -1,10 +1,10 @@
#!/bin/sh
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
gnuplot<<EOF
set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4 b/tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution
old mode 100755
new mode 100644
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
index cbae27d84035877236709a4089d544150d05745c..c1f1b64998ea466bf56ed0de07ff7cb590ea160a 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs
@@ -53,12 +53,11 @@ EOF
}
-# test if gnuplot exists on the system
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
SETSDIRT="../postProcessing/thermoCouple"
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
index 79c100551c67cb5e50c84eaef8f19d8b03c86907..a4395abc9dadfb5ed97df4b19e5ef80a7883ebe6 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
@@ -16,10 +16,8 @@ FoamFile
extractionMethod extractFromSurface;
-extractFromSurfaceCoeffs
-{
- includedAngle 150; // Identifes a feature when angle
-} // between faces < includedAngle
+includedAngle 150; // Identifes a feature when angle
+ // between faces < includedAngle
trimFeatures
{
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0/p b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0/p
old mode 100755
new mode 100644
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
index e3aa1a2c222f5e38b95ed23eead0271ce69c3428..5490c672cbc5958d86c341b4845d7fc2a915d468 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ walls.stl
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180: selects all edges
+ includedAngle 150;
subsetFeatures
{
@@ -40,8 +37,8 @@ walls.stl
// Write options
- // Write features to obj format for postprocessing
- writeObj yes;
+ // Write features to obj format for postprocessing
+ writeObj yes;
}
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
index 693c8dbfdf34aa3bdf7b2cda9544d212f06491e7..7016a3610a0141c01635bed04317e249651d5b70 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
@@ -85,20 +85,18 @@ EOF
echo "createGraphs:"
-# test if gnuplot exists on the system
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
SETSDIR="../postProcessing/sample"
-if [ ! -d $SETSDIR ]
-then
- echo "FOAM FATAL ERROR: result sets not available in directory $SETSDIR" >&2
+[ -d "$SETSDIR" ] || {
+ echo "FOAM FATAL ERROR: result sets not available in directory $SETSDIR" 1>&2
exit 1
-fi
+}
# paths to data
LATESTTIME=$(ls $SETSDIR)
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index e5001e59464388310b8c520a130592753459a37a..50f950de252ed90fd97e9335091fa8c6e6a2e758 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -18,17 +18,15 @@ geom.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180: selects all edges
+ includedAngle 150;
// Write options
writeFeatureEdgeMesh yes;
+
// Write features to obj format for postprocessing
writeObj yes;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/createGraphs b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/createGraphs
index 04bbc57ea0a4109b12822ba42e3cac767d0ef9ea..1c39ff49a97032b6b79518be3dbb71b679285b80 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/createGraphs
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/createGraphs
@@ -30,28 +30,25 @@
# Joule heating case
#
#------------------------------------------------------------------------------
-
cd ${0%/*} || exit 1 # Run from this directory
# Stop on first error
set -e
-# test if gnuplot exists on the system
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
echo "Creating graph"
OFDATA='postProcessing/sample1/solid/20000/centreLine_T_jouleHeatingSource:V_jouleHeatingSource:sigma.xy'
-if [ ! -f "$OFDATA" ]
-then
- echo "FOAM FATAL ERROR: OpenFOAM results not available in $OFDATA" >&2
+[ -f "$OFDATA" ] || {
+ echo "FOAM FATAL ERROR: OpenFOAM results not available in $OFDATA" 1>&2
exit 1
-fi
+}
gnuplot<<EOF
set terminal postscript eps color enhanced
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
index ae838574d94b66b83047789abd45c0f81afd9b56..7f68f709137cae5fd9bafbc7b60546e1df7e6251 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@@ -36,12 +36,11 @@ done
# create validation plot
-# test if gnuplot exists on the system
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
graphName="OF_vs_ANALYTICAL.eps"
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
index 52258ae69251d62c223ced2f827f90a1f628f2f6..459fbbdc8f257193663afaeeb609cd5c4c31b0eb 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
@@ -1,14 +1,12 @@
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
-extractFromSurfaceCoeffs
-{
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
-}
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0 : selects no edges
+// - 180: selects all edges
+includedAngle 150;
+
trimFeatures
{
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph
index a30402600ef4a7c305a4f6eb368e9798a376b0e8..d6402c1b4d24e9841380cf21afb38e0ffb713987 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph
@@ -3,11 +3,11 @@
tail -n +4 ../postProcessing/probes/0/U | \
tr -s " " | tr -d '(' | cut -d " " -f2-3 > ../Numerical.dat
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
gnuplot<<EOF
set terminal postscript eps color enhanced "Helvetica,20"
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
index 7c81e11aa4d4e398b389e429aeb5e9ee0e5520f5..49ee29f401131590919865b95674706fe2d842ea 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
@@ -18,16 +18,13 @@ boundaryAndFaceZones.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
baffles (porosityFaces);
// Write options
- writeObj no; //yes;
+ writeObj no; //yes;
}
diff --git a/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs b/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs
index 20e1699f3d0bad39768a74fd10ca95bd0755b7fe..40bb7784037feef5fef2410faa9f6d721b1fa38b 100755
--- a/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs
+++ b/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs
@@ -1,10 +1,10 @@
#!/bin/sh
-if ! which gnuplot > /dev/null 2>&1
-then
- echo "gnuplot not found - skipping graph creation" >&2
+# Test if gnuplot exists on the system
+command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
exit 1
-fi
+}
gnuplot<<EOF
set term post enhanced color solid linewidth 2.0 20
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
index 54e009ccfa83fea14941c9239b0743dd36bbdfa3..5f2fcf61602c3784d4568b4110470d099d527700 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ motorBike.obj
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180: selects all edges
+ includedAngle 150;
subsetFeatures
{
@@ -40,8 +37,8 @@ motorBike.obj
// Write options
- // Write features to obj format for postprocessing
- writeObj yes;
+ // Write features to obj format for postprocessing
+ writeObj yes;
}
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
index 81c52e08cbaae095dbb5c67b86d2cac4ddf48b55..ef114df0074339d3bc049d5bf9c54a6f7a9718c8 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ shaftRotating.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 100;
- }
+ includedAngle 100;
subsetFeatures
{
@@ -30,19 +27,15 @@ shaftRotating.stl
}
// Write options
-
- writeObj yes;
+ writeObj yes;
}
vessel.stl
{
- extractionMethod extractFromSurface;
+ extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
subsetFeatures
{
@@ -55,8 +48,7 @@ vessel.stl
}
// Write options
-
- writeObj no;
+ writeObj no;
}
@@ -64,14 +56,10 @@ spargerInlet.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
// Write options
-
- writeObj no;
+ writeObj no;
}
@@ -79,14 +67,10 @@ stirrer.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
// Write options
-
- writeObj no;
+ writeObj no;
}
@@ -94,16 +78,12 @@ stirrer_baffles.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
baffles (stirrer);
// Write options
-
- writeObj no;
+ writeObj no;
}
@@ -111,16 +91,12 @@ rotating.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
baffles (MRF);
// Write options
-
- writeObj yes;
+ writeObj yes;
}
@@ -128,16 +104,12 @@ baffles.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
baffles (baffles);
// Write options
-
- writeObj no;
+ writeObj no;
}
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
index 3de3952127d353e2e84f5ce632b34430feb26e3f..1adbed4d4258fd53bd88372d30d93e284b6a8366 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
@@ -14,18 +14,17 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0 : selects no edges
+// - 180: selects all edges
+
opencfd_text.stl
{
- extractionMethod extractFromSurface;
+ extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 120;
- }
+ includedAngle 120;
subsetFeatures
{
@@ -44,23 +43,16 @@ opencfd_text.stl
// Write options
- // Write features to obj format for postprocessing
- writeObj no;
+ // Write features to obj format for postprocessing
+ writeObj no;
}
opencfd_box.stl
{
- extractionMethod extractFromSurface;
+ extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 120;
- }
+ includedAngle 120;
subsetFeatures
{
@@ -79,8 +71,8 @@ opencfd_box.stl
// Write options
- // Write features to obj format for postprocessing
- writeObj no;
+ // Write features to obj format for postprocessing
+ writeObj no;
}
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
index 92e26dfb6a04f70799fedb99f41cb4a25f2ad2fb..dbc8c8c9140bbcad6412e531543c15d930b26e94 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
@@ -18,14 +18,11 @@ jaggedBoundary.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 175;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180: selects all edges
+ includedAngle 175;
subsetFeatures
{
@@ -44,8 +41,8 @@ jaggedBoundary.stl
// Write options
- // Write features to obj format for postprocessing
- writeObj no;
+ // Write features to obj format for postprocessing
+ writeObj no;
}
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
index c8ef75f519a3eb5023cf13e7b5c08a67332f4d01..08e6cceabd505e28cce506578b725b2da1fd5f63 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
@@ -18,14 +18,11 @@ unit_cube.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 175;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180: selects all edges
+ includedAngle 175;
subsetFeatures
{
@@ -44,8 +41,8 @@ unit_cube.stl
// Write options
- // Write features to obj format for postprocessing
- writeObj yes;
+ // Write features to obj format for postprocessing
+ writeObj yes;
}
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
index e8e85fa1282853e9c67cd918a749af1c74847bd9..3a51068dd6c4410a256c998e6563687de5d6b0d0 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
@@ -19,19 +19,16 @@ flange.stl
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180: selects all edges
+ includedAngle 150;
// Write options
- // Write features to obj format for postprocessing
- writeObj yes;
+ // Write features to obj format for postprocessing
+ writeObj yes;
}
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement
old mode 100755
new mode 100644
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
index 0ae80247dac36831d106d4141246b8a9600ea248..af90271dddb4461b59284ae8372b8fb551032017 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ DTC-scaled.stl
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180: selects all edges
+ includedAngle 150;
subsetFeatures
{
@@ -40,8 +37,8 @@ DTC-scaled.stl
// Write options
- // Write features to obj format for postprocessing
- writeObj yes;
+ // Write features to obj format for postprocessing
+ writeObj yes;
}
diff --git a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
index ec1a7aa4e52727c9a69dce333825d5e114ffca9b..55ed0f7aec17e99c9b3275d04e1d46d2643b4ec4 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
@@ -14,24 +14,23 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0 : selects no edges
+// - 180: selects all edges
+
vessel.stl
{
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 120;
- }
+ includedAngle 120;
// Write options
- // Write features to obj format for postprocessing
- writeObj no;
+ // Write features to obj format for postprocessing
+ writeObj no;
}
gasInlet.stl
@@ -39,36 +38,27 @@ gasInlet.stl
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
- writeObj no;
+ writeObj no;
}
stirrer.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
- writeObj no;
+ writeObj no;
}
outlet.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
- writeObj no;
+ writeObj no;
}
/*
@@ -76,36 +66,27 @@ baffles.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
- writeObj no;
+ writeObj no;
}
rotating.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
- writeObj no;
+ writeObj no;
}
sparger.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- includedAngle 120;
- }
+ includedAngle 120;
- writeObj no;
+ writeObj no;
}
*/
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
index d22cdd2cc4657de99bc5a60f25cdd222767ff088..af3c3b444d579918e06711244835d4f27592030b 100755
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
@@ -8,8 +8,8 @@ cd ${0%/*} || exit 1 # Run from this directory
runParallel $(getApplication)
-unset FOAM_SIGFPE
-runParallel -s reconstruct redistributePar -reconstruct
+# Disable trapping of floating-point exceptions
+FOAM_SIGFPE=false runParallel -s reconstruct redistributePar -reconstruct
# A bit more testing of decomposing
\cp system/controlDict_nextWrite system/controlDict
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict
index 54e009ccfa83fea14941c9239b0743dd36bbdfa3..5f2fcf61602c3784d4568b4110470d099d527700 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ motorBike.obj
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180: selects all edges
+ includedAngle 150;
subsetFeatures
{
@@ -40,8 +37,8 @@ motorBike.obj
// Write options
- // Write features to obj format for postprocessing
- writeObj yes;
+ // Write features to obj format for postprocessing
+ writeObj yes;
}
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
index 0ae80247dac36831d106d4141246b8a9600ea248..af90271dddb4461b59284ae8372b8fb551032017 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ DTC-scaled.stl
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180: selects all edges
+ includedAngle 150;
subsetFeatures
{
@@ -40,8 +37,8 @@ DTC-scaled.stl
// Write options
- // Write features to obj format for postprocessing
- writeObj yes;
+ // Write features to obj format for postprocessing
+ writeObj yes;
}
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
index 52258ae69251d62c223ced2f827f90a1f628f2f6..0f429323e0a371cd00448925fbf953719387b4d2 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
@@ -1,14 +1,12 @@
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
-extractFromSurfaceCoeffs
-{
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
-}
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0 : selects no edges
+// - 180: selects all edges
+includedAngle 150;
trimFeatures
{
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
index 54e009ccfa83fea14941c9239b0743dd36bbdfa3..dc2ea8b2342fc6188f930e904aac3b3dc23166b1 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
@@ -19,14 +19,12 @@ motorBike.obj
// How to obtain raw features (extractFromFile || extractFromSurface)
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ // Mark edges whose adjacent surface normals are at an angle less
+ // than includedAngle as features
+ // - 0 : selects no edges
+ // - 180 : selects all edges
+
+ includedAngle 150;
subsetFeatures
{
@@ -40,8 +38,8 @@ motorBike.obj
// Write options
- // Write features to obj format for postprocessing
- writeObj yes;
+ // Write features to obj format for postprocessing
+ writeObj yes;
}
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index ffeafc363fb361c27158b0ab36e3d20e07fbbad3..b0aef956f790d8a2acdb3225e4df72eb500d6353 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -14,18 +14,17 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0 : selects no edges
+// - 180 : selects all edges
+
bottomAir.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ includedAngle 150;
// Write options
writeFeatureEdgeMesh yes;
@@ -34,14 +33,7 @@ heater.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ includedAngle 150;
// Write options
writeFeatureEdgeMesh yes;
@@ -50,14 +42,7 @@ leftSolid.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ includedAngle 150;
// Write options
writeFeatureEdgeMesh yes;
@@ -66,14 +51,7 @@ rightSolid.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ includedAngle 150;
// Write options
writeFeatureEdgeMesh yes;
@@ -82,14 +60,7 @@ topAir.stl
{
extractionMethod extractFromSurface;
- extractFromSurfaceCoeffs
- {
- // Mark edges whose adjacent surface normals are at an angle less
- // than includedAngle as features
- // - 0 : selects no edges
- // - 180: selects all edges
- includedAngle 150;
- }
+ includedAngle 150;
// Write options
writeFeatureEdgeMesh yes;