From 8ab5b6152ef92a67fcaea2ce4a69d76b3a7bace6 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 8 Jun 2018 23:01:24 +0100 Subject: [PATCH] CSV: Updated writing of componentColumns for consistency with construction for binary IO Resolves bug-report https://bugs.openfoam.org/view.php?id=2950 --- .../primitives/functions/Function1/CSV/CSV.C | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C index f8c547af3..a5c5fc9d3 100644 --- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C +++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C @@ -273,21 +273,10 @@ void Foam::Function1Types::CSV::writeData(Ostream& os) const os.writeKeyword("nHeaderLine") << nHeaderLine_ << token::END_STATEMENT << nl; + os.writeKeyword("refColumn") << refColumn_ << token::END_STATEMENT << nl; - // Force writing labelList in ascii - os.writeKeyword("componentColumns"); - if (os.format() == IOstream::BINARY) - { - os.format(IOstream::ASCII); - os << componentColumns_; - os.format(IOstream::BINARY); - } - else - { - os << componentColumns_; - } - os << token::END_STATEMENT << nl; + componentColumns_.writeEntry("componentColumns", os); os.writeKeyword("separator") << string(separator_) << token::END_STATEMENT << nl;