From a8550cd0ba5c794af44943526b85d8a7d58e3ca7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Sun, 23 Nov 2008 16:08:28 +0100
Subject: [PATCH] List - adjusted transfer(DynamicList) and added
transfer(SortableList)
---
.../test/DynamicList/DynamicListTest.C | 9 +++++++++
applications/test/sort/sortListTest.C | 7 +++++++
src/OpenFOAM/containers/Lists/List/List.C | 18 ++++++++++++------
src/OpenFOAM/containers/Lists/List/List.H | 7 ++++++-
4 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/applications/test/DynamicList/DynamicListTest.C b/applications/test/DynamicList/DynamicListTest.C
index 1c882b6ff38..f08f2d54a7d 100644
--- a/applications/test/DynamicList/DynamicListTest.C
+++ b/applications/test/DynamicList/DynamicListTest.C
@@ -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;
}
diff --git a/applications/test/sort/sortListTest.C b/applications/test/sort/sortListTest.C
index 89252ae1f37..34a756dae7f 100644
--- a/applications/test/sort/sortListTest.C
+++ b/applications/test/sort/sortListTest.C
@@ -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;
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 5d6c1608f72..4bc73c590f6 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -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();
+ a.allocSize_ = 0;
- if (this->v_) delete[] this->v_;
- this->size_ = a.size_;
- this->v_ = a.v_;
+ transfer(static_cast<List<T>&>(a));
+}
- a.size_ = 0;
- a.v_ = 0;
- a.allocSize_ = 0;
+
+// 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));
}
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 4f51878d454..c3fada1d621 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -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);
--
GitLab