From a296bcba515c2c7f37bcd8cd6ffed2c2ab473f15 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 20 Aug 2020 14:57:09 +0100 Subject: [PATCH] Removed unused template argument from field reuse classes --- .../DimensionedFieldFunctions.C | 5 ++--- .../DimensionedFieldFunctionsM.C | 8 +++----- .../DimensionedFieldReuseFunctions.H | 12 ++++++------ .../DimensionedScalarField.C | 8 +++----- .../FieldField/FieldFieldFunctions.C | 5 ++--- .../FieldField/FieldFieldFunctionsM.C | 8 +++----- .../FieldField/FieldFieldReuseFunctions.H | 19 ++++++------------- .../GeometricField/GeometricFieldFunctions.C | 4 ++-- .../GeometricField/GeometricFieldFunctionsM.C | 7 +++---- .../GeometricFieldReuseFunctions.H | 11 ++++------- .../GeometricScalarField.C | 6 +++--- 11 files changed, 37 insertions(+), 56 deletions(-) diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C index ec7c4a57a5..c943a1f9a1 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C @@ -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& df2 = tdf2(); \ \ tmp> tRes = \ - reuseTmpTmpDimensionedField \ - ::New \ + reuseTmpTmpDimensionedField::New \ ( \ tdf1, \ tdf2, \ diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C index cb97304a98..215f377f6d 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C @@ -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> Func \ \ tmp> tRes \ ( \ - reuseTmpTmpDimensionedField \ - ::New \ + reuseTmpTmpDimensionedField::New \ ( \ tdf1, \ tdf2, \ @@ -477,8 +476,7 @@ tmp> operator Op \ \ tmp> tRes \ ( \ - reuseTmpTmpDimensionedField \ - ::New \ + reuseTmpTmpDimensionedField::New \ ( \ tdf1, \ tdf2, \ diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H index 9ff0927d8b..d0351c3369 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H @@ -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 +template class reuseTmpTmpDimensionedField { public: @@ -145,8 +145,8 @@ public: }; -template -class reuseTmpTmpDimensionedField +template +class reuseTmpTmpDimensionedField { public: @@ -182,7 +182,7 @@ public: template -class reuseTmpTmpDimensionedField +class reuseTmpTmpDimensionedField { public: @@ -217,7 +217,7 @@ public: template -class reuseTmpTmpDimensionedField +class reuseTmpTmpDimensionedField { public: diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C index 393d5bfb40..9a3e0a1163 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C @@ -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> pow } tmp> tPow = - reuseTmpTmpDimensionedField:: - New + reuseTmpTmpDimensionedField::New ( tdsf1, tdsf2, @@ -511,8 +510,7 @@ tmp> atan2 const DimensionedField& dsf2 = tdsf2(); tmp> tAtan2 = - reuseTmpTmpDimensionedField:: - New + reuseTmpTmpDimensionedField::New ( tdsf1, tdsf2, diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C index a7521881c8..7600c3cfa7 100644 --- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C +++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C @@ -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::type productType; \ tmp> tRes \ ( \ - reuseTmpTmpFieldField::New \ - (tf1, tf2) \ + reuseTmpTmpFieldField::New(tf1, tf2)\ ); \ opFunc(tRes.ref(), tf1(), tf2()); \ tf1.clear(); \ diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C index a7af2eae41..7509d2ce6c 100644 --- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C +++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C @@ -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> Func \ { \ tmp> tRes \ ( \ - reuseTmpTmpFieldField:: \ - New(tf1, tf2) \ + reuseTmpTmpFieldField::New(tf1, tf2) \ ); \ Func(tRes.ref(), tf1(), tf2()); \ tf1.clear(); \ @@ -375,8 +374,7 @@ tmp> operator Op \ { \ tmp> tRes \ ( \ - reuseTmpTmpFieldField:: \ - New(tf1, tf2) \ + reuseTmpTmpFieldField::New(tf1, tf2) \ ); \ OpFunc(tRes.ref(), tf1(), tf2()); \ tf1.clear(); \ diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H index 15b0a08f2d..fc6324d7fc 100644 --- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H +++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H @@ -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 Field, - class TypeR, - class Type1, - class Type12, - class Type2 -> +template class Field, class TypeR, class Type1, class Type2> class reuseTmpTmpFieldField { public: @@ -130,8 +123,8 @@ public: }; -template class Field, class TypeR, class Type1, class Type12> -class reuseTmpTmpFieldField +template class Field, class TypeR, class Type1> +class reuseTmpTmpFieldField { public: @@ -157,7 +150,7 @@ public: template class Field, class TypeR, class Type2> -class reuseTmpTmpFieldField +class reuseTmpTmpFieldField { public: @@ -183,7 +176,7 @@ public: template class Field, class TypeR> -class reuseTmpTmpFieldField +class reuseTmpTmpFieldField { public: diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C index 6b06d4be7d..2ce8883c5c 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C @@ -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> tRes = \ reuseTmpTmpGeometricField \ - ::New \ + ::New \ ( \ tgf1, \ tgf2, \ diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C index ce04bfbd9f..a08a388a18 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C @@ -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> Func \ tmp> tRes \ ( \ reuseTmpTmpGeometricField \ - \ - ::New \ + ::New \ ( \ tgf1, \ tgf2, \ @@ -565,7 +564,7 @@ tmp> operator Op \ tmp> tRes \ ( \ reuseTmpTmpGeometricField \ - ::New \ + ::New \ ( \ tgf1, \ tgf2, \ diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H index 8626ff26d2..2a8b319bb1 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H @@ -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 PatchField, class GeoMesh @@ -216,12 +215,10 @@ template < class TypeR, class Type1, - class Type12, template class PatchField, class GeoMesh > -class reuseTmpTmpGeometricField - +class reuseTmpTmpGeometricField { public: @@ -263,7 +260,7 @@ template template class PatchField, class GeoMesh > -class reuseTmpTmpGeometricField +class reuseTmpTmpGeometricField { public: @@ -298,7 +295,7 @@ public: template class PatchField, class GeoMesh> -class reuseTmpTmpGeometricField +class reuseTmpTmpGeometricField { public: diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C index ea28bd6fbb..84d40133b1 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C @@ -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> pow tmp> tPow ( reuseTmpTmpGeometricField - ::New + ::New ( tgsf1, tgsf2, @@ -608,7 +608,7 @@ tmp> atan2 tmp> tAtan2 ( reuseTmpTmpGeometricField - ::New + ::New ( tgsf1, tgsf2,