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

COMP: remove explicit specialisations for CSV reading (fixes #2764)

Browse Source 
- can use traits to distinguish label vs scalar types and
  setComponents to properly index into single or multi-component
  types without needing template specialisations for the task.

  This avoids the need for a concrete translation unit and the
  reported problem of multiply-defined specialisations when the header
  is included in different places.
This commit is contained in:
Mark Olesen
2023-05-02 10:46:59 +02:00
parent e967305ef2
commit 287025d2df
4 changed files with 47 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2020-2022 OpenCFD Ltd.
Copyright (C) 2020-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -66,41 +66,26 @@ Foam::labelList Foam::csvTableReader<Type>::getComponentColumns
// * * * * * * * * * * * * * 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 UList<string>& strings
) const
{
Type result;
for (label i = 0; i < pTraits<Type>::nComponents; ++i)
if (std::is_integral<Type>::value)
{
result[i] = readScalar(strings[componentColumns_[i]]);
// nComponents == 1
setComponent(result, 0) = readLabel(strings[componentColumns_[0]]);
}
else
{
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; ++cmpt)
{
setComponent(result, cmpt) =
readScalar(strings[componentColumns_[cmpt]]);
}
}
return result;
@ -144,7 +129,7 @@ void Foam::csvTableReader<Type>::operator()
// Skip header
if (headerLine_)
{
is.getLine(line);
is.getLine(nullptr);
++lineNo;
}
@ -171,12 +156,12 @@ void Foam::csvTableReader<Type>::operator()
if (nPos == std::string::npos)
{
strings.append(line.substr(pos));
strings.push_back(line.substr(pos));
pos = nPos;
}
else
{
strings.append(line.substr(pos, nPos-pos));
strings.push_back(line.substr(pos, nPos-pos));
pos = nPos + 1;
}
}
@ -198,7 +183,7 @@ void Foam::csvTableReader<Type>::operator()
scalar x = readScalar(strings[refColumn_]);
Type value = readValue(strings);
values.append(Tuple2<scalar,Type>(x, value));
values.emplace_back(x, value);
}
data.transfer(values);