- avoid stealing autoPtr in interpolationTable copy operations - improve local memory requirements of readers - make OpenFOAM table reader default constructible - more code alignment between csvTableReader and Function1::CSV (fix #1498 for csvTableReader as well)
235 lines
5.8 KiB
C
235 lines
5.8 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2011-2017 OpenFOAM Foundation
|
|
Copyright (C) 2020 OpenCFD Ltd.
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "csvTableReader.H"
|
|
#include "fileOperation.H"
|
|
#include "DynamicList.H"
|
|
#include "ListOps.H"
|
|
|
|
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
|
|
|
|
template<class Type>
|
|
Foam::labelList Foam::csvTableReader<Type>::getComponentColumns
|
|
(
|
|
const word& name,
|
|
const dictionary& dict
|
|
)
|
|
{
|
|
// Writing of columns was forced to be ASCII,
|
|
// do the same when reading
|
|
|
|
labelList cols;
|
|
|
|
ITstream& is = dict.lookup(name);
|
|
is.format(IOstream::ASCII);
|
|
is >> cols;
|
|
dict.checkITstream(is, name);
|
|
|
|
if (cols.size() != pTraits<Type>::nComponents)
|
|
{
|
|
FatalIOErrorInFunction(dict)
|
|
<< name << " with " << cols
|
|
<< " does not have the expected length "
|
|
<< pTraits<Type>::nComponents << nl
|
|
<< exit(FatalIOError);
|
|
}
|
|
|
|
return cols;
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
|
|
|
namespace Foam
|
|
{
|
|
template<>
|
|
label csvTableReader<label>::readValue
|
|
(
|
|
const List<string>& strings
|
|
) const
|
|
{
|
|
return readLabel(strings[componentColumns_[0]]);
|
|
}
|
|
|
|
|
|
template<>
|
|
scalar csvTableReader<scalar>::readValue
|
|
(
|
|
const List<string>& strings
|
|
) const
|
|
{
|
|
return readScalar(strings[componentColumns_[0]]);
|
|
}
|
|
|
|
} // End namespace Foam
|
|
|
|
|
|
template<class Type>
|
|
Type Foam::csvTableReader<Type>::readValue
|
|
(
|
|
const List<string>& strings
|
|
) const
|
|
{
|
|
Type result;
|
|
|
|
for (label i = 0; i < pTraits<Type>::nComponents; ++i)
|
|
{
|
|
result[i] = readScalar(strings[componentColumns_[i]]);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
|
|
|
template<class Type>
|
|
Foam::csvTableReader<Type>::csvTableReader(const dictionary& dict)
|
|
:
|
|
tableReader<Type>(dict),
|
|
headerLine_(dict.get<bool>("hasHeaderLine")),
|
|
refColumn_(dict.get<label>("timeColumn")),
|
|
componentColumns_(getComponentColumns("valueColumns", dict)),
|
|
separator_(dict.getOrDefault<string>("separator", ",")[0])
|
|
{}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
|
|
|
template<class Type>
|
|
void Foam::csvTableReader<Type>::operator()
|
|
(
|
|
const fileName& fName,
|
|
List<Tuple2<scalar, Type>>& data
|
|
)
|
|
{
|
|
autoPtr<ISstream> isPtr(fileHandler().NewIFstream(fName));
|
|
ISstream& is = isPtr();
|
|
|
|
const label maxEntry =
|
|
max(refColumn_, componentColumns_[findMax(componentColumns_)]);
|
|
|
|
label lineNo = 0;
|
|
|
|
// Skip header
|
|
if (headerLine_)
|
|
{
|
|
string line;
|
|
is.getLine(line);
|
|
++lineNo;
|
|
}
|
|
|
|
DynamicList<Tuple2<scalar, Type>> values;
|
|
DynamicList<string> strings(maxEntry+1); // reserve
|
|
|
|
while (is.good())
|
|
{
|
|
string line;
|
|
is.getLine(line);
|
|
++lineNo;
|
|
|
|
strings.clear();
|
|
|
|
std::size_t pos = 0;
|
|
|
|
for
|
|
(
|
|
label n = 0;
|
|
(pos != std::string::npos) && (n <= maxEntry);
|
|
++n
|
|
)
|
|
{
|
|
const auto nPos = line.find(separator_, pos);
|
|
|
|
if (nPos == std::string::npos)
|
|
{
|
|
strings.append(line.substr(pos));
|
|
pos = nPos;
|
|
}
|
|
else
|
|
{
|
|
strings.append(line.substr(pos, nPos-pos));
|
|
pos = nPos + 1;
|
|
}
|
|
}
|
|
|
|
if (strings.size() <= 1)
|
|
{
|
|
break;
|
|
}
|
|
|
|
if (strings.size() <= maxEntry)
|
|
{
|
|
FatalErrorInFunction
|
|
<< "Not enough columns near line " << lineNo
|
|
<< ". Require " << (maxEntry+1) << " but found "
|
|
<< strings << nl
|
|
<< exit(FatalError);
|
|
}
|
|
|
|
scalar x = readScalar(strings[refColumn_]);
|
|
Type value = readValue(strings);
|
|
|
|
values.append(Tuple2<scalar,Type>(x, value));
|
|
}
|
|
|
|
data.transfer(values);
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
void Foam::csvTableReader<Type>::operator()
|
|
(
|
|
const fileName& fName,
|
|
List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& data
|
|
)
|
|
{
|
|
NotImplemented;
|
|
}
|
|
|
|
|
|
template<class Type>
|
|
void Foam::csvTableReader<Type>::write(Ostream& os) const
|
|
{
|
|
tableReader<Type>::write(os);
|
|
|
|
os.writeEntry("hasHeaderLine", headerLine_);
|
|
os.writeEntry("timeColumn", refColumn_);
|
|
|
|
// Force writing labelList in ascii
|
|
const enum IOstream::streamFormat fmt = os.format();
|
|
os.format(IOstream::ASCII);
|
|
os.writeEntry("componentColumns", componentColumns_);
|
|
os.format(fmt);
|
|
|
|
os.writeEntry("separator", string(separator_));
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|