STYLE: partial revert for 5cfa9762

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

@@ -27,8 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::PDRDragModel>
-Foam::PDRDragModel::New
+Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
 (
     const dictionary& PDRProperties,
     const compressible::RASModel& turbulence,
@@ -37,10 +36,7 @@ Foam::PDRDragModel::New
     const surfaceScalarField& phi
 )
 {
-    const word modelType
-    (
-        PDRProperties.lookup("PDRDragModel")
-    );
+    const word modelType(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::XiEqModel::New
+Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
 (
-    const dictionary& XiEqProperties,
+    const dictionary& propDict,
     const hhuCombustionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )
 {
-    const word modelType
-    (
-        XiEqProperties.lookup("XiEqModel")
-    );
+    const word modelType(propDict.lookup("XiEqModel"));
 
     Info<< "Selecting flame-wrinkling model " << modelType << endl;
 
@@ -63,8 +59,7 @@ Foam::XiEqModel::New
             << exit(FatalError);
     }
 
-    return autoPtr<XiEqModel>
-        (cstrIter()(XiEqProperties, thermo, turbulence, Su));
+    return autoPtr<XiEqModel>(cstrIter()(propDict, thermo, turbulence, Su));
 }
 
 

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

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

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

@@ -27,10 +27,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::XiModel>
-Foam::XiModel::New
+Foam::autoPtr<Foam::XiModel> 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
-    (
-        XiProperties.lookup("XiModel")
-    );
+    const word modelType(propDict.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::combustionModel::New
+Foam::autoPtr<Foam::combustionModel> 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
-    (
-        combustionProperties.lookup
-        (
-            "combustionModel"
-        )
-    );
+    const word modelType(propDict.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 "
-        << phaseChangeTwoPhaseMixtureTypeName << endl;
+    Info<< "Selecting phaseChange model " << mixtureType << endl;
 
     componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
-            ->find(phaseChangeTwoPhaseMixtureTypeName);
+        componentsConstructorTablePtr_->find(mixtureType);
 
     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::dragModel::New
+Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
 (
     const dictionary& interfaceDict,
     const volScalarField& alpha,
@@ -36,15 +35,10 @@ Foam::dragModel::New
     const phaseModel& phaseb
 )
 {
-    const word modelType
-    (
-        interfaceDict.lookup("dragModel" + phasea.name())
-    );
+    const word modelType(interfaceDict.lookup("dragModel" + phasea.name()));
 
-    Info<< "Selecting dragModel for phase "
-        << phasea.name()
-        << ": "
-        << modelType << endl;
+    Info<< "Selecting dragModel for phase " << phasea.name()
+        << ": " << 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::conductivityModel::New
+Foam::autoPtr<Foam::conductivityModel> Foam::conductivityModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
-    (
-        dict.lookup("conductivityModel")
-    );
+    const word modelType(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::frictionalStressModel::New
+Foam::autoPtr<Foam::frictionalStressModel> Foam::frictionalStressModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
-    (
-        dict.lookup("frictionalStressModel")
-    );
+    const word modelType(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::granularPressureModel::New
+Foam::autoPtr<Foam::granularPressureModel> Foam::granularPressureModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
-    (
-        dict.lookup("granularPressureModel")
-    );
+    const word modelType(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::radialModel::New
+Foam::autoPtr<Foam::radialModel> Foam::radialModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
-    (
-        dict.lookup("radialModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("viscosityModel")
-    );
+    const word modelType(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::phaseModel::New
+Foam::autoPtr<Foam::phaseModel> 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::extrudeModel::New
+Foam::autoPtr<Foam::extrudeModel> Foam::extrudeModel::New
 (
     const dictionary& dict
 )
 {
-    const word modelType
-    (
-        dict.lookup("extrudeModel")
-    );
+    const word modelType(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::ODESolver::New
+Foam::autoPtr<Foam::ODESolver> 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::token::compound::New
+Foam::autoPtr<Foam::token::compound> 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::dictionary::New(Istream& is)
+Foam::autoPtr<Foam::dictionary> 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::entry::New(Istream& is)
+Foam::autoPtr<Foam::entry> Foam::entry::New(Istream& is)
 {
     is.fatalCheck("entry::New(Istream&)");