GIT: Initial state after latest Foundation merge

This commit is contained in:
Andrew Heather
2016-09-20 14:49:08 +01:00
4571 changed files with 115696 additions and 74609 deletions

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,7 +37,7 @@ defineTypeNameAndDebug(treeDataCell, 0);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::treeBoundBox Foam::treeDataCell::calcCellBb(const label cellI) const
Foam::treeBoundBox Foam::treeDataCell::calcCellBb(const label celli) const
{
const cellList& cells = mesh_.cells();
const faceList& faces = mesh_.faces();
@ -49,11 +49,11 @@ Foam::treeBoundBox Foam::treeDataCell::calcCellBb(const label cellI) const
vector(-GREAT, -GREAT, -GREAT)
);
const cell& cFaces = cells[cellI];
const cell& cFaces = cells[celli];
forAll(cFaces, cFaceI)
forAll(cFaces, cFacei)
{
const face& f = faces[cFaces[cFaceI]];
const face& f = faces[cFaces[cFacei]];
forAll(f, fp)
{
@ -208,14 +208,14 @@ void Foam::treeDataCell::findNearestOp::operator()
forAll(indices, i)
{
label index = indices[i];
label cellI = shape.cellLabels()[index];
scalar distSqr = magSqr(sample - shape.mesh().cellCentres()[cellI]);
label celli = shape.cellLabels()[index];
scalar distSqr = magSqr(sample - shape.mesh().cellCentres()[celli]);
if (distSqr < nearestDistSqr)
{
nearestDistSqr = distSqr;
minIndex = index;
nearestPoint = shape.mesh().cellCentres()[cellI];
nearestPoint = shape.mesh().cellCentres()[celli];
}
}
}

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -74,7 +74,7 @@ class treeDataCell
// Private Member Functions
//- Calculate cell bounding box
treeBoundBox calcCellBb(const label cellI) const;
treeBoundBox calcCellBb(const label celli) const;
//- Initialise all member data
void update();