Commit 03338b9e authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: partial revert for 5cfa9762

parent f7f6faa8
......@@ -27,8 +27,11 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::autoPtr< Foam::edgeMesh >
Foam::edgeMesh::New(const fileName& name, const word& ext)
Foam::autoPtr<Foam::edgeMesh> 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> Foam::edgeMesh::New
(
const fileName& name
)
{
word ext = name.ext();
if (ext == "gz")
......
......@@ -28,8 +28,7 @@ License
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::engineMesh>
Foam::engineMesh::New
Foam::autoPtr<Foam::engineMesh> Foam::engineMesh::New
(
const Foam::IOobject& io
)
......
......@@ -27,8 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::SRF::SRFModel>
Foam::SRF::SRFModel::New
Foam::autoPtr<Foam::SRF::SRFModel> Foam::SRF::SRFModel::New
(
const volVectorField& Urel
)
......
......@@ -28,8 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::fvPatch>
Foam::fvPatch::New
Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
(
const polyPatch& patch,
const fvBoundaryMesh& bm
......
......@@ -29,16 +29,14 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
Foam::autoPtr<Foam::interpolation<Type> >
Foam::interpolation<Type>::New
Foam::autoPtr<Foam::interpolation<Type> > Foam::interpolation<Type>::New
(
const word& interpolationType,
const GeometricField<Type, fvPatchField, volMesh>& psi
)
{
typename dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_
->find(interpolationType);
dictionaryConstructorTablePtr_->find(interpolationType);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
......@@ -58,8 +56,7 @@ Foam::interpolation<Type>::New
template<class Type>
Foam::autoPtr<Foam::interpolation<Type> >
Foam::interpolation<Type>::New
Foam::autoPtr<Foam::interpolation<Type> > Foam::interpolation<Type>::New
(
const dictionary& interpolationSchemes,
const GeometricField<Type, fvPatchField, volMesh>& psi
......
......@@ -221,7 +221,7 @@ Foam::displacementLayeredMotionFvMotionSolver::faceZoneEvaluate
tmp<vectorField> tfld(new vectorField(meshPoints.size()));
vectorField& fld = tfld();
const word& type = dict.lookup("type");
const word type(dict.lookup("type"));
if (type == "fixedValue")
{
......
......@@ -44,8 +44,7 @@ Foam::motionDiffusivity::motionDiffusivity(const fvMotionSolver& mSolver)
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::motionDiffusivity>
Foam::motionDiffusivity::New
Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New
(
const fvMotionSolver& mSolver,
Istream& mdData
......
......@@ -46,17 +46,13 @@ Foam::injectorType::injectorType
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::injectorType>
Foam::injectorType::New
Foam::autoPtr<Foam::injectorType> 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;
......
......@@ -31,17 +31,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::atomizationModel>
Foam::atomizationModel::New
Foam::autoPtr<Foam::atomizationModel> 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;
......
......@@ -31,17 +31,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::breakupModel>
Foam::breakupModel::New
Foam::autoPtr<Foam::breakupModel> 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;
......
......@@ -33,18 +33,14 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::collisionModel>
Foam::collisionModel::New
Foam::autoPtr<Foam::collisionModel> 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;
......
......@@ -30,17 +30,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::dispersionModel>
Foam::dispersionModel::New
Foam::autoPtr<Foam::dispersionModel> 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;
......
......@@ -30,13 +30,9 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::dragModel>
Foam::dragModel::New(const dictionary& dict)
Foam::autoPtr<Foam::dragModel> Foam::dragModel::New(const dictionary& dict)
{
const word modelType
(
dict.lookup("dragModel")
);
const word modelType(dict.lookup("dragModel"));
Info<< "Selecting dragModel " << modelType << endl;
......
......@@ -31,13 +31,12 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::evaporationModel>
Foam::evaporationModel::New(const dictionary& dict)
Foam::autoPtr<Foam::evaporationModel> Foam::evaporationModel::New
(
const dictionary& dict
)
{
const word modelType
(
dict.lookup("evaporationModel")
);
const word modelType(dict.lookup("evaporationModel"));
Info<< "Selecting evaporationModel " << modelType << endl;
......
......@@ -31,16 +31,12 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::heatTransferModel>
Foam::heatTransferModel::New
Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
(
const dictionary& dict
)
{
const word modelType
(
dict.lookup("heatTransferModel")
);
const word modelType(dict.lookup("heatTransferModel"));
Info<< "Selecting heatTransferModel " << modelType << endl;
......
......@@ -31,17 +31,13 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::injectorModel>
Foam::injectorModel::New
Foam::autoPtr<Foam::injectorModel> 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;
......
......@@ -29,18 +29,14 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::wallModel>
Foam::wallModel::New
Foam::autoPtr<Foam::wallModel> 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;
......
......@@ -35,10 +35,7 @@ Foam::BinaryCollisionModel<CloudType>::New
CloudType& owner
)
{
const word modelType
(
dict.lookup("BinaryCollisionModel")
);
const word modelType(dict.lookup("BinaryCollisionModel"));
Info<< "Selecting BinaryCollisionModel " << modelType << endl;
......
......@@ -35,10 +35,7 @@ Foam::InflowBoundaryModel<CloudType>::New
CloudType& owner
)
{
const word modelType
(
dict.lookup("InflowBoundaryModel")
);
const word modelType(dict.lookup("InflowBoundaryModel"));
Info<< "Selecting InflowBoundaryModel " << modelType << endl;
......
......@@ -35,10 +35,7 @@ Foam::WallInteractionModel<CloudType>::New
CloudType& owner
)
{
const word modelType
(
dict.lookup("WallInteractionModel")
);
const word modelType(dict.lookup("WallInteractionModel"));
Info<< "Selecting WallInteractionModel " << modelType << endl;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment