Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
86602859
Commit
86602859
authored
Dec 12, 2008
by
henry
Browse files
Merge branch 'master' of
ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev
parents
1d22ab65
c7a0f553
Changes
6
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/PDRFoam/Make/options
View file @
86602859
...
...
@@ -9,7 +9,8 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
...
...
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
View file @
86602859
...
...
@@ -292,6 +292,7 @@ meshQualityControls
minFlatness 0.5;
//- Minimum pyramid volume. Is absolute volume of cell pyramid.
// Set to a sensible fraction of the smallest cell volume expected.
// Set to very negative number (e.g. -1E30) to disable.
minVol 1e-13;
...
...
src/Pstream/Allwmake
View file @
86602859
...
...
@@ -5,7 +5,7 @@ set -x
wmake libso dummy
case
"
$WM_MPLIB
"
in
LAM
|
OPENMPI
|
MPI
|
MPICH
|
MPICH-GM
|
HPMPI
|
MPIGAMMA
)
LAM
|
OPENMPI
|
MPI
|
MPICH
|
MPICH-GM
|
HPMPI
)
export
WM_OPTIONS
=
${
WM_OPTIONS
}
$WM_MPLIB
set
+x
echo
...
...
src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
View file @
86602859
...
...
@@ -205,7 +205,7 @@ Foam::label Foam::meshRefinement::getBafflePatch
WarningIn
(
"meshRefinement::getBafflePatch(const labelList& const label)"
"meshRefinement::getBafflePatch(const labelList&
,
const label)"
)
<<
"Could not find boundary face neighbouring internal face "
<<
faceI
<<
" with face centre "
<<
mesh_
.
faceCentres
()[
faceI
]
<<
nl
...
...
@@ -1854,16 +1854,15 @@ void Foam::meshRefinement::findCellZoneTopo
{
break
;
}
}
// Synchronise regionToCellZone.
// Note:
// - region numbers are identical on all processors
// - keepRegion is identical ,,
// - cellZones are identical ,,
Pstream
::
listCombineGather
(
regionToCellZone
,
maxEqOp
<
label
>
());
Pstream
::
listCombineScatter
(
regionToCellZone
);
// Synchronise regionToCellZone.
// Note:
// - region numbers are identical on all processors
// - keepRegion is identical ,,
// - cellZones are identical ,,
Pstream
::
listCombineGather
(
regionToCellZone
,
maxEqOp
<
label
>
());
Pstream
::
listCombineScatter
(
regionToCellZone
);
}
forAll
(
regionToCellZone
,
regionI
)
...
...
src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
View file @
86602859
...
...
@@ -70,7 +70,7 @@ void Foam::topoCellLooper::subsetList
<<
"startI:"
<<
startI
<<
" freeI:"
<<
freeI
<<
" lst:"
<<
lst
<<
abort
(
FatalError
);
}
lst
.
set
Size
(
freeI
);
lst
.
set
Capacity
(
freeI
);
}
else
{
...
...
@@ -88,7 +88,7 @@ void Foam::topoCellLooper::subsetList
<<
" lst:"
<<
lst
<<
abort
(
FatalError
);
}
lst
.
set
Size
(
freeI
-
startI
);
lst
.
set
Capacity
(
freeI
-
startI
);
}
}
...
...
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
View file @
86602859
...
...
@@ -734,25 +734,21 @@ void Foam::polyTopoChange::reorderCompactFaces
)
{
reorder
(
oldToNew
,
faces_
);
faces_
.
setSize
(
newSize
);
faces_
.
shrink
();
faces_
.
setCapacity
(
newSize
);
reorder
(
oldToNew
,
region_
);
region_
.
setSize
(
newSize
);
region_
.
shrink
();
region_
.
setCapacity
(
newSize
);
reorder
(
oldToNew
,
faceOwner_
);
faceOwner_
.
setSize
(
newSize
);
faceOwner_
.
shrink
();
faceOwner_
.
setCapacity
(
newSize
);
reorder
(
oldToNew
,
faceNeighbour_
);
faceNeighbour_
.
setSize
(
newSize
);
faceNeighbour_
.
shrink
();
faceNeighbour_
.
setCapacity
(
newSize
);
// Update faceMaps.
reorder
(
oldToNew
,
faceMap_
);
faceMap_
.
set
Size
(
newSize
);
faceMap_
.
shrink
();
faceMap_
.
set
Capacity
(
newSize
);
renumberReverseMap
(
oldToNew
,
reverseFaceMap_
);
renumberKey
(
oldToNew
,
faceFromPoint_
);
...
...
@@ -932,13 +928,11 @@ void Foam::polyTopoChange::compact
}
reorder
(
localPointMap
,
points_
);
points_
.
setSize
(
newPointI
);
points_
.
shrink
();
points_
.
setCapacity
(
newPointI
);
// Update pointMaps
reorder
(
localPointMap
,
pointMap_
);
pointMap_
.
setSize
(
newPointI
);
pointMap_
.
shrink
();
pointMap_
.
setCapacity
(
newPointI
);
renumberReverseMap
(
localPointMap
,
reversePointMap_
);
renumberKey
(
localPointMap
,
pointZone_
);
...
...
@@ -1038,13 +1032,11 @@ void Foam::polyTopoChange::compact
if
(
orderCells
||
(
newCellI
!=
cellMap_
.
size
()))
{
reorder
(
localCellMap
,
cellMap_
);
cellMap_
.
setSize
(
newCellI
);
cellMap_
.
shrink
();
cellMap_
.
setCapacity
(
newCellI
);
renumberReverseMap
(
localCellMap
,
reverseCellMap_
);
reorder
(
localCellMap
,
cellZone_
);
cellZone_
.
setSize
(
newCellI
);
cellZone_
.
shrink
();
cellZone_
.
setCapacity
(
newCellI
);
renumberKey
(
localCellMap
,
cellFromPoint_
);
renumberKey
(
localCellMap
,
cellFromEdge_
);
...
...
@@ -2157,9 +2149,9 @@ void Foam::polyTopoChange::addMesh
const
pointField
&
points
=
mesh
.
points
();
const
pointZoneMesh
&
pointZones
=
mesh
.
pointZones
();
//
Resize
points_
.
set
Size
(
points_
.
size
()
+
points
.
size
());
pointMap_
.
set
Size
(
pointMap_
.
size
()
+
points
.
size
());
//
Extend
points_
.
set
Capacity
(
points_
.
size
()
+
points
.
size
());
pointMap_
.
set
Capacity
(
pointMap_
.
size
()
+
points
.
size
());
pointZone_
.
resize
(
pointZone_
.
size
()
+
points
.
size
()
/
100
);
// Precalc offset zones
...
...
@@ -2198,11 +2190,11 @@ void Foam::polyTopoChange::addMesh
// always equals nCells
label
nAllCells
=
mesh
.
nCells
();
cellMap_
.
set
Size
(
cellMap_
.
size
()
+
nAllCells
);
cellMap_
.
set
Capacity
(
cellMap_
.
size
()
+
nAllCells
);
cellFromPoint_
.
resize
(
cellFromPoint_
.
size
()
+
nAllCells
/
100
);
cellFromEdge_
.
resize
(
cellFromEdge_
.
size
()
+
nAllCells
/
100
);
cellFromFace_
.
resize
(
cellFromFace_
.
size
()
+
nAllCells
/
100
);
cellZone_
.
set
Size
(
cellZone_
.
size
()
+
nAllCells
);
cellZone_
.
set
Capacity
(
cellZone_
.
size
()
+
nAllCells
);
// Precalc offset zones
...
...
@@ -2258,11 +2250,11 @@ void Foam::polyTopoChange::addMesh
// Resize
label
nAllFaces
=
mesh
.
faces
().
size
();
faces_
.
set
Size
(
faces_
.
size
()
+
nAllFaces
);
region_
.
set
Size
(
region_
.
size
()
+
nAllFaces
);
faceOwner_
.
set
Size
(
faceOwner_
.
size
()
+
nAllFaces
);
faceNeighbour_
.
set
Size
(
faceNeighbour_
.
size
()
+
nAllFaces
);
faceMap_
.
set
Size
(
faceMap_
.
size
()
+
nAllFaces
);
faces_
.
set
Capacity
(
faces_
.
size
()
+
nAllFaces
);
region_
.
set
Capacity
(
region_
.
size
()
+
nAllFaces
);
faceOwner_
.
set
Capacity
(
faceOwner_
.
size
()
+
nAllFaces
);
faceNeighbour_
.
set
Capacity
(
faceNeighbour_
.
size
()
+
nAllFaces
);
faceMap_
.
set
Capacity
(
faceMap_
.
size
()
+
nAllFaces
);
faceFromPoint_
.
resize
(
faceFromPoint_
.
size
()
+
nAllFaces
/
100
);
faceFromEdge_
.
resize
(
faceFromEdge_
.
size
()
+
nAllFaces
/
100
);
flipFaceFlux_
.
resize
(
flipFaceFlux_
.
size
()
+
nAllFaces
/
100
);
...
...
@@ -3006,9 +2998,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
{
retiredPoints_
.
clear
();
retiredPoints_
.
resize
(
0
);
region_
.
clear
();
region_
.
setSize
(
0
);
region_
.
clearStorage
();
}
...
...
@@ -3072,8 +3062,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
faceZoneFlip_
.
clear
();
faceZoneFlip_
.
resize
(
0
);
cellZone_
.
clear
();
cellZone_
.
setSize
(
0
);
cellZone_
.
clearStorage
();
}
...
...
@@ -3240,8 +3229,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
{
retiredPoints_
.
clear
();
retiredPoints_
.
resize
(
0
);
region_
.
clear
();
region_
.
setSize
(
0
);
region_
.
clearStorage
();
}
...
...
@@ -3368,7 +3356,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
faceZoneFlip_
.
resize
(
0
);
cellZone_
.
clear
();
cellZone_
.
setSiz
e
(
0
);
cellZone_
.
clearStorag
e
();
}
// Patch point renumbering
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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