STYLE: partial revert for 5cfa97624e

applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::PDRDragModel>
+Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
-Foam::PDRDragModel::New
 (
     const dictionary& PDRProperties,
     const compressible::RASModel& turbulence,
@@ -37,10 +36,7 @@ Foam::PDRDragModel::New
     const surfaceScalarField& phi
 )
 {
-    const word modelType
+    const word modelType(PDRProperties.lookup("PDRDragModel"));
-    (
-        PDRProperties.lookup("PDRDragModel")
-    );
 
     Info<< "Selecting flame-wrinkling model " << modelType << endl;
 

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C

@@ -27,19 +27,15 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::XiEqModel>
+Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
-Foam::XiEqModel::New
 (
-    const dictionary& XiEqProperties,
+    const dictionary& propDict,
     const hhuCombustionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )
 {
-    const word modelType
+    const word modelType(propDict.lookup("XiEqModel"));
-    (
-        XiEqProperties.lookup("XiEqModel")
-    );
 
     Info<< "Selecting flame-wrinkling model " << modelType << endl;
 
@@ -63,8 +59,7 @@ Foam::XiEqModel::New
             << exit(FatalError);
     }
 
-    return autoPtr<XiEqModel>
+    return autoPtr<XiEqModel>(cstrIter()(propDict, thermo, turbulence, Su));
-        (cstrIter()(XiEqProperties, thermo, turbulence, Su));
 }
 
 

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C

@@ -27,19 +27,15 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::XiGModel>
+Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
-Foam::XiGModel::New
 (
-    const dictionary& XiGProperties,
+    const dictionary& propDict,
     const hhuCombustionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )
 {
-    const word modelType
+    const word modelType(propDict.lookup("XiGModel"));
-    (
-        XiGProperties.lookup("XiGModel")
-    );
 
     Info<< "Selecting flame-wrinkling model " << modelType << endl;
 
@@ -63,8 +59,7 @@ Foam::XiGModel::New
             << exit(FatalError);
     }
 
-    return autoPtr<XiGModel>
+    return autoPtr<XiGModel>(cstrIter()(propDict, thermo, turbulence, Su));
-        (cstrIter()(XiGProperties, thermo, turbulence, Su));
 }
 
 

applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C

@@ -27,10 +27,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::XiModel>
+Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
-Foam::XiModel::New
 (
-    const dictionary& XiProperties,
+    const dictionary& propDict,
     const hhuCombustionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su,
@@ -39,10 +38,7 @@ Foam::XiModel::New
     const surfaceScalarField& phi
 )
 {
-    const word modelType
+    const word modelType(propDict.lookup("XiModel"));
-    (
-        XiProperties.lookup("XiModel")
-    );
 
     Info<< "Selecting flame-wrinkling model " << modelType << endl;
 
@@ -62,7 +58,7 @@ Foam::XiModel::New
     }
 
     return autoPtr<XiModel>
-        (cstrIter()(XiProperties, thermo, turbulence, Su, rho, b, phi));
+        (cstrIter()(propDict, thermo, turbulence, Su, rho, b, phi));
 }
 
 

applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModelNew.C

@@ -27,23 +27,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::combustionModel>
+Foam::autoPtr<Foam::combustionModel> Foam::combustionModel::New
-Foam::combustionModel::New
 (
-    const dictionary& combustionProperties,
+    const dictionary& propDict,
     const hsCombustionThermo& thermo,
     const compressible::turbulenceModel& turbulence,
     const surfaceScalarField& phi,
     const volScalarField& rho
 )
 {
-    const word modelType
+    const word modelType(propDict.lookup("combustionModel"));
-    (
-        combustionProperties.lookup
-        (
-            "combustionModel"
-        )
-    );
 
     Info<< "Selecting combustion model " << modelType << endl;
 
@@ -63,7 +56,7 @@ Foam::combustionModel::New
     }
 
     return autoPtr<combustionModel>
-        (cstrIter()(combustionProperties, thermo, turbulence, phi, rho));
+        (cstrIter()(propDict, thermo, turbulence, phi, rho));
 }
 
 

applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C

@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
+    autoPtr<motionSolver> motionPtr = motionSolver::New(mesh);
 
     while (runTime.loop())
     {

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C

@@ -37,7 +37,7 @@ Foam::phaseChangeTwoPhaseMixture::New
 )
 {
     // get model name, but do not register the dictionary
-    const word phaseChangeTwoPhaseMixtureTypeName
+    const word mixtureType
     (
         IOdictionary
         (
@@ -53,12 +53,10 @@ Foam::phaseChangeTwoPhaseMixture::New
         ).lookup("phaseChangeTwoPhaseMixture")
     );
 
-    Info<< "Selecting phaseChange model "
+    Info<< "Selecting phaseChange model " << mixtureType << endl;
-        << phaseChangeTwoPhaseMixtureTypeName << endl;
 
     componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
+        componentsConstructorTablePtr_->find(mixtureType);
-            ->find(phaseChangeTwoPhaseMixtureTypeName);
 
     if (cstrIter == componentsConstructorTablePtr_->end())
     {
@@ -66,7 +64,7 @@ Foam::phaseChangeTwoPhaseMixture::New
         (
             "phaseChangeTwoPhaseMixture::New"
         )   << "Unknown phaseChangeTwoPhaseMixture type "
-            << phaseChangeTwoPhaseMixtureTypeName << nl << nl
+            << mixtureType << nl << nl
             << "Valid phaseChangeTwoPhaseMixture types are : " << endl
             << componentsConstructorTablePtr_->sortedToc()
             << exit(FatalError);

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::dragModel>
+Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
-Foam::dragModel::New
 (
     const dictionary& interfaceDict,
     const volScalarField& alpha,
@@ -36,15 +35,10 @@ Foam::dragModel::New
     const phaseModel& phaseb
 )
 {
-    const word modelType
+    const word modelType(interfaceDict.lookup("dragModel" + phasea.name()));
-    (
-        interfaceDict.lookup("dragModel" + phasea.name())
-    );
 
-    Info<< "Selecting dragModel for phase "
+    Info<< "Selecting dragModel for phase " << phasea.name()
-        << phasea.name()
+        << ": " << modelType << endl;
-        << ": "
-        << modelType << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C

@@ -27,16 +27,12 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::conductivityModel>
+Foam::autoPtr<Foam::conductivityModel> Foam::conductivityModel::New
-Foam::conductivityModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("conductivityModel"));
-    (
-        dict.lookup("conductivityModel")
-    );
 
     Info<< "Selecting conductivityModel " << modelType << endl;
 

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C

@@ -27,16 +27,12 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::frictionalStressModel>
+Foam::autoPtr<Foam::frictionalStressModel> Foam::frictionalStressModel::New
-Foam::frictionalStressModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("frictionalStressModel"));
-    (
-        dict.lookup("frictionalStressModel")
-    );
 
     Info<< "Selecting frictionalStressModel " << modelType << endl;
 

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C

@@ -27,16 +27,12 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::granularPressureModel>
+Foam::autoPtr<Foam::granularPressureModel> Foam::granularPressureModel::New
-Foam::granularPressureModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("granularPressureModel"));
-    (
-        dict.lookup("granularPressureModel")
-    );
 
     Info<< "Selecting granularPressureModel " << modelType << endl;
 

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModelNew.C

@@ -27,16 +27,12 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::radialModel>
+Foam::autoPtr<Foam::radialModel> Foam::radialModel::New
-Foam::radialModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("radialModel"));
-    (
-        dict.lookup("radialModel")
-    );
 
     Info<< "Selecting radialModel " << modelType << endl;
 

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C

@@ -33,10 +33,7 @@ Foam::kineticTheoryModels::viscosityModel::New
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("viscosityModel"));
-    (
-        dict.lookup("viscosityModel")
-    );
 
     Info<< "Selecting viscosityModel " << modelType << endl;
 

applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C

@@ -134,8 +134,7 @@ Foam::phaseModel::phaseModel
 }
 
 
-Foam::autoPtr<Foam::phaseModel>
+Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
-Foam::phaseModel::New
 (
     const fvMesh& mesh,
     const dictionary& transportProperties,

applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C

@@ -27,16 +27,12 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::extrudeModel>
+Foam::autoPtr<Foam::extrudeModel> Foam::extrudeModel::New
-Foam::extrudeModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("extrudeModel"));
-    (
-        dict.lookup("extrudeModel")
-    );
 
     Info<< "Selecting extrudeModel " << modelType << endl;
 

applications/utilities/mesh/manipulation/moveMesh/moveMesh.C

@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 
-    autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
+    autoPtr<motionSolver> motionPtr = motionSolver::New(mesh);
 
     while (runTime.loop())
     {

src/ODE/ODESolvers/ODESolver/ODESolverNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::ODESolver>
+Foam::autoPtr<Foam::ODESolver> Foam::ODESolver::New
-Foam::ODESolver::New
 (
     const Foam::word& ODESolverTypeName,
     const Foam::ODE& ode

src/OpenFOAM/db/IOstreams/token/token.C

@@ -52,8 +52,7 @@ Foam::token::compound::~compound()
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::token::compound>
+Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
-Foam::token::compound::New
 (
     const word& compoundType,
     Istream& is

src/OpenFOAM/db/dictionary/dictionaryIO.C

@@ -118,8 +118,7 @@ Foam::dictionary::dictionary(Istream& is)
 }
 
 
-Foam::autoPtr<Foam::dictionary>
+Foam::autoPtr<Foam::dictionary> Foam::dictionary::New(Istream& is)
-Foam::dictionary::New(Istream& is)
 {
     return autoPtr<dictionary>(new dictionary(is));
 }

src/OpenFOAM/db/dictionary/entry/entryIO.C

@@ -191,8 +191,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
 }
 
 
-Foam::autoPtr<Foam::entry>
+Foam::autoPtr<Foam::entry> Foam::entry::New(Istream& is)
-Foam::entry::New(Istream& is)
 {
     is.fatalCheck("entry::New(Istream&)");
 

src/OpenFOAM/db/functionObjects/functionObject/functionObject.C

@@ -43,8 +43,7 @@ Foam::functionObject::functionObject(const word& name)
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::functionObject>
+Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
-Foam::functionObject::New
 (
     const word& name,
     const Time& t,

src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C

@@ -26,8 +26,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr< Foam::pointPatchField<Type> >
+Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
-Foam::pointPatchField<Type>::New
 (
     const word& patchFieldType,
     const word& actualPatchType,
@@ -96,8 +95,7 @@ Foam::pointPatchField<Type>::New
 
 
 template<class Type>
-Foam::autoPtr< Foam::pointPatchField<Type> >
+Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
-Foam::pointPatchField<Type>::New
 (
     const word& patchFieldType,
     const pointPatch& p,
@@ -109,8 +107,7 @@ Foam::pointPatchField<Type>::New
 
 
 template<class Type>
-Foam::autoPtr< Foam::pointPatchField<Type> >
+Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
-Foam::pointPatchField<Type>::New
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -196,8 +193,7 @@ Foam::pointPatchField<Type>::New
 // Return a pointer to a new patch created on freestore from
 // a given pointPatchField<Type> mapped onto a new patch
 template<class Type>
-Foam::autoPtr< Foam::pointPatchField<Type> >
+Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
-Foam::pointPatchField<Type>::New
 (
     const pointPatchField<Type>& ptf,
     const pointPatch& p,

src/OpenFOAM/graph/graph.C

@@ -143,8 +143,10 @@ Foam::scalarField& Foam::graph::y()
 }
 
 
-Foam::autoPtr<Foam::graph::writer>
+Foam::autoPtr<Foam::graph::writer> Foam::graph::writer::New
-Foam::graph::writer::New(const word& graphFormat)
+(
+    const word& graphFormat
+)
 {
     if (!wordConstructorTablePtr_)
     {

src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C

@@ -36,8 +36,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::word
+Foam::word Foam::lduMatrix::preconditioner::getName
-Foam::lduMatrix::preconditioner::getName
 (
     const dictionary& solverControls
 )

src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C

@@ -58,8 +58,7 @@ Foam::lduMatrix::smoother::getName
 }
 
 
-Foam::autoPtr<Foam::lduMatrix::smoother>
+Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
-Foam::lduMatrix::smoother::New
 (
     const word& fieldName,
     const lduMatrix& matrix,

src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C

@@ -37,8 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::lduMatrix::solver>
+Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
-Foam::lduMatrix::solver::New
 (
     const word& fieldName,
     const lduMatrix& matrix,

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::GAMGInterfaceField>
+Foam::autoPtr<Foam::GAMGInterfaceField> Foam::GAMGInterfaceField::New
-Foam::GAMGInterfaceField::New
 (
     const GAMGInterface& GAMGCp,
     const lduInterfaceField& fineInterface

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C

@@ -29,8 +29,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::GAMGInterface>
+Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
-Foam::GAMGInterface::New
 (
     const lduInterface& fineInterface,
     const labelField& localRestrictAddressing,

src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::facePointPatch>
+Foam::autoPtr<Foam::facePointPatch> Foam::facePointPatch::New
-Foam::facePointPatch::New
 (
     const polyPatch& patch,
     const pointBoundaryMesh& bm

src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::polyPatch>
+Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
-Foam::polyPatch::New
 (
     const word& patchType,
     const word& name,
@@ -67,8 +66,7 @@ Foam::polyPatch::New
 }
 
 
-Foam::autoPtr<Foam::polyPatch>
+Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
-Foam::polyPatch::New
 (
     const word& name,
     const dictionary& dict,

src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::cellZone>
+Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
-Foam::cellZone::New
 (
     const word& name,
     const dictionary& dict,
@@ -44,10 +43,7 @@ Foam::cellZone::New
             << endl;
     }
 
-    const word zoneType
+    const word zoneType(dict.lookup("type"));
-    (
-        dict.lookup("type")
-    );
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(zoneType);

src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::faceZone>
+Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
-Foam::faceZone::New
 (
     const word& name,
     const dictionary& dict,
@@ -44,10 +43,7 @@ Foam::faceZone::New
             << endl;
     }
 
-    const word zoneType
+    const word zoneType(dict.lookup("type"));
-    (
-        dict.lookup("type")
-    );
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(zoneType);

src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::pointZone>
+Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
-Foam::pointZone::New
 (
     const word& name,
     const dictionary& dict,
@@ -44,10 +43,7 @@ Foam::pointZone::New
             << endl;
     }
 
-    const word zoneType
+    const word zoneType(dict.lookup("type"));
-    (
-        dict.lookup("type")
-    );
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(zoneType);

src/conversion/ensight/part/ensightPart.C

@@ -126,8 +126,7 @@ Foam::ensightPart::ensightPart(const ensightPart& part)
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::ensightPart>
+Foam::autoPtr<Foam::ensightPart> Foam::ensightPart::New(Istream& is)
-Foam::ensightPart::New(Istream& is)
 {
     const word partType(is);
 

src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C

@@ -29,8 +29,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::dynamicFvMesh>
+Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
-Foam::dynamicFvMesh::New(const IOobject& io)
 {
     // do not register the dictionary
     IOdictionary dict

src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C

@@ -1078,9 +1078,9 @@ bool Foam::dynamicRefineFvMesh::update()
                 << exit(FatalError);
         }
 
-        word field(refineDict.lookup("field"));
+        const word fieldName(refineDict.lookup("field"));
 
-        const volScalarField& vFld = lookupObject<volScalarField>(field);
+        const volScalarField& vFld = lookupObject<volScalarField>(fieldName);
 
         const scalar lowerRefineLevel =
             readScalar(refineDict.lookup("lowerRefineLevel"));

src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C

@@ -27,17 +27,13 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::solidBodyMotionFunction>
+Foam::autoPtr<Foam::solidBodyMotionFunction> Foam::solidBodyMotionFunction::New
-Foam::solidBodyMotionFunction::New
 (
     const dictionary& SBMFCoeffs,
     const Time& runTime
 )
 {
-    const word motionType
+    const word motionType(SBMFCoeffs.lookup("solidBodyMotionFunction"));
-    (
-        SBMFCoeffs.lookup("solidBodyMotionFunction")
-    );
 
     Info<< "Selecting solid-body motion function " << motionType << endl;
 

src/dynamicMesh/meshCut/cellLooper/cellLooper.C

@@ -39,8 +39,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::cellLooper>
+Foam::autoPtr<Foam::cellLooper> Foam::cellLooper::New
-Foam::cellLooper::New
 (
     const word& type,
     const polyMesh& mesh

src/dynamicMesh/motionSolver/motionSolver.C

@@ -58,8 +58,7 @@ Foam::motionSolver::motionSolver(const polyMesh& mesh)
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::motionSolver>
+Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New(const polyMesh& mesh)
-Foam::motionSolver::New(const polyMesh& mesh)
 {
     IOdictionary solverDict
     (

src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::polyMeshModifier>
+Foam::autoPtr<Foam::polyMeshModifier> Foam::polyMeshModifier::New
-Foam::polyMeshModifier::New
 (
     const word& name,
     const dictionary& dict,

src/edgeMesh/edgeMeshNew.C

@@ -27,8 +27,11 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr< Foam::edgeMesh >
+Foam::autoPtr<Foam::edgeMesh> Foam::edgeMesh::New
-Foam::edgeMesh::New(const fileName& name, const word& ext)
+(
+    const fileName& name,
+    const word& ext
+)
 {
     fileExtensionConstructorTable::iterator cstrIter =
         fileExtensionConstructorTablePtr_->find(ext);
@@ -49,8 +52,10 @@ Foam::edgeMesh::New(const fileName& name, const word& ext)
 }
 
 
-Foam::autoPtr< Foam::edgeMesh >
+Foam::autoPtr<Foam::edgeMesh> Foam::edgeMesh::New
-Foam::edgeMesh::New(const fileName& name)
+(
+    const fileName& name
+)
 {
     word ext = name.ext();
     if (ext == "gz")

src/engine/engineMesh/engineMesh/engineMeshNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::engineMesh>
+Foam::autoPtr<Foam::engineMesh> Foam::engineMesh::New
-Foam::engineMesh::New
 (
     const Foam::IOobject& io
 )

src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::SRF::SRFModel>
+Foam::autoPtr<Foam::SRF::SRFModel> Foam::SRF::SRFModel::New
-Foam::SRF::SRFModel::New
 (
     const volVectorField& Urel
 )

src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::fvPatch>
+Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
-Foam::fvPatch::New
 (
     const polyPatch& patch,
     const fvBoundaryMesh& bm

src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C

@@ -29,16 +29,14 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::interpolation<Type> >
+Foam::autoPtr<Foam::interpolation<Type> > Foam::interpolation<Type>::New
-Foam::interpolation<Type>::New
 (
     const word& interpolationType,
     const GeometricField<Type, fvPatchField, volMesh>& psi
 )
 {
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_
+        dictionaryConstructorTablePtr_->find(interpolationType);
-            ->find(interpolationType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
@@ -58,8 +56,7 @@ Foam::interpolation<Type>::New
 
 
 template<class Type>
-Foam::autoPtr<Foam::interpolation<Type> >
+Foam::autoPtr<Foam::interpolation<Type> > Foam::interpolation<Type>::New
-Foam::interpolation<Type>::New
 (
     const dictionary& interpolationSchemes,
     const GeometricField<Type, fvPatchField, volMesh>& psi

src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.C

@@ -221,7 +221,7 @@ Foam::displacementLayeredMotionFvMotionSolver::faceZoneEvaluate
     tmp<vectorField> tfld(new vectorField(meshPoints.size()));
     vectorField& fld = tfld();
 
-    const word& type = dict.lookup("type");
+    const word type(dict.lookup("type"));
 
     if (type == "fixedValue")
     {

src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C

@@ -44,8 +44,7 @@ Foam::motionDiffusivity::motionDiffusivity(const fvMotionSolver& mSolver)
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::motionDiffusivity>
+Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New
-Foam::motionDiffusivity::New
 (
     const fvMotionSolver& mSolver,
     Istream& mdData

src/lagrangian/dieselSpray/injector/injectorType/injectorType.C

@@ -46,17 +46,13 @@ Foam::injectorType::injectorType
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::injectorType>
+Foam::autoPtr<Foam::injectorType> Foam::injectorType::New
-Foam::injectorType::New
 (
     const Time& t,
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("injectorType"));
-    (
-        dict.lookup("injectorType")
-    );
 
     Info<< "Selecting injectorType " << modelType << endl;
 

src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModelNew.C

@@ -31,17 +31,13 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::atomizationModel>
+Foam::autoPtr<Foam::atomizationModel> Foam::atomizationModel::New
-Foam::atomizationModel::New
 (
     const dictionary& dict,
     spray& sm
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("atomizationModel"));
-    (
-        dict.lookup("atomizationModel")
-    );
 
     Info<< "Selecting atomizationModel " << modelType << endl;
 

src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C

@@ -31,17 +31,13 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::breakupModel>
+Foam::autoPtr<Foam::breakupModel> Foam::breakupModel::New
-Foam::breakupModel::New
 (
     const dictionary& dict,
     spray& sm
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("breakupModel"));
-    (
-        dict.lookup("breakupModel")
-    );
 
     Info<< "Selecting breakupModel " << modelType << endl;
 

src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C

@@ -33,18 +33,14 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::collisionModel>
+Foam::autoPtr<Foam::collisionModel> Foam::collisionModel::New
-Foam::collisionModel::New
 (
     const dictionary& dict,
     spray& sm,
     Random& rndGen
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("collisionModel"));
-    (
-        dict.lookup("collisionModel")
-    );
 
     Info<< "Selecting collisionModel " << modelType << endl;
 

src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModelNew.C

@@ -30,17 +30,13 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::dispersionModel>
+Foam::autoPtr<Foam::dispersionModel> Foam::dispersionModel::New
-Foam::dispersionModel::New
 (
     const dictionary& dict,
     spray& sm
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("dispersionModel"));
-    (
-        dict.lookup("dispersionModel")
-    );
 
     Info<< "Selecting dispersionModel " << modelType << endl;
 

src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C

@@ -30,13 +30,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::dragModel>
+Foam::autoPtr<Foam::dragModel> Foam::dragModel::New(const dictionary& dict)
-Foam::dragModel::New(const dictionary& dict)
 {
-    const word modelType
+    const word modelType(dict.lookup("dragModel"));
-    (
-        dict.lookup("dragModel")
-    );
 
     Info<< "Selecting dragModel " << modelType << endl;
 

src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C

@@ -31,13 +31,12 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::evaporationModel>
+Foam::autoPtr<Foam::evaporationModel> Foam::evaporationModel::New
-Foam::evaporationModel::New(const dictionary& dict)
+(
+    const dictionary& dict
+)
 {
-    const word modelType
+    const word modelType(dict.lookup("evaporationModel"));
-    (
-        dict.lookup("evaporationModel")
-    );
 
     Info<< "Selecting evaporationModel " << modelType << endl;
 

src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C

@@ -31,16 +31,12 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::heatTransferModel>
+Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
-Foam::heatTransferModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("heatTransferModel"));
-    (
-        dict.lookup("heatTransferModel")
-    );
 
     Info<< "Selecting heatTransferModel " << modelType << endl;
 

src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C

@@ -31,17 +31,13 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::injectorModel>
+Foam::autoPtr<Foam::injectorModel> Foam::injectorModel::New
-Foam::injectorModel::New
 (
     const dictionary& dict,
     spray& sm
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("injectorModel"));
-    (
-        dict.lookup("injectorModel")
-    );
 
     Info<< "Selecting injectorModel " << modelType << endl;
 

src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C

@@ -29,18 +29,14 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::wallModel>
+Foam::autoPtr<Foam::wallModel> Foam::wallModel::New
-Foam::wallModel::New
 (
     const dictionary& dict,
     const volVectorField& U,
     spray& sm
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("wallModel"));
-    (
-        dict.lookup("wallModel")
-    );
 
     Info<< "Selecting wallModel " << modelType << endl;
 

src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C

@@ -35,10 +35,7 @@ Foam::BinaryCollisionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("BinaryCollisionModel"));
-    (
-        dict.lookup("BinaryCollisionModel")
-    );
 
     Info<< "Selecting BinaryCollisionModel " << modelType << endl;
 

src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C

@@ -35,10 +35,7 @@ Foam::InflowBoundaryModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("InflowBoundaryModel"));
-    (
-        dict.lookup("InflowBoundaryModel")
-    );
 
     Info<< "Selecting InflowBoundaryModel " << modelType << endl;
 

src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C

@@ -35,10 +35,7 @@ Foam::WallInteractionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("WallInteractionModel"));
-    (
-        dict.lookup("WallInteractionModel")
-    );
 
     Info<< "Selecting WallInteractionModel " << modelType << endl;
 

src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C

@@ -36,15 +36,13 @@ Foam::IntegrationScheme<Type>::New
     const dictionary& dict
 )
 {
-    word IntegrationSchemeTypeName;
+    const word schemeName(dict.lookup(phiName));
-
-    dict.lookup(phiName) >> IntegrationSchemeTypeName;
 
     Info<< "Selecting " << phiName << " IntegrationScheme "
-        << IntegrationSchemeTypeName << endl;
+        << schemeName << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(IntegrationSchemeTypeName);
+        dictionaryConstructorTablePtr_->find(schemeName);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
@@ -52,7 +50,7 @@ Foam::IntegrationScheme<Type>::New
         (
             "IntegrationScheme::New(const dictionary&)"
         )   << "Unknown IntegrationScheme type "
-            << IntegrationSchemeTypeName << nl << nl
+            << schemeName << nl << nl
             << "Valid IntegrationScheme types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);

src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C

@@ -28,8 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr< Foam::DataEntry<Type> >
+Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
-Foam::DataEntry<Type>::New
 (
     const word& entryName,
     const dictionary& dict

src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C

@@ -35,10 +35,7 @@ Foam::DispersionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("DispersionModel"));
-    (
-        dict.lookup("DispersionModel")
-    );
 
     Info<< "Selecting DispersionModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C

@@ -28,17 +28,13 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::DragModel<CloudType> >
+Foam::autoPtr<Foam::DragModel<CloudType> > Foam::DragModel<CloudType>::New
-Foam::DragModel<CloudType>::New
 (
     const dictionary& dict,
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("DragModel"));
-    (
-        dict.lookup("DragModel")
-    );
 
     Info<< "Selecting DragModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C

@@ -35,10 +35,7 @@ Foam::InjectionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("InjectionModel"));
-    (
-        dict.lookup("InjectionModel")
-    );
 
     Info<< "Selecting InjectionModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C

@@ -35,10 +35,7 @@ Foam::PatchInteractionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("PatchInteractionModel"));
-    (
-        dict.lookup("PatchInteractionModel")
-    );
 
     Info<< "Selecting PatchInteractionModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C

@@ -46,7 +46,7 @@ Foam::StandardWallInteraction<CloudType>::StandardWallInteraction
     {
         case PatchInteractionModel<CloudType>::itOther:
         {
-            word interactionTypeName(this->coeffDict().lookup("type"));
+            const word interactionTypeName(this->coeffDict().lookup("type"));
 
             FatalErrorIn
             (

src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C

@@ -35,10 +35,7 @@ Foam::PostProcessingModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("PostProcessingModel"));
-    (
-        dict.lookup("PostProcessingModel")
-    );
 
     Info<< "Selecting PostProcessingModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C

@@ -36,10 +36,7 @@ Foam::SurfaceFilmModel<CloudType>::New
     const dimensionedVector& g
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("SurfaceFilmModel"));
-    (
-        dict.lookup("SurfaceFilmModel")
-    );
 
     Info<< "Selecting SurfaceFilmModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C

@@ -35,10 +35,7 @@ Foam::CompositionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("CompositionModel"));
-    (
-        dict.lookup("CompositionModel")
-    );
 
     Info<< "Selecting CompositionModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C

@@ -35,10 +35,7 @@ Foam::PhaseChangeModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("PhaseChangeModel"));
-    (
-        dict.lookup("PhaseChangeModel")
-    );
 
     Info<< "Selecting PhaseChangeModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C

@@ -35,10 +35,7 @@ Foam::DevolatilisationModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("DevolatilisationModel"));
-    (
-        dict.lookup("DevolatilisationModel")
-    );
 
     Info<< "Selecting DevolatilisationModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C

@@ -35,10 +35,7 @@ Foam::SurfaceReactionModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("SurfaceReactionModel"));
-    (
-        dict.lookup("SurfaceReactionModel")
-    );
 
     Info<< "Selecting SurfaceReactionModel " << modelType << endl;
 

src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C

@@ -35,10 +35,7 @@ Foam::HeatTransferModel<CloudType>::New
     CloudType& owner
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("HeatTransferModel"));
-    (
-        dict.lookup("HeatTransferModel")
-    );
 
     Info<< "Selecting HeatTransferModel " << modelType << endl;
 

src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C

@@ -28,18 +28,14 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::energyScalingFunction>
+Foam::autoPtr<Foam::energyScalingFunction> Foam::energyScalingFunction::New
-Foam::energyScalingFunction::New
 (
     const word& name,
-    const dictionary& energyScalingFunctionProperties,
+    const dictionary& propDict,
     const pairPotential& pairPot
 )
 {
-    const word scalingType
+    const word scalingType(propDict.lookup("energyScalingFunction"));
-    (
-        energyScalingFunctionProperties.lookup("energyScalingFunction")
-    );
 
     Info<< "Selecting energy scaling function "
         << scalingType << " for "
@@ -60,8 +56,7 @@ Foam::energyScalingFunction::New
             << exit(FatalError);
     }
 
-    return autoPtr<energyScalingFunction>
+    return autoPtr<energyScalingFunction>(cstrIter()(name, propDict, pairPot));
-        (cstrIter()(name, energyScalingFunctionProperties, pairPot));
 }
 
 

src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C

@@ -28,17 +28,13 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::pairPotential>
+Foam::autoPtr<Foam::pairPotential> Foam::pairPotential::New
-Foam::pairPotential::New
 (
     const word& name,
-    const dictionary& pairPotentialProperties
+    const dictionary& propDict
 )
 {
-    const word potentialType
+    const word potentialType(propDict.lookup("pairPotential"));
-    (
-        pairPotentialProperties.lookup("pairPotential")
-    );
 
     Info<< nl << "Selecting intermolecular pair potential "
         << potentialType << " for "
@@ -59,8 +55,7 @@ Foam::pairPotential::New
             << exit(FatalError);
     }
 
-    return autoPtr<pairPotential>
+    return autoPtr<pairPotential>(cstrIter()(name, propDict));
-        (cstrIter()(name, pairPotentialProperties));
 }
 
 

src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C

@@ -27,21 +27,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::tetherPotential>
+Foam::autoPtr<Foam::tetherPotential> Foam::tetherPotential::New
-Foam::tetherPotential::New
 (
     const word& name,
-    const dictionary& tetherPotentialProperties
+    const dictionary& propDict
 )
 {
-    const word potentialType
+    const word potentialType(propDict.lookup("tetherPotential"));
-    (
-        tetherPotentialProperties.lookup("tetherPotential")
-    );
 
-    Info<< nl << "Selecting tether potential "
+    Info<< nl << "Selecting tether potential " << potentialType
-        << potentialType << " for "
+        << " for " << name << endl;
-        << name << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(potentialType);
@@ -58,8 +53,7 @@ Foam::tetherPotential::New
             << exit(FatalError);
     }
 
-    return autoPtr<tetherPotential>
+    return autoPtr<tetherPotential>(cstrIter()(name, propDict));
-        (cstrIter()(name, tetherPotentialProperties));
 }
 
 

src/mesh/blockMesh/curvedEdges/curvedEdge.C

@@ -30,7 +30,6 @@ License
 
 namespace Foam
 {
-
     defineTypeNameAndDebug(curvedEdge, 0);
     defineRunTimeSelectionTable(curvedEdge, Istream);
 }
@@ -74,8 +73,7 @@ Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::clone() const
 }
 
 
-Foam::autoPtr<Foam::curvedEdge>
+Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::New
-Foam::curvedEdge::New
 (
     const pointField& points,
     Istream& is

src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C

@@ -127,8 +127,7 @@ Foam::coordinateRotation::coordinateRotation
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::coordinateRotation>
+Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
-Foam::coordinateRotation::New
 (
     const dictionary& dict
 )

src/meshTools/coordinateSystems/coordinateSystemNew.C

@@ -28,8 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::coordinateSystem>
+Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
-Foam::coordinateSystem::New
 (
     const word& name,
     const dictionary& dict
@@ -75,8 +74,7 @@ Foam::coordinateSystem::New
 }
 
 
-Foam::autoPtr<Foam::coordinateSystem>
+Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
-Foam::coordinateSystem::New
 (
     const word& coordType,
     const word& name,
@@ -113,14 +111,13 @@ Foam::coordinateSystem::New
 }
 
 
-Foam::autoPtr<Foam::coordinateSystem>
+Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
-Foam::coordinateSystem::New
 (
     Istream& is
 )
 {
-    word name(is);
+    const word name(is);
-    dictionary dict(is);
+    const dictionary dict(is);
 
     return New(name, dict);
 }

src/meshTools/searchableSurface/searchableSurface.C

@@ -38,8 +38,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
-Foam::autoPtr<Foam::searchableSurface>
+Foam::autoPtr<Foam::searchableSurface> Foam::searchableSurface::New
-Foam::searchableSurface::New
 (
     const word& searchableSurfaceType,
     const IOobject& io,
@@ -47,15 +46,14 @@ Foam::searchableSurface::New
 )
 {
     dictConstructorTable::iterator cstrIter =
-        dictConstructorTablePtr_
+        dictConstructorTablePtr_->find(searchableSurfaceType);
-            ->find(searchableSurfaceType);
 
     if (cstrIter == dictConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "searchableSurface::New(const word&, const word&"
+            "searchableSurface::New(const word&,"
-            ", const IOobject&, const dictionary&)"
+            " const IOobject&, const dictionary&)"
         )   << "Unknown searchableSurface type " << searchableSurfaceType
             << endl << endl
             << "Valid searchableSurface types : " << endl

src/meshTools/sets/topoSetSource/topoSetSource.C

@@ -66,8 +66,7 @@ const Foam::string Foam::topoSetSource::illegalSource_
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::topoSetSource>
+Foam::autoPtr<Foam::topoSetSource> Foam::topoSetSource::New
-Foam::topoSetSource::New
 (
     const word& topoSetSourceType,
     const polyMesh& mesh,
@@ -75,8 +74,7 @@ Foam::topoSetSource::New
 )
 {
     wordConstructorTable::iterator cstrIter =
-        wordConstructorTablePtr_
+        wordConstructorTablePtr_->find(topoSetSourceType);
-            ->find(topoSetSourceType);
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
@@ -95,8 +93,7 @@ Foam::topoSetSource::New
 }
 
 
-Foam::autoPtr<Foam::topoSetSource>
+Foam::autoPtr<Foam::topoSetSource> Foam::topoSetSource::New
-Foam::topoSetSource::New
 (
     const word& topoSetSourceType,
     const polyMesh& mesh,
@@ -104,8 +101,7 @@ Foam::topoSetSource::New
 )
 {
     istreamConstructorTable::iterator cstrIter =
-        istreamConstructorTablePtr_
+        istreamConstructorTablePtr_->find(topoSetSourceType);
-            ->find(topoSetSourceType);
 
     if (cstrIter == istreamConstructorTablePtr_->end())
     {

src/meshTools/sets/topoSets/topoSet.C

@@ -42,8 +42,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::topoSet>
+Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
-Foam::topoSet::New
 (
     const word& setType,
     const polyMesh& mesh,
@@ -53,8 +52,7 @@ Foam::topoSet::New
 )
 {
     wordConstructorTable::iterator cstrIter =
-        wordConstructorTablePtr_
+        wordConstructorTablePtr_->find(setType);
-            ->find(setType);
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
@@ -73,8 +71,7 @@ Foam::topoSet::New
 }
 
 
-Foam::autoPtr<Foam::topoSet>
+Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
-Foam::topoSet::New
 (
     const word& setType,
     const polyMesh& mesh,
@@ -84,8 +81,7 @@ Foam::topoSet::New
 )
 {
     sizeConstructorTable::iterator cstrIter =
-        sizeConstructorTablePtr_
+        sizeConstructorTablePtr_->find(setType);
-            ->find(setType);
 
     if (cstrIter == sizeConstructorTablePtr_->end())
     {
@@ -104,8 +100,7 @@ Foam::topoSet::New
 }
 
 
-Foam::autoPtr<Foam::topoSet>
+Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
-Foam::topoSet::New
 (
     const word& setType,
     const polyMesh& mesh,
@@ -115,8 +110,7 @@ Foam::topoSet::New
 )
 {
     setConstructorTable::iterator cstrIter =
-        setConstructorTablePtr_
+        setConstructorTablePtr_->find(setType);
-            ->find(setType);
 
     if (cstrIter == setConstructorTablePtr_->end())
     {

src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C

@@ -42,16 +42,12 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::decompositionMethod>
+Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
-Foam::decompositionMethod::New
 (
     const dictionary& decompositionDict
 )
 {
-    const word methodType
+    const word methodType(decompositionDict.lookup("method"));
-    (
-        decompositionDict.lookup("method")
-    );
 
     Info<< "Selecting decompositionMethod " << methodType << endl;
 
@@ -75,17 +71,13 @@ Foam::decompositionMethod::New
 }
 
 
-Foam::autoPtr<Foam::decompositionMethod>
+Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
-Foam::decompositionMethod::New
 (
     const dictionary& decompositionDict,
     const polyMesh& mesh
 )
 {
-    const word methodType
+    const word methodType(decompositionDict.lookup("method"));
-    (
-        decompositionDict.lookup("method")
-    );
 
     Info<< "Selecting decompositionMethod " << methodType << endl;
 

src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::calcType>
+Foam::autoPtr<Foam::calcType> Foam::calcType::New
-Foam::calcType::New
 (
     const word& calcTypeName
 )

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C

@@ -39,7 +39,7 @@ Foam::sixDoFRigidBodyMotionRestraint::New(const dictionary& sDoFRBMRDict)
     //     << restraintType << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-    dictionaryConstructorTablePtr_->find(restraintType);
+        dictionaryConstructorTablePtr_->find(restraintType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {

src/sampling/sampledSet/sampledSet/sampledSet.C

@@ -406,8 +406,7 @@ Foam::sampledSet::~sampledSet()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::sampledSet>
+Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
-Foam::sampledSet::New
 (
     const word& name,
     const polyMesh& mesh,
@@ -415,10 +414,7 @@ Foam::sampledSet::New
     const dictionary& dict
 )
 {
-    const word sampleType
+    const word sampleType(dict.lookup("type"));
-    (
-        dict.lookup("type")
-    );
 
     wordConstructorTable::iterator cstrIter =
         wordConstructorTablePtr_->find(sampleType);

src/sampling/sampledSet/writers/writer.C

@@ -31,15 +31,13 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr< Foam::writer<Type> >
+Foam::autoPtr< Foam::writer<Type> > Foam::writer<Type>::New
-Foam::writer<Type>::New
 (
     const word& writeType
 )
 {
     typename wordConstructorTable::iterator cstrIter =
-        wordConstructorTablePtr_
+        wordConstructorTablePtr_->find(writeType);
-            ->find(writeType);
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {

src/sampling/sampledSurface/sampledSurface/sampledSurface.C

@@ -113,19 +113,15 @@ void Foam::sampledSurface::makeCf() const
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
-
+Foam::autoPtr<Foam::sampledSurface> Foam::sampledSurface::New
-Foam::autoPtr<Foam::sampledSurface>
-Foam::sampledSurface::New
 (
     const word& name,
     const polyMesh& mesh,
     const dictionary& dict
 )
 {
-    const word sampleType
+    const word sampleType(dict.lookup("type"));
-    (
+
-        dict.lookup("type")
-    );
     if (debug)
     {
         Info<< "Selecting sampledType " << sampleType << endl;
@@ -150,6 +146,7 @@ Foam::sampledSurface::New
     return autoPtr<sampledSurface>(cstrIter()(name, mesh, dict));
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::sampledSurface::sampledSurface
@@ -168,7 +165,6 @@ Foam::sampledSurface::sampledSurface
 {}
 
 
-// Construct from dictionary
 Foam::sampledSurface::sampledSurface
 (
     const word& name,

src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C

@@ -34,10 +34,7 @@ Foam::surfaceFilmModels::injectionModel::New
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("injectionModel"));
-    (
-        dict.lookup("injectionModel")
-    );
 
     Info<< "    Selecting injectionModel " << modelType << endl;
 

src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C

@@ -34,10 +34,7 @@ Foam::surfaceFilmModels::phaseChangeModel::New
     const dictionary& dict
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("phaseChangeModel"));
-    (
-        dict.lookup("phaseChangeModel")
-    );
 
     Info<< "    Selecting phaseChangeModel " << modelType << endl;
 

src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::basicPsiThermo>
+Foam::autoPtr<Foam::basicPsiThermo> Foam::basicPsiThermo::New
-Foam::basicPsiThermo::New
 (
     const fvMesh& mesh
 )

src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::basicRhoThermo>
+Foam::autoPtr<Foam::basicRhoThermo> Foam::basicRhoThermo::New
-Foam::basicRhoThermo::New
 (
     const fvMesh& mesh
 )

src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::psiChemistryModel>
+Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
-Foam::psiChemistryModel::New
 (
     const fvMesh& mesh
 )

src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::rhoChemistryModel>
+Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
-Foam::rhoChemistryModel::New
 (
     const fvMesh& mesh
 )

src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolverNew.C

@@ -36,10 +36,7 @@ Foam::chemistrySolver<CompType, ThermoType>::New
     const word& thermoTypeName
 )
 {
-    const word modelName
+    const word modelName(model.lookup("chemistrySolver"));
-    (
-        model.lookup("chemistrySolver")
-    );
 
     const word chemistrySolverType =
         modelName + '<' + compTypeName + ',' + thermoTypeName + '>';

src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::laminarFlameSpeed>
+Foam::autoPtr<Foam::laminarFlameSpeed> Foam::laminarFlameSpeed::New
-Foam::laminarFlameSpeed::New
 (
     const hhuCombustionThermo& ct
 )
@@ -47,16 +46,12 @@ Foam::laminarFlameSpeed::New
         )
     );
 
-    const word laminarFlameSpeedType
+    const word corrType(propDict.lookup("laminarFlameSpeedCorrelation"));
-    (
-        propDict.lookup("laminarFlameSpeedCorrelation")
-    );
 
-    Info<< "Selecting laminar flame speed correlation "
+    Info<< "Selecting laminar flame speed correlation " << corrType << endl;
-        << laminarFlameSpeedType << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(laminarFlameSpeedType);
+        dictionaryConstructorTablePtr_->find(corrType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
@@ -65,7 +60,7 @@ Foam::laminarFlameSpeed::New
             "laminarFlameSpeed::New(const hhuCombustionThermo&)",
             propDict
         )   << "Unknown laminarFlameSpeed type "
-            << laminarFlameSpeedType << nl << nl
+            << corrType << nl << nl
             << "Valid laminarFlameSpeed types are :" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);

src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C

@@ -73,8 +73,7 @@ Foam::liquidMixture::liquidMixture
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::liquidMixture>
+Foam::autoPtr<Foam::liquidMixture> Foam::liquidMixture::New
-Foam::liquidMixture::New
 (
     const dictionary& thermophysicalProperties
 )

src/thermophysicalModels/liquids/liquid/liquid.C

@@ -39,14 +39,11 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::liquid>
+Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
-Foam::liquid::New(Istream& is)
 {
     if (debug)
     {
-        Info<< "liquid::New(Istream&) : "
+        Info<< "liquid::New(Istream&) : " << "constructing liquid" << endl;
-            << "constructing liquid"
-            << endl;
     }
 
     const word liquidType(is);

src/thermophysicalModels/pdfs/pdf/pdfNew.C

@@ -27,17 +27,13 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::pdfs::pdf>
+Foam::autoPtr<Foam::pdfs::pdf> Foam::pdfs::pdf::New
-Foam::pdfs::pdf::New
 (
     const dictionary& dict,
     Random& rndGen
 )
 {
-    const word modelType
+    const word modelType(dict.lookup("pdfType"));
-    (
-        dict.lookup("pdfType")
-    );
 
     Info<< "Selecting pdfType " << modelType << endl;