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: Updated mesh-to-mesh nearest mapping

Browse Source
This commit is contained in:
andy
2013-03-26 15:13:32 +00:00
parent e038d8a76c
commit dec0a99a24
1 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/sampling/meshToMeshInterpolation/meshToMeshNew/calcMapNearest.C
View File

@ -48,8 +48,6 @@ void Foam::meshToMeshNew::calcMapNearest
label srcCellI = srcSeedI; label srcCellI = srcSeedI;
label tgtCellI = tgtSeedI; label tgtCellI = tgtSeedI;
boolList tgtMapFlag(tgt.nCells(), true);
do do
{ {
// find nearest tgt cell // find nearest tgt cell
@ -61,7 +59,6 @@ void Foam::meshToMeshNew::calcMapNearest
// mark source cell srcCellI and tgtCellI as matched // mark source cell srcCellI and tgtCellI as matched
mapFlag[srcCellI] = false; mapFlag[srcCellI] = false;
tgtMapFlag[tgtCellI] = false;
// accumulate intersection volume // accumulate intersection volume
V_ += srcVc[srcCellI]; V_ += srcVc[srcCellI];
@ -80,11 +77,44 @@ void Foam::meshToMeshNew::calcMapNearest
} }
while (srcCellI >= 0); while (srcCellI >= 0);
// If there are more target cells than source cells, some target cells
// will not yet be mapped // for the case of multiple source cells per target cell, select the
forAll(tgtMapFlag, tgtCellI) // nearest source cell only and discard the others
const vectorField& srcCc = src.cellCentres();
const vectorField& tgtCc = tgt.cellCentres();
forAll(tgtToSrc, targetCellI)
{ {
if (tgtMapFlag[tgtCellI]) if (tgtToSrc[targetCellI].size() > 1)
{
const vector& tgtC = tgtCc[tgtCellI];
DynamicList<label>& srcCells = tgtToSrc[targetCellI];
label srcCellI = srcCells[0];
scalar d = magSqr(tgtC - srcCc[srcCellI]);
for (label i = 1; i < srcCells.size(); i++)
{
label srcI = srcCells[i];
scalar dNew = magSqr(tgtC - srcCc[srcI]);
if (dNew < d)
{
d = dNew;
srcCellI = srcI;
}
}
srcCells.clear();
srcCells.append(srcCellI);
}
}
// If there are more target cells than source cells, some target cells
// might not yet be mapped
forAll(tgtToSrc, tgtCellI)
{
if (tgtToSrc[tgtCellI].empty())
{ {
label srcCellI = findMappedSrcCell(tgt, tgtCellI, tgtToSrc); label srcCellI = findMappedSrcCell(tgt, tgtCellI, tgtToSrc);
@ -95,8 +125,6 @@ void Foam::meshToMeshNew::calcMapNearest
} }
// transfer addressing into persistent storage // transfer addressing into persistent storage
// note: always 1 target cell per source cell (srcToTgt)
// can be multiple source cells per target cell (tgtToSrc)
forAll(srcToTgtCellAddr_, i) forAll(srcToTgtCellAddr_, i)
{ {
scalar v = srcVc[i]; scalar v = srcVc[i];