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

Merge commit 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2009-12-03 16:40:37 +01:00
parent 192c0e56a1 3e2425b72b
commit 6e3ed58ae5
18 changed files with 138 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C
View File

@ -89,7 +89,7 @@ int main(int argc, char *argv[])
// ~~~~~~~~~~~~~~~~~~~~~~
scalar minRange = GREAT;
direction extrudeDir = -1;
direction extrudeDir = 4; //illegal value.
for (direction dir = 0; dir < 3; dir++)
{

94
applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
View File

@ -36,9 +36,10 @@ Description
- mesh with cells put into cellZones (-makeCellZones)
Note:
- Should work in parallel but cellZone interfaces cannot align with
processor boundaries so use the correct option in decomposition to
preserve those interfaces.
- Should work in parallel.
cellZones can differ on either side of processor boundaries in which case
the faces get moved from processor patch to directMapped patch. Not
ery well tested.
- If a cell zone gets split into more than one region it can detect
the largest matching region (-sloppyCellZones). This will accept any
region that covers more than 50% of the zone. It has to be a subset
@ -514,6 +515,10 @@ void getInterfaceSizes
EdgeMap<label>& interfaceSizes
)
{
// Internal faces
// ~~~~~~~~~~~~~~
forAll(mesh.faceNeighbour(), faceI)
{
label ownRegion = cellRegion[mesh.faceOwner()[faceI]];
@ -540,6 +545,47 @@ void getInterfaceSizes
}
}
// Boundary faces
// ~~~~~~~~~~~~~~
// Neighbour cellRegion.
labelList coupledRegion(mesh.nFaces()-mesh.nInternalFaces());
forAll(coupledRegion, i)
{
label cellI = mesh.faceOwner()[i+mesh.nInternalFaces()];
coupledRegion[i] = cellRegion[cellI];
}
syncTools::swapBoundaryFaceList(mesh, coupledRegion, false);
forAll(coupledRegion, i)
{
label faceI = i+mesh.nInternalFaces();
label ownRegion = cellRegion[mesh.faceOwner()[faceI]];
label neiRegion = coupledRegion[i];
if (ownRegion != neiRegion)
{
edge interface
(
min(ownRegion, neiRegion),
max(ownRegion, neiRegion)
);
EdgeMap<label>::iterator iter = interfaceSizes.find(interface);
if (iter != interfaceSizes.end())
{
iter()++;
}
else
{
interfaceSizes.insert(interface, 1);
}
}
}
if (sumParallel && Pstream::parRun())
{
if (Pstream::master())
@ -672,6 +718,17 @@ autoPtr<mapPolyMesh> createRegionMesh
}
// Neighbour cellRegion.
labelList coupledRegion(mesh.nFaces()-mesh.nInternalFaces());
forAll(coupledRegion, i)
{
label cellI = mesh.faceOwner()[i+mesh.nInternalFaces()];
coupledRegion[i] = cellRegion[cellI];
}
syncTools::swapBoundaryFaceList(mesh, coupledRegion, false);
// Topology change container. Start off from existing mesh.
polyTopoChange meshMod(mesh);
@ -691,16 +748,17 @@ autoPtr<mapPolyMesh> createRegionMesh
{
label faceI = exposedFaces[i];
if (!mesh.isInternalFace(faceI))
{
FatalErrorIn("createRegionMesh(..)")
<< "Exposed face:" << faceI << " is not an internal face."
<< " fc:" << mesh.faceCentres()[faceI]
<< exit(FatalError);
}
label ownRegion = cellRegion[mesh.faceOwner()[faceI]];
label neiRegion = cellRegion[mesh.faceNeighbour()[faceI]];
label neiRegion = -1;
if (mesh.isInternalFace(faceI))
{
neiRegion = cellRegion[mesh.faceNeighbour()[faceI]];
}
else
{
neiRegion = coupledRegion[faceI-mesh.nInternalFaces()];
}
label otherRegion = -1;
@ -1357,22 +1415,14 @@ int main(int argc, char *argv[])
}
}
// Different cellZones on either side of processor patch are not
// allowed for now. Convert to processorPatches or what?
// Different cellZones on either side of processor patch.
forAll(neiZoneID, i)
{
label faceI = i+mesh.nInternalFaces();
if (zoneID[mesh.faceOwner()[faceI]] != neiZoneID[i])
{
//blockedFace[faceI] = true;
FatalErrorIn(args.executable())
<< "Coupled face " << faceI
<< " fc:" << mesh.faceCentres()[faceI]
<< " has cellZone " << zoneID[mesh.faceOwner()[faceI]]
<< " on owner side but cellZone " << neiZoneID[i]
<< " on other side. This is not allowed."
<< exit(FatalError);
blockedFace[faceI] = true;
}
}
}

30
applications/utilities/miscellaneous/foamDebugSwitches/Make/options
View File

@ -1,43 +1,59 @@
EXE_LIBS = \
-lautoMesh \
-lbarotropicCompressibilityModel \
-lbasicThermophysicalModels \
-lblockMesh \
-lchemistryModel \
-lreactionThermophysicalModels \
-lcoalCombustion \
-lcompressibleLESModels \
-lcompressibleRASModels \
-lcompressibleTurbulenceModel \
-lconversion \
-ldecompositionMethods \
-ldieselSpray \
-ldsmc \
-ldynamicFvMesh \
-ldynamicMesh \
-ledgeMesh \
-lengine \
-lerrorEstimation \
-lfieldFunctionObjects \
-lfiniteVolume \
-lforces \
-lfvMotionSolvers \
-lgenericPatchFields \
-lincompressibleLESModels \
-lincompressibleTransportModels \
-lcompressibleRASModels \
-lincompressibleRASModels \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-linterfaceProperties \
-llagrangianIntermediate \
-lIOFunctionObjects \
-llagrangian \
-llagrangianIntermediate \
-llaminarFlameSpeedModels \
-lLESdeltas \
-lLESfilters \
-lliquidMixture \
-lliquids \
-lmeshTools \
-lmolecularMeasurements \
-lmolecule \
-lODE \
-lOpenFOAM \
-lpdf \
-lphaseModel \
-lpotential \
-lradiation \
-lrandomProcesses \
-lreactionThermophysicalModels \
-lsampling \
-lsolidMixture \
-lsolidParticle \
-lsolids \
-lspecie \
-lsurfMesh \
-lsystemCall \
-lthermalPorousZone \
-lthermophysicalFunctions \
-ltopoChangerFvMesh \
-ltriSurface \
-lautoMesh \
-lblockMesh
-lutilityFunctionObjects

2
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
View File

@ -57,6 +57,7 @@ class argList;
class ensightMesh
{
public:
class nFacePrimitives
{
public:
@ -75,6 +76,7 @@ class ensightMesh
{}
};
private:
// Private data

20
applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
View File

@ -797,7 +797,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vsf[i])(),
linearInterpolate(vsf[i])(),
faceLabels
)()
);
@ -808,7 +808,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vvf[i])(),
linearInterpolate(vvf[i])(),
faceLabels
)()
);
@ -819,7 +819,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vSpheretf[i])(),
linearInterpolate(vSpheretf[i])(),
faceLabels
)()
);
@ -830,7 +830,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vSymmtf[i])(),
linearInterpolate(vSymmtf[i])(),
faceLabels
)()
);
@ -841,7 +841,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vtf[i])(),
linearInterpolate(vtf[i])(),
faceLabels
)()
);
@ -1094,7 +1094,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vsf[i])(),
linearInterpolate(vsf[i])(),
pp
)()
);
@ -1105,7 +1105,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vvf[i])(),
linearInterpolate(vvf[i])(),
pp
)()
);
@ -1116,7 +1116,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vSpheretf[i])(),
linearInterpolate(vSpheretf[i])(),
pp
)()
);
@ -1127,7 +1127,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vSymmtf[i])(),
linearInterpolate(vSymmtf[i])(),
pp
)()
);
@ -1138,7 +1138,7 @@ int main(int argc, char *argv[])
(
writer.getFaceField
(
fvc::interpolate(vtf[i])(),
linearInterpolate(vtf[i])(),
pp
)()
);