zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MRG: Integrated Foundation code to commit 47bd8e1

Browse Source
This commit is contained in:
Andrew Heather
2017-03-23 10:12:38 +00:00
parent 68851ce4f0 47bd8e13f7
commit 04c3d535b0
148 changed files with 9543 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
View File

@ -2,8 +2,8 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -215,7 +215,7 @@ Foam::Function1Types::CSV<Type>::CSV
componentColumns_(coeffs_.lookup("componentColumns")),
separator_(coeffs_.lookupOrDefault<string>("separator", string(","))[0]),
mergeSeparators_(readBool(coeffs_.lookup("mergeSeparators"))),
fName_(fName != fileName::null ? fName : coeffs_.lookup("fileName"))
fName_(fName != fileName::null ? fName : coeffs_.lookup("file"))
{
if (componentColumns_.size() != pTraits<Type>::nComponents)
{
@ -273,7 +273,7 @@ void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
TableBase<Type>::writeEntries(os);
os.writeEntry("nHeaderLine", nHeaderLine_);
os.writeEntry("refColumn", refColumn_);
os.writeEntry("refColumn", refColumn_);
// Force writing labelList in ascii
const enum IOstream::streamFormat fmt = os.format();
@ -281,9 +281,9 @@ void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
os.writeEntry("componentColumns", componentColumns_);
os.format(fmt);
os.writeEntry("separator", string(separator_));
os.writeEntry("separator", string(separator_));
os.writeEntry("mergeSeparators", mergeSeparators_);
os.writeEntry("fileName", fName_);
os.writeEntry("file", fName_);
os.endBlock() << flush;
}