diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C index 1628b6f9ed..9ed62a26f9 100644 --- a/applications/test/List/Test-List.C +++ b/applications/test/List/Test-List.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -97,11 +97,14 @@ void printMyString(const UList& lst) int main(int argc, char *argv[]) { argList::noParallel(); + argList::noFunctionObjects(); + argList::addOption("reList", "reList"); argList::addOption("wordList", "wordList"); argList::addOption("stringList", "stringList"); argList::addOption("float", "xx"); - argList::addBoolOption("transform", "Test List::createList functionality"); + argList::addBoolOption("create", "Test ListOps::create functionality"); + argList::addBoolOption("ListList", "Test list of list functionality"); argList::addBoolOption("flag"); #include "setRootCase.H" @@ -332,11 +335,11 @@ int main(int argc, char *argv[]) List sident(range.begin(), range.end()); Info<<"range-list (scalar)=" << sident << nl; - // Sub-ranges also work - List sident2(range(3), range(10)); - Info<<"range-list (scalar)=" << sident2 << nl; +// // Sub-ranges also work +// List sident2(range.at(3), range.at(10)); +// Info<<"subrange-list (scalar)=" << sident2 << nl; - // VERY BAD IDEA: List sident3(range(10), range(3)); + // VERY BAD IDEA: List sident3(range.at(10), range.at(3)); // This doesn't work, and don't know what it should do anyhow // List vident(range.begin(), range.end()); @@ -362,15 +365,15 @@ int main(int argc, char *argv[]) Info<<"-flag:" << args["flag"] << endl; } - if (args.found("transform")) + if (args.found("create")) { - Info<< nl << "Test List::createList functionality" << nl; + Info<< nl << "Test ListOps::create functionality" << nl; const auto labels = identity(15); Info<< "labels: " << flatOutput(labels) << endl; { - auto scalars = List::createList + auto scalars = ListOps::create ( labels, [](const label& val){ return scalar(1.5*val); } @@ -379,7 +382,7 @@ int main(int argc, char *argv[]) } { - auto vectors = List::createList + auto vectors = ListOps::create ( labels, [](const label& val){ return vector(1.2*val, -1.2*val, 0); } @@ -388,7 +391,7 @@ int main(int argc, char *argv[]) } { - auto longs = List::createList + auto longs = ListOps::create ( labels, [](const label& val){ return val; } @@ -396,7 +399,7 @@ int main(int argc, char *argv[]) Info<< "longs: " << flatOutput(longs) << endl; } { - auto negs = List