From 702225c24917fb4406122d109aa81e44b76f3e63 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Sat, 11 Feb 2023 13:28:51 +0100 Subject: [PATCH] ENH: add stdFoam::span container - basic functionality similar to std::span (C++20). Holds pointer and size: for lightweight handling of address ranges. - implements cdata_bytes() and data_bytes() methods for similarity with UList. For span, however, both container accesses are const but the data_bytes() method is only available when the underlying pointer is non-const. No specializations of std::as_bytes() or std::as_writeable_bytes() as free functions, since std::byte etc are not available anyhow. --- applications/test/span/Make/files | 3 + applications/test/span/Make/options | 2 + applications/test/span/Test-stdFoam-span.C | 156 +++++++++++++++++++ src/OpenFOAM/include/stdFoam.H | 173 ++++++++++++++++++++- 4 files changed, 333 insertions(+), 1 deletion(-) create mode 100644 applications/test/span/Make/files create mode 100644 applications/test/span/Make/options create mode 100644 applications/test/span/Test-stdFoam-span.C diff --git a/applications/test/span/Make/files b/applications/test/span/Make/files new file mode 100644 index 0000000000..81d892eb39 --- /dev/null +++ b/applications/test/span/Make/files @@ -0,0 +1,3 @@ +Test-stdFoam-span.C + +EXE = $(FOAM_USER_APPBIN)/Test-stdFoam-span diff --git a/applications/test/span/Make/options b/applications/test/span/Make/options new file mode 100644 index 0000000000..18e6fe47af --- /dev/null +++ b/applications/test/span/Make/options @@ -0,0 +1,2 @@ +/* EXE_INC = */ +/* EXE_LIBS = */ diff --git a/applications/test/span/Test-stdFoam-span.C b/applications/test/span/Test-stdFoam-span.C new file mode 100644 index 0000000000..fc6048b7b8 --- /dev/null +++ b/applications/test/span/Test-stdFoam-span.C @@ -0,0 +1,156 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | www.openfoam.com + \\/ M anipulation | +------------------------------------------------------------------------------- + Copyright (C) 2023 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 . + +Application + Test-stdFoam-span + +Description + Basic functionality test for span + +\*---------------------------------------------------------------------------*/ + +#include "argList.H" + +#include "IOstreams.H" +#include "StringStream.H" +#include "scalar.H" +#include "vector.H" +#include "labelRange.H" +#include "scalarList.H" + +using namespace Foam; + +template +void printInfo(const UList& list) +{ + Info<< "list: " << flatOutput(list) << nl + << "data: " << Foam::name(list.cdata()) + << " size: " << Foam::name(list.size()) << nl; +} + + +template +void printInfo(const stdFoam::span span) +{ + Info<< "span: " << Foam::name(span.data()) + << ", " << span.size() << nl; +} + +template +void printContent(const stdFoam::span span) +{ + Info<< "range:"; + for (const auto& val : span) + { + Info<< " " << val; + } + Info<< nl; +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Main program: + +int main(int argc, char *argv[]) +{ + argList::noParallel(); + argList::noFunctionObjects(); + + #include "setRootCase.H" + + { + const List