Commit 789d261f authored by sergio's avatar sergio
Browse files

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

parents d0c39b0e 69f6f638
......@@ -8,7 +8,7 @@ if (Pstream::master())
(
new OFstream
(
runTime.rootPath()/runTime.globalCaseName()
runTime.globalPath()
/("logSummary." + runTime.timeName() + ".dat")
)
);
......
......@@ -8,7 +8,7 @@ if (Pstream::master())
(
new OFstream
(
runTime.rootPath()/runTime.globalCaseName()
runTime.globalPath()
/("logSummary." + runTime.timeName() + ".dat")
)
);
......
......@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
const labelListList& transformedSlaves =
globalData.globalPointTransformedBoundaryFaces();
label nBnd = mesh.nFaces()-mesh.nInternalFaces();
const label nBnd = mesh.nBoundaryFaces();
pointField fc(globalPointBoundaryFacesMap.constructSize());
SubList<point>(fc, nBnd) =
......
......@@ -195,7 +195,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
SubList<face>
(
mesh.faces(),
mesh.nFaces()-mesh.nInternalFaces(),
mesh.nBoundaryFaces(),
mesh.nInternalFaces()
),
mesh.points()
......
#include "tensor.H"
#include "triad.H"
#include "symmTensor.H"
#include "transform.H"
#include "stringList.H"
......@@ -13,7 +14,40 @@ int main()
tensor t3 = t1 + t2;
Info<< t3 << endl;
Info<< "tensor " << t1 << " + " << t2 << nl
<< " = " << t3 << nl << nl;
{
Info<< "rows:" << nl;
for (direction i=0; i < 3; ++i)
{
Info<< " (" << i << ") = " << t3.row(i) << nl;
}
}
{
Info<< "cols:" << nl;
for (direction i=0; i < 3; ++i)
{
Info<< " (" << i << ") = " << t3.col(i) << nl;
}
Info<< "col<0> = " << t3.col<0>() << nl;
Info<< "col<1> = " << t3.col<1>() << nl;
Info<< "col<2> = " << t3.col<2>() << nl;
// Compilation error: Info << "col<3> = " << t3.col<3>() << nl;
t3.col<1>({0, 2, 4});
Info<< "replaced col<1> = " << t3.col<1>() << nl;
Info<< "tensor " << t3 << nl;
t3.row<2>(Zero);
Info<< "replaced row<1> = " << t3.row<2>() << nl;
Info<< "tensor " << t3 << nl;
triad tr3(t3);
Info<< "triad " << tr3 << " :: T() " << tr3.T() << nl;
}
Info<< nl;
tensor t4(3,-2,1,-2,2,0,1, 0, 4);
......
......@@ -413,7 +413,7 @@ int main(int argc, char *argv[])
const SubList<face> outsideFaces
(
mesh.faces(),
mesh.nFaces() - mesh.nInternalFaces(),
mesh.nBoundaryFaces(),
mesh.nInternalFaces()
);
......
......@@ -1386,7 +1386,7 @@ int main(int argc, char *argv[])
DynamicList<polyPatch*> newPatches(nPatches);
// For every boundary face the old patch.
labelList facePatchID(pShapeMesh.nFaces()-pShapeMesh.nInternalFaces(), -1);
labelList facePatchID(pShapeMesh.nBoundaryFaces(), -1);
label cMeshFace = pShapeMesh.nInternalFaces();
label nBoundaries = 0;
......
......@@ -468,7 +468,7 @@ void Foam::backgroundMeshDecomposition::printMeshData
// // Print stats
// globalIndex globalBoundaryFaces(mesh.nFaces()-mesh.nInternalFaces());
// globalIndex globalBoundaryFaces(mesh.nBoundaryFaces());
for (label proci = 0; proci < Pstream::nProcs(); proci++)
{
......@@ -671,7 +671,7 @@ void Foam::backgroundMeshDecomposition::buildPatchAndTree()
SubList<face>
(
mesh_.faces(),
mesh_.nFaces() - mesh_.nInternalFaces(),
mesh_.nBoundaryFaces(),
mesh_.nInternalFaces()
),
mesh_.points()
......
......@@ -39,7 +39,7 @@ void Foam::conformalVoronoiMesh::calcNeighbourCellCentres
pointField& neiCc
) const
{
label nBoundaryFaces = mesh.nFaces() - mesh.nInternalFaces();
const label nBoundaryFaces = mesh.nBoundaryFaces();
if (neiCc.size() != nBoundaryFaces)
{
......@@ -319,7 +319,7 @@ void Foam::conformalVoronoiMesh::calcFaceZones
const labelList& faceOwner = mesh.faceOwner();
const labelList& faceNeighbour = mesh.faceNeighbour();
labelList neiFaceOwner(mesh.nFaces() - mesh.nInternalFaces(), label(-1));
labelList neiFaceOwner(mesh.nBoundaryFaces(), label(-1));
const polyBoundaryMesh& patches = mesh.boundaryMesh();
......@@ -421,7 +421,7 @@ void Foam::conformalVoronoiMesh::calcFaceZones
)
);
pointField neiCc(mesh.nFaces() - mesh.nInternalFaces());
pointField neiCc(mesh.nBoundaryFaces());
calcNeighbourCellCentres
(
mesh,
......@@ -498,7 +498,7 @@ void Foam::conformalVoronoiMesh::calcFaceZones
}
// labelList neiCellSurface(mesh.nFaces()-mesh.nInternalFaces());
// labelList neiCellSurface(mesh.nBoundaryFaces());
//
// forAll(patches, patchi)
// {
......
......@@ -119,7 +119,7 @@ void printMeshData(const polyMesh& mesh)
// Print stats
globalIndex globalBoundaryFaces(mesh.nFaces()-mesh.nInternalFaces());
globalIndex globalBoundaryFaces(mesh.nBoundaryFaces());
label maxProcCells = 0;
label totProcFaces = 0;
......
......@@ -525,7 +525,7 @@ void extractSurface
fileName globalCasePath
(
runTime.processorCase()
? runTime.path()/".."/outFileName
? runTime.globalPath()/outFileName
: runTime.path()/outFileName
);
globalCasePath.clean();
......
......@@ -314,7 +314,7 @@ void Foam::mergeAndWrite
}
boolList bndInSet(mesh.nFaces()-mesh.nInternalFaces());
boolList bndInSet(mesh.nBoundaryFaces());
forAll(pbm, patchi)
{
const polyPatch& pp = pbm[patchi];
......
......@@ -249,7 +249,7 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
(
mesh,
"duplicateFaces",
(mesh.nFaces() - mesh.nInternalFaces())/256
mesh.nBoundaryFaces()/256
);
forAll(duplicates, bFacei)
......
......@@ -295,11 +295,7 @@ int main(int argc, char *argv[])
{
const polyBoundaryMesh& bm = mesh.boundaryMesh();
labelList neiStatus
(
mesh.nFaces()-mesh.nInternalFaces(),
orientedSurface::UNVISITED
);
labelList neiStatus(mesh.nBoundaryFaces(), orientedSurface::UNVISITED);
forAll(faceLabels, i)
{
......
......@@ -140,7 +140,7 @@ void simpleMarkFeatures
SubList<face>
(
mesh.faces(),
mesh.nFaces()-mesh.nInternalFaces(),
mesh.nBoundaryFaces(),
mesh.nInternalFaces()
),
mesh.points()
......@@ -238,7 +238,7 @@ void simpleMarkFeatures
// ~~~~~~~~~~~~~~~~~~~~~~~~~
// Face centres that need inclusion in the dual mesh
labelHashSet featureFaceSet(mesh.nFaces()-mesh.nInternalFaces());
labelHashSet featureFaceSet(mesh.nBoundaryFaces());
// A. boundary faces.
for (label facei = mesh.nInternalFaces(); facei < mesh.nFaces(); facei++)
{
......
......@@ -353,7 +353,7 @@ void getInterfaceSizes
// ~~~~~~~~~~~~~~
// Neighbour cellRegion.
labelList coupledRegion(mesh.nFaces()-mesh.nInternalFaces());
labelList coupledRegion(mesh.nBoundaryFaces());
forAll(coupledRegion, i)
{
......@@ -641,7 +641,7 @@ autoPtr<mapPolyMesh> createRegionMesh
// Neighbour cellRegion.
labelList coupledRegion(mesh.nFaces()-mesh.nInternalFaces());
labelList coupledRegion(mesh.nBoundaryFaces());
forAll(coupledRegion, i)
{
......@@ -1232,7 +1232,7 @@ void getZoneID
}
// Neighbour zoneID.
neiZoneID.setSize(mesh.nFaces()-mesh.nInternalFaces());
neiZoneID.setSize(mesh.nBoundaryFaces());
forAll(neiZoneID, i)
{
......@@ -1263,7 +1263,7 @@ void matchRegions
// Get current per cell zoneID
labelList zoneID(mesh.nCells(), -1);
labelList neiZoneID(mesh.nFaces()-mesh.nInternalFaces());
labelList neiZoneID(mesh.nBoundaryFaces());
getZoneID(mesh, cellZones, zoneID, neiZoneID);
// Sizes per cellzone
......@@ -1552,7 +1552,7 @@ int main(int argc, char *argv[])
// Existing zoneID
labelList zoneID(mesh.nCells(), -1);
// Neighbour zoneID.
labelList neiZoneID(mesh.nFaces()-mesh.nInternalFaces());
labelList neiZoneID(mesh.nBoundaryFaces());
getZoneID(mesh, cellZones, zoneID, neiZoneID);
......@@ -1622,7 +1622,7 @@ int main(int argc, char *argv[])
);
labelList newZoneID(mesh.nCells(), -1);
labelList newNeiZoneID(mesh.nFaces()-mesh.nInternalFaces());
labelList newNeiZoneID(mesh.nBoundaryFaces());
getZoneID(mesh, newCellZones, newZoneID, newNeiZoneID);
label unzonedCelli = newZoneID.find(-1);
......
......@@ -172,7 +172,7 @@ void printMeshData(const polyMesh& mesh)
// Print stats
globalIndex globalBoundaryFaces(mesh.nFaces()-mesh.nInternalFaces());
globalIndex globalBoundaryFaces(mesh.nBoundaryFaces());
label maxProcCells = 0;
label totProcFaces = 0;
......@@ -2451,7 +2451,7 @@ int main(int argc, char *argv[])
<< " on all processors" << nl << endl;
instantList timeDirs;
const fileName basePath(args.rootPath()/args.globalCaseName());
const fileName basePath(args.globalPath());
if (Pstream::master())
{
......
......@@ -225,7 +225,7 @@ int main(int argc, char *argv[])
fileName ensightDir = args.lookupOrDefault<word>("name", "EnSight");
if (!ensightDir.isAbsolute())
{
ensightDir = args.rootPath()/args.globalCaseName()/ensightDir;
ensightDir = args.globalPath()/ensightDir;
}
......
......@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
fileName ensightDir = args.lookupOrDefault<word>("name", "Ensight");
if (!ensightDir.isAbsolute())
{
ensightDir = args.rootPath()/args.globalCaseName()/ensightDir;
ensightDir = args.globalPath()/ensightDir;
}
//
......
......@@ -55,7 +55,7 @@ void Foam::channelIndex::walkOppositeFaces
{
const cellList& cells = mesh.cells();
const faceList& faces = mesh.faces();
label nBnd = mesh.nFaces() - mesh.nInternalFaces();
const label nBnd = mesh.nBoundaryFaces();
DynamicList<label> frontFaces(startFaces);
forAll(frontFaces, i)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment