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

Removed unused template argument from field reuse classes

Browse Source
This commit is contained in:
Will Bainbridge
2020-08-20 14:57:09 +01:00
parent f274630f4d
commit a296bcba51
11 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -433,8 +433,7 @@ operator op \
const DimensionedField<Type2, GeoMesh>& df2 = tdf2(); \
\
tmp<DimensionedField<productType, GeoMesh>> tRes = \
reuseTmpTmpDimensionedField \
<productType, Type1, Type1, Type2, GeoMesh>::New \
reuseTmpTmpDimensionedField<productType, Type1, Type2, GeoMesh>::New \
( \
tdf1, \
tdf2, \

8
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -217,8 +217,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func \
\
tmp<DimensionedField<ReturnType, GeoMesh>> tRes \
( \
reuseTmpTmpDimensionedField \
<ReturnType, Type1, Type1, Type2, GeoMesh>::New \
reuseTmpTmpDimensionedField<ReturnType, Type1, Type2, GeoMesh>::New \
( \
tdf1, \
tdf2, \
@ -477,8 +476,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op \
\
tmp<DimensionedField<ReturnType, GeoMesh>> tRes \
( \
reuseTmpTmpDimensionedField \
<ReturnType, Type1, Type1, Type2, GeoMesh>::New \
reuseTmpTmpDimensionedField<ReturnType, Type1, Type2, GeoMesh>::New \
( \
tdf1, \
tdf2, \

12
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -120,7 +120,7 @@ public:
};
template<class TypeR, class Type1, class Type12, class Type2, class GeoMesh>
template<class TypeR, class Type1, class Type2, class GeoMesh>
class reuseTmpTmpDimensionedField
{
public:
@ -145,8 +145,8 @@ public:
};
template<class TypeR, class Type1, class Type12, class GeoMesh>
class reuseTmpTmpDimensionedField<TypeR, Type1, Type12, TypeR, GeoMesh>
template<class TypeR, class Type1, class GeoMesh>
class reuseTmpTmpDimensionedField<TypeR, Type1, TypeR, GeoMesh>
{
public:
@ -182,7 +182,7 @@ public:
template<class TypeR, class Type2, class GeoMesh>
class reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, Type2, GeoMesh>
class reuseTmpTmpDimensionedField<TypeR, TypeR, Type2, GeoMesh>
{
public:
@ -217,7 +217,7 @@ public:
template<class TypeR, class GeoMesh>
class reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, TypeR, GeoMesh>
class reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, GeoMesh>
{
public:

8
src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -232,8 +232,7 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
}
tmp<DimensionedField<scalar, GeoMesh>> tPow =
reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::
New
reuseTmpTmpDimensionedField<scalar, scalar, scalar, GeoMesh>::New
(
tdsf1,
tdsf2,
@ -511,8 +510,7 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::
New
reuseTmpTmpDimensionedField<scalar, scalar, scalar, GeoMesh>::New
(
tdsf1,
tdsf2,

5
src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -749,8 +749,7 @@ operator op \
typedef typename product<Type1, Type2>::type productType; \
tmp<FieldField<Field1, productType>> tRes \
( \
reuseTmpTmpFieldField<Field1, productType, Type1, Type1, Type2>::New \
(tf1, tf2) \
reuseTmpTmpFieldField<Field1, productType, Type1, Type2>::New(tf1, tf2)\
); \
opFunc(tRes.ref(), tf1(), tf2()); \
tf1.clear(); \

8
src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -188,8 +188,7 @@ tmp<FieldField<Field, ReturnType>> Func \
{ \
tmp<FieldField<Field, ReturnType>> tRes \
( \
reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>:: \
New(tf1, tf2) \
reuseTmpTmpFieldField<Field, ReturnType, Type1, Type2>::New(tf1, tf2) \
); \
Func(tRes.ref(), tf1(), tf2()); \
tf1.clear(); \
@ -375,8 +374,7 @@ tmp<FieldField<Field, ReturnType>> operator Op \
{ \
tmp<FieldField<Field, ReturnType>> tRes \
( \
reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>:: \
New(tf1, tf2) \
reuseTmpTmpFieldField<Field, ReturnType, Type1, Type2>::New(tf1, tf2) \
); \
OpFunc(tRes.ref(), tf1(), tf2()); \
tf1.clear(); \

19
src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -104,14 +104,7 @@ public:
};
template
<
template<class> class Field,
class TypeR,
class Type1,
class Type12,
class Type2
>
template<template<class> class Field, class TypeR, class Type1, class Type2>
class reuseTmpTmpFieldField
{
public:
@ -130,8 +123,8 @@ public:
};
template<template<class> class Field, class TypeR, class Type1, class Type12>
class reuseTmpTmpFieldField<Field, TypeR, Type1, Type12, TypeR>
template<template<class> class Field, class TypeR, class Type1>
class reuseTmpTmpFieldField<Field, TypeR, Type1, TypeR>
{
public:
@ -157,7 +150,7 @@ public:
template<template<class> class Field, class TypeR, class Type2>
class reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR, Type2>
class reuseTmpTmpFieldField<Field, TypeR, TypeR, Type2>
{
public:
@ -183,7 +176,7 @@ public:
template<template<class> class Field, class TypeR>
class reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR, TypeR>
class reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR>
{
public:

4
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -652,7 +652,7 @@ operator op \
\
tmp<GeometricField<productType, PatchField, GeoMesh>> tRes = \
reuseTmpTmpGeometricField \
<productType, Type1, Type1, Type2, PatchField, GeoMesh>::New \
<productType, Type1, Type2, PatchField, GeoMesh>::New \
( \
tgf1, \
tgf2, \

7
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -267,8 +267,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func \
tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes \
( \
reuseTmpTmpGeometricField \
<ReturnType, Type1, Type1, Type2, PatchField, GeoMesh> \
::New \
<ReturnType, Type1, Type2, PatchField, GeoMesh>::New \
( \
tgf1, \
tgf2, \
@ -565,7 +564,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op \
tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes \
( \
reuseTmpTmpGeometricField \
<ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>::New \
<ReturnType, Type1, Type2, PatchField, GeoMesh>::New \
( \
tgf1, \
tgf2, \

11
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -183,7 +183,6 @@ template
<
class TypeR,
class Type1,
class Type12,
class Type2,
template<class> class PatchField,
class GeoMesh
@ -216,12 +215,10 @@ template
<
class TypeR,
class Type1,
class Type12,
template<class> class PatchField,
class GeoMesh
>
class reuseTmpTmpGeometricField
<TypeR, Type1, Type12, TypeR, PatchField, GeoMesh>
class reuseTmpTmpGeometricField<TypeR, Type1, TypeR, PatchField, GeoMesh>
{
public:
@ -263,7 +260,7 @@ template
template<class> class PatchField,
class GeoMesh
>
class reuseTmpTmpGeometricField<TypeR, TypeR, TypeR, Type2, PatchField, GeoMesh>
class reuseTmpTmpGeometricField<TypeR, TypeR, Type2, PatchField, GeoMesh>
{
public:
@ -298,7 +295,7 @@ public:
template<class TypeR, template<class> class PatchField, class GeoMesh>
class reuseTmpTmpGeometricField<TypeR, TypeR, TypeR, TypeR, PatchField, GeoMesh>
class reuseTmpTmpGeometricField<TypeR, TypeR, TypeR, PatchField, GeoMesh>
{
public:

6
src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -269,7 +269,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
(
reuseTmpTmpGeometricField
<scalar, scalar, scalar, scalar, PatchField, GeoMesh>::New
<scalar, scalar, scalar, PatchField, GeoMesh>::New
(
tgsf1,
tgsf2,
@ -608,7 +608,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
(
reuseTmpTmpGeometricField
<scalar, scalar, scalar, scalar, PatchField, GeoMesh>::New
<scalar, scalar, scalar, PatchField, GeoMesh>::New
(
tgsf1,
tgsf2,