zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further code simplification: GeometricField<GType, fvsPatchField, surfaceMesh> -> SurfaceField<GType>

Browse Source
This commit is contained in:
Henry Weller
2022-12-03 13:51:48 +00:00
parent ba995e18fa
commit df1fd09f63
9 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
View File

@ -110,7 +110,7 @@ laplacian
const word& name
)
{
GeometricField<GType, fvsPatchField, surfaceMesh> Gamma
SurfaceField<GType> Gamma
(
IOobject
(
@ -153,7 +153,7 @@ laplacian
const VolField<Type>& vf
)
{
GeometricField<GType, fvsPatchField, surfaceMesh> Gamma
SurfaceField<GType> Gamma
(
IOobject
(
@ -335,7 +335,7 @@ template<class Type, class GType>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const SurfaceField<GType>& gamma,
const VolField<Type>& vf,
const word& name
)
@ -352,7 +352,7 @@ template<class Type, class GType>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
const tmp<SurfaceField<GType>>& tgamma,
const VolField<Type>& vf,
const word& name
)
@ -370,7 +370,7 @@ template<class Type, class GType>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const SurfaceField<GType>& gamma,
const tmp<VolField<Type>>& tvf,
const word& name
)
@ -387,7 +387,7 @@ laplacian
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
const tmp<SurfaceField<GType>>& tgamma,
const tmp<VolField<Type>>& tvf,
const word& name
)
@ -406,7 +406,7 @@ template<class Type, class GType>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const SurfaceField<GType>& gamma,
const VolField<Type>& vf
)
{
@ -423,7 +423,7 @@ template<class Type, class GType>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
const tmp<SurfaceField<GType>>& tgamma,
const VolField<Type>& vf
)
{
@ -440,7 +440,7 @@ template<class Type, class GType>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const SurfaceField<GType>& gamma,
const tmp<VolField<Type>>& tvf
)
{
@ -456,7 +456,7 @@ laplacian
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
const tmp<SurfaceField<GType>>& tgamma,
const tmp<VolField<Type>>& tvf
)
{

16
src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
View File

@ -173,7 +173,7 @@ namespace fvc
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const VolField<Type>&,
const word&
);
@ -181,7 +181,7 @@ namespace fvc
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const tmp<SurfaceField<GType>>&,
const VolField<Type>&,
const word&
);
@ -189,7 +189,7 @@ namespace fvc
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const tmp<VolField<Type>>&,
const word&
);
@ -197,7 +197,7 @@ namespace fvc
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const tmp<SurfaceField<GType>>&,
const tmp<VolField<Type>>&,
const word&
);
@ -205,28 +205,28 @@ namespace fvc
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const VolField<Type>&
);
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const tmp<SurfaceField<GType>>&,
const VolField<Type>&
);
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const tmp<VolField<Type>>&
);
template<class Type, class GType>
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const tmp<SurfaceField<GType>>&,
const tmp<VolField<Type>>&
);
}

12
src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C
View File

@ -160,7 +160,7 @@ laplacian
const word& name
)
{
const GeometricField<GType, fvsPatchField, surfaceMesh> Gamma
const SurfaceField<GType> Gamma
(
IOobject
(
@ -185,7 +185,7 @@ laplacian
const VolField<Type>& vf
)
{
const GeometricField<GType, fvsPatchField, surfaceMesh> Gamma
const SurfaceField<GType> Gamma
(
IOobject
(
@ -273,7 +273,7 @@ template<class Type, class GType>
tmp<fvMatrix<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const SurfaceField<GType>& gamma,
const VolField<Type>& vf,
const word& name
)
@ -290,7 +290,7 @@ template<class Type, class GType>
tmp<fvMatrix<Type>>
laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
const tmp<SurfaceField<GType>>& tgamma,
const VolField<Type>& vf,
const word& name
)
@ -305,7 +305,7 @@ template<class Type, class GType>
tmp<fvMatrix<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const SurfaceField<GType>& gamma,
const VolField<Type>& vf
)
{
@ -322,7 +322,7 @@ template<class Type, class GType>
tmp<fvMatrix<Type>>
laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tGamma,
const tmp<SurfaceField<GType>>& tGamma,
const VolField<Type>& vf
)
{

8
src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
View File

@ -150,7 +150,7 @@ namespace fvm
template<class Type, class GType>
tmp<fvMatrix<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const VolField<Type>&,
const word&
);
@ -158,7 +158,7 @@ namespace fvm
template<class Type, class GType>
tmp<fvMatrix<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const tmp<SurfaceField<GType>>&,
const VolField<Type>&,
const word&
);
@ -166,14 +166,14 @@ namespace fvm
template<class Type, class GType>
tmp<fvMatrix<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const VolField<Type>&
);
template<class Type, class GType>
tmp<fvMatrix<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const tmp<SurfaceField<GType>>&,
const VolField<Type>&
);

4
src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C
View File

@ -148,7 +148,7 @@ template<class Type, class GType>
tmp<fvMatrix<Type>>
gaussLaplacianScheme<Type, GType>::fvmLaplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const SurfaceField<GType>& gamma,
const VolField<Type>& vf
)
{
@ -195,7 +195,7 @@ template<class Type, class GType>
tmp<VolField<Type>>
gaussLaplacianScheme<Type, GType>::fvcLaplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const SurfaceField<GType>& gamma,
const VolField<Type>& vf
)
{

4
src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
View File

@ -124,13 +124,13 @@ public:
tmp<fvMatrix<Type>> fvmLaplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const VolField<Type>&
);
tmp<VolField<Type>> fvcLaplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const VolField<Type>&
);
};

4
src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
View File

@ -172,7 +172,7 @@ public:
virtual tmp<fvMatrix<Type>> fvmLaplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const VolField<Type>&
) = 0;
@ -189,7 +189,7 @@ public:
virtual tmp<VolField<Type>> fvcLaplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const SurfaceField<GType>&,
const VolField<Type>&
) = 0;

6
src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H
View File

@ -92,11 +92,11 @@ public:
void compact();
//- Use map to get the data into stencil order
template<class T>
template<class Type>
void collectData
(
const GeometricField<T, fvsPatchField, surfaceMesh>& fld,
List<List<T>>& stencilFld
const SurfaceField<Type>& fld,
List<List<Type>>& stencilFld
) const
{
extendedFaceToCellStencil::collectData

6
src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H
View File

@ -71,13 +71,13 @@ public:
// Member Functions
//- Use map to get the data into stencil order
template<class T>
template<class Type>
static void collectData
(
const distributionMap& map,
const labelListList& stencil,
const GeometricField<T, fvsPatchField, surfaceMesh>& fld,
List<List<T>>& stencilFld
const SurfaceField<Type>& fld,
List<List<Type>>& stencilFld
);
//- Sum surface field contributions to create cell values