STYLE: partial revert for 5cfa9762

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

@@ -36,15 +36,13 @@ Foam::IntegrationScheme<Type>::New
     const dictionary& dict
 )
 {
-    word IntegrationSchemeTypeName;
-
-    dict.lookup(phiName) >> IntegrationSchemeTypeName;
+    const word schemeName(dict.lookup(phiName));
 
     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::DataEntry<Type>::New
+Foam::autoPtr<Foam::DataEntry<Type> > 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
-    (
-        dict.lookup("DispersionModel")
-    );
+    const word modelType(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::DragModel<CloudType>::New
+Foam::autoPtr<Foam::DragModel<CloudType> > Foam::DragModel<CloudType>::New
 (
     const dictionary& dict,
     CloudType& owner
 )
 {
-    const word modelType
-    (
-        dict.lookup("DragModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("InjectionModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("PatchInteractionModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("PostProcessingModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("SurfaceFilmModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("CompositionModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("PhaseChangeModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("DevolatilisationModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("SurfaceReactionModel")
-    );
+    const word modelType(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
-    (
-        dict.lookup("HeatTransferModel")
-    );
+    const word modelType(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::energyScalingFunction::New
+Foam::autoPtr<Foam::energyScalingFunction> Foam::energyScalingFunction::New
 (
     const word& name,
-    const dictionary& energyScalingFunctionProperties,
+    const dictionary& propDict,
     const pairPotential& pairPot
 )
 {
-    const word scalingType
-    (
-        energyScalingFunctionProperties.lookup("energyScalingFunction")
-    );
+    const word scalingType(propDict.lookup("energyScalingFunction"));
 
     Info<< "Selecting energy scaling function "
         << scalingType << " for "
@@ -60,8 +56,7 @@ Foam::energyScalingFunction::New
             << exit(FatalError);
     }
 
-    return autoPtr<energyScalingFunction>
-        (cstrIter()(name, energyScalingFunctionProperties, pairPot));
+    return autoPtr<energyScalingFunction>(cstrIter()(name, propDict, pairPot));
 }
 
 

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

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

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

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

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::curvedEdge::New
+Foam::autoPtr<Foam::curvedEdge> 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::coordinateRotation::New
+Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
 (
     const dictionary& dict
 )

src/meshTools/coordinateSystems/coordinateSystemNew.C

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