From 672e215a789ad34521acf7771bbb0530d2e30847 Mon Sep 17 00:00:00 2001 From: Gregor Weiss Date: Tue, 26 Sep 2023 15:57:01 +0200 Subject: [PATCH] Removed debugging in (Dimensioned)Field - it made problems in undefined reference to instantiations with triSurfaceGeoMesh during compilation of applications --- src/foam/Make/files | 4 ---- .../DimensionedField/DebugIODimensionedField.C | 3 --- .../DimensionedField/DimensionedField.H | 3 --- .../DimensionedField/DimensionedFieldIO.C | 5 ----- src/foam/fields/Fields/Field/DebugIOField.C | 3 --- src/foam/fields/Fields/Field/Field.C | 8 -------- src/foam/fields/Fields/Field/Field.H | 3 --- .../GeometricField/GeometricField.C | 15 --------------- 8 files changed, 44 deletions(-) delete mode 100644 src/foam/fields/DimensionedFields/DimensionedField/DebugIODimensionedField.C delete mode 100644 src/foam/fields/Fields/Field/DebugIOField.C diff --git a/src/foam/Make/files b/src/foam/Make/files index 961976b66..14f4d2770 100644 --- a/src/foam/Make/files +++ b/src/foam/Make/files @@ -614,16 +614,12 @@ $(meshTools)/meshTools.C $(meshTools)/matchPoints.C $(meshTools)/mergePoints.C -fields/DimensionedFields/DimensionedField/DebugIODimensionedField.C fields/UniformDimensionedFields/uniformDimensionedFields.C fields/cloud/cloud.C fields/cloudDistribute/cloudDistribute.C Fields = fields/Fields - -$(Fields)/Field/DebugIOField.C - $(Fields)/labelField/labelField.C $(Fields)/scalarField/scalarField.C $(Fields)/vectorField/vectorField.C diff --git a/src/foam/fields/DimensionedFields/DimensionedField/DebugIODimensionedField.C b/src/foam/fields/DimensionedFields/DimensionedField/DebugIODimensionedField.C deleted file mode 100644 index f90129eec..000000000 --- a/src/foam/fields/DimensionedFields/DimensionedField/DebugIODimensionedField.C +++ /dev/null @@ -1,3 +0,0 @@ -#include "DimensionedField.H" - -defineTypeNameAndDebug(Foam::DebugIODimensionedFieldName, 0); \ No newline at end of file diff --git a/src/foam/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/foam/fields/DimensionedFields/DimensionedField/DimensionedField.H index 1a7d09b74..7233d2d92 100644 --- a/src/foam/fields/DimensionedFields/DimensionedField/DimensionedField.H +++ b/src/foam/fields/DimensionedFields/DimensionedField/DimensionedField.H @@ -48,8 +48,6 @@ SourceFiles namespace Foam { -TemplateName(DebugIODimensionedField); - // Forward declaration of friend functions and operators template class DimensionedField; @@ -74,7 +72,6 @@ template Ostream& operator<< template class DimensionedField : - public DebugIODimensionedFieldName, public regIOobject, public Field { diff --git a/src/foam/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/foam/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C index a7508458a..d972540e6 100644 --- a/src/foam/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C +++ b/src/foam/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C @@ -76,11 +76,6 @@ bool DimensionedField::writeData const word& fieldDictEntry ) const { - if (debug) - { - Pout<< "dimensions = " << endl; - } - os.writeKeyword("dimensions") << dimensions() << token::END_STATEMENT << nl << nl; diff --git a/src/foam/fields/Fields/Field/DebugIOField.C b/src/foam/fields/Fields/Field/DebugIOField.C deleted file mode 100644 index ea6be5b0e..000000000 --- a/src/foam/fields/Fields/Field/DebugIOField.C +++ /dev/null @@ -1,3 +0,0 @@ -#include "Field.H" - -defineTypeNameAndDebug(Foam::DebugIOFieldName, 0); \ No newline at end of file diff --git a/src/foam/fields/Fields/Field/Field.C b/src/foam/fields/Fields/Field/Field.C index 8c1133dbc..644ddf7e1 100644 --- a/src/foam/fields/Fields/Field/Field.C +++ b/src/foam/fields/Fields/Field/Field.C @@ -212,14 +212,6 @@ Field::Field const label s ) { - if (debug) - { - Info<< "Field::Field" - << "(const word& keyword, const dictionary& dict, const label s)" - << " : keyword = " << keyword - << endl; - } - if (s) { ITstream& is = dict.lookup(keyword); diff --git a/src/foam/fields/Fields/Field/Field.H b/src/foam/fields/Fields/Field/Field.H index 32328e319..4b0d26623 100644 --- a/src/foam/fields/Fields/Field/Field.H +++ b/src/foam/fields/Fields/Field/Field.H @@ -51,8 +51,6 @@ SourceFiles namespace Foam { - -TemplateName(DebugIOField); // Forward declaration of friend functions and operators @@ -79,7 +77,6 @@ class dictionary; template class Field : - public DebugIOFieldName, public refCount, public List { diff --git a/src/foam/fields/GeometricFields/GeometricField/GeometricField.C b/src/foam/fields/GeometricFields/GeometricField/GeometricField.C index abadd1aff..fc226cc57 100644 --- a/src/foam/fields/GeometricFields/GeometricField/GeometricField.C +++ b/src/foam/fields/GeometricFields/GeometricField/GeometricField.C @@ -58,14 +58,6 @@ Foam::GeometricField::readField const dictionary& fieldDict ) { - if (debug) - { - Info<< "Foam::GeometricField" - << "::readField(const dictionary& fieldDict)" - << "\n dict =\n" << fieldDict << nl - << endl; - } - DimensionedField::readField(fieldDict, "internalField"); tmp tboundaryField @@ -104,13 +96,6 @@ Foam::tmp > Foam::GeometricField::readField(Istream& is) { - if (debug) - { - Info<< "Foam::GeometricField" - << "::readField(Istream& is) with stream format " << is.format() - << endl; - } - if (is.version() < 2.0) { FatalIOErrorIn