zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

initial changes to compile src

Browse Source
This commit is contained in:
mattijs
2009-08-04 18:32:32 +01:00
parent 2dbf42085d
commit 3ca538421d
71 changed files with 3561 additions and 2713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
View File

@ -300,7 +300,11 @@ label mergePatchFaces
const faceZone& fZone = mesh.faceZones()[zoneID];
zoneFlip = fZone.flipMap()[fZone.whichFace(newMasterI)];
}
label patchI = mesh.boundaryMesh().whichPatch(newMasterI);
labelPair patchIDs = polyTopoChange::whichPatch
(
mesh.boundaryMesh(),
newMasterI
);
Pout<< "Restoring new master face " << newMasterI
@ -316,10 +320,11 @@ label mergePatchFaces
own, // owner
-1, // neighbour
false, // face flip
patchI, // patch for face
patchIDs[0], // patch for face
false, // remove from zone
zoneID, // zone for face
zoneFlip // face flip in zone
zoneFlip, // face flip in zone
patchIDs[1] // subPatch
)
);
@ -341,9 +346,10 @@ label mergePatchFaces
-1, // masterEdgeID,
newMasterI, // masterFaceID,
false, // flipFaceFlux,
patchI, // patchID,
patchIDs[0], // patchID,
zoneID, // zoneID,
zoneFlip // zoneFlip
zoneFlip, // zoneFlip
patchIDs[1] // subPatch
)
);
}

73
applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "cellSplitter.H"
@ -51,17 +49,12 @@ defineTypeNameAndDebug(cellSplitter, 0);
void Foam::cellSplitter::getFaceInfo
(
const label faceI,
label& patchID,
labelPair& patchIDs,
label& zoneID,
label& zoneFlip
) const
{
patchID = -1;
if (!mesh_.isInternalFace(faceI))
{
patchID = mesh_.boundaryMesh().whichPatch(faceI);
}
patchIDs = polyTopoChange::whichPatch(mesh_.boundaryMesh(), faceI);
zoneID = mesh_.faceZones().whichZone(faceI);
@ -172,17 +165,16 @@ void Foam::cellSplitter::setRefinement
label anchorPoint = mesh_.cellPoints()[cellI][0];
label addedPointI =
meshMod.setAction
label addedPointI = meshMod.setAction
(
polyAddPoint
(
polyAddPoint
(
iter(), // point
anchorPoint, // master point
-1, // zone for point
true // supports a cell
)
);
iter(), // point
anchorPoint, // master point
-1, // zone for point
true // supports a cell
)
);
addedPoints_.insert(cellI, addedPointI);
//Pout<< "Added point " << addedPointI
@ -212,18 +204,17 @@ void Foam::cellSplitter::setRefinement
// Add other pyramids
for (label i = 1; i < cFaces.size(); i++)
{
label addedCellI =
meshMod.setAction
label addedCellI = meshMod.setAction
(
polyAddCell
(
polyAddCell
(
-1, // master point
-1, // master edge
-1, // master face
cellI, // master cell
-1 // zone
)
);
-1, // master point
-1, // master edge
-1, // master face
cellI, // master cell
-1 // zone
)
);
newCells[i] = addedCellI;
}
@ -310,7 +301,8 @@ void Foam::cellSplitter::setRefinement
false, // flux flip
-1, // patch for face
-1, // zone for face
false // face zone flip
false, // face zone flip
-1 // subPatch
)
);
}
@ -356,7 +348,8 @@ void Foam::cellSplitter::setRefinement
false, // flux flip
-1, // patch for face
-1, // zone for face
false // face zone flip
false, // face zone flip
-1 // subPatch
)
);
}
@ -411,7 +404,8 @@ void Foam::cellSplitter::setRefinement
-1, // patch for face
false, // remove from zone
-1, // zone for face
false // face zone flip
false, // face zone flip
-1 // subPatch
)
);
}
@ -429,7 +423,8 @@ void Foam::cellSplitter::setRefinement
-1, // patch for face
false, // remove from zone
-1, // zone for face
false // face zone flip
false, // face zone flip
-1 // subPatch
)
);
}
@ -439,8 +434,9 @@ void Foam::cellSplitter::setRefinement
{
label newOwn = newOwner(faceI, cellToCells);
label patchID, zoneID, zoneFlip;
getFaceInfo(faceI, patchID, zoneID, zoneFlip);
labelPair patchIDs;
label zoneID, zoneFlip;
getFaceInfo(faceI, patchIDs, zoneID, zoneFlip);
meshMod.setAction
(
@ -451,10 +447,11 @@ void Foam::cellSplitter::setRefinement
newOwn, // owner
-1, // neighbour
false, // flux flip
patchID, // patch for face
patchIDs[0], // patch for face
false, // remove from zone
zoneID, // zone for face
zoneFlip // face zone flip
zoneFlip, // face zone flip
patchIDs[1]
)
);
}

3
applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
View File

@ -39,6 +39,7 @@ SourceFiles
#include "Map.H"
#include "edge.H"
#include "labelPair.H"
#include "typeInfo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -73,7 +74,7 @@ class cellSplitter
void getFaceInfo
(
const label faceI,
label& patchID,
labelPair& patchIDs,
label& zoneID,
label& zoneFlip
) const;

24
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
View File

@ -1124,7 +1124,8 @@ int main(int argc, char *argv[])
false, // flipFaceFlux
-1, // patchID
faceZonei, // zoneID
false // zoneFlip
false, // zoneFlip
-1 // subPatchID
);
// Mark face as being done
@ -1158,7 +1159,8 @@ int main(int argc, char *argv[])
false, // flipFaceFlux
patchi, // patchID
-1, // zoneID
false // zoneFlip
false, // zoneFlip
-1 // subPatchID
);
// For baffles create the opposite face
@ -1175,7 +1177,8 @@ int main(int argc, char *argv[])
false, // flipFaceFlux
patchi, // patchID
-1, // zoneID
false // zoneFlip
false, // zoneFlip
-1 // subPatchID
);
}
@ -1203,13 +1206,14 @@ int main(int argc, char *argv[])
faces[facei],
owner[facei],
neighbour[facei],
-1, //masterPointID
-1, //masterEdgeID
facei, //masterFace
false, //flipFaceFlux
-1, //patchID
-1, //zoneID
false //zoneFlip
-1, // masterPointID
-1, // masterEdgeID
facei, // masterFace
false, // flipFaceFlux
-1, // patchID
-1, // zoneID
false, // zoneFlip
-1 // subPatchID
);
}
}

12
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C
View File

@ -136,7 +136,8 @@ void Foam::extrude2DMesh::setRefinement
false, // flipFaceFlux
-1, // patchID
zoneID, // zoneID
zoneFlip // zoneFlip
zoneFlip, // zoneFlip
-1 // subPatchID
);
}
@ -173,7 +174,8 @@ void Foam::extrude2DMesh::setRefinement
false, // flipFaceFlux
patchI, // patchID
zoneID, // zoneID
zoneFlip // zoneFlip
zoneFlip, // zoneFlip
-1 //?TBD subPatchID
);
}
}
@ -236,7 +238,8 @@ void Foam::extrude2DMesh::setRefinement
false, // flipFaceFlux
frontPatchI, // patchID
-1, // zoneID
false // zoneFlip
false, // zoneFlip
-1 //?TDB subPatchID
);
// Offset to create front face.
@ -255,7 +258,8 @@ void Foam::extrude2DMesh::setRefinement
false, // flipFaceFlux
frontPatchI, // patchID
-1, // zoneID
false // zoneFlip
false, // zoneFlip
-1 //?TDB subPatchID
);
}
}

1
applications/utilities/mesh/generation/snappyHexMesh/Make/options
View File

@ -9,5 +9,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-L$(FOAM_MPI_LIBBIN) -lparMetisDecompositionMethod \
-lautoMesh