mirror of
https://github.com/PhasicFlow/phasicFlow.git
synced 2025-06-22 16:28:30 +00:00
Bug fix for observed in particles, getNth and naming for contact lists
This commit is contained in:
@ -80,13 +80,17 @@ public:
|
||||
|
||||
TypeInfoNV("sortedContactList");
|
||||
|
||||
|
||||
explicit sortedContactList(uint32 initialSize =1)
|
||||
sortedContactList(uint32 initialSize =1)
|
||||
:
|
||||
SortedPairs(initialSize),
|
||||
values_("values", SortedPairs::capacity()),
|
||||
sortedPairs0_("sortedPairs0", SortedPairs::capacity()),
|
||||
values0_("values0", SortedPairs::capacity())
|
||||
sortedContactList("sortedContactList", initialSize)
|
||||
{}
|
||||
|
||||
sortedContactList(const word& name, uint32 initialSize =1)
|
||||
:
|
||||
SortedPairs(name, initialSize),
|
||||
values_(groupNames(name, "values"), SortedPairs::capacity()),
|
||||
sortedPairs0_(groupNames(name, "sortedPairs0"), SortedPairs::capacity()),
|
||||
values0_(groupNames(name, "values0"), SortedPairs::capacity())
|
||||
{}
|
||||
|
||||
bool beforeBroadSearch()
|
||||
|
@ -110,11 +110,11 @@ public:
|
||||
|
||||
|
||||
// constructors
|
||||
explicit sortedPairs(uint32 initialSize =1)
|
||||
explicit sortedPairs(const word& name, uint32 initialSize =1)
|
||||
:
|
||||
UnsortedPairs(initialSize),
|
||||
flags_("flags_",UnsortedPairs::capacity()+1),
|
||||
sortedPairs_("sortedPairs_",UnsortedPairs::capacity())
|
||||
flags_( groupNames(name, "flags_"), UnsortedPairs::capacity()+1),
|
||||
sortedPairs_(groupNames(name, "sortedPairs_"), UnsortedPairs::capacity())
|
||||
{}
|
||||
|
||||
|
||||
|
@ -82,11 +82,16 @@ public:
|
||||
TypeInfoNV("unsortedContactList");
|
||||
|
||||
explicit unsortedContactList(uint32 capacity=1)
|
||||
:
|
||||
unsortedContactList("unsortedContactList", capacity)
|
||||
{}
|
||||
|
||||
unsortedContactList(const word& name, uint32 capacity=1)
|
||||
:
|
||||
UnsortedPairs(capacity),
|
||||
values_("values", UnsortedPairs::capacity()),
|
||||
values_(groupNames(name, "values"), UnsortedPairs::capacity()),
|
||||
container0_(capacity),
|
||||
values0_("values0",container0_.capacity())
|
||||
values0_(groupNames(name, "values0"),container0_.capacity())
|
||||
{}
|
||||
|
||||
|
||||
|
@ -194,7 +194,9 @@ public:
|
||||
{
|
||||
uint newCap = container_.capacity()+len;
|
||||
this->clear();
|
||||
//output<<"----------------before "<<capacity()<< " " << size()<<endl;
|
||||
container_.rehash(newCap);
|
||||
//output<<"----------------after "<<capacity()<< " " << size()<<endl;
|
||||
}
|
||||
|
||||
INLINE_FUNCTION_H
|
||||
|
Reference in New Issue
Block a user