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

STYLE: adjust tests and one code instance for updated labelRange

Browse Source
This commit is contained in:
Mark Olesen
2020-09-23 10:44:05 +02:00
parent 2aa46d4379
commit 413ccd5ce3
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/test/DynamicList/Test-DynamicList.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017-2019 OpenCFD Ltd. Copyright (C) 2017-2020 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -333,7 +333,7 @@ int main(int argc, char *argv[])
labelRange(40, 18), // trailing portion labelRange(40, 18), // trailing portion
labelRange(-5, 10), // leading portion labelRange(-5, 10), // leading portion
labelRange(10, 8), // mid-portion labelRange(10, 8), // mid-portion
labelRange(0, input1.size()), // everything labelRange(input1.size()), // everything
} }
) )
{ {

4
applications/test/IjkField/Test-IjkField.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2019 OpenCFD Ltd. Copyright (C) 2019-2020 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -59,7 +59,7 @@ int main(int argc, char *argv[])
Info<< "addressing: " << addr1.sizes() << nl; Info<< "addressing: " << addr1.sizes() << nl;
Info<< "index of (2,2,2) " << addr1.index(2,2,2) << nl; Info<< "index of (2,2,2) " << addr1.index(2,2,2) << nl;
for (const label idx : labelRange(0, addr1.size())) for (const label idx : labelRange(addr1.size()))
{ {
Info<< "index of " << idx << " => " << addr1.index(idx) << nl; Info<< "index of " << idx << " => " << addr1.index(idx) << nl;
} }

6
applications/test/List/Test-List.C
View File

@ -327,7 +327,7 @@ int main(int argc, char *argv[])
Info<< "normal: " << wList << nl; Info<< "normal: " << wList << nl;
} }
// test SubList and labelRange // Test SubList and labelRange
{ {
Info<< nl; Info<< nl;
labelList longLabelList = identity(25); labelList longLabelList = identity(25);
@ -363,7 +363,7 @@ int main(int argc, char *argv[])
// and complete misses // and complete misses
longLabelList[{500,50}] = 100; longLabelList[{500,50}] = 100;
// labelRange automatically suppresses -ve size -> nop // -ve size suppressed by internal 'validateRange' = no-op
longLabelList[{5,-5}] = 42; longLabelList[{5,-5}] = 42;
longLabelList[{21,100}] = 42; longLabelList[{21,100}] = 42;
@ -379,7 +379,7 @@ int main(int argc, char *argv[])
//Nope: sort(longLabelList[labelRange(18,5)]); //Nope: sort(longLabelList[labelRange(18,5)]);
{ {
// Instead // Instead
UList<label> sub = longLabelList[labelRange(0, 8)]; UList<label> sub = longLabelList[labelRange(8)];
sort(sub); sort(sub);
} }
Info<< "sub-sorted: " << flatOutput(longLabelList) << nl; Info<< "sub-sorted: " << flatOutput(longLabelList) << nl;

4
applications/test/PackedList1/Test-PackedList1.C
View File

@ -435,7 +435,7 @@ int main(int argc, char *argv[])
bits.set(labelRange(150, 15)); bits.set(labelRange(150, 15));
Info<< "bits" << nl; report(bits, true); Info<< "bits" << nl; report(bits, true);
bits.set(labelRange(0, 5)); bits.set(labelRange(5));
Info<< "bits" << nl; report(bits, true); Info<< "bits" << nl; report(bits, true);
@ -455,7 +455,7 @@ int main(int argc, char *argv[])
bits.unset(labelRange(35, 16)); bits.unset(labelRange(35, 16));
Info<< "bits" << nl; report(bits, true); Info<< "bits" << nl; report(bits, true);
bits.unset(labelRange(0, 50)); bits.unset(labelRange(50));
bits.resize(100000); bits.resize(100000);
bits.set(labelRange(30, 6)); bits.set(labelRange(30, 6));
bits[33] = false; bits[33] = false;

2
applications/test/sliceRange/Test-sliceRange.C
View File

@ -163,7 +163,7 @@ int main(int argc, char *argv[])
Info<< nl << "Random list: " << flatOutput(list1) << nl; Info<< nl << "Random list: " << flatOutput(list1) << nl;
{ {
IndirectSubList<scalar> sublist1(list1, labelRange(0, 10)); IndirectSubList<scalar> sublist1(list1, labelRange(10));
Info<< nl << "SubList: " << sublist1.addressing() << " = " Info<< nl << "SubList: " << sublist1.addressing() << " = "
<< flatOutput(sublist1) << nl; << flatOutput(sublist1) << nl;

2
src/functionObjects/field/STDMD/STDMD.C
View File

@ -933,7 +933,7 @@ void Foam::functionObjects::STDMD::writeOutput(OFstream& os) const
writeFileHeader(os); writeFileHeader(os);
for (const auto& i : labelRange(0, oFreqs_.size())) for (const label i : labelRange(oFreqs_.size()))
{ {
os << oFreqs_[i] << tab os << oFreqs_[i] << tab
<< oMags_[i] << tab << oMags_[i] << tab