From 03338b9ea99beafe10e59faa83b704fbbdc50532 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 23 Apr 2010 10:23:08 +0200 Subject: [PATCH] STYLE: partial revert for 5cfa97624eedd60d0d15fef4b9bfb685ababba44 --- .../dragModels/PDRDragModel/PDRDragModelNew.C | 8 ++------ .../XiEqModels/XiEqModel/XiEqModelNew.C | 13 ++++--------- .../XiModels/XiGModels/XiGModel/XiGModelNew.C | 13 ++++--------- .../PDRFoam/XiModels/XiModel/XiModelNew.C | 12 ++++-------- .../combustionModel/combustionModelNew.C | 15 ++++----------- .../compressible/sonicDyMFoam/sonicDyMFoam.C | 2 +- .../phaseChangeTwoPhaseMixtureNew.C | 10 ++++------ .../dragModels/dragModel/dragModelNew.C | 14 ++++---------- .../conductivityModel/conductivityModelNew.C | 8 ++------ .../frictionalStressModelNew.C | 8 ++------ .../granularPressureModelNew.C | 8 ++------ .../radialModel/radialModel/radialModelNew.C | 8 ++------ .../viscosityModel/viscosityModelNew.C | 5 +---- .../phaseModel/phaseModel/phaseModel.C | 3 +-- .../extrudeModel/extrudeModelNew.C | 8 ++------ .../mesh/manipulation/moveMesh/moveMesh.C | 2 +- src/ODE/ODESolvers/ODESolver/ODESolverNew.C | 3 +-- src/OpenFOAM/db/IOstreams/token/token.C | 3 +-- src/OpenFOAM/db/dictionary/dictionaryIO.C | 3 +-- src/OpenFOAM/db/dictionary/entry/entryIO.C | 3 +-- .../functionObject/functionObject.C | 3 +-- .../pointPatchField/pointPatchFieldNew.C | 12 ++++-------- src/OpenFOAM/graph/graph.C | 6 ++++-- .../lduMatrix/lduMatrixPreconditioner.C | 3 +-- .../lduMatrix/lduMatrix/lduMatrixSmoother.C | 3 +-- .../lduMatrix/lduMatrix/lduMatrixSolver.C | 3 +-- .../GAMGInterfaceField/GAMGInterfaceFieldNew.C | 3 +-- .../GAMGInterface/GAMGInterfaceNew.C | 3 +-- .../facePointPatch/facePointPatchNew.C | 3 +-- .../polyPatches/polyPatch/polyPatchNew.C | 6 ++---- .../polyMesh/zones/cellZone/cellZoneNew.C | 8 ++------ .../polyMesh/zones/faceZone/faceZoneNew.C | 8 ++------ .../polyMesh/zones/pointZone/pointZoneNew.C | 8 ++------ src/conversion/ensight/part/ensightPart.C | 3 +-- .../dynamicFvMesh/dynamicFvMeshNew.C | 3 +-- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 4 ++-- .../solidBodyMotionFunctionNew.C | 8 ++------ .../meshCut/cellLooper/cellLooper.C | 3 +-- src/dynamicMesh/motionSolver/motionSolver.C | 3 +-- .../polyMeshModifier/polyMeshModifierNew.C | 3 +-- src/edgeMesh/edgeMeshNew.C | 13 +++++++++---- .../engineMesh/engineMesh/engineMeshNew.C | 3 +-- .../SRF/SRFModel/SRFModel/SRFModelNew.C | 3 +-- .../fvMesh/fvPatches/fvPatch/fvPatchNew.C | 3 +-- .../interpolation/interpolationNew.C | 9 +++------ .../displacementLayeredMotionFvMotionSolver.C | 2 +- .../motionDiffusivity/motionDiffusivity.C | 3 +-- .../injector/injectorType/injectorType.C | 8 ++------ .../atomizationModel/atomizationModelNew.C | 8 ++------ .../breakupModel/breakupModelNew.C | 8 ++------ .../collisionModel/collisionModelNew.C | 8 ++------ .../dispersionModel/dispersionModelNew.C | 8 ++------ .../dragModel/dragModel/dragModelNew.C | 8 ++------ .../evaporationModel/evaporationModelNew.C | 11 +++++------ .../heatTransferModel/heatTransferModelNew.C | 8 ++------ .../injectorModel/injectorModelNew.C | 8 ++------ .../wallModel/wallModel/wallModelNew.C | 8 ++------ .../BinaryCollisionModelNew.C | 5 +---- .../InflowBoundaryModelNew.C | 5 +---- .../WallInteractionModelNew.C | 5 +---- .../IntegrationScheme/IntegrationSchemeNew.C | 10 ++++------ .../IO/DataEntry/DataEntry/DataEntryNew.C | 3 +-- .../DispersionModel/DispersionModelNew.C | 5 +---- .../DragModel/DragModel/DragModelNew.C | 8 ++------ .../InjectionModel/InjectionModelNew.C | 5 +---- .../PatchInteractionModelNew.C | 5 +---- .../StandardWallInteraction.C | 2 +- .../PostProcessingModelNew.C | 5 +---- .../SurfaceFilmModel/SurfaceFilmModelNew.C | 5 +---- .../CompositionModel/CompositionModelNew.C | 5 +---- .../PhaseChangeModel/PhaseChangeModelNew.C | 5 +---- .../DevolatilisationModelNew.C | 5 +---- .../SurfaceReactionModelNew.C | 5 +---- .../HeatTransferModel/HeatTransferModelNew.C | 5 +---- .../basic/energyScalingFunctionNew.C | 13 ++++--------- .../pairPotential/basic/pairPotentialNew.C | 13 ++++--------- .../tetherPotential/basic/tetherPotentialNew.C | 18 ++++++------------ src/mesh/blockMesh/curvedEdges/curvedEdge.C | 4 +--- .../coordinateRotation/coordinateRotation.C | 3 +-- .../coordinateSystems/coordinateSystemNew.C | 13 +++++-------- .../searchableSurface/searchableSurface.C | 10 ++++------ .../sets/topoSetSource/topoSetSource.C | 12 ++++-------- src/meshTools/sets/topoSets/topoSet.C | 18 ++++++------------ .../decompositionMethod/decompositionMethod.C | 16 ++++------------ .../foamCalcFunctions/calcType/calcTypeNew.C | 3 +-- .../sixDoFRigidBodyMotionRestraintNew.C | 2 +- .../sampledSet/sampledSet/sampledSet.C | 8 ++------ src/sampling/sampledSet/writers/writer.C | 6 ++---- .../sampledSurface/sampledSurface.C | 12 ++++-------- .../injectionModel/injectionModelNew.C | 5 +---- .../phaseChangeModel/phaseChangeModelNew.C | 5 +---- .../basicPsiThermo/basicPsiThermoNew.C | 3 +-- .../basicRhoThermo/basicRhoThermoNew.C | 3 +-- .../psiChemistryModel/psiChemistryModelNew.C | 3 +-- .../rhoChemistryModel/rhoChemistryModelNew.C | 3 +-- .../chemistrySolver/chemistrySolverNew.C | 5 +---- .../laminarFlameSpeed/laminarFlameSpeedNew.C | 15 +++++---------- .../liquidMixture/liquidMixture.C | 3 +-- .../liquids/liquid/liquid.C | 7 ++----- src/thermophysicalModels/pdfs/pdf/pdfNew.C | 8 ++------ .../absorptionEmissionModelNew.C | 5 +---- .../scatterModel/scatterModelNew.C | 8 ++------ .../hCombustionThermo/hCombustionThermoNew.C | 6 ++---- .../hhuCombustionThermoNew.C | 6 ++++-- .../hsCombustionThermo/hsCombustionThermoNew.C | 6 ++---- .../hReactionThermo/hReactionThermoNew.C | 6 ++---- .../hsReactionThermo/hsReactionThermoNew.C | 6 ++---- .../solidMixture/solidMixture/solidMixture.C | 3 +-- .../solids/solid/solidNew.C | 3 +-- .../thermophysicalFunction.C | 6 ++++-- .../viscosityModel/viscosityModelNew.C | 8 ++------ .../LES/LESdeltas/LESdelta/LESdelta.C | 3 +-- .../LES/LESfilters/LESfilter/LESfilter.C | 3 +-- 113 files changed, 228 insertions(+), 504 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C index 869f9da12e..0c208d44cc 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::PDRDragModel::New +Foam::autoPtr 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; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C index 90a5d60787..6f347bbe2d 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C @@ -27,19 +27,15 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::XiEqModel::New +Foam::autoPtr 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 - (cstrIter()(XiEqProperties, thermo, turbulence, Su)); + return autoPtr(cstrIter()(propDict, thermo, turbulence, Su)); } diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C index 9f229740cc..b675e7f334 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C @@ -27,19 +27,15 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::XiGModel::New +Foam::autoPtr 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 - (cstrIter()(XiGProperties, thermo, turbulence, Su)); + return autoPtr(cstrIter()(propDict, thermo, turbulence, Su)); } diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C index ae3d5b4988..a77f8e8a20 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C @@ -27,10 +27,9 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::XiModel::New +Foam::autoPtr 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 - (cstrIter()(XiProperties, thermo, turbulence, Su, rho, b, phi)); + (cstrIter()(propDict, thermo, turbulence, Su, rho, b, phi)); } diff --git a/applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModelNew.C b/applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModelNew.C index 09291807c3..ff1e54b0dc 100644 --- a/applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModelNew.C +++ b/applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModelNew.C @@ -27,23 +27,16 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::combustionModel::New +Foam::autoPtr 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 - (cstrIter()(combustionProperties, thermo, turbulence, phi, rho)); + (cstrIter()(propDict, thermo, turbulence, phi, rho)); } diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C index 4bd0cdc61f..312952bcbf 100644 --- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C +++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) Info<< "\nStarting time loop\n" << endl; - autoPtr motionPtr = motionSolver::New(mesh); + autoPtr motionPtr = motionSolver::New(mesh); while (runTime.loop()) { diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C index b78b018880..bffffd6aae 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C +++ b/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); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C index 773a6c70f9..d916f84693 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::dragModel::New +Foam::autoPtr 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); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C index 66c851a48d..8b29862356 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C @@ -27,16 +27,12 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::conductivityModel::New +Foam::autoPtr Foam::conductivityModel::New ( const dictionary& dict ) { - const word modelType - ( - dict.lookup("conductivityModel") - ); + const word modelType(dict.lookup("conductivityModel")); Info<< "Selecting conductivityModel " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C index 7ce2ce03fc..447298e219 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C @@ -27,16 +27,12 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::frictionalStressModel::New +Foam::autoPtr Foam::frictionalStressModel::New ( const dictionary& dict ) { - const word modelType - ( - dict.lookup("frictionalStressModel") - ); + const word modelType(dict.lookup("frictionalStressModel")); Info<< "Selecting frictionalStressModel " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C index d7f4d745f6..682ce1781a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C @@ -27,16 +27,12 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::granularPressureModel::New +Foam::autoPtr Foam::granularPressureModel::New ( const dictionary& dict ) { - const word modelType - ( - dict.lookup("granularPressureModel") - ); + const word modelType(dict.lookup("granularPressureModel")); Info<< "Selecting granularPressureModel " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModelNew.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModelNew.C index 3e729140ce..14bd1a52e8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModelNew.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModelNew.C @@ -27,16 +27,12 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::radialModel::New +Foam::autoPtr Foam::radialModel::New ( const dictionary& dict ) { - const word modelType - ( - dict.lookup("radialModel") - ); + const word modelType(dict.lookup("radialModel")); Info<< "Selecting radialModel " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C index 32e3dc7fe1..35b9684509 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C +++ b/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; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C index 055cbb2773..805cd23845 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C @@ -134,8 +134,7 @@ Foam::phaseModel::phaseModel } -Foam::autoPtr -Foam::phaseModel::New +Foam::autoPtr Foam::phaseModel::New ( const fvMesh& mesh, const dictionary& transportProperties, diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C index 1e91ed4c0d..eed1abdb70 100644 --- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C +++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/extrudeModelNew.C @@ -27,16 +27,12 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::extrudeModel::New +Foam::autoPtr Foam::extrudeModel::New ( const dictionary& dict ) { - const word modelType - ( - dict.lookup("extrudeModel") - ); + const word modelType(dict.lookup("extrudeModel")); Info<< "Selecting extrudeModel " << modelType << endl; diff --git a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C index 191cfef5eb..c975f36e66 100644 --- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C +++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createMesh.H" - autoPtr motionPtr = motionSolver::New(mesh); + autoPtr motionPtr = motionSolver::New(mesh); while (runTime.loop()) { diff --git a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C index add1e02b05..10bb45f96d 100644 --- a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C +++ b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::ODESolver::New +Foam::autoPtr Foam::ODESolver::New ( const Foam::word& ODESolverTypeName, const Foam::ODE& ode diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C index 487f903839..50c0d80f3c 100644 --- a/src/OpenFOAM/db/IOstreams/token/token.C +++ b/src/OpenFOAM/db/IOstreams/token/token.C @@ -52,8 +52,7 @@ Foam::token::compound::~compound() // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::token::compound::New +Foam::autoPtr Foam::token::compound::New ( const word& compoundType, Istream& is diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C index 4ee2af5750..1c452bafaf 100644 --- a/src/OpenFOAM/db/dictionary/dictionaryIO.C +++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C @@ -118,8 +118,7 @@ Foam::dictionary::dictionary(Istream& is) } -Foam::autoPtr -Foam::dictionary::New(Istream& is) +Foam::autoPtr Foam::dictionary::New(Istream& is) { return autoPtr(new dictionary(is)); } diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C index ea1f91a495..cbe2179172 100644 --- a/src/OpenFOAM/db/dictionary/entry/entryIO.C +++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C @@ -191,8 +191,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is) } -Foam::autoPtr -Foam::entry::New(Istream& is) +Foam::autoPtr Foam::entry::New(Istream& is) { is.fatalCheck("entry::New(Istream&)"); diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C index 35a20392ef..83c4b337fc 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C @@ -43,8 +43,7 @@ Foam::functionObject::functionObject(const word& name) // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::functionObject::New +Foam::autoPtr Foam::functionObject::New ( const word& name, const Time& t, diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C index 0eace332cc..09a3a3e03c 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C @@ -26,8 +26,7 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::autoPtr< Foam::pointPatchField > -Foam::pointPatchField::New +Foam::autoPtr > Foam::pointPatchField::New ( const word& patchFieldType, const word& actualPatchType, @@ -96,8 +95,7 @@ Foam::pointPatchField::New template -Foam::autoPtr< Foam::pointPatchField > -Foam::pointPatchField::New +Foam::autoPtr > Foam::pointPatchField::New ( const word& patchFieldType, const pointPatch& p, @@ -109,8 +107,7 @@ Foam::pointPatchField::New template -Foam::autoPtr< Foam::pointPatchField > -Foam::pointPatchField::New +Foam::autoPtr > Foam::pointPatchField::New ( const pointPatch& p, const DimensionedField& iF, @@ -196,8 +193,7 @@ Foam::pointPatchField::New // Return a pointer to a new patch created on freestore from // a given pointPatchField mapped onto a new patch template -Foam::autoPtr< Foam::pointPatchField > -Foam::pointPatchField::New +Foam::autoPtr > Foam::pointPatchField::New ( const pointPatchField& ptf, const pointPatch& p, diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C index 930badb76d..c0c15260f5 100644 --- a/src/OpenFOAM/graph/graph.C +++ b/src/OpenFOAM/graph/graph.C @@ -143,8 +143,10 @@ Foam::scalarField& Foam::graph::y() } -Foam::autoPtr -Foam::graph::writer::New(const word& graphFormat) +Foam::autoPtr Foam::graph::writer::New +( + const word& graphFormat +) { if (!wordConstructorTablePtr_) { diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C index b492ed9821..eb9d9190f0 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C @@ -36,8 +36,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::word -Foam::lduMatrix::preconditioner::getName +Foam::word Foam::lduMatrix::preconditioner::getName ( const dictionary& solverControls ) diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C index c5864b52b9..da2406d66a 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C @@ -58,8 +58,7 @@ Foam::lduMatrix::smoother::getName } -Foam::autoPtr -Foam::lduMatrix::smoother::New +Foam::autoPtr Foam::lduMatrix::smoother::New ( const word& fieldName, const lduMatrix& matrix, diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C index edbd8e4226..a9c3516aa8 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C @@ -37,8 +37,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::lduMatrix::solver::New +Foam::autoPtr Foam::lduMatrix::solver::New ( const word& fieldName, const lduMatrix& matrix, 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 e1e06c965f..b5bd371d93 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::GAMGInterfaceField::New +Foam::autoPtr Foam::GAMGInterfaceField::New ( const GAMGInterface& GAMGCp, const lduInterfaceField& fineInterface 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 fac2aea8a5..6c4bed7523 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C @@ -29,8 +29,7 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::GAMGInterface::New +Foam::autoPtr Foam::GAMGInterface::New ( const lduInterface& fineInterface, const labelField& localRestrictAddressing, diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C index a05b8d37a9..da4f8f6ec5 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::facePointPatch::New +Foam::autoPtr Foam::facePointPatch::New ( const polyPatch& patch, const pointBoundaryMesh& bm diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C index d2ea21bd0a..fb77cc19d9 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::autoPtr -Foam::polyPatch::New +Foam::autoPtr Foam::polyPatch::New ( const word& patchType, const word& name, @@ -67,8 +66,7 @@ Foam::polyPatch::New } -Foam::autoPtr -Foam::polyPatch::New +Foam::autoPtr Foam::polyPatch::New ( const word& name, const dictionary& dict, diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C index a5ec479f68..83461c88a4 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::autoPtr -Foam::cellZone::New +Foam::autoPtr Foam::cellZone::New ( const word& name, const dictionary& dict, @@ -44,10 +43,7 @@ Foam::cellZone::New << endl; } - const word zoneType - ( - dict.lookup("type") - ); + const word zoneType(dict.lookup("type")); dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(zoneType); diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C index f8e41d8947..417c614733 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::autoPtr -Foam::faceZone::New +Foam::autoPtr Foam::faceZone::New ( const word& name, const dictionary& dict, @@ -44,10 +43,7 @@ Foam::faceZone::New << endl; } - const word zoneType - ( - dict.lookup("type") - ); + const word zoneType(dict.lookup("type")); dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(zoneType); diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C index e1ce962d50..90f739c782 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::autoPtr -Foam::pointZone::New +Foam::autoPtr Foam::pointZone::New ( const word& name, const dictionary& dict, @@ -44,10 +43,7 @@ Foam::pointZone::New << endl; } - const word zoneType - ( - dict.lookup("type") - ); + const word zoneType(dict.lookup("type")); dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(zoneType); diff --git a/src/conversion/ensight/part/ensightPart.C b/src/conversion/ensight/part/ensightPart.C index aa1eacd628..b20990137c 100644 --- a/src/conversion/ensight/part/ensightPart.C +++ b/src/conversion/ensight/part/ensightPart.C @@ -126,8 +126,7 @@ Foam::ensightPart::ensightPart(const ensightPart& part) // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::ensightPart::New(Istream& is) +Foam::autoPtr Foam::ensightPart::New(Istream& is) { const word partType(is); diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C index 57311b38dd..9a4c920dfa 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C +++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C @@ -29,8 +29,7 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::dynamicFvMesh::New(const IOobject& io) +Foam::autoPtr Foam::dynamicFvMesh::New(const IOobject& io) { // do not register the dictionary IOdictionary dict diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C index d66982bb35..a8b9ec7987 100644 --- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C +++ b/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(field); + const volScalarField& vFld = lookupObject(fieldName); const scalar lowerRefineLevel = readScalar(refineDict.lookup("lowerRefineLevel")); diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C index 9b996ff876..abc90561ae 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C @@ -27,17 +27,13 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::solidBodyMotionFunction::New +Foam::autoPtr Foam::solidBodyMotionFunction::New ( const dictionary& SBMFCoeffs, const Time& runTime ) { - const word motionType - ( - SBMFCoeffs.lookup("solidBodyMotionFunction") - ); + const word motionType(SBMFCoeffs.lookup("solidBodyMotionFunction")); Info<< "Selecting solid-body motion function " << motionType << endl; diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C index aadb0781d6..8484897761 100644 --- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C +++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C @@ -39,8 +39,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::cellLooper::New +Foam::autoPtr Foam::cellLooper::New ( const word& type, const polyMesh& mesh diff --git a/src/dynamicMesh/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolver/motionSolver.C index 2979d1fe06..efc29c2afc 100644 --- a/src/dynamicMesh/motionSolver/motionSolver.C +++ b/src/dynamicMesh/motionSolver/motionSolver.C @@ -58,8 +58,7 @@ Foam::motionSolver::motionSolver(const polyMesh& mesh) // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::motionSolver::New(const polyMesh& mesh) +Foam::autoPtr Foam::motionSolver::New(const polyMesh& mesh) { IOdictionary solverDict ( diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C index f7b74a432e..4a34685eba 100644 --- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C +++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::autoPtr -Foam::polyMeshModifier::New +Foam::autoPtr Foam::polyMeshModifier::New ( const word& name, const dictionary& dict, diff --git a/src/edgeMesh/edgeMeshNew.C b/src/edgeMesh/edgeMeshNew.C index 4dce59a4c2..c212758c12 100644 --- a/src/edgeMesh/edgeMeshNew.C +++ b/src/edgeMesh/edgeMeshNew.C @@ -27,8 +27,11 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::autoPtr< Foam::edgeMesh > -Foam::edgeMesh::New(const fileName& name, const word& ext) +Foam::autoPtr Foam::edgeMesh::New +( + 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::edgeMesh::New(const fileName& name) +Foam::autoPtr Foam::edgeMesh::New +( + const fileName& name +) { word ext = name.ext(); if (ext == "gz") diff --git a/src/engine/engineMesh/engineMesh/engineMeshNew.C b/src/engine/engineMesh/engineMesh/engineMeshNew.C index d34011d279..b827036fd3 100644 --- a/src/engine/engineMesh/engineMesh/engineMeshNew.C +++ b/src/engine/engineMesh/engineMesh/engineMeshNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::engineMesh::New +Foam::autoPtr Foam::engineMesh::New ( const Foam::IOobject& io ) diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C index db5a422ad1..5c2eb2ea76 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::SRF::SRFModel::New +Foam::autoPtr Foam::SRF::SRFModel::New ( const volVectorField& Urel ) diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C index b371396989..7cac8a003d 100644 --- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C +++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::fvPatch::New +Foam::autoPtr Foam::fvPatch::New ( const polyPatch& patch, const fvBoundaryMesh& bm diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C index 8a7b66ecc4..55eddc7bed 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C +++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C @@ -29,16 +29,14 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template -Foam::autoPtr > -Foam::interpolation::New +Foam::autoPtr > Foam::interpolation::New ( const word& interpolationType, const GeometricField& psi ) { typename dictionaryConstructorTable::iterator cstrIter = - dictionaryConstructorTablePtr_ - ->find(interpolationType); + dictionaryConstructorTablePtr_->find(interpolationType); if (cstrIter == dictionaryConstructorTablePtr_->end()) { @@ -58,8 +56,7 @@ Foam::interpolation::New template -Foam::autoPtr > -Foam::interpolation::New +Foam::autoPtr > Foam::interpolation::New ( const dictionary& interpolationSchemes, const GeometricField& psi diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.C index 4c950ab8c4..8ade7abb49 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.C @@ -221,7 +221,7 @@ Foam::displacementLayeredMotionFvMotionSolver::faceZoneEvaluate tmp tfld(new vectorField(meshPoints.size())); vectorField& fld = tfld(); - const word& type = dict.lookup("type"); + const word type(dict.lookup("type")); if (type == "fixedValue") { diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C index 3f3b570fff..ed4c2930ba 100644 --- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C +++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C @@ -44,8 +44,7 @@ Foam::motionDiffusivity::motionDiffusivity(const fvMotionSolver& mSolver) // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::motionDiffusivity::New +Foam::autoPtr Foam::motionDiffusivity::New ( const fvMotionSolver& mSolver, Istream& mdData diff --git a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C index 83c9207c4b..1efcba20d0 100644 --- a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C +++ b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C @@ -46,17 +46,13 @@ Foam::injectorType::injectorType // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::injectorType::New +Foam::autoPtr Foam::injectorType::New ( const Time& t, const dictionary& dict ) { - const word modelType - ( - dict.lookup("injectorType") - ); + const word modelType(dict.lookup("injectorType")); Info<< "Selecting injectorType " << modelType << endl; diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModelNew.C index 6dda97beae..c541bda2ec 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModelNew.C @@ -31,17 +31,13 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::atomizationModel::New +Foam::autoPtr Foam::atomizationModel::New ( const dictionary& dict, spray& sm ) { - const word modelType - ( - dict.lookup("atomizationModel") - ); + const word modelType(dict.lookup("atomizationModel")); Info<< "Selecting atomizationModel " << modelType << endl; diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C index a1e04ffe38..c388f64982 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C @@ -31,17 +31,13 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::breakupModel::New +Foam::autoPtr Foam::breakupModel::New ( const dictionary& dict, spray& sm ) { - const word modelType - ( - dict.lookup("breakupModel") - ); + const word modelType(dict.lookup("breakupModel")); Info<< "Selecting breakupModel " << modelType << endl; diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C index e0d86aa903..e6b59d57d0 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C @@ -33,18 +33,14 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::collisionModel::New +Foam::autoPtr Foam::collisionModel::New ( const dictionary& dict, spray& sm, Random& rndGen ) { - const word modelType - ( - dict.lookup("collisionModel") - ); + const word modelType(dict.lookup("collisionModel")); Info<< "Selecting collisionModel " << modelType << endl; diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModelNew.C index f5fc96605a..c3491dcefb 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModelNew.C @@ -30,17 +30,13 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::dispersionModel::New +Foam::autoPtr Foam::dispersionModel::New ( const dictionary& dict, spray& sm ) { - const word modelType - ( - dict.lookup("dispersionModel") - ); + const word modelType(dict.lookup("dispersionModel")); Info<< "Selecting dispersionModel " << modelType << endl; diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C index 4bc7e5f898..a07000f845 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C @@ -30,13 +30,9 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::dragModel::New(const dictionary& dict) +Foam::autoPtr Foam::dragModel::New(const dictionary& dict) { - const word modelType - ( - dict.lookup("dragModel") - ); + const word modelType(dict.lookup("dragModel")); Info<< "Selecting dragModel " << modelType << endl; diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C index 59e80075ff..1e2c34d736 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C @@ -31,13 +31,12 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::evaporationModel::New(const dictionary& dict) +Foam::autoPtr Foam::evaporationModel::New +( + const dictionary& dict +) { - const word modelType - ( - dict.lookup("evaporationModel") - ); + const word modelType(dict.lookup("evaporationModel")); Info<< "Selecting evaporationModel " << modelType << endl; diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C index 3c691edfac..3b53958dec 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C @@ -31,16 +31,12 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::heatTransferModel::New +Foam::autoPtr Foam::heatTransferModel::New ( const dictionary& dict ) { - const word modelType - ( - dict.lookup("heatTransferModel") - ); + const word modelType(dict.lookup("heatTransferModel")); Info<< "Selecting heatTransferModel " << modelType << endl; diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C index 616b0d243a..eca3049de8 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C @@ -31,17 +31,13 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::injectorModel::New +Foam::autoPtr Foam::injectorModel::New ( const dictionary& dict, spray& sm ) { - const word modelType - ( - dict.lookup("injectorModel") - ); + const word modelType(dict.lookup("injectorModel")); Info<< "Selecting injectorModel " << modelType << endl; diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C index d281e6a58e..ad888a2739 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C @@ -29,18 +29,14 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::wallModel::New +Foam::autoPtr Foam::wallModel::New ( const dictionary& dict, const volVectorField& U, spray& sm ) { - const word modelType - ( - dict.lookup("wallModel") - ); + const word modelType(dict.lookup("wallModel")); Info<< "Selecting wallModel " << modelType << endl; diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C index 24196871fd..469824f33a 100644 --- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C +++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C @@ -35,10 +35,7 @@ Foam::BinaryCollisionModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("BinaryCollisionModel") - ); + const word modelType(dict.lookup("BinaryCollisionModel")); Info<< "Selecting BinaryCollisionModel " << modelType << endl; diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C index 8a682da17e..7a49c0e828 100644 --- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C +++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C @@ -35,10 +35,7 @@ Foam::InflowBoundaryModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("InflowBoundaryModel") - ); + const word modelType(dict.lookup("InflowBoundaryModel")); Info<< "Selecting InflowBoundaryModel " << modelType << endl; diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C index bd421e2d56..6fc1d3442f 100644 --- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C +++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C @@ -35,10 +35,7 @@ Foam::WallInteractionModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("WallInteractionModel") - ); + const word modelType(dict.lookup("WallInteractionModel")); Info<< "Selecting WallInteractionModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C index e603593b6f..af68aa627b 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C +++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C @@ -36,15 +36,13 @@ Foam::IntegrationScheme::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::New ( "IntegrationScheme::New(const dictionary&)" ) << "Unknown IntegrationScheme type " - << IntegrationSchemeTypeName << nl << nl + << schemeName << nl << nl << "Valid IntegrationScheme types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << nl << exit(FatalError); diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C index 7110b8b7be..7c3facfed7 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template -Foam::autoPtr< Foam::DataEntry > -Foam::DataEntry::New +Foam::autoPtr > Foam::DataEntry::New ( const word& entryName, const dictionary& dict diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C index c503ba60f0..8c907403d1 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C @@ -35,10 +35,7 @@ Foam::DispersionModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("DispersionModel") - ); + const word modelType(dict.lookup("DispersionModel")); Info<< "Selecting DispersionModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C index 429f60378c..7dab108c5b 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C @@ -28,17 +28,13 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template -Foam::autoPtr > -Foam::DragModel::New +Foam::autoPtr > Foam::DragModel::New ( const dictionary& dict, CloudType& owner ) { - const word modelType - ( - dict.lookup("DragModel") - ); + const word modelType(dict.lookup("DragModel")); Info<< "Selecting DragModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C index 552a0cc67c..5eb805d6bc 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C @@ -35,10 +35,7 @@ Foam::InjectionModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("InjectionModel") - ); + const word modelType(dict.lookup("InjectionModel")); Info<< "Selecting InjectionModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C index 07751da5e0..a3989151d1 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C @@ -35,10 +35,7 @@ Foam::PatchInteractionModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("PatchInteractionModel") - ); + const word modelType(dict.lookup("PatchInteractionModel")); Info<< "Selecting PatchInteractionModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C index 04b54e0237..cd57acd282 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C @@ -46,7 +46,7 @@ Foam::StandardWallInteraction::StandardWallInteraction { case PatchInteractionModel::itOther: { - word interactionTypeName(this->coeffDict().lookup("type")); + const word interactionTypeName(this->coeffDict().lookup("type")); FatalErrorIn ( diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C index d4df99d7e8..7fff48227e 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C @@ -35,10 +35,7 @@ Foam::PostProcessingModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("PostProcessingModel") - ); + const word modelType(dict.lookup("PostProcessingModel")); Info<< "Selecting PostProcessingModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C index 001972fcad..4916a99e2d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C @@ -36,10 +36,7 @@ Foam::SurfaceFilmModel::New const dimensionedVector& g ) { - const word modelType - ( - dict.lookup("SurfaceFilmModel") - ); + const word modelType(dict.lookup("SurfaceFilmModel")); Info<< "Selecting SurfaceFilmModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C index 8e08d54321..b77c92cff0 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C @@ -35,10 +35,7 @@ Foam::CompositionModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("CompositionModel") - ); + const word modelType(dict.lookup("CompositionModel")); Info<< "Selecting CompositionModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C index 8b8987157d..297a43dd57 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C @@ -35,10 +35,7 @@ Foam::PhaseChangeModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("PhaseChangeModel") - ); + const word modelType(dict.lookup("PhaseChangeModel")); Info<< "Selecting PhaseChangeModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C index 0609c7b1b7..5eeec98177 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C @@ -35,10 +35,7 @@ Foam::DevolatilisationModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("DevolatilisationModel") - ); + const word modelType(dict.lookup("DevolatilisationModel")); Info<< "Selecting DevolatilisationModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C index caca8de814..e1b9990b2f 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C @@ -35,10 +35,7 @@ Foam::SurfaceReactionModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("SurfaceReactionModel") - ); + const word modelType(dict.lookup("SurfaceReactionModel")); Info<< "Selecting SurfaceReactionModel " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C index 55719729b1..f86d523b2c 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C @@ -35,10 +35,7 @@ Foam::HeatTransferModel::New CloudType& owner ) { - const word modelType - ( - dict.lookup("HeatTransferModel") - ); + const word modelType(dict.lookup("HeatTransferModel")); Info<< "Selecting HeatTransferModel " << modelType << endl; diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C index 66d8b4d636..825f5985c1 100644 --- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C +++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C @@ -28,18 +28,14 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::energyScalingFunction::New +Foam::autoPtr 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 - (cstrIter()(name, energyScalingFunctionProperties, pairPot)); + return autoPtr(cstrIter()(name, propDict, pairPot)); } diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C index acbec90e29..ab3069341c 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C @@ -28,17 +28,13 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::pairPotential::New +Foam::autoPtr 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 - (cstrIter()(name, pairPotentialProperties)); + return autoPtr(cstrIter()(name, propDict)); } diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C index 917d2ad209..c206949dde 100644 --- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C +++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C @@ -27,21 +27,16 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::tetherPotential::New +Foam::autoPtr 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 - (cstrIter()(name, tetherPotentialProperties)); + return autoPtr(cstrIter()(name, propDict)); } diff --git a/src/mesh/blockMesh/curvedEdges/curvedEdge.C b/src/mesh/blockMesh/curvedEdges/curvedEdge.C index 84d2aa3460..091a741226 100644 --- a/src/mesh/blockMesh/curvedEdges/curvedEdge.C +++ b/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::clone() const } -Foam::autoPtr -Foam::curvedEdge::New +Foam::autoPtr Foam::curvedEdge::New ( const pointField& points, Istream& is diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C index 54d8b2d895..43af02a76f 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C +++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C @@ -127,8 +127,7 @@ Foam::coordinateRotation::coordinateRotation // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::coordinateRotation::New +Foam::autoPtr Foam::coordinateRotation::New ( const dictionary& dict ) diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C index 87af596881..d1f47de396 100644 --- a/src/meshTools/coordinateSystems/coordinateSystemNew.C +++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::autoPtr -Foam::coordinateSystem::New +Foam::autoPtr Foam::coordinateSystem::New ( const word& name, const dictionary& dict @@ -75,8 +74,7 @@ Foam::coordinateSystem::New } -Foam::autoPtr -Foam::coordinateSystem::New +Foam::autoPtr Foam::coordinateSystem::New ( const word& coordType, const word& name, @@ -113,14 +111,13 @@ Foam::coordinateSystem::New } -Foam::autoPtr -Foam::coordinateSystem::New +Foam::autoPtr Foam::coordinateSystem::New ( Istream& is ) { - word name(is); - dictionary dict(is); + const word name(is); + const dictionary dict(is); return New(name, dict); } diff --git a/src/meshTools/searchableSurface/searchableSurface.C b/src/meshTools/searchableSurface/searchableSurface.C index 8c2deab0c3..6624c199d7 100644 --- a/src/meshTools/searchableSurface/searchableSurface.C +++ b/src/meshTools/searchableSurface/searchableSurface.C @@ -38,8 +38,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::searchableSurface::New +Foam::autoPtr Foam::searchableSurface::New ( const word& searchableSurfaceType, const IOobject& io, @@ -47,15 +46,14 @@ Foam::searchableSurface::New ) { dictConstructorTable::iterator cstrIter = - dictConstructorTablePtr_ - ->find(searchableSurfaceType); + dictConstructorTablePtr_->find(searchableSurfaceType); if (cstrIter == dictConstructorTablePtr_->end()) { FatalErrorIn ( - "searchableSurface::New(const word&, const word&" - ", const IOobject&, const dictionary&)" + "searchableSurface::New(const word&," + " const IOobject&, const dictionary&)" ) << "Unknown searchableSurface type " << searchableSurfaceType << endl << endl << "Valid searchableSurface types : " << endl diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C index 1830364750..f499b10f30 100644 --- a/src/meshTools/sets/topoSetSource/topoSetSource.C +++ b/src/meshTools/sets/topoSetSource/topoSetSource.C @@ -66,8 +66,7 @@ const Foam::string Foam::topoSetSource::illegalSource_ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::topoSetSource::New +Foam::autoPtr Foam::topoSetSource::New ( const word& topoSetSourceType, const polyMesh& mesh, @@ -75,8 +74,7 @@ Foam::topoSetSource::New ) { wordConstructorTable::iterator cstrIter = - wordConstructorTablePtr_ - ->find(topoSetSourceType); + wordConstructorTablePtr_->find(topoSetSourceType); if (cstrIter == wordConstructorTablePtr_->end()) { @@ -95,8 +93,7 @@ Foam::topoSetSource::New } -Foam::autoPtr -Foam::topoSetSource::New +Foam::autoPtr Foam::topoSetSource::New ( const word& topoSetSourceType, const polyMesh& mesh, @@ -104,8 +101,7 @@ Foam::topoSetSource::New ) { istreamConstructorTable::iterator cstrIter = - istreamConstructorTablePtr_ - ->find(topoSetSourceType); + istreamConstructorTablePtr_->find(topoSetSourceType); if (cstrIter == istreamConstructorTablePtr_->end()) { diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C index 6e4bc3e885..fb9e79164b 100644 --- a/src/meshTools/sets/topoSets/topoSet.C +++ b/src/meshTools/sets/topoSets/topoSet.C @@ -42,8 +42,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::topoSet::New +Foam::autoPtr Foam::topoSet::New ( const word& setType, const polyMesh& mesh, @@ -53,8 +52,7 @@ Foam::topoSet::New ) { wordConstructorTable::iterator cstrIter = - wordConstructorTablePtr_ - ->find(setType); + wordConstructorTablePtr_->find(setType); if (cstrIter == wordConstructorTablePtr_->end()) { @@ -73,8 +71,7 @@ Foam::topoSet::New } -Foam::autoPtr -Foam::topoSet::New +Foam::autoPtr Foam::topoSet::New ( const word& setType, const polyMesh& mesh, @@ -84,8 +81,7 @@ Foam::topoSet::New ) { sizeConstructorTable::iterator cstrIter = - sizeConstructorTablePtr_ - ->find(setType); + sizeConstructorTablePtr_->find(setType); if (cstrIter == sizeConstructorTablePtr_->end()) { @@ -104,8 +100,7 @@ Foam::topoSet::New } -Foam::autoPtr -Foam::topoSet::New +Foam::autoPtr Foam::topoSet::New ( const word& setType, const polyMesh& mesh, @@ -115,8 +110,7 @@ Foam::topoSet::New ) { setConstructorTable::iterator cstrIter = - setConstructorTablePtr_ - ->find(setType); + setConstructorTablePtr_->find(setType); if (cstrIter == setConstructorTablePtr_->end()) { diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C index adc86641a8..2e240d6ea3 100644 --- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C +++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C @@ -42,16 +42,12 @@ namespace Foam // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::autoPtr -Foam::decompositionMethod::New +Foam::autoPtr Foam::decompositionMethod::New ( const dictionary& decompositionDict ) { - const word methodType - ( - decompositionDict.lookup("method") - ); + const word methodType(decompositionDict.lookup("method")); Info<< "Selecting decompositionMethod " << methodType << endl; @@ -75,17 +71,13 @@ Foam::decompositionMethod::New } -Foam::autoPtr -Foam::decompositionMethod::New +Foam::autoPtr Foam::decompositionMethod::New ( const dictionary& decompositionDict, const polyMesh& mesh ) { - const word methodType - ( - decompositionDict.lookup("method") - ); + const word methodType(decompositionDict.lookup("method")); Info<< "Selecting decompositionMethod " << methodType << endl; diff --git a/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C b/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C index ef2930b759..52bec69e4a 100644 --- a/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C +++ b/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::calcType::New +Foam::autoPtr Foam::calcType::New ( const word& calcTypeName ) diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C index 05b575e946..3060f14d2d 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C +++ b/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()) { diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C index fa867d813f..780b38d6bf 100644 --- a/src/sampling/sampledSet/sampledSet/sampledSet.C +++ b/src/sampling/sampledSet/sampledSet/sampledSet.C @@ -406,8 +406,7 @@ Foam::sampledSet::~sampledSet() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::autoPtr -Foam::sampledSet::New +Foam::autoPtr Foam::sampledSet::New ( const word& name, const polyMesh& mesh, @@ -415,10 +414,7 @@ Foam::sampledSet::New const dictionary& dict ) { - const word sampleType - ( - dict.lookup("type") - ); + const word sampleType(dict.lookup("type")); wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(sampleType); diff --git a/src/sampling/sampledSet/writers/writer.C b/src/sampling/sampledSet/writers/writer.C index 5accc37a0d..2626abfbc4 100644 --- a/src/sampling/sampledSet/writers/writer.C +++ b/src/sampling/sampledSet/writers/writer.C @@ -31,15 +31,13 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // template -Foam::autoPtr< Foam::writer > -Foam::writer::New +Foam::autoPtr< Foam::writer > Foam::writer::New ( const word& writeType ) { typename wordConstructorTable::iterator cstrIter = - wordConstructorTablePtr_ - ->find(writeType); + wordConstructorTablePtr_->find(writeType); if (cstrIter == wordConstructorTablePtr_->end()) { diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C index 8422825104..3a257eafd4 100644 --- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C +++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C @@ -113,19 +113,15 @@ void Foam::sampledSurface::makeCf() const // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // - -Foam::autoPtr -Foam::sampledSurface::New +Foam::autoPtr Foam::sampledSurface::New ( const word& name, const polyMesh& mesh, const dictionary& dict ) { - const word sampleType - ( - dict.lookup("type") - ); + const word sampleType(dict.lookup("type")); + if (debug) { Info<< "Selecting sampledType " << sampleType << endl; @@ -150,6 +146,7 @@ Foam::sampledSurface::New return autoPtr(cstrIter()(name, mesh, dict)); } + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::sampledSurface::sampledSurface @@ -168,7 +165,6 @@ Foam::sampledSurface::sampledSurface {} -// Construct from dictionary Foam::sampledSurface::sampledSurface ( const word& name, diff --git a/src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C b/src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C index ff382bb6c3..07bfb64cdf 100644 --- a/src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C +++ b/src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C @@ -34,10 +34,7 @@ Foam::surfaceFilmModels::injectionModel::New const dictionary& dict ) { - const word modelType - ( - dict.lookup("injectionModel") - ); + const word modelType(dict.lookup("injectionModel")); Info<< " Selecting injectionModel " << modelType << endl; diff --git a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C index 4ac8687971..1ad7bd0b71 100644 --- a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C +++ b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C @@ -34,10 +34,7 @@ Foam::surfaceFilmModels::phaseChangeModel::New const dictionary& dict ) { - const word modelType - ( - dict.lookup("phaseChangeModel") - ); + const word modelType(dict.lookup("phaseChangeModel")); Info<< " Selecting phaseChangeModel " << modelType << endl; diff --git a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C index 81013626c8..e6f2d195f0 100644 --- a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C +++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermoNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::basicPsiThermo::New +Foam::autoPtr Foam::basicPsiThermo::New ( const fvMesh& mesh ) diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C index 19ec52d434..b5f8c88073 100644 --- a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C +++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermoNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::basicRhoThermo::New +Foam::autoPtr Foam::basicRhoThermo::New ( const fvMesh& mesh ) diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C index 8ba8a2b7e3..38d88071f1 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/psiChemistryModelNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::psiChemistryModel::New +Foam::autoPtr Foam::psiChemistryModel::New ( const fvMesh& mesh ) diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C index 049549a2e3..95a6100de5 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModelNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::rhoChemistryModel::New +Foam::autoPtr Foam::rhoChemistryModel::New ( const fvMesh& mesh ) diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolverNew.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolverNew.C index 625c5b3b69..ccae8f10de 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolverNew.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolverNew.C @@ -36,10 +36,7 @@ Foam::chemistrySolver::New const word& thermoTypeName ) { - const word modelName - ( - model.lookup("chemistrySolver") - ); + const word modelName(model.lookup("chemistrySolver")); const word chemistrySolverType = modelName + '<' + compTypeName + ',' + thermoTypeName + '>'; diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C index 990f84d591..f3e7e6ccc1 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C +++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::laminarFlameSpeed::New +Foam::autoPtr Foam::laminarFlameSpeed::New ( const hhuCombustionThermo& ct ) @@ -47,16 +46,12 @@ Foam::laminarFlameSpeed::New ) ); - const word laminarFlameSpeedType - ( - propDict.lookup("laminarFlameSpeedCorrelation") - ); + const word corrType(propDict.lookup("laminarFlameSpeedCorrelation")); - Info<< "Selecting laminar flame speed correlation " - << laminarFlameSpeedType << endl; + Info<< "Selecting laminar flame speed correlation " << corrType << 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); diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C index c3d7ded785..19b88994d6 100644 --- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C +++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C @@ -73,8 +73,7 @@ Foam::liquidMixture::liquidMixture // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::liquidMixture::New +Foam::autoPtr Foam::liquidMixture::New ( const dictionary& thermophysicalProperties ) diff --git a/src/thermophysicalModels/liquids/liquid/liquid.C b/src/thermophysicalModels/liquids/liquid/liquid.C index 2d9b234859..3da16191f2 100644 --- a/src/thermophysicalModels/liquids/liquid/liquid.C +++ b/src/thermophysicalModels/liquids/liquid/liquid.C @@ -39,14 +39,11 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::liquid::New(Istream& is) +Foam::autoPtr Foam::liquid::New(Istream& is) { if (debug) { - Info<< "liquid::New(Istream&) : " - << "constructing liquid" - << endl; + Info<< "liquid::New(Istream&) : " << "constructing liquid" << endl; } const word liquidType(is); diff --git a/src/thermophysicalModels/pdfs/pdf/pdfNew.C b/src/thermophysicalModels/pdfs/pdf/pdfNew.C index ca7b5c3e63..c4144ee563 100644 --- a/src/thermophysicalModels/pdfs/pdf/pdfNew.C +++ b/src/thermophysicalModels/pdfs/pdf/pdfNew.C @@ -27,17 +27,13 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::pdfs::pdf::New +Foam::autoPtr Foam::pdfs::pdf::New ( const dictionary& dict, Random& rndGen ) { - const word modelType - ( - dict.lookup("pdfType") - ); + const word modelType(dict.lookup("pdfType")); Info<< "Selecting pdfType " << modelType << endl; diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C index 827c9f2a62..a18cee8129 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C @@ -35,10 +35,7 @@ Foam::radiation::absorptionEmissionModel::New const fvMesh& mesh ) { - const word modelType - ( - dict.lookup("absorptionEmissionModel") - ); + const word modelType(dict.lookup("absorptionEmissionModel")); Info<< "Selecting absorptionEmissionModel " << modelType << endl; diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C index 83ddcb58c2..4234e8e9b7 100644 --- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C +++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C @@ -28,17 +28,13 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::radiation::scatterModel::New +Foam::autoPtr Foam::radiation::scatterModel::New ( const dictionary& dict, const fvMesh& mesh ) { - const word modelType - ( - dict.lookup("scatterModel") - ); + const word modelType(dict.lookup("scatterModel")); Info<< "Selecting scatterModel " << modelType << endl; diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C index 309d4d2702..7065df6d07 100644 --- a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C +++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermoNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::hCombustionThermo::New +Foam::autoPtr Foam::hCombustionThermo::New ( const fvMesh& mesh ) @@ -71,8 +70,7 @@ Foam::hCombustionThermo::New } -Foam::autoPtr -Foam::hCombustionThermo::NewType +Foam::autoPtr Foam::hCombustionThermo::NewType ( const fvMesh& mesh, const word& thermoType diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C index 805f44449a..5fb31430e7 100644 --- a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C +++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermoNew.C @@ -28,8 +28,10 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::hhuCombustionThermo::New(const fvMesh& mesh) +Foam::autoPtr Foam::hhuCombustionThermo::New +( + const fvMesh& mesh +) { // get model name, but do not register the dictionary // otherwise it is registered in the database twice diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C index c7b94d1ace..4e4aecb6c7 100644 --- a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C +++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermoNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::hsCombustionThermo::New +Foam::autoPtr Foam::hsCombustionThermo::New ( const fvMesh& mesh ) @@ -71,8 +70,7 @@ Foam::hsCombustionThermo::New } -Foam::autoPtr -Foam::hsCombustionThermo::NewType +Foam::autoPtr Foam::hsCombustionThermo::NewType ( const fvMesh& mesh, const word& thermoType diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C index 6afa8d33e6..3a186ec5ee 100644 --- a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C +++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermoNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::hReactionThermo::New +Foam::autoPtr Foam::hReactionThermo::New ( const fvMesh& mesh ) @@ -71,8 +70,7 @@ Foam::hReactionThermo::New } -Foam::autoPtr -Foam::hReactionThermo::NewType +Foam::autoPtr Foam::hReactionThermo::NewType ( const fvMesh& mesh, const word& thermoType diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C index f8518cd45f..3607d3458b 100644 --- a/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C +++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermoNew.C @@ -28,8 +28,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::hsReactionThermo::New +Foam::autoPtr Foam::hsReactionThermo::New ( const fvMesh& mesh ) @@ -71,8 +70,7 @@ Foam::hsReactionThermo::New } -Foam::autoPtr -Foam::hsReactionThermo::NewType +Foam::autoPtr Foam::hsReactionThermo::NewType ( const fvMesh& mesh, const word& thermoType diff --git a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C index a69ddb4bf3..0b23ab7827 100644 --- a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C +++ b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C @@ -49,8 +49,7 @@ Foam::solidMixture::solidMixture // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::solidMixture::New +Foam::autoPtr Foam::solidMixture::New ( const dictionary& thermophysicalProperties ) diff --git a/src/thermophysicalModels/solids/solid/solidNew.C b/src/thermophysicalModels/solids/solid/solidNew.C index c3695cec9e..860e1e5d5a 100644 --- a/src/thermophysicalModels/solids/solid/solidNew.C +++ b/src/thermophysicalModels/solids/solid/solidNew.C @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::solid::New(Istream& is) +Foam::autoPtr Foam::solid::New(Istream& is) { if (debug) { diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C index 6497b05131..dd45456458 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C +++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C @@ -39,8 +39,10 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::thermophysicalFunction::New(Istream& is) +Foam::autoPtr Foam::thermophysicalFunction::New +( + Istream& is +) { if (debug) { diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C index d2424513c7..0872496cf2 100644 --- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C +++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C @@ -29,8 +29,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::viscosityModel::New +Foam::autoPtr Foam::viscosityModel::New ( const word& name, const dictionary& viscosityProperties, @@ -38,10 +37,7 @@ Foam::viscosityModel::New const surfaceScalarField& phi ) { - const word modelType - ( - viscosityProperties.lookup("transportModel") - ); + const word modelType(viscosityProperties.lookup("transportModel")); Info<< "Selecting incompressible transport model " << modelType << endl; diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C index 39efc1ee49..53dc4ac961 100644 --- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C +++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C @@ -58,8 +58,7 @@ Foam::LESdelta::LESdelta(const word& name, const fvMesh& mesh) // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::LESdelta::New +Foam::autoPtr Foam::LESdelta::New ( const word& name, const fvMesh& mesh, diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C index 56a503f8cd..98ef370e46 100644 --- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C +++ b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C @@ -37,8 +37,7 @@ namespace Foam // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::LESfilter::New +Foam::autoPtr Foam::LESfilter::New ( const fvMesh& mesh, const dictionary& dict