Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
integration-cfmesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Community
integration-cfmesh
Commits
17c26778
Commit
17c26778
authored
Aug 20, 2015
by
Franjo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'defect-release-v1.1' into developmentPublicRepo
parents
98c65acb
3bd5dcdc
Changes
66
Hide whitespace changes
Inline
Side-by-side
Showing
66 changed files
with
336 additions
and
287 deletions
+336
-287
.gitignore
.gitignore
+3
-0
executables/cartesian2DMesh/cartesian2DMesh.C
executables/cartesian2DMesh/cartesian2DMesh.C
+0
-1
executables/pMesh/pMesh.C
executables/pMesh/pMesh.C
+0
-1
executables/tetMesh/tetMesh.C
executables/tetMesh/tetMesh.C
+0
-1
meshLibrary/utilities/anisotropicMeshing/coordinateModification/boxScaling.C
...es/anisotropicMeshing/coordinateModification/boxScaling.C
+1
-1
meshLibrary/utilities/anisotropicMeshing/coordinateModification/coordinateModification.C
...icMeshing/coordinateModification/coordinateModification.C
+1
-1
meshLibrary/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H
...tropicMeshing/coordinateModification/coordinateModifier.H
+0
-1
meshLibrary/utilities/anisotropicMeshing/coordinateModification/planeScaling.C
.../anisotropicMeshing/coordinateModification/planeScaling.C
+1
-1
meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C
...ndaryLayers/boundaryLayers/boundaryLayersCreateVertices.C
+1
-1
meshLibrary/utilities/checkMeshDict/checkMeshDict.C
meshLibrary/utilities/checkMeshDict/checkMeshDict.C
+2
-2
meshLibrary/utilities/containers/FRWGraph/FRWGraph.C
meshLibrary/utilities/containers/FRWGraph/FRWGraph.C
+23
-4
meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H
meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H
+10
-8
meshLibrary/utilities/containers/LongList/LongList.C
meshLibrary/utilities/containers/LongList/LongList.C
+4
-29
meshLibrary/utilities/containers/LongList/LongListI.H
meshLibrary/utilities/containers/LongList/LongListI.H
+10
-8
meshLibrary/utilities/containers/VRWGraph/VRWGraph.C
meshLibrary/utilities/containers/VRWGraph/VRWGraph.C
+20
-13
meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H
meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H
+3
-2
meshLibrary/utilities/containers/VRWGraphList/VRWGraphList.C
meshLibrary/utilities/containers/VRWGraphList/VRWGraphList.C
+11
-3
meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C
...ry/utilities/decomposeCells/decomposeCellsDecomposition.C
+1
-1
meshLibrary/utilities/decomposeCells/decomposeCellsPyramids.C
...Library/utilities/decomposeCells/decomposeCellsPyramids.C
+3
-3
meshLibrary/utilities/faceDecomposition/decomposeFaces.C
meshLibrary/utilities/faceDecomposition/decomposeFaces.C
+1
-1
meshLibrary/utilities/helperClasses/parallelHelpers/parPartTet/parPartTet.H
...ies/helperClasses/parallelHelpers/parPartTet/parPartTet.H
+1
-1
meshLibrary/utilities/helperClasses/parallelHelpers/parTriFace/parTriFace.H
...ies/helperClasses/parallelHelpers/parTriFace/parTriFace.H
+1
-3
meshLibrary/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C
...lities/meshes/partTetMesh/partTetMeshParallelAddressing.C
+2
-2
meshLibrary/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C
...lities/meshes/partTriMesh/partTriMeshParallelAddressing.C
+1
-1
meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.C
...meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.C
+1
-1
meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C
...ties/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C
+5
-5
meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C
...shes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C
+1
-1
meshLibrary/utilities/meshes/triSurf/triSurfAddressing.C
meshLibrary/utilities/meshes/triSurf/triSurfAddressing.C
+4
-11
meshLibrary/utilities/octrees/meshOctree/meshOctreeFindNearestSurfacePoint.C
...es/octrees/meshOctree/meshOctreeFindNearestSurfacePoint.C
+10
-0
meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C
...meshOctreeModifier/meshOctreeModifierParallelRefinement.C
+2
-2
meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/boxRefinement.C
...ctree/refinementControls/objectRefinement/boxRefinement.C
+1
-1
meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/coneRefinement.C
...tree/refinementControls/objectRefinement/coneRefinement.C
+1
-1
meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/hollowConeRefinement.C
...efinementControls/objectRefinement/hollowConeRefinement.C
+1
-1
meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/lineRefinement.C
...tree/refinementControls/objectRefinement/lineRefinement.C
+1
-1
meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.H
...ee/refinementControls/objectRefinement/objectRefinement.H
+1
-1
meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/sphereRefinement.C
...ee/refinementControls/objectRefinement/sphereRefinement.C
+1
-1
meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizer.C
...tilities/smoothers/geometry/meshOptimizer/meshOptimizer.C
+1
-1
meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C
...thers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C
+8
-8
meshLibrary/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C
...ilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C
+1
-1
meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/knuppMetric/knuppMetric.C
...hOptimisation/advancedSmoothers/knuppMetric/knuppMetric.C
+1
-1
meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/meshUntangler/meshUntangler.C
...imisation/advancedSmoothers/meshUntangler/meshUntangler.C
+1
-1
meshLibrary/utilities/smoothers/geometry/meshOptimizer/tetMeshOptimisation/advancedSmoothers/quadricMetric/quadricMetric.C
...imisation/advancedSmoothers/quadricMetric/quadricMetric.C
+1
-1
meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C
...faceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C
+2
-2
meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C
...kCellConnectionsOverFaces/checkCellConnectionsOverFaces.C
+1
-1
meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C
...gy/topologicalCleaner/topologicalCleanerInvalidVertices.C
+1
-1
meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonConsecutiveBoundaryVertices.C
...alCleaner/topologyCleanerNonConsecutiveBoundaryVertices.C
+45
-42
meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
...surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
+12
-6
meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C
...ols/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.C
+49
-32
meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H
...ols/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H
+6
-5
meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C
...eEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C
+60
-41
meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C
...rfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C
+2
-1
meshLibrary/utilities/triSurfaceTools/triSurfaceChecks/triSurfaceChecks.C
...ities/triSurfaceTools/triSurfaceChecks/triSurfaceChecks.C
+10
-11
meshLibrary/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.C
...ceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.C
+2
-3
utilities/FLMAToSurface/FLMAToSurface.C
utilities/FLMAToSurface/FLMAToSurface.C
+0
-1
utilities/FMSToSurface/FMSToSurface.C
utilities/FMSToSurface/FMSToSurface.C
+0
-1
utilities/FMSToVTK/FMSToVTK.C
utilities/FMSToVTK/FMSToVTK.C
+3
-3
utilities/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C
...ies/extrudeEdgesInto2DSurface/extrudeEdgesInto2DSurface.C
+0
-1
utilities/generateBoundaryLayers/generateBoundaryLayers.C
utilities/generateBoundaryLayers/generateBoundaryLayers.C
+0
-1
utilities/improveMeshQuality/improveMeshQuality.C
utilities/improveMeshQuality/improveMeshQuality.C
+0
-1
utilities/improveSymmetryPlanes/improveSymmetryPlanes.C
utilities/improveSymmetryPlanes/improveSymmetryPlanes.C
+0
-1
utilities/mergeSurfacePatches/mergeSurfacePatches.C
utilities/mergeSurfacePatches/mergeSurfacePatches.C
+0
-1
utilities/meshToFPMA/meshToFPMA.C
utilities/meshToFPMA/meshToFPMA.C
+0
-1
utilities/patchesToSubsets/patchesToSubsets.C
utilities/patchesToSubsets/patchesToSubsets.C
+0
-1
utilities/preparePar/preparePar.C
utilities/preparePar/preparePar.C
+1
-0
utilities/removeSurfaceFacets/removeSurfaceFacets.C
utilities/removeSurfaceFacets/removeSurfaceFacets.C
+0
-1
utilities/subsetToPatch/subsetToPatch.C
utilities/subsetToPatch/subsetToPatch.C
+0
-1
No files found.
.gitignore
0 → 100644
View file @
17c26778
*.dep
**/lnInclude/*
**/Make/**/*
executables/cartesian2DMesh/cartesian2DMesh.C
View file @
17c26778
...
...
@@ -30,7 +30,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "Time.H"
#include "cartesian2DMeshGenerator.H"
using
namespace
Foam
;
...
...
executables/pMesh/pMesh.C
View file @
17c26778
...
...
@@ -30,7 +30,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "Time.H"
#include "voronoiMeshGenerator.H"
using
namespace
Foam
;
...
...
executables/tetMesh/tetMesh.C
View file @
17c26778
...
...
@@ -30,7 +30,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "Time.H"
#include "tetMeshGenerator.H"
using
namespace
Foam
;
...
...
meshLibrary/utilities/anisotropicMeshing/coordinateModification/boxScaling.C
View file @
17c26778
...
...
@@ -176,7 +176,7 @@ void boxScaling::boundingPlanes(PtrList<plane>&pl) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionary
boxScaling
::
dict
(
bool
ignoreType
)
const
dictionary
boxScaling
::
dict
(
bool
/*ignoreType*/
)
const
{
dictionary
dict
;
...
...
meshLibrary/utilities/anisotropicMeshing/coordinateModification/coordinateModification.C
View file @
17c26778
...
...
@@ -46,7 +46,7 @@ coordinateModification::coordinateModification()
coordinateModification
::
coordinateModification
(
const
word
&
name
,
const
dictionary
&
dict
const
dictionary
&
/*dict*/
)
:
name_
(
name
)
...
...
meshLibrary/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H
View file @
17c26778
...
...
@@ -39,7 +39,6 @@ SourceFiles
#include "word.H"
#include "point.H"
#include "coordinateModificationList.H"
#include "Time.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
meshLibrary/utilities/anisotropicMeshing/coordinateModification/planeScaling.C
View file @
17c26778
...
...
@@ -153,7 +153,7 @@ void planeScaling::boundingPlanes(PtrList<plane>& pl) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionary
planeScaling
::
dict
(
bool
ignoreType
)
const
dictionary
planeScaling
::
dict
(
bool
/*ignoreType*/
)
const
{
dictionary
dict
;
...
...
meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C
View file @
17c26778
...
...
@@ -686,7 +686,7 @@ void boundaryLayers::createNewPartitionVerticesParallel
(
const
labelLongList
&
procPoints
,
const
List
<
direction
>&
pVertices
,
const
boolList
&
treatPatches
const
boolList
&
/*treatPatches*/
)
{
if
(
!
Pstream
::
parRun
()
)
...
...
meshLibrary/utilities/checkMeshDict/checkMeshDict.C
View file @
17c26778
...
...
@@ -860,7 +860,7 @@ void checkMeshDict::updatePatchCellSize
void
checkMeshDict
::
updateSubsetCellSize
(
const
std
::
map
<
word
,
wordList
>&
patchesFromPatch
const
std
::
map
<
word
,
wordList
>&
/*patchesFromPatch*/
)
{
...
...
@@ -1028,7 +1028,7 @@ void checkMeshDict::updateRemoveCellsIntersectingPatches
void
checkMeshDict
::
updateObjectRefinements
(
const
std
::
map
<
word
,
wordList
>&
patchesFromPatch
const
std
::
map
<
word
,
wordList
>&
/*patchesFromPatch*/
)
{
...
...
meshLibrary/utilities/containers/FRWGraph/FRWGraph.C
View file @
17c26778
...
...
@@ -34,15 +34,34 @@ Foam::Ostream& Foam::operator<<
const
Foam
::
FRWGraph
<
T
,
width
>&
DL
)
{
os
<<
DL
.
size
()
<<
"("
<<
endl
;
for
(
register
label
i
=
0
;
i
<
DL
.
size
();
++
i
)
os
<<
DL
.
size
()
<<
"("
<<
nl
;
for
(
label
i
=
0
;
i
<
DL
.
size
();
++
i
)
{
os
<<
width
<<
"("
;
for
(
label
j
=
0
;
j
<
width
;
++
j
)
os
<<
DL
(
i
,
j
)
<<
" "
<<
endl
;
os
<<
")"
<<
endl
;
{
if
(
j
)
{
os
<<
" "
;
}
os
<<
DL
(
i
,
j
);
}
os
<<
")"
<<
nl
;
}
os
<<
")"
;
// Check state of IOstream
os
.
check
(
"template<class T, Foam::label width>Foam::Ostream& Foam::operator<<"
"(Foam::Ostream& os, const Foam::FRWGraph<T, width>&)"
);
return
os
;
}
...
...
meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H
View file @
17c26778
...
...
@@ -36,7 +36,7 @@ void Foam::FRWGraph<T, width>::checkIndex(const label i, const label j) const
<<
" is not in range "
<<
0
<<
" and "
<<
nRows_
<<
abort
(
FatalError
);
}
if
(
(
j
<
0
)
||
(
j
>=
width
)
)
FatalErrorIn
(
...
...
@@ -105,7 +105,7 @@ inline Foam::label Foam::FRWGraph<T,width>::size() const
}
template
<
class
T
,
Foam
::
label
width
>
inline
Foam
::
label
Foam
::
FRWGraph
<
T
,
width
>::
sizeOfRow
(
const
label
rowI
)
const
inline
Foam
::
label
Foam
::
FRWGraph
<
T
,
width
>::
sizeOfRow
(
const
label
)
const
{
return
width
;
}
...
...
@@ -155,10 +155,11 @@ inline bool Foam::FRWGraph<T,width>::contains
)
const
{
const
label
start
=
rowI
*
width
;
for
(
register
label
i
=
0
;
i
<
width
;
++
i
)
for
(
label
i
=
0
;
i
<
width
;
++
i
)
if
(
data_
[
start
+
i
]
==
e
)
return
true
;
return
false
;
}
...
...
@@ -170,10 +171,11 @@ inline Foam::label Foam::FRWGraph<T,width>::containsAtPosition
)
const
{
const
label
start
=
rowI
*
width
;
for
(
register
label
i
=
0
;
i
<
width
;
++
i
)
for
(
label
i
=
0
;
i
<
width
;
++
i
)
if
(
data_
[
start
+
i
]
==
e
)
return
i
;
return
-
1
;
}
...
...
@@ -188,7 +190,7 @@ inline const T& Foam::FRWGraph<T,width>::operator()
#ifdef FULLDEBUG
checkIndex
(
i
,
j
);
#endif
return
data_
[
i
*
width
+
j
];
}
...
...
@@ -201,7 +203,7 @@ inline T& Foam::FRWGraph<T,width>::operator()
#ifdef FULLDEBUG
checkIndex
(
i
,
j
);
#endif
return
data_
[
i
*
width
+
j
];
}
...
...
meshLibrary/utilities/containers/LongList/LongList.C
View file @
17c26778
...
...
@@ -202,7 +202,7 @@ Foam::Istream& Foam::operator>>
if
(
listDelimiter
==
token
::
BEGIN_LIST
)
{
for
(
register
label
i
=
0
;
i
<
size
;
++
i
)
for
(
label
i
=
0
;
i
<
size
;
++
i
)
{
is
>>
DL
[
i
];
...
...
@@ -223,7 +223,7 @@ Foam::Istream& Foam::operator>>
"reading the single entry"
);
for
(
register
label
i
=
0
;
i
<
size
;
++
i
)
for
(
label
i
=
0
;
i
<
size
;
++
i
)
{
DL
[
i
]
=
element
;
}
...
...
@@ -306,7 +306,7 @@ void Foam::LongList<T, Offset>::appendFromStream(Istream& is)
if
(
listDelimiter
==
token
::
BEGIN_LIST
)
{
for
(
register
label
i
=
0
;
i
<
size
;
++
i
)
for
(
label
i
=
0
;
i
<
size
;
++
i
)
{
is
>>
this
->
operator
[](
origSize
);
++
origSize
;
...
...
@@ -328,7 +328,7 @@ void Foam::LongList<T, Offset>::appendFromStream(Istream& is)
"reading the single entry"
);
for
(
register
label
i
=
0
;
i
<
size
;
++
i
)
for
(
label
i
=
0
;
i
<
size
;
++
i
)
{
this
->
operator
[](
origSize
)
=
element
;
++
origSize
;
...
...
@@ -346,31 +346,6 @@ void Foam::LongList<T, Offset>::appendFromStream(Istream& is)
forAll
(
buf
,
i
)
this
->
operator
[](
origSize
++
)
=
buf
[
i
];
/*const label blockSize = 1<<shift_;
Info << "nextFree_ " << nextFree_ << endl;
//- append elements by reading binary block
while( origSize < nextFree_ )
{
const label currBlock = origSize >> shift_;
const label currPos = origSize & mask_;
Info << "Orig size " << origSize
<< nl << "currBlock " << currBlock
<< nl << "currPos " << currPos << endl;
T* data = &dataPtr_[currBlock][currPos];
label bs = Foam::min(nextFree_-origSize, blockSize);
bs = Foam::min(blockSize - currPos, bs);
Info << "bs " << bs << endl;
is.read(reinterpret_cast<char*>(data), bs * sizeof(T));
origSize += bs;
} */
is
.
fatalCheck
(
"appendFromStream(Istream& is)"
...
...
meshLibrary/utilities/containers/LongList/LongListI.H
View file @
17c26778
...
...
@@ -78,7 +78,7 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
if
(
numblock1
<
numBlocks_
)
{
for
(
register
label
i
=
numblock1
;
i
<
numBlocks_
;
++
i
)
for
(
label
i
=
numblock1
;
i
<
numBlocks_
;
++
i
)
delete
[]
dataPtr_
[
i
];
}
else
if
(
numblock1
>
numBlocks_
)
...
...
@@ -91,7 +91,8 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
}
while
(
numblock1
>
numAllocatedBlocks_
);
T
**
dataptr1
=
new
T
*
[
numAllocatedBlocks_
];
for
(
register
label
i
=
0
;
i
<
numBlocks_
;
++
i
)
for
(
label
i
=
0
;
i
<
numBlocks_
;
++
i
)
dataptr1
[
i
]
=
dataPtr_
[
i
];
if
(
dataPtr_
)
...
...
@@ -99,7 +100,7 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
dataPtr_
=
dataptr1
;
}
for
(
register
label
i
=
numBlocks_
;
i
<
numblock1
;
++
i
)
for
(
label
i
=
numBlocks_
;
i
<
numblock1
;
++
i
)
dataPtr_
[
i
]
=
new
T
[
blockSize
];
}
...
...
@@ -110,7 +111,7 @@ inline void Foam::LongList<T, Offset>::allocateSize(const label s)
template
<
class
T
,
Foam
::
label
Offset
>
void
Foam
::
LongList
<
T
,
Offset
>::
clearOut
()
{
for
(
register
label
i
=
0
;
i
<
numBlocks_
;
++
i
)
for
(
label
i
=
0
;
i
<
numBlocks_
;
++
i
)
delete
[]
dataPtr_
[
i
];
if
(
dataPtr_
)
...
...
@@ -281,7 +282,7 @@ inline void Foam::LongList<T, Offset>::appendIfNotIn(const T& e)
template
<
class
T
,
Foam
::
label
Offset
>
inline
bool
Foam
::
LongList
<
T
,
Offset
>::
contains
(
const
T
&
e
)
const
{
for
(
register
label
i
=
0
;
i
<
nextFree_
;
++
i
)
for
(
label
i
=
0
;
i
<
nextFree_
;
++
i
)
if
(
(
*
this
)[
i
]
==
e
)
return
true
;
...
...
@@ -294,7 +295,7 @@ inline Foam::label Foam::LongList<T, Offset>::containsAtPosition
const
T
&
e
)
const
{
for
(
register
label
i
=
0
;
i
<
nextFree_
;
++
i
)
for
(
label
i
=
0
;
i
<
nextFree_
;
++
i
)
if
(
(
*
this
)[
i
]
==
e
)
return
i
;
...
...
@@ -376,7 +377,7 @@ inline T& Foam::LongList<T, Offset>::newElmt(const label i)
template
<
class
T
,
Foam
::
label
Offset
>
inline
void
Foam
::
LongList
<
T
,
Offset
>::
operator
=
(
const
T
&
t
)
{
for
(
register
label
i
=
0
;
i
<
nextFree_
;
++
i
)
for
(
label
i
=
0
;
i
<
nextFree_
;
++
i
)
operator
[](
i
)
=
t
;
}
...
...
@@ -384,7 +385,8 @@ template<class T, Foam::label Offset>
inline
void
Foam
::
LongList
<
T
,
Offset
>::
operator
=
(
const
LongList
<
T
,
Offset
>&
l
)
{
setSize
(
l
.
size
());
for
(
register
label
i
=
0
;
i
<
l
.
nextFree_
;
++
i
)
for
(
label
i
=
0
;
i
<
l
.
nextFree_
;
++
i
)
operator
[](
i
)
=
l
[
i
];
}
...
...
meshLibrary/utilities/containers/VRWGraph/VRWGraph.C
View file @
17c26778
...
...
@@ -35,22 +35,29 @@ Foam::Ostream& Foam::operator<<
const
Foam
::
VRWGraph
&
DL
)
{
os
<<
DL
.
size
()
<<
nl
<<
token
::
BEGIN_LIST
;
for
(
register
label
i
=
0
;
i
<
DL
.
size
();
++
i
)
os
<<
DL
.
size
()
<<
nl
<<
token
::
BEGIN_LIST
<<
nl
;
for
(
label
i
=
0
;
i
<
DL
.
size
();
++
i
)
{
os
<<
nl
<<
DL
.
sizeOfRow
(
i
)
<<
token
::
BEGIN_LIST
;
os
<<
DL
.
sizeOfRow
(
i
)
<<
token
::
BEGIN_LIST
;
for
(
label
j
=
0
;
j
<
DL
.
sizeOfRow
(
i
);
++
j
)
{
if
(
j
>
0
)
os
<<
token
::
SPACE
;
if
(
j
)
os
<<
token
::
SPACE
;
os
<<
DL
(
i
,
j
);
}
os
<<
token
::
END_LIST
;
os
<<
token
::
END_LIST
<<
nl
;
}
os
<<
nl
<<
token
::
END_LIST
;
os
<<
token
::
END_LIST
;
// Check state of IOstream
os
.
check
(
"Foam::Ostream& Foam::operator<<(Foam::Ostream&, const Foam::VRWGraph&)"
);
return
os
;
}
...
...
@@ -90,14 +97,14 @@ void Foam::VRWGraph::optimizeMemoryUsage()
{
newPosForNode
[
elI
]
=
-
1
;
}
//- create new data
for
(
label
elI
=
0
;
elI
<
nElements
;
++
elI
)
if
(
(
newPosForNode
[
elI
]
!=
-
1
)
&&
(
newPosForNode
[
elI
]
<
elI
)
)
data_
[
newPosForNode
[
elI
]]
=
data_
[
elI
];
data_
.
setSize
(
pos
);
//- renumber rows
nElements
=
rows_
.
size
();
for
(
label
rowI
=
0
;
rowI
<
nElements
;
++
rowI
)
...
...
meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H
View file @
17c26778
...
...
@@ -518,7 +518,7 @@ inline bool Foam::VRWGraph::contains
return
false
;
const
label
size
=
rows_
[
rowI
].
size
();
for
(
register
label
i
=
0
;
i
<
size
;
++
i
)
for
(
label
i
=
0
;
i
<
size
;
++
i
)
if
(
data_
[
start
+
i
]
==
e
)
return
true
;
...
...
@@ -536,7 +536,8 @@ inline Foam::label Foam::VRWGraph::containsAtPosition
return
-
1
;
const
label
size
=
rows_
[
rowI
].
size
();
for
(
register
label
i
=
0
;
i
<
size
;
++
i
)
for
(
label
i
=
0
;
i
<
size
;
++
i
)
if
(
data_
[
start
+
i
]
==
e
)
return
i
;
...
...
meshLibrary/utilities/containers/VRWGraphList/VRWGraphList.C
View file @
17c26778
...
...
@@ -36,13 +36,21 @@ Foam::Ostream& Foam::operator<<
)
{
os
<<
DL
.
size
()
<<
nl
<<
token
::
BEGIN_LIST
;
for
(
register
label
i
=
0
;
i
<
DL
.
size
();
++
i
)
for
(
label
i
=
0
;
i
<
DL
.
size
();
++
i
)
{
os
<<
nl
<<
DL
[
i
];
}
os
<<
nl
<<
token
::
END_LIST
;
// Check state of IOstream
os
.
check
(
"Foam::Ostream& Foam::operator<<"
"(Foam::Ostream&, const Foam::VRWGraphList&)"
);
return
os
;
}
...
...
meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C
View file @
17c26778
...
...
@@ -162,7 +162,7 @@ void decomposeCells::createPointsAndCellFaces(const boolList& decomposeCell)
}
}
void
decomposeCells
::
storeBoundaryFaces
(
const
boolList
&
decomposeCell
)
void
decomposeCells
::
storeBoundaryFaces
(
const
boolList
&
/*decomposeCell*/
)
{
meshSurfaceEngine
mse
(
mesh_
);
const
faceList
::
subList
&
bFaces
=
mse
.
boundaryFaces
();
...
...
meshLibrary/utilities/decomposeCells/decomposeCellsPyramids.C
View file @
17c26778
...
...
@@ -127,9 +127,9 @@ void decomposeCells::findAddressingForCell
label
decomposeCells
::
findTopVertex
(
const
label
cellI
,
const
DynList
<
label
,
32
>&
vrt
,
const
DynList
<
edge
,
64
>&
edges
,
const
DynList
<
DynList
<
label
,
2
>
,
64
>&
edgeFaces
const
DynList
<
label
,
32
>&
/*vrt*/
,
const
DynList
<
edge
,
64
>&
/*edges*/
,
const
DynList
<
DynList
<
label
,
2
>
,
64
>&
/*edgeFaces*/
)
{
const
cell
&
c
=
mesh_
.
cells
()[
cellI
];
...
...
meshLibrary/utilities/faceDecomposition/decomposeFaces.C
View file @
17c26778
...
...
@@ -370,7 +370,7 @@ void decomposeFaces::decomposeConcaveInternalFaces
# endif
//- decompose internal faces
for
(
register
label
faceI
=
0
;
faceI
<
nIntFaces
;
++
faceI
)
for
(
label
faceI
=
0
;
faceI
<
nIntFaces
;
++
faceI
)
{
const
face
&
f
=
faces
[
faceI
];
...
...
meshLibrary/utilities/helperClasses/parallelHelpers/parPartTet/parPartTet.H
View file @
17c26778
...
...
@@ -87,7 +87,7 @@ public:
return
pts_
[
i
];
}
inline
bool
operator
!=
(
const
parPartTet
&
ptf
)
const
inline
bool
operator
!=
(
const
parPartTet
&
/*ptf*/
)
const
{
Serr
<<
"Not implemented"
<<
endl
;
::
exit
(
1
);
...
...
meshLibrary/utilities/helperClasses/parallelHelpers/parTriFace/parTriFace.H
View file @
17c26778
...
...
@@ -99,12 +99,10 @@ class parTriFace
// Member operators
inline
bool
operator
!=
(
const
parTriFace
&
ptf
)
const
inline
bool
operator
!=
(
const
parTriFace
&
/*ptf*/
)
const
{
Serr
<<
"parTriFace::operator!= Not implemented"
<<
endl
;
::
exit
(
1
);
return
true
;
}
// Friend operators
...
...
meshLibrary/utilities/meshes/partTetMesh/partTetMeshParallelAddressing.C
View file @
17c26778
...
...
@@ -46,8 +46,8 @@ namespace Foam
void
partTetMesh
::
createParallelAddressing
(
const
labelLongList
&
nodeLabelForPoint
,
const
labelLongList
&
nodeLabelForFace
,
const
labelLongList
&
nodeLabelForCell
const
labelLongList
&
/*nodeLabelForFace*/
,
const
labelLongList
&
/*nodeLabelForCell*/
)
{
//- vertices marked as SMOOTH and BOUNDARY are used by the smoother
...
...
meshLibrary/utilities/meshes/partTriMesh/partTriMeshParallelAddressing.C
View file @
17c26778
...
...
@@ -47,7 +47,7 @@ namespace Foam
void
partTriMesh
::
createParallelAddressing
(
const
labelList
&
nodeLabelForPoint
,
const
labelList
&
nodeLabelForFace
const
labelList
&
/*nodeLabelForFace*/
)
{
const
meshSurfaceEngine
&
mse
=
mPart_
.
surfaceEngine
();
...
...
meshLibrary/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.C
View file @
17c26778
...
...
@@ -90,7 +90,7 @@ void processorBoundaryPatch::write(Ostream& os) const
this
->
operator
<<
(
os
);
}
void
processorBoundaryPatch
::
writeDict
(
Ostream
&
os
)
const
void
processorBoundaryPatch
::
writeDict
(
Ostream
&
/*os*/
)
const
{
}
...
...
meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C
View file @
17c26778
...
...
@@ -1606,10 +1606,10 @@ void checkVolumeUniformity
bool
checkVolumeUniformity
(
const
polyMeshGen
&
,
const
bool
report
,
const
scalar
warnUniform
,
labelHashSet
*
setPtr
,
const
boolList
*
changedFacePtr
const
bool
/*report*/
,
const
scalar
/*warnUniform*/
,
labelHashSet
*
/*setPtr*/
,
const
boolList
*
/*changedFacePtr*/
)
{
...
...
@@ -2122,7 +2122,7 @@ label findWorstQualityFaces
(
const
polyMeshGen
&
mesh
,
labelHashSet
&
badFaces
,
const
bool
report
,
const
bool
/*report*/
,
const
boolList
*
activeFacePtr
,
const
scalar
relativeThreshold
)
...
...
meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C
View file @
17c26778
...
...
@@ -187,7 +187,7 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace)
neiProcNo
[
npI
]
=
procBoundaries
[
patchI
].
neiProcNo
();
nFacesInPatch
[
npI
]
=
0
;
for
(
register
label
faceI
=
0
;
faceI
<
oldNumFacesInPatch
;
++
faceI
)
for
(
label
faceI
=
0
;
faceI
<
oldNumFacesInPatch
;
++
faceI
)
{
if
(
!
removeFace
[
oldStart
+
faceI
]
&&
...
...
meshLibrary/utilities/meshes/triSurf/triSurfAddressing.C
View file @
17c26778
...
...
@@ -81,28 +81,22 @@ void triSurfAddressing::calculateEdges() const
const
label
triI
=
pFacets
(
pI
,
pfI
);
const
labelledTri
&
tri
=
facets_
[
triI
];
label
pos
(
-
1
);
forAll
(
tri
,
i
)
{
if
(
tri
[
i
]
==
pI
)
{
pos
=
i
;
if
(
tri
[(
pos
+
1
)
%
3
]
>=
pI
)
if
(
tri
[(
i
+
1
)
%
3
]
>=
pI
)
edgesAtPoint
.
insert
(
std
::
make_pair
(
pI
,
tri
[(
pos
+
1
)
%
3
])
std
::
make_pair
(
pI
,
tri
[(
i
+
1
)
%
3
])
);
if
(
tri
[(
pos
+
2
)
%
3
]
>=
pI
)
if
(
tri
[(
i
+
2
)
%
3
]
>=
pI
)
edgesAtPoint
.
insert
(
std
::
make_pair
(
pI
,
tri
[(
pos
+
2
)
%
3
])