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

Merge remote branch 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2010-05-03 09:34:31 +02:00
parent 856f0f4685 08916e83a2
commit 0e9851b432
579 changed files with 8601 additions and 5768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/test/globalIndex/Make/files
View File

@ -1,4 +1,3 @@
globalIndex.C
globalIndexTest.C
EXE = $(FOAM_USER_APPBIN)/globalIndexTest

21
applications/test/nearWallDist-wave/testWallDist2.C
View File

@ -108,13 +108,17 @@ int main(int argc, char *argv[])
}
}
List<wallPoint> allFaceInfo(mesh.nFaces());
List<wallPoint> allCellInfo(mesh.nCells());
MeshWave<wallPoint> wallDistCalc
FaceCellWave<wallPoint> wallDistCalc
(
mesh,
changedFaces,
faceDist,
0 // max iterations
allFaceInfo,
allCellInfo,
0 // max iterations
);
Info<< "\nStarting time loop\n" << endl;
@ -148,16 +152,13 @@ int main(int argc, char *argv[])
// Copy face and cell values into field
//
const List<wallPoint>& cellInfo = wallDistCalc.allCellInfo();
const List<wallPoint>& faceInfo = wallDistCalc.allFaceInfo();
label nIllegal = 0;
// Copy cell values
forAll(cellInfo, cellI)
forAll(allCellInfo, cellI)
{
scalar dist = cellInfo[cellI].distSqr();
if (cellInfo[cellI].valid())
scalar dist = allCellInfo[cellI].distSqr();
if (allCellInfo[cellI].valid())
{
wallDistUncorrected[cellI] = Foam::sqrt(dist);
}
@ -178,8 +179,8 @@ int main(int argc, char *argv[])
{
const label meshFaceI = patchField.patch().start() + patchFaceI;
scalar dist = faceInfo[meshFaceI].distSqr();
if (faceInfo[meshFaceI].valid())
scalar dist = allFaceInfo[meshFaceI].distSqr();
if (allFaceInfo[meshFaceI].valid())
{
patchField[patchFaceI] = Foam::sqrt(dist);
}