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

ENH: findRefCell: initialise to -1 if not needed. Fixes #988.

Browse Source
This commit is contained in:
mattijs
2018-11-05 12:12:25 +00:00
parent c84390ab13
commit dfb652bcac
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
View File

@ -3,7 +3,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) 2011-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -111,6 +111,10 @@ bool Foam::setRefCell
return true; return true;
} }
else
{
refCelli = -1;
}
return false; return false;
} }
@ -141,25 +145,14 @@ Foam::scalar Foam::getRefCellValue
FatalErrorInFunction FatalErrorInFunction
<< "Illegal reference cellID " << refCelli << "Illegal reference cellID " << refCelli
<< ". Mesh has " << field.mesh().nCells() << ". cells." << ". Mesh has " << field.mesh().nCells() << ". cells."
<< exit(FatalIOError); << exit(FatalError);
} }
// Catch duplicates
label hasRef =
(refCelli >= 0 && refCelli < field.mesh().nCells() ? 1 : 0);
if (1 != returnReduce<label>(hasRef, sumOp<label>()))
{
FatalErrorInFunction
<< "Invalid reference cellID " << refCelli
<< ". Mesh has " << field.mesh().nCells() << ". cells."
<< exit(FatalIOError);
}
scalar refCellValue = (hasRef ? field[refCelli] : 0.0);
#else
scalar refCellValue = (refCelli >= 0 ? field[refCelli] : 0.0);
#endif #endif
scalar refCellValue = (refCelli >= 0 ? field[refCelli] : 0.0);
// Currently distributing the value to all processors. This is generally
// not needed since only the processor holding the reference cell needs
// it. Tdb.
return returnReduce(refCellValue, sumOp<scalar>()); return returnReduce(refCellValue, sumOp<scalar>());
} }