Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs
2010-04-07 10:18:07 +01:00
3 changed files with 22 additions and 3 deletions

View File

@ -3,7 +3,7 @@
OpenFOAM(R) is Copyright (C) 1991-2010 OpenCFD Ltd.
Contact: OpenCFD (enquiries@OpenCFD.co.uk)
You may use, distribute and copy the OpenCFD CFD Toolbox under the terms
You may use, distribute and copy the OpenFOAM CFD Toolbox under the terms
of GNU General Public License version 3, which is displayed below, or
(at your option) any later version.

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,6 +37,9 @@ ListType Foam::renumber
// Create copy
ListType newLst(lst.size());
// ensure consistent addressable size (eg, DynamicList)
newLst.setSize(lst.size());
forAll(lst, elemI)
{
if (lst[elemI] >= 0)
@ -76,6 +79,9 @@ ListType Foam::reorder
// Create copy
ListType newLst(lst.size());
// ensure consistent addressable size (eg, DynamicList)
newLst.setSize(lst.size());
forAll(lst, elemI)
{
if (oldToNew[elemI] >= 0)
@ -101,6 +107,9 @@ void Foam::inplaceReorder
// Create copy
ListType newLst(lst.size());
// ensure consistent addressable size (eg, DynamicList)
newLst.setSize(lst.size());
forAll(lst, elemI)
{
if (oldToNew[elemI] >= 0)
@ -258,6 +267,9 @@ ListType Foam::subset
ListType newLst(lst.size());
// ensure consistent addressable size (eg, DynamicList)
newLst.setSize(lst.size());
label nElem = 0;
forAll(lst, elemI)
{
@ -318,6 +330,9 @@ ListType Foam::subset
ListType newLst(lst.size());
// ensure consistent addressable size (eg, DynamicList)
newLst.setSize(lst.size());
label nElem = 0;
forAll(lst, elemI)
{

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -57,8 +57,12 @@ StringListType Foam::subsetMatchingStrings
const bool invert
)
{
// Create copy
StringListType newLst(lst.size());
// ensure consistent addressable size (eg, DynamicList)
newLst.setSize(lst.size());
label nElem = 0;
forAll(lst, elemI)
{