From ccb65ef390753974c84bcb0ed1f545dcb8f288d4 Mon Sep 17 00:00:00 2001 From: graham Date: Wed, 7 Apr 2010 11:39:24 +0100 Subject: [PATCH] ENH: Removing old InteractionList classes. Current InteractionList class will compile on its own, but does not supply all of the interface required by PairCollision, so this model won't compile. --- .../DirectInteractionList.C | 548 ----- .../DirectInteractionList.H | 158 -- .../DirectInteractionListI.H | 53 - .../ReferredCell/ReferredCell.C | 556 ----- .../ReferredCell/ReferredCell.H | 339 --- .../ReferredCell/ReferredCellI.H | 119 -- .../ReferredCellList/ReferredCellList.C | 1858 ----------------- .../ReferredCellList/ReferredCellList.H | 148 -- .../ReferredCellList/ReferredCellListI.H | 45 - .../referralLists/receivingReferralList.C | 119 -- .../referralLists/receivingReferralList.H | 127 -- .../referralLists/receivingReferralListI.H | 35 - .../referralLists/sendingReferralList.C | 117 -- .../referralLists/sendingReferralList.H | 125 -- .../referralLists/sendingReferralListI.H | 35 - 15 files changed, 4382 deletions(-) delete mode 100644 src/lagrangian/basic/InteractionLists/DirectInteractionList/DirectInteractionList.C delete mode 100644 src/lagrangian/basic/InteractionLists/DirectInteractionList/DirectInteractionList.H delete mode 100644 src/lagrangian/basic/InteractionLists/DirectInteractionList/DirectInteractionListI.H delete mode 100644 src/lagrangian/basic/InteractionLists/ReferredCellList/ReferredCell/ReferredCell.C delete mode 100644 src/lagrangian/basic/InteractionLists/ReferredCellList/ReferredCell/ReferredCell.H delete mode 100644 src/lagrangian/basic/InteractionLists/ReferredCellList/ReferredCell/ReferredCellI.H delete mode 100644 src/lagrangian/basic/InteractionLists/ReferredCellList/ReferredCellList.C delete mode 100644 src/lagrangian/basic/InteractionLists/ReferredCellList/ReferredCellList.H delete mode 100644 src/lagrangian/basic/InteractionLists/ReferredCellList/ReferredCellListI.H delete mode 100644 src/lagrangian/basic/InteractionLists/referralLists/receivingReferralList.C delete mode 100644 src/lagrangian/basic/InteractionLists/referralLists/receivingReferralList.H delete mode 100644 src/lagrangian/basic/InteractionLists/referralLists/receivingReferralListI.H delete mode 100644 src/lagrangian/basic/InteractionLists/referralLists/sendingReferralList.C delete mode 100644 src/lagrangian/basic/InteractionLists/referralLists/sendingReferralList.H delete mode 100644 src/lagrangian/basic/InteractionLists/referralLists/sendingReferralListI.H diff --git a/src/lagrangian/basic/InteractionLists/DirectInteractionList/DirectInteractionList.C b/src/lagrangian/basic/InteractionLists/DirectInteractionList/DirectInteractionList.C deleted file mode 100644 index 68c7d6dabf..0000000000 --- a/src/lagrangian/basic/InteractionLists/DirectInteractionList/DirectInteractionList.C +++ /dev/null @@ -1,548 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 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 - -\*---------------------------------------------------------------------------*/ - -#include "DirectInteractionList.H" -#include "InteractionLists.H" -#include "ReferredCellList.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template -void Foam::DirectInteractionList::buildDirectInteractionList -( - bool pointPointListBuild -) -{ - Info<< " Building list of direct interaction neighbours" << endl; - - const polyMesh& mesh = il_.mesh(); - - List > DirectInteractionList(mesh.nCells()); - - if (pointPointListBuild) - { - Info<< " Point-Point direct interaction list build." << endl; - - label pointJIndex; - - forAll (mesh.points(), pointIIndex) - { - for - ( - pointJIndex = pointIIndex; - pointJIndex != mesh.points().size(); - ++pointJIndex - ) - { - if (il_.testPointPointDistance(pointIIndex, pointJIndex)) - { - const labelList& ptICells - ( - mesh.pointCells()[pointIIndex] - ); - - const labelList& ptJCells - ( - mesh.pointCells()[pointJIndex] - ); - - forAll(ptICells, pIC) - { - const label cellI(ptICells[pIC]); - - forAll(ptJCells, pJC) - { - const label cellJ(ptJCells[pJC]); - - if (cellJ > cellI) - { - if - ( - findIndex - ( - DirectInteractionList[cellI], - cellJ - ) - == -1 - ) - { - DirectInteractionList[cellI].append(cellJ); - } - } - - if (cellI > cellJ) - { - if - ( - findIndex - ( - DirectInteractionList[cellJ], - cellI - ) - == - -1 - ) - { - DirectInteractionList[cellJ].append(cellI); - } - } - } - } - } - } - } - } - else - { - Info<< " Point-Face, Edge-Edge direct interaction list build." - << endl; - - forAll(mesh.points(), p) - { - forAll(mesh.faces(), f) - { - if (il_.testPointFaceDistance(p, f)) - { - const labelList& pCells(mesh.pointCells()[p]); - - const label cellO(mesh.faceOwner()[f]); - - forAll(pCells, pC) - { - const label cellI(pCells[pC]); - - // cells are not added to their own DIL - - if (cellO > cellI) - { - if - ( - findIndex - ( - DirectInteractionList[cellI], - cellO - ) - == - -1 - ) - { - DirectInteractionList[cellI].append(cellO); - } - } - - if (cellI > cellO) - { - if - ( - findIndex - ( - DirectInteractionList[cellO], - cellI - ) - == - -1 - ) - { - DirectInteractionList[cellO].append(cellI); - } - } - - if (mesh.isInternalFace(f)) - { - // boundary faces will not have neighbour - // information - - const label cellN(mesh.faceNeighbour()[f]); - - if (cellN > cellI) - { - if - ( - findIndex - ( - DirectInteractionList[cellI], - cellN - ) - == - -1 - ) - { - DirectInteractionList[cellI].append(cellN); - } - } - - if (cellI > cellN) - { - if - ( - findIndex - ( - DirectInteractionList[cellN], - cellI - ) - == - -1 - ) - { - DirectInteractionList[cellN].append(cellI); - } - } - } - } - } - } - } - - label edgeJIndex; - - forAll(mesh.edges(), edgeIIndex) - { - const edge& eI(mesh.edges()[edgeIIndex]); - - for - ( - edgeJIndex = edgeIIndex + 1; - edgeJIndex != mesh.edges().size(); - ++edgeJIndex - ) - { - const edge& eJ(mesh.edges()[edgeJIndex]); - - if (il_.testEdgeEdgeDistance(eI, eJ)) - { - const labelList& eICells(mesh.edgeCells()[edgeIIndex]); - - const labelList& eJCells(mesh.edgeCells()[edgeJIndex]); - - forAll(eICells, eIC) - { - const label cellI(eICells[eIC]); - - forAll(eJCells, eJC) - { - const label cellJ(eJCells[eJC]); - - if (cellJ > cellI) - { - if - ( - findIndex - ( - DirectInteractionList[cellI], - cellJ - ) - == - -1 - ) - { - DirectInteractionList[cellI].append(cellJ); - } - } - - if (cellI > cellJ) - { - if - ( - findIndex - ( - DirectInteractionList[cellJ], - cellI - ) - == - -1 - ) - { - DirectInteractionList[cellJ].append(cellI); - } - } - } - } - } - } - } - } - - forAll(DirectInteractionList, transDIL) - { - (*this)[transDIL].transfer - ( - DirectInteractionList[transDIL].shrink() - ); - } - - // sorting DILs - - forAll((*this), dilI) - { - sort((*this)[dilI]); - } -} - - -template -void Foam::DirectInteractionList::buildWallFaces() -{ - Info<< " Building list of wall faces in range of cells" << endl; - - const polyMesh& mesh = il_.mesh(); - - // DynamicLists for data gathering - DynamicList