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

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

Browse Source
This commit is contained in:
mattijs
2010-04-07 10:18:07 +01:00
parent a85b221bf7 90cb1973fa
commit 90189b35d4
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
COPYING
View File

@ -3,7 +3,7 @@
OpenFOAM(R) is Copyright (C) 1991-2010 OpenCFD Ltd. OpenFOAM(R) is Copyright (C) 1991-2010 OpenCFD Ltd.
Contact: OpenCFD (enquiries@OpenCFD.co.uk) 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 of GNU General Public License version 3, which is displayed below, or
(at your option) any later version. (at your option) any later version.

17
src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
View File

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

6
src/OpenFOAM/primitives/Lists/stringListOpsTemplates.C
View File

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