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

List - adjusted transfer(DynamicList) and added transfer(SortableList)

Browse Source
This commit is contained in:
Mark Olesen
2008-11-23 16:08:28 +01:00
parent 8b72dbedbe
commit a8550cd0ba
4 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/test/DynamicList/DynamicListTest.C
View File

@ -100,6 +100,15 @@ int main(int argc, char *argv[])
Info<< "<dlB>" << dlB << "</dlB>" << nl << "sizes: "
<< " " << dlB.size() << "/" << dlB.allocSize() << endl;
// try with a normal list:
List<label> lstA;
lstA.transfer(dlB);
Info<< "Transferred to normal list" << endl;
Info<< "<lstA>" << lstA << "</lstA>" << nl << "sizes: "
<< " " << lstA.size() << endl;
Info<< "<dlB>" << dlB << "</dlB>" << nl << "sizes: "
<< " " << dlB.size() << "/" << dlB.allocSize() << endl;
return 0;
}

7
applications/test/sort/sortListTest.C
View File

@ -70,6 +70,13 @@ int main(int argc, char *argv[])
Info << "sorted: " << b << endl;
Info << "indices: " << b.indices() << endl;
labelList flatten;
flatten.transfer(b);
Info << "flatten: " << flatten << endl;
Info << "sorted: " << b << endl;
Info << "indices: " << b.indices() << endl;
Info << "End\n" << endl;
return 0;

20
src/OpenFOAM/containers/Lists/List/List.C
View File

@ -432,14 +432,20 @@ void Foam::List<T>::transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>& a)
{
// shrink the allocated space to the number of elements used
a.shrink();
if (this->v_) delete[] this->v_;
this->size_ = a.size_;
this->v_ = a.v_;
a.size_ = 0;
a.v_ = 0;
a.allocSize_ = 0;
transfer(static_cast<List<T>&>(a));
}
// Transfer the contents of the argument SortableList into this List
// and anull the argument list
template<class T>
void Foam::List<T>::transfer(SortableList<T>& a)
{
// shrink away the sort indices
a.shrink();
transfer(static_cast<List<T>&>(a));
}

7
src/OpenFOAM/containers/Lists/List/List.H
View File

@ -63,7 +63,8 @@ template<class T, label Size> class FixedList;
template<class T> class PtrList;
template<class T> class SLList;
template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
class DynamicList;
class DynamicList;
template<class T> class SortableList;
template<class T> class IndirectList;
template<class T> class BiIndirectList;
@ -173,6 +174,10 @@ public:
template<unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
//- Transfer the contents of the argument List into this List
// and annull the argument list.
void transfer(SortableList<T>&);
//- Return subscript-checked element of UList.
inline T& newElmt(const label);