From 3b6027d1be8f912cca7ca428e746a265b9a55f7e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 14 Jun 2018 15:14:14 +0100
Subject: [PATCH] ENH: test: make test apps compile. Fixes #876.
---
applications/test/HashTable2/Test-HashTable2.C | 2 +-
applications/test/PackedList/Test-PackedList.C | 2 +-
applications/test/PackedList1/Test-PackedList1.C | 12 ++++++------
.../test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C | 2 +-
applications/test/PatchTools/Test-PatchTools.C | 2 +-
.../test/extendedStencil/Test-ExtendedStencil.C | 2 +-
applications/test/fieldDependency/Make/options | 3 ++-
.../test/fieldDependency/Test-fieldDependency.C | 1 +
applications/test/fieldMapping/Test-fieldMapping.C | 2 +-
.../test/findCell-octree/Test-findCell-octree.C | 1 +
.../Test-findSphereFeatureEdges-octree.C | 1 +
applications/test/graph/Test-graph.C | 6 ++++--
applications/test/hexRef8/Test-hexRef8.C | 2 +-
.../Test-mapDistributePolyMesh.C | 2 +-
applications/test/mappedPatch/Test-MappedPatch.C | 1 +
applications/test/router/Test-processorRouter.C | 2 +-
applications/test/syncTools/Test-syncTools.C | 8 ++++----
applications/test/wallDist/Test-wallDist.C | 1 +
18 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/applications/test/HashTable2/Test-HashTable2.C b/applications/test/HashTable2/Test-HashTable2.C
index 8d6e110fadb..0bad52fa61c 100644
--- a/applications/test/HashTable2/Test-HashTable2.C
+++ b/applications/test/HashTable2/Test-HashTable2.C
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
<< "toc: " << table4.toc() << endl;
HashPtrTable<label, Foam::string> ptable1(0);
- ptable1.insert("kjhkjh", new label(10));
+ ptable1.insert("kjhkjh", autoPtr<label>::New(10));
Info<< "PtrTable toc: " << ptable1.toc() << endl;
diff --git a/applications/test/PackedList/Test-PackedList.C b/applications/test/PackedList/Test-PackedList.C
index 0b82de45915..f8a314923a1 100644
--- a/applications/test/PackedList/Test-PackedList.C
+++ b/applications/test/PackedList/Test-PackedList.C
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
if (args.found("info"))
{
- packLst.printInfo(Info);
+ Info<< packLst.info();
}
Info<< nl;
diff --git a/applications/test/PackedList1/Test-PackedList1.C b/applications/test/PackedList1/Test-PackedList1.C
index 53bfcb0b79b..9d724547287 100644
--- a/applications/test/PackedList1/Test-PackedList1.C
+++ b/applications/test/PackedList1/Test-PackedList1.C
@@ -185,13 +185,13 @@ int main(int argc, char *argv[])
list1.resize(8, list1.max_value);
report(list1);
- Info<< "\ntest flip() function\n";
- list1.flip();
- report(list1);
+ //Info<< "\ntest flip() function\n";
+ //list1.flip();
+ //report(list1);
- Info<< "\nre-flip()\n";
- list1.flip();
- report(list1);
+ //Info<< "\nre-flip()\n";
+ //list1.flip();
+ //report(list1);
Info<< "\ntest set() function\n";
list1.set(1, 5);
diff --git a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
index 1438e3b32cf..03033e42102 100644
--- a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
+++ b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
@@ -29,10 +29,10 @@ Description
#include "argList.H"
#include "Time.H"
#include "fvMesh.H"
-#include "volFields.H"
#include "PatchEdgeFaceWave.H"
#include "patchEdgeFaceInfo.H"
#include "patchPatchDist.H"
+#include "fvCFD.H"
using namespace Foam;
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index adab0d98bbf..6da444cbe41 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.C
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
- #include "createMesh.H"
+ #include "createPolyMesh.H"
const word patchName = args[1];
label patchi = mesh.boundaryMesh().findPatchID(patchName);
diff --git a/applications/test/extendedStencil/Test-ExtendedStencil.C b/applications/test/extendedStencil/Test-ExtendedStencil.C
index 6374014b9ec..ddb0a421df4 100644
--- a/applications/test/extendedStencil/Test-ExtendedStencil.C
+++ b/applications/test/extendedStencil/Test-ExtendedStencil.C
@@ -33,7 +33,7 @@ Description
#include "fvMesh.H"
#include "volFields.H"
#include "Time.H"
-//#include "mapDistribute.H"
+#include "fvCFD.H"
#include "OFstream.H"
#include "meshTools.H"
//#include "FECCellToFaceStencil.H"
diff --git a/applications/test/fieldDependency/Make/options b/applications/test/fieldDependency/Make/options
index fa15f124528..b733f6ac040 100644
--- a/applications/test/fieldDependency/Make/options
+++ b/applications/test/fieldDependency/Make/options
@@ -1,5 +1,6 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lfiniteVolume
diff --git a/applications/test/fieldDependency/Test-fieldDependency.C b/applications/test/fieldDependency/Test-fieldDependency.C
index 17364b70262..ff744dbf215 100644
--- a/applications/test/fieldDependency/Test-fieldDependency.C
+++ b/applications/test/fieldDependency/Test-fieldDependency.C
@@ -29,6 +29,7 @@ Description
#include "argList.H"
#include "Time.H"
#include "volFields.H"
+#include "fvCFD.H"
using namespace Foam;
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index d7146166237..0ea8147e8c1 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -38,7 +38,7 @@ Description
#include "removeFaces.H"
#include "mapPolyMesh.H"
#include "polyTopoChange.H"
-#include "fvcDiv.H"
+#include "fvCFD.H"
#include "zeroGradientFvPatchFields.H"
#include "Random.H"
diff --git a/applications/test/findCell-octree/Test-findCell-octree.C b/applications/test/findCell-octree/Test-findCell-octree.C
index de15a98aac9..71c9ff270fc 100644
--- a/applications/test/findCell-octree/Test-findCell-octree.C
+++ b/applications/test/findCell-octree/Test-findCell-octree.C
@@ -29,6 +29,7 @@ License
#include "indexedOctree.H"
#include "treeDataCell.H"
#include "OFstream.H"
+#include "fvCFD.H"
using namespace Foam;
diff --git a/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C b/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C
index f616b3a48cd..a189a204535 100644
--- a/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C
+++ b/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C
@@ -30,6 +30,7 @@ License
#include "treeDataEdge.H"
#include "OFstream.H"
#include "extendedFeatureEdgeMesh.H"
+#include "fvCFD.H"
using namespace Foam;
diff --git a/applications/test/graph/Test-graph.C b/applications/test/graph/Test-graph.C
index ba9ce9e5bec..5cfea035a4a 100644
--- a/applications/test/graph/Test-graph.C
+++ b/applications/test/graph/Test-graph.C
@@ -55,11 +55,13 @@ int main()
graph phi("@f! (R = 5)", "@a!", "@f!", alpha);
phi.insert
(
- "@f!&e!", new curve("@f!&e!", curve::curveStyle::CONTINUOUS, phie)
+ "@f!&e!",
+ autoPtr<curve>::New("@f!&e!", curve::curveStyle::CONTINUOUS, phie)
);
phi.insert
(
- "@f!&c!", new curve("@f!&c!", curve::curveStyle::CONTINUOUS, phic)
+ "@f!&c!",
+ autoPtr<curve>::New("@f!&c!", curve::curveStyle::CONTINUOUS, phic)
);
phi.write("phi", "xmgr");
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 0b606525d14..a9459148a74 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -42,7 +42,7 @@ Description
#include "zeroGradientFvPatchFields.H"
#include "calculatedPointPatchFields.H"
#include "pointConstraints.H"
-#include "fvcDiv.H"
+#include "fvCFD.H"
using namespace Foam;
diff --git a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
index a52f312b2c6..4d14ce9bd6f 100644
--- a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
+++ b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
{
#include "setRootCase.H"
#include "createTime.H"
- #include "createMesh.H"
+ #include "createPolyMesh.H"
Info<< "Reading distribute map\n" << endl;
diff --git a/applications/test/mappedPatch/Test-MappedPatch.C b/applications/test/mappedPatch/Test-MappedPatch.C
index 06577292261..0e67afd525d 100644
--- a/applications/test/mappedPatch/Test-MappedPatch.C
+++ b/applications/test/mappedPatch/Test-MappedPatch.C
@@ -38,6 +38,7 @@ Description
#include "OFstream.H"
#include "mappedPolyPatch.H"
#include "mappedFixedValueFvPatchFields.H"
+#include "fvCFD.H"
using namespace Foam;
diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C
index 4f47c80b63d..bb9fa0a95ac 100644
--- a/applications/test/router/Test-processorRouter.C
+++ b/applications/test/router/Test-processorRouter.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
{
#include "setRootCase.H"
#include "createTime.H"
- #include "createMesh.H"
+ #include "createPolyMesh.H"
word procLabel = '[' + word(name(Pstream::myProcNo())) + "]-";
diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index 718063dfd7e..5dfef2fcf2d 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -412,7 +412,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
{
if (isMasterPoint.test(pointi))
{
- nMasters.set(pointi);
+ nMasters[pointi] = 1;
}
}
@@ -488,7 +488,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
{
if (isMasterEdge.test(edgeI))
{
- nMasters.set(edgeI);
+ nMasters[edgeI] = 1;
}
}
@@ -551,13 +551,13 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
{
labelList nMasters(mesh.nFaces(), 0);
- Bitset isMasterFace(syncTools::getMasterFaces(mesh));
+ bitSet isMasterFace(syncTools::getMasterFaces(mesh));
forAll(isMasterFace, facei)
{
if (isMasterFace.test(facei))
{
- nMasters.set(facei);
+ nMasters[facei] = 1;
}
}
diff --git a/applications/test/wallDist/Test-wallDist.C b/applications/test/wallDist/Test-wallDist.C
index d25bffc0068..831c3120051 100644
--- a/applications/test/wallDist/Test-wallDist.C
+++ b/applications/test/wallDist/Test-wallDist.C
@@ -30,6 +30,7 @@ Description
#include "Time.H"
#include "fvMesh.H"
#include "wallDist.H"
+#include "fvCFD.H"
using namespace Foam;
--
GitLab