Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
789d261f
Commit
789d261f
authored
Oct 01, 2018
by
sergio
Browse files
Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop
parents
d0c39b0e
69f6f638
Changes
109
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/XiFoam/XiEngineFoam/startSummary.H
View file @
789d261f
...
...
@@ -8,7 +8,7 @@ if (Pstream::master())
(
new
OFstream
(
runTime
.
rootPath
()
/
runTime
.
globalCaseName
()
runTime
.
globalPath
()
/
(
"logSummary."
+
runTime
.
timeName
()
+
".dat"
)
)
);
...
...
applications/solvers/combustion/coldEngineFoam/startSummary.H
View file @
789d261f
...
...
@@ -8,7 +8,7 @@ if (Pstream::master())
(
new
OFstream
(
runTime
.
rootPath
()
/
runTime
.
globalCaseName
()
runTime
.
globalPath
()
/
(
"logSummary."
+
runTime
.
timeName
()
+
".dat"
)
)
);
...
...
applications/test/globalMeshData/Test-globalMeshData.C
View file @
789d261f
...
...
@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
const
labelListList
&
transformedSlaves
=
globalData
.
globalPointTransformedBoundaryFaces
();
label
nBnd
=
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
();
const
label
nBnd
=
mesh
.
n
Boundary
Faces
();
pointField
fc
(
globalPointBoundaryFacesMap
.
constructSize
());
SubList
<
point
>
(
fc
,
nBnd
)
=
...
...
applications/test/syncTools/Test-syncTools.C
View file @
789d261f
...
...
@@ -195,7 +195,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
SubList
<
face
>
(
mesh
.
faces
(),
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
(),
mesh
.
n
Boundary
Faces
(),
mesh
.
nInternalFaces
()
),
mesh
.
points
()
...
...
applications/test/tensor/Test-tensor.C
View file @
789d261f
#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
);
...
...
applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
View file @
789d261f
...
...
@@ -413,7 +413,7 @@ int main(int argc, char *argv[])
const
SubList
<
face
>
outsideFaces
(
mesh
.
faces
(),
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
(),
mesh
.
n
Boundary
Faces
(),
mesh
.
nInternalFaces
()
);
...
...
applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
View file @
789d261f
...
...
@@ -1386,7 +1386,7 @@ int main(int argc, char *argv[])
DynamicList<polyPatch*> newPatches(nPatches);
// For every boundary face the old patch.
labelList facePatchID(pShapeMesh.n
Faces()-pShapeMesh.nInternal
Faces(), -1);
labelList facePatchID(pShapeMesh.n
Boundary
Faces(), -1);
label cMeshFace = pShapeMesh.nInternalFaces();
label nBoundaries = 0;
...
...
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
View file @
789d261f
...
...
@@ -468,7 +468,7 @@ void Foam::backgroundMeshDecomposition::printMeshData
// // Print stats
// globalIndex globalBoundaryFaces(mesh.n
Faces()-mesh.nInternal
Faces());
// globalIndex globalBoundaryFaces(mesh.n
Boundary
Faces());
for
(
label
proci
=
0
;
proci
<
Pstream
::
nProcs
();
proci
++
)
{
...
...
@@ -671,7 +671,7 @@ void Foam::backgroundMeshDecomposition::buildPatchAndTree()
SubList
<
face
>
(
mesh_
.
faces
(),
mesh_
.
n
Faces
()
-
mesh_
.
nInternal
Faces
(),
mesh_
.
n
Boundary
Faces
(),
mesh_
.
nInternalFaces
()
),
mesh_
.
points
()
...
...
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
View file @
789d261f
...
...
@@ -39,7 +39,7 @@ void Foam::conformalVoronoiMesh::calcNeighbourCellCentres
pointField
&
neiCc
)
const
{
label
nBoundaryFaces
=
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
();
const
label
nBoundaryFaces
=
mesh
.
n
Boundary
Faces
();
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
.
n
Faces
()
-
mesh
.
nInternal
Faces
(),
label
(
-
1
));
labelList
neiFaceOwner
(
mesh
.
n
Boundary
Faces
(),
label
(
-
1
));
const
polyBoundaryMesh
&
patches
=
mesh
.
boundaryMesh
();
...
...
@@ -421,7 +421,7 @@ void Foam::conformalVoronoiMesh::calcFaceZones
)
);
pointField
neiCc
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
pointField
neiCc
(
mesh
.
n
Boundary
Faces
());
calcNeighbourCellCentres
(
mesh
,
...
...
@@ -498,7 +498,7 @@ void Foam::conformalVoronoiMesh::calcFaceZones
}
// labelList neiCellSurface(mesh.n
Faces()-mesh.nInternal
Faces());
// labelList neiCellSurface(mesh.n
Boundary
Faces());
//
// forAll(patches, patchi)
// {
...
...
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
View file @
789d261f
...
...
@@ -119,7 +119,7 @@ void printMeshData(const polyMesh& mesh)
// Print stats
globalIndex
globalBoundaryFaces
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
globalIndex
globalBoundaryFaces
(
mesh
.
n
Boundary
Faces
());
label
maxProcCells
=
0
;
label
totProcFaces
=
0
;
...
...
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View file @
789d261f
...
...
@@ -525,7 +525,7 @@ void extractSurface
fileName
globalCasePath
(
runTime
.
processorCase
()
?
runTime
.
path
()
/
".."
/
outFileName
?
runTime
.
globalPath
()
/
outFileName
:
runTime
.
path
()
/
outFileName
);
globalCasePath
.
clean
();
...
...
applications/utilities/mesh/manipulation/checkMesh/checkTools.C
View file @
789d261f
...
...
@@ -314,7 +314,7 @@ void Foam::mergeAndWrite
}
boolList
bndInSet
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
boolList
bndInSet
(
mesh
.
n
Boundary
Faces
());
forAll
(
pbm
,
patchi
)
{
const
polyPatch
&
pp
=
pbm
[
patchi
];
...
...
applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
View file @
789d261f
...
...
@@ -249,7 +249,7 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
(
mesh
,
"duplicateFaces"
,
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
()
)
/
256
mesh
.
n
Boundary
Faces
()
/
256
);
forAll
(
duplicates
,
bFacei
)
...
...
applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
View file @
789d261f
...
...
@@ -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
)
{
...
...
applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
View file @
789d261f
...
...
@@ -140,7 +140,7 @@ void simpleMarkFeatures
SubList
<
face
>
(
mesh
.
faces
(),
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
(),
mesh
.
n
Boundary
Faces
(),
mesh
.
nInternalFaces
()
),
mesh
.
points
()
...
...
@@ -238,7 +238,7 @@ void simpleMarkFeatures
// ~~~~~~~~~~~~~~~~~~~~~~~~~
// Face centres that need inclusion in the dual mesh
labelHashSet
featureFaceSet
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
labelHashSet
featureFaceSet
(
mesh
.
n
Boundary
Faces
());
// A. boundary faces.
for
(
label
facei
=
mesh
.
nInternalFaces
();
facei
<
mesh
.
nFaces
();
facei
++
)
{
...
...
applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
View file @
789d261f
...
...
@@ -353,7 +353,7 @@ void getInterfaceSizes
// ~~~~~~~~~~~~~~
// Neighbour cellRegion.
labelList
coupledRegion
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
labelList
coupledRegion
(
mesh
.
n
Boundary
Faces
());
forAll
(
coupledRegion
,
i
)
{
...
...
@@ -641,7 +641,7 @@ autoPtr<mapPolyMesh> createRegionMesh
// Neighbour cellRegion.
labelList
coupledRegion
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
labelList
coupledRegion
(
mesh
.
n
Boundary
Faces
());
forAll
(
coupledRegion
,
i
)
{
...
...
@@ -1232,7 +1232,7 @@ void getZoneID
}
// Neighbour zoneID.
neiZoneID
.
setSize
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
neiZoneID
.
setSize
(
mesh
.
n
Boundary
Faces
());
forAll
(
neiZoneID
,
i
)
{
...
...
@@ -1263,7 +1263,7 @@ void matchRegions
// Get current per cell zoneID
labelList
zoneID
(
mesh
.
nCells
(),
-
1
);
labelList
neiZoneID
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
labelList
neiZoneID
(
mesh
.
n
Boundary
Faces
());
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
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
labelList
neiZoneID
(
mesh
.
n
Boundary
Faces
());
getZoneID
(
mesh
,
cellZones
,
zoneID
,
neiZoneID
);
...
...
@@ -1622,7 +1622,7 @@ int main(int argc, char *argv[])
);
labelList
newZoneID
(
mesh
.
nCells
(),
-
1
);
labelList
newNeiZoneID
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
labelList
newNeiZoneID
(
mesh
.
n
Boundary
Faces
());
getZoneID
(
mesh
,
newCellZones
,
newZoneID
,
newNeiZoneID
);
label
unzonedCelli
=
newZoneID
.
find
(
-
1
);
...
...
applications/utilities/parallelProcessing/redistributePar/redistributePar.C
View file @
789d261f
...
...
@@ -172,7 +172,7 @@ void printMeshData(const polyMesh& mesh)
// Print stats
globalIndex
globalBoundaryFaces
(
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
());
globalIndex
globalBoundaryFaces
(
mesh
.
n
Boundary
Faces
());
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
())
{
...
...
applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
View file @
789d261f
...
...
@@ -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
;
}
...
...
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
View file @
789d261f
...
...
@@ -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
;
}
//
...
...
applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
View file @
789d261f
...
...
@@ -55,7 +55,7 @@ void Foam::channelIndex::walkOppositeFaces
{
const
cellList
&
cells
=
mesh
.
cells
();
const
faceList
&
faces
=
mesh
.
faces
();
label
nBnd
=
mesh
.
n
Faces
()
-
mesh
.
nInternal
Faces
();
const
label
nBnd
=
mesh
.
n
Boundary
Faces
();
DynamicList
<
label
>
frontFaces
(
startFaces
);
forAll
(
frontFaces
,
i
)
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment