songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMP: adjust syncTools test to compile

Browse Source
This commit is contained in:
Mark Olesen 2010-11-23 16:08:47 +01:00
parent 2ab6d349d6
commit e5cf4f093e
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/test/syncTools/Make/files
View File

@ -1,3 +1,3 @@
syncToolsTest.C Test-syncTools.C
EXE = $(FOAM_USER_APPBIN)/syncToolsTest EXE = $(FOAM_USER_APPBIN)/Test-syncTools

46
applications/test/syncTools/syncToolsTest.C → applications/test/syncTools/Test-syncTools.C
View File

@ -62,7 +62,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
labelList maxEdgeValues(edgeValues); labelList maxEdgeValues(edgeValues);
syncTools::syncEdgeList(mesh, bits, minEqOp<unsigned int>(), 0); syncTools::syncEdgeList(mesh, bits, minEqOp<unsigned int>(), 0);
syncTools::syncEdgeList(mesh, edgeValues, minEqOp<label>(), 0, false); syncTools::syncEdgeList(mesh, edgeValues, minEqOp<label>(), 0);
syncTools::syncEdgeList(mesh, maxBits, maxEqOp<unsigned int>(), 0); syncTools::syncEdgeList(mesh, maxBits, maxEqOp<unsigned int>(), 0);
syncTools::syncEdgeList syncTools::syncEdgeList
@ -70,8 +70,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
mesh, mesh,
maxEdgeValues, maxEdgeValues,
maxEqOp<label>(), maxEqOp<label>(),
0, 0
false
); );
forAll(bits, i) forAll(bits, i)
@ -110,7 +109,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
labelList maxPointValues(pointValues); labelList maxPointValues(pointValues);
syncTools::syncPointList(mesh, bits, minEqOp<unsigned int>(), 0); syncTools::syncPointList(mesh, bits, minEqOp<unsigned int>(), 0);
syncTools::syncPointList(mesh, pointValues, minEqOp<label>(), 0, false); syncTools::syncPointList(mesh, pointValues, minEqOp<label>(), 0);
syncTools::syncPointList(mesh, maxBits, maxEqOp<unsigned int>(), 0); syncTools::syncPointList(mesh, maxBits, maxEqOp<unsigned int>(), 0);
syncTools::syncPointList syncTools::syncPointList
@ -118,8 +117,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
mesh, mesh,
maxPointValues, maxPointValues,
maxEqOp<label>(), maxEqOp<label>(),
0, 0
false
); );
forAll(bits, i) forAll(bits, i)
@ -158,10 +156,10 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
labelList maxFaceValues(faceValues); labelList maxFaceValues(faceValues);
syncTools::syncFaceList(mesh, bits, minEqOp<unsigned int>()); syncTools::syncFaceList(mesh, bits, minEqOp<unsigned int>());
syncTools::syncFaceList(mesh, faceValues, minEqOp<label>(), false); syncTools::syncFaceList(mesh, faceValues, minEqOp<label>());
syncTools::syncFaceList(mesh, maxBits, maxEqOp<unsigned int>()); syncTools::syncFaceList(mesh, maxBits, maxEqOp<unsigned int>());
syncTools::syncFaceList(mesh, maxFaceValues, maxEqOp<label>(), false); syncTools::syncFaceList(mesh, maxFaceValues, maxEqOp<label>());
forAll(bits, faceI) forAll(bits, faceI)
{ {
@ -225,16 +223,16 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
( (
mesh, mesh,
sparseData, sparseData,
minEqOp<vector>(), minEqOp<vector>()
true // apply separation // true // apply separation
); );
syncTools::syncPointList syncTools::syncPointList
( (
mesh, mesh,
fullData, fullData,
minEqOp<vector>(), minEqOp<vector>(),
point::max, point::max
true // apply separation // true // apply separation
); );
// Compare. // Compare.
@ -310,16 +308,14 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
( (
mesh, mesh,
sparseData, sparseData,
minEqOp<vector>(), minEqOp<vector>()
true
); );
syncTools::syncEdgeList syncTools::syncEdgeList
( (
mesh, mesh,
fullData, fullData,
minEqOp<vector>(), minEqOp<vector>(),
point::max, point::max
true
); );
// Compare. // Compare.
@ -388,8 +384,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
mesh, mesh,
syncedPoints, syncedPoints,
minEqOp<point>(), minEqOp<point>(),
point::max, point::max
true
); );
forAll(syncedPoints, pointI) forAll(syncedPoints, pointI)
@ -425,8 +420,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
mesh, mesh,
nMasters, nMasters,
plusEqOp<label>(), plusEqOp<label>(),
0, 0
false
); );
forAll(nMasters, pointI) forAll(nMasters, pointI)
@ -470,8 +464,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
mesh, mesh,
syncedMids, syncedMids,
minEqOp<point>(), minEqOp<point>(),
point::max, point::max
true
); );
forAll(syncedMids, edgeI) forAll(syncedMids, edgeI)
@ -509,8 +502,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
mesh, mesh,
nMasters, nMasters,
plusEqOp<label>(), plusEqOp<label>(),
0, 0
false
); );
forAll(nMasters, edgeI) forAll(nMasters, edgeI)
@ -544,8 +536,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
( (
mesh, mesh,
syncedFc, syncedFc,
maxEqOp<point>(), maxEqOp<point>()
true
); );
forAll(syncedFc, faceI) forAll(syncedFc, faceI)
@ -580,8 +571,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
( (
mesh, mesh,
nMasters, nMasters,
plusEqOp<label>(), plusEqOp<label>()
false
); );
forAll(nMasters, faceI) forAll(nMasters, faceI)