- setSize() adjusts the addressable length only. Changed setSize(label) usage to setCapacity(label) or reserve(label) throughout. The final name (capacity vs. storageSize() vs. whatever) can easily be decided at a later date. - added setSize(label, const T&), which may still not be really useful, but is at least now meaningful - made shrink() a bit more legible. - added append(UList<T>&) - copying from a UList avoids reallocations where possible The following bits of code continue to use the DynamicList::setSize(), but appear to be legitimate (or the corresponding code itself needs rethinking). src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C:167: error: within this context src/OpenFOAM/lnInclude/faceTemplates.C:44: error: within this context src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C:178: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:737: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:741: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:745: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:749: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:754: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:935: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:940: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:1041: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:1046: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:2161: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:2162: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:2201: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:2205: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:2261: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:2262: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:2263: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:2264: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:2265: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:3011: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:3076: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:3244: error: within this context src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C:3371: error: within this context src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C:73: error: within this context src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C:91: error: within this context src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C:73: error: within this context src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C:91: error: within this context
144 lines
4.4 KiB
C
144 lines
4.4 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd.
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 2 of the License, or (at your
|
|
option) any later version.
|
|
|
|
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OpenFOAM; if not, write to the Free Software Foundation,
|
|
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
Description
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "DynamicList.H"
|
|
#include "IOstreams.H"
|
|
|
|
using namespace Foam;
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
// Main program:
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
List<DynamicList<label, 1, 0> > ldl(2);
|
|
|
|
ldl[0](0) = 0;
|
|
ldl[0](2) = 2;
|
|
ldl[0](3) = 3;
|
|
ldl[0](1) = 1;
|
|
|
|
ldl[0].setCapacity(5); // increase allocated size
|
|
ldl[1].setCapacity(10); // increase allocated size
|
|
ldl[0].reserve(15); // should increase allocated size
|
|
ldl[1].reserve(5); // should not decrease allocated size
|
|
ldl[1](3) = 2; // allocates space and sets value
|
|
|
|
// this works without a segfault, but doesn't change the list size
|
|
ldl[0][4] = 4;
|
|
|
|
ldl[1] = 3;
|
|
|
|
Info<< "<ldl>" << ldl << "</ldl>" << nl << "sizes: ";
|
|
forAll(ldl, i)
|
|
{
|
|
Info<< " " << ldl[i].size() << "/" << ldl[i].capacity();
|
|
}
|
|
Info<< endl;
|
|
|
|
List<List<label> > ll(2);
|
|
ll[0].transfer(ldl[0]);
|
|
ll[1].transfer(ldl[1].shrink());
|
|
|
|
Info<< "<ldl>" << ldl << "</ldl>" << nl << "sizes: ";
|
|
forAll(ldl, i)
|
|
{
|
|
Info<< " " << ldl[i].size() << "/" << ldl[i].capacity();
|
|
}
|
|
Info<< endl;
|
|
|
|
Info<< "<ll>" << ll << "</ll>" << nl << endl;
|
|
|
|
|
|
// test the transfer between DynamicLists
|
|
DynamicList<label, 1, 0> dlA;
|
|
DynamicList<label, 1, 0> dlB;
|
|
|
|
for (label i = 0; i < 5; i++)
|
|
{
|
|
dlA.append(i);
|
|
}
|
|
dlA.setCapacity(10);
|
|
|
|
Info<< "<dlA>" << dlA << "</dlA>" << nl << "sizes: "
|
|
<< " " << dlA.size() << "/" << dlA.capacity() << endl;
|
|
|
|
dlB.transfer(dlA);
|
|
|
|
// provokes memory error if previous transfer did not maintain
|
|
// the correct allocated space
|
|
dlB[6] = 6;
|
|
|
|
Info<< "Transferred to dlB" << endl;
|
|
Info<< "<dlA>" << dlA << "</dlA>" << nl << "sizes: "
|
|
<< " " << dlA.size() << "/" << dlA.capacity() << endl;
|
|
Info<< "<dlB>" << dlB << "</dlB>" << nl << "sizes: "
|
|
<< " " << dlB.size() << "/" << dlB.capacity() << 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.capacity() << endl;
|
|
|
|
// Copy back and append a few time
|
|
for (label i=0; i < 3; i++)
|
|
{
|
|
dlB.append(lstA);
|
|
}
|
|
|
|
Info<< "appended list a few times" << endl;
|
|
Info<< "<dlB>" << dlB << "</dlB>" << nl << "sizes: "
|
|
<< " " << dlB.size() << "/" << dlB.capacity() << endl;
|
|
|
|
// assign the list (should maintain allocated space)
|
|
dlB = lstA;
|
|
Info<< "assigned list" << endl;
|
|
Info<< "<dlB>" << dlB << "</dlB>" << nl << "sizes: "
|
|
<< " " << dlB.size() << "/" << dlB.capacity() << endl;
|
|
|
|
|
|
// dlB.append(dlB);
|
|
// Info<< "appended to itself:" << endl;
|
|
// Info<< "<dlB>" << dlB << "</dlB>" << nl << "sizes: "
|
|
// << " " << dlB.size() << "/" << dlB.capacity() << endl;
|
|
|
|
// dlB = dlB;
|
|
// Info<< "self assignment:" << endl;
|
|
// Info<< "<dlB>" << dlB << "</dlB>" << nl << "sizes: "
|
|
// << " " << dlB.size() << "/" << dlB.capacity() << endl;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|