Commit d1941723 authored by Henry Weller's avatar Henry Weller
Browse files

src/finiteVolume/interpolation: Modified code to conform to OpenFOAM coding standards

declaring the namespace in function definitions in C files
parent fc98b1f6
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -28,15 +28,10 @@ License
#include "polyMesh.H"
#include "calculatedPointPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
template<class Type>
interpolation<Type>::interpolation
Foam::interpolation<Type>::interpolation
(
const GeometricField<Type, fvPatchField, volMesh>& psi
)
......@@ -52,10 +47,6 @@ interpolation<Type>::interpolation
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
# include "interpolationNew.C"
#include "interpolationNew.C"
// ************************************************************************* //
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -26,15 +26,10 @@ License
#include "interpolationCell.H"
#include "volFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
template<class Type>
interpolationCell<Type>::interpolationCell
Foam::interpolationCell<Type>::interpolationCell
(
const GeometricField<Type, fvPatchField, volMesh>& psi
)
......@@ -46,7 +41,7 @@ interpolationCell<Type>::interpolationCell
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
Type interpolationCell<Type>::interpolate
Type Foam::interpolationCell<Type>::interpolate
(
const vector&,
const label cellI,
......@@ -57,8 +52,4 @@ Type interpolationCell<Type>::interpolate
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -29,13 +29,7 @@ License
namespace Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeInterpolation(interpolationCell);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
makeInterpolation(interpolationCell);
}
// ************************************************************************* //
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -26,15 +26,10 @@ License
#include "interpolationCellPatchConstrained.H"
#include "volFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
template<class Type>
interpolationCellPatchConstrained<Type>::interpolationCellPatchConstrained
Foam::interpolationCellPatchConstrained<Type>::interpolationCellPatchConstrained
(
const GeometricField<Type, fvPatchField, volMesh>& psi
)
......@@ -46,7 +41,7 @@ interpolationCellPatchConstrained<Type>::interpolationCellPatchConstrained
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
Type interpolationCellPatchConstrained<Type>::interpolate
Type Foam::interpolationCellPatchConstrained<Type>::interpolate
(
const vector& pt,
const label cellI,
......@@ -69,8 +64,4 @@ Type interpolationCellPatchConstrained<Type>::interpolate
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -29,13 +29,7 @@ License
namespace Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeInterpolation(interpolationCellPatchConstrained);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
makeInterpolation(interpolationCellPatchConstrained);
}
// ************************************************************************* //
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -31,15 +31,10 @@ License
#include "findCellPointFaceTet.H"
#include "findCellPointFaceTriangle.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
template<class Type>
interpolationCellPointFace<Type>::interpolationCellPointFace
Foam::interpolationCellPointFace<Type>::interpolationCellPointFace
(
const GeometricField<Type, fvPatchField, volMesh>& psi
)
......@@ -61,7 +56,7 @@ interpolationCellPointFace<Type>::interpolationCellPointFace
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
Type interpolationCellPointFace<Type>::interpolate
Type Foam::interpolationCellPointFace<Type>::interpolate
(
const vector& position,
const label cellI,
......@@ -258,8 +253,7 @@ Type interpolationCellPointFace<Type>::interpolate
}
else
{
Info<< "interpolationCellPointFace<Type>::interpolate"
<< "(const vector&, const label cellI) const : "
InfoInFunction
<< "search failed; using closest cellFace value" << endl
<< "cell number " << cellI << tab
<< "position " << position << endl;
......@@ -363,8 +357,4 @@ Type interpolationCellPointFace<Type>::interpolate
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -29,13 +29,7 @@ License
namespace Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeInterpolation(interpolationCellPointFace);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
makeInterpolation(interpolationCellPointFace);
}
// ************************************************************************* //
......@@ -27,16 +27,9 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace limitFuncs
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
inline tmp<volScalarField> magSqr<Type>::operator()
inline Foam::tmp<Foam::volScalarField>
Foam::limitFuncs::magSqr<Type>::operator()
(
const GeometricField<Type, fvPatchField, volMesh>& phi
) const
......@@ -46,7 +39,8 @@ inline tmp<volScalarField> magSqr<Type>::operator()
template<>
inline tmp<volScalarField> magSqr<scalar>::operator()
inline Foam::tmp<Foam::volScalarField>
Foam::limitFuncs::magSqr<Foam::scalar>::operator()
(
const volScalarField& phi
) const
......@@ -56,7 +50,8 @@ inline tmp<volScalarField> magSqr<scalar>::operator()
template<>
inline tmp<volScalarField> magSqr<symmTensor>::operator()
inline Foam::tmp<Foam::volScalarField>
Foam::limitFuncs::magSqr<Foam::symmTensor>::operator()
(
const volSymmTensorField& phi
) const
......@@ -66,7 +61,8 @@ inline tmp<volScalarField> magSqr<symmTensor>::operator()
template<>
inline tmp<volScalarField> magSqr<tensor>::operator()
inline Foam::tmp<Foam::volScalarField>
Foam::limitFuncs::magSqr<Foam::tensor>::operator()
(
const volTensorField& phi
) const
......@@ -76,7 +72,8 @@ inline tmp<volScalarField> magSqr<tensor>::operator()
template<class Type>
inline tmp<volScalarField> rhoMagSqr<Type>::operator()
inline Foam::tmp<Foam::volScalarField>
Foam::limitFuncs::rhoMagSqr<Type>::operator()
(
const GeometricField<Type, fvPatchField, volMesh>& phi
) const
......@@ -88,7 +85,8 @@ inline tmp<volScalarField> rhoMagSqr<Type>::operator()
template<>
inline tmp<volScalarField> rhoMagSqr<scalar>::operator()
inline Foam::tmp<Foam::volScalarField>
Foam::limitFuncs::rhoMagSqr<Foam::scalar>::operator()
(
const volScalarField& phi
) const
......@@ -99,9 +97,4 @@ inline tmp<volScalarField> rhoMagSqr<scalar>::operator()
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace limitFuncs
} // End namespace Foam
// ************************************************************************* //
......@@ -28,16 +28,11 @@ License
#include "surfaceFields.H"
#include "coupledFvPatchField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
template<class Type>
tmp<limitedSurfaceInterpolationScheme<Type> >
limitedSurfaceInterpolationScheme<Type>::New
Foam::tmp<Foam::limitedSurfaceInterpolationScheme<Type> >
Foam::limitedSurfaceInterpolationScheme<Type>::New
(
const fvMesh& mesh,
Istream& schemeData
......@@ -84,10 +79,9 @@ limitedSurfaceInterpolationScheme<Type>::New
}
// Return weighting factors for scheme given by name in dictionary
template<class Type>
tmp<limitedSurfaceInterpolationScheme<Type> >
limitedSurfaceInterpolationScheme<Type>::New
Foam::tmp<Foam::limitedSurfaceInterpolationScheme<Type> >
Foam::limitedSurfaceInterpolationScheme<Type>::New
(
const fvMesh& mesh,
const surfaceScalarField& faceFlux,
......@@ -138,14 +132,16 @@ limitedSurfaceInterpolationScheme<Type>::New
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class Type>
limitedSurfaceInterpolationScheme<Type>::~limitedSurfaceInterpolationScheme()
Foam::limitedSurfaceInterpolationScheme<Type>::
~limitedSurfaceInterpolationScheme()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
Foam::tmp<Foam::surfaceScalarField>
Foam::limitedSurfaceInterpolationScheme<Type>::weights
(
const GeometricField<Type, fvPatchField, volMesh>& phi,
const surfaceScalarField& CDweights,
......@@ -187,7 +183,8 @@ tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
}
template<class Type>
tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
Foam::tmp<Foam::surfaceScalarField>
Foam::limitedSurfaceInterpolationScheme<Type>::weights
(
const GeometricField<Type, fvPatchField, volMesh>& phi
) const
......@@ -201,8 +198,8 @@ tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
}
template<class Type>
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
limitedSurfaceInterpolationScheme<Type>::flux
Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
Foam::limitedSurfaceInterpolationScheme<Type>::flux
(
const GeometricField<Type, fvPatchField, volMesh>& phi
) const
......@@ -211,8 +208,4 @@ limitedSurfaceInterpolationScheme<Type>::flux
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //
......@@ -31,16 +31,11 @@ Description
#include "volFields.H"
#include "surfaceFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
//- Construct from face-flux field and coefficient
template<class Type>
multivariateSurfaceInterpolationScheme<Type>::
Foam::multivariateSurfaceInterpolationScheme<Type>::
multivariateSurfaceInterpolationScheme
(
const fvMesh& mesh,
......@@ -56,10 +51,9 @@ multivariateSurfaceInterpolationScheme
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
// Return weighting factors for scheme given by name in dictionary
template<class Type>
tmp<multivariateSurfaceInterpolationScheme<Type> >
multivariateSurfaceInterpolationScheme<Type>::New
Foam::tmp<Foam::multivariateSurfaceInterpolationScheme<Type> >
Foam::multivariateSurfaceInterpolationScheme<Type>::New
(
const fvMesh& mesh,
const multivariateSurfaceInterpolationScheme<Type>::fieldTable& vtfs,
......@@ -99,13 +93,9 @@ multivariateSurfaceInterpolationScheme<Type>::New
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class Type>
multivariateSurfaceInterpolationScheme<Type>::
Foam::multivariateSurfaceInterpolationScheme<Type>::
~multivariateSurfaceInterpolationScheme()
{}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -27,19 +27,9 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace fvc
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Return weighting factors for scheme given by name in dictionary
template<class Type>
tmp<surfaceInterpolationScheme<Type> > scheme
Foam::tmp<Foam::surfaceInterpolationScheme<Type> >
Foam::fvc::scheme
(
const surfaceScalarField& faceFlux,
Istream& streamData
......@@ -54,9 +44,8 @@ tmp<surfaceInterpolationScheme<Type> > scheme
}
// Return weighting factors for scheme given by name in dictionary
template<class Type>
tmp<surfaceInterpolationScheme<Type> > scheme
Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
(
const surfaceScalarField& faceFlux,
const word& name
......@@ -71,9 +60,8 @@ tmp<surfaceInterpolationScheme<Type> > scheme
}
// Return weighting factors for scheme given by name in dictionary
template<class Type>
tmp<surfaceInterpolationScheme<Type> > scheme
Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
(
const fvMesh& mesh,
Istream& streamData
......@@ -87,9 +75,8 @@ tmp<surfaceInterpolationScheme<Type> > scheme
}
// Return weighting factors for scheme given by name in dictionary
template<class Type>
tmp<surfaceInterpolationScheme<Type> > scheme
Foam::tmp<Foam::surfaceInterpolationScheme<Type> > Foam::fvc::scheme
(
const fvMesh& mesh,
const word& name
......@@ -103,10 +90,9 @@ tmp<surfaceInterpolationScheme<Type> > scheme
}
// Interpolate field onto faces using scheme given by name in dictionary
template<class Type>
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
interpolate
Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
Foam::fvc::interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const surfaceScalarField& faceFlux,
......@@ -115,21 +101,18 @@ interpolate
{
if (surfaceInterpolation::debug)
{
Info<< "interpolate"
<< "(const GeometricField<Type, fvPatchField, volMesh>&, "
<< "const surfaceScalarField&, Istream&) : "
InfoInFunction
<< "interpolating GeometricField<Type, fvPatchField, volMesh> "
<< endl;
<< vf.name() << endl;
}
return scheme<Type>(faceFlux, schemeData)().interpolate(vf);
}
// Interpolate field onto faces using scheme given by name in dictionary
template<class Type>
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
interpolate
Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
Foam::fvc::interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const surfaceScalarField& faceFlux,
......@@ -138,21 +121,17 @@ interpolate
{
if (surfaceInterpolation::debug)
{
Info<< "interpolate"
<< "(const GeometricField<Type, fvPatchField, volMesh>&, "
<< "const surfaceScalarField&, const word&) : "
InfoInFunction
<< "interpolating GeometricField<Type, fvPatchField, volMesh> "
<< "using " << name
<< endl;
<< vf.name() << " using " << name << endl;
}
return scheme<Type>(faceFlux, name)().interpolate(vf);
}
// Interpolate field onto faces using scheme given by name in dictionary
template<class Type>
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
interpolate
Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
Foam::fvc::interpolate
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf,
const surfaceScalarField& faceFlux,
......@@ -167,10 +146,9 @@ interpolate
return tsf;
}