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

GIT: Initial state after latest Foundation merge

Browse Source
This commit is contained in:
Andrew Heather
2016-09-20 14:49:08 +01:00
parent 4ea1613653 360ab50ed6
commit 9fbd612672
4571 changed files with 115696 additions and 74609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/utilities/preProcessing/mapFields/mapFields.C
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
@ -397,15 +397,15 @@ int main(int argc, char *argv[])
Info<< "Target mesh size: " << meshTarget.nCells() << endl;
for (int procI=0; procI<nProcs; procI++)
for (int proci=0; proci<nProcs; proci++)
{
Info<< nl << "Source processor " << procI << endl;
Info<< nl << "Source processor " << proci << endl;
Time runTimeSource
(
Time::controlDictName,
rootDirSource,
caseDirSource/fileName(word("processor") + name(procI))
caseDirSource/fileName(word("processor") + name(proci))
);
#include "setTimeIndex.H"
@ -472,15 +472,15 @@ int main(int argc, char *argv[])
Info<< "Source mesh size: " << meshSource.nCells() << endl;
for (int procI=0; procI<nProcs; procI++)
for (int proci=0; proci<nProcs; proci++)
{
Info<< nl << "Target processor " << procI << endl;
Info<< nl << "Target processor " << proci << endl;
Time runTimeTarget
(
Time::controlDictName,
rootDirTarget,
caseDirTarget/fileName(word("processor") + name(procI))
caseDirTarget/fileName(word("processor") + name(proci))
);
fvMesh meshTarget

26
applications/utilities/preProcessing/mapFields/mapLagrangian.C
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
@ -39,17 +39,17 @@ static const scalar perturbFactor = 1e-6;
// compatible with tracking.
static label findCell(const Cloud<passiveParticle>& cloud, const point& pt)
{
label cellI = -1;
label tetFaceI = -1;
label celli = -1;
label tetFacei = -1;
label tetPtI = -1;
const polyMesh& mesh = cloud.pMesh();
mesh.findCellFacePt(pt, cellI, tetFaceI, tetPtI);
mesh.findCellFacePt(pt, celli, tetFacei, tetPtI);
if (cellI >= 0)
if (celli >= 0)
{
return cellI;
return celli;
}
else
{
@ -62,17 +62,17 @@ static label findCell(const Cloud<passiveParticle>& cloud, const point& pt)
polyMesh::FACE_PLANES // no decomposition needed
);
label faceI = meshSearcher.findNearestBoundaryFace(pt);
label facei = meshSearcher.findNearestBoundaryFace(pt);
if (faceI >= 0)
if (facei >= 0)
{
const point& cc = mesh.cellCentres()[mesh.faceOwner()[faceI]];
const point& cc = mesh.cellCentres()[mesh.faceOwner()[facei]];
const point perturbPt = (1-perturbFactor)*pt+perturbFactor*cc;
mesh.findCellFacePt(perturbPt, cellI, tetFaceI, tetPtI);
mesh.findCellFacePt(perturbPt, celli, tetFacei, tetPtI);
return cellI;
return celli;
}
}
@ -188,9 +188,9 @@ void mapLagrangian(const meshToMesh0& meshToMesh0Interp)
);
passiveParticle& newP = newPtr();
label faceI = newP.track(iter().position(), td);
label facei = newP.track(iter().position(), td);
if (faceI < 0 && newP.cell() >= 0)
if (facei < 0 && newP.cell() >= 0)
{
// Hit position.
foundCell = true;