From 52255e53a7a983995aa2e27b64b8fcc3399d15b6 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 12 Dec 2019 11:53:54 +0000 Subject: [PATCH] Ensight format writing: Reverted changes to writeKeyword Patch contributed by Timo Niemi, VTT. Resolves bug-report https://bugs.openfoam.org/view.php?id=3409 --- src/conversion/ensight/part/ensightPartCells.C | 2 +- src/conversion/ensight/part/ensightPartFaces.C | 2 +- src/conversion/ensight/part/ensightPartIO.C | 10 +++++----- src/conversion/ensight/part/ensightPartTemplates.C | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/conversion/ensight/part/ensightPartCells.C b/src/conversion/ensight/part/ensightPartCells.C index d079cb9b67..17b386c852 100644 --- a/src/conversion/ensight/part/ensightPartCells.C +++ b/src/conversion/ensight/part/ensightPartCells.C @@ -307,7 +307,7 @@ void Foam::ensightPartCells::writeConnectivity const labelUList& pointMap ) const { - writeKeyword(os, key); + os.writeKeyword(key); os.write(idList.size()); os.newline(); diff --git a/src/conversion/ensight/part/ensightPartFaces.C b/src/conversion/ensight/part/ensightPartFaces.C index ed03f6885b..7423e5dd4c 100644 --- a/src/conversion/ensight/part/ensightPartFaces.C +++ b/src/conversion/ensight/part/ensightPartFaces.C @@ -259,7 +259,7 @@ void Foam::ensightPartFaces::writeConnectivity const labelUList& pointMap ) const { - writeKeyword(os, key); + os.writeKeyword(key); os.write(idList.size()); os.newline(); diff --git a/src/conversion/ensight/part/ensightPartIO.C b/src/conversion/ensight/part/ensightPartIO.C index e1e4b35725..049a188363 100644 --- a/src/conversion/ensight/part/ensightPartIO.C +++ b/src/conversion/ensight/part/ensightPartIO.C @@ -179,7 +179,7 @@ void Foam::ensightPart::writeGeometry writeHeader(os, true); // write points - writeKeyword(os, "coordinates"); + os.writeKeyword("coordinates"); os.write(ptList.nPoints); os.newline(); @@ -226,7 +226,7 @@ void Foam::ensightPart::writeScalarField if (perNode) { - writeKeyword(os, "coordinates"); + os.writeKeyword("coordinates"); writeFieldList(os, field, labelUList::null()); } else @@ -237,7 +237,7 @@ void Foam::ensightPart::writeScalarField if (idList.size()) { - writeKeyword(os, elementTypes()[elemI]); + os.writeKeyword(elementTypes()[elemI]); writeFieldList(os, field, idList); } } @@ -261,7 +261,7 @@ void Foam::ensightPart::writeVectorField if (perNode) { - writeKeyword(os, "coordinates"); + os.writeKeyword("coordinates"); writeFieldList(os, field0, labelUList::null()); writeFieldList(os, field1, labelUList::null()); writeFieldList(os, field2, labelUList::null()); @@ -274,7 +274,7 @@ void Foam::ensightPart::writeVectorField if (idList.size()) { - writeKeyword(os, elementTypes()[elemI]); + os.writeKeyword(elementTypes()[elemI]); writeFieldList(os, field0, idList); writeFieldList(os, field1, idList); writeFieldList(os, field2, idList); diff --git a/src/conversion/ensight/part/ensightPartTemplates.C b/src/conversion/ensight/part/ensightPartTemplates.C index e2a62001f1..7b094f4575 100644 --- a/src/conversion/ensight/part/ensightPartTemplates.C +++ b/src/conversion/ensight/part/ensightPartTemplates.C @@ -44,7 +44,7 @@ void Foam::ensightPart::writeField if (perNode) { - writeKeyword(os, "coordinates"); + os.writeKeyword("coordinates"); for ( direction cmpt=0; @@ -63,7 +63,7 @@ void Foam::ensightPart::writeField if (idList.size()) { - writeKeyword(os, elementTypes()[elemI]); + os.writeKeyword(elementTypes()[elemI]); for (