From dd8b8bceac6d0c83bfa0fa486c8846d20c711159 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 9 Feb 2017 17:47:56 +0000
Subject: [PATCH] csvSetWriter: Corrected axis header
Resolves bug-report https://bugs.openfoam.org/view.php?id=2455
---
src/OpenFOAM/primitives/strings/word/wordI.H | 5 +----
.../sampledSetWriters/csv/csvSetWriter.C | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/OpenFOAM/primitives/strings/word/wordI.H b/src/OpenFOAM/primitives/strings/word/wordI.H
index 587adfac99b..7873387a3bb 100644
--- a/src/OpenFOAM/primitives/strings/word/wordI.H
+++ b/src/OpenFOAM/primitives/strings/word/wordI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,8 +25,6 @@ License
#include <cctype>
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
inline void Foam::word::stripInvalid()
@@ -175,6 +173,5 @@ inline Foam::word Foam::operator&(const word& a, const word& b)
}
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* //
diff --git a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
index 8d69d32cb37..e87fb0338c3 100644
--- a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -147,7 +147,7 @@ namespace Foam
os << nl;
}
-} // end namespace
+}
template<class Type>
@@ -183,17 +183,24 @@ void Foam::csvSetWriter<Type>::writeCoordHeader
Ostream& os
) const
{
+ const word axisName(points.axis());
+
if (points.hasVectorAxis())
{
- forAll(points, i)
+ for
+ (
+ word::const_iterator iter = axisName.begin();
+ iter != axisName.end();
+ ++iter
+ )
{
- os << points.axis()[i];
+ os << *iter;
writeSeparator(os);
}
}
else
{
- os << points.axis();
+ os << axisName;
writeSeparator(os);
}
}
--
GitLab