Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs
2011-06-03 18:11:56 +01:00

View File

@ -1302,13 +1302,32 @@ int main(int argc, char *argv[])
if (oneD) if (oneD)
{ {
// Reuse single empty patch. // Reuse single empty patch.
word patchName = "oneDWedgePatch"; word patchType = dict.lookup("oneDPolyPatchType");
word patchName;
zoneSidePatch[zoneI] = addPatch<wedgePolyPatch> if (patchType == "emptyPolyPatch")
( {
mesh, patchName = "oneDEmptyPatch";
patchName zoneSidePatch[zoneI] = addPatch<emptyPolyPatch>
); (
mesh,
patchName
);
}
else if (patchType == "wedgePolyPatch")
{
patchName = "oneDWedgePatch";
zoneSidePatch[zoneI] = addPatch<wedgePolyPatch>
(
mesh,
patchName
);
}
else
{
FatalErrorIn(args.executable())
<< "Type " << patchType << " does not exist "
<< exit(FatalError);
}
Info<< zoneSidePatch[zoneI] << '\t' << patchName << nl; Info<< zoneSidePatch[zoneI] << '\t' << patchName << nl;
@ -1427,6 +1446,10 @@ int main(int argc, char *argv[])
{ {
ePatches[i] = zoneSidePatch[zoneID[eFaces[i]]]; ePatches[i] = zoneSidePatch[zoneID[eFaces[i]]];
} }
if (eFaces.size() != 2)
{
nonManifoldEdge[edgeI] = 1;
}
} }
else if (eFaces.size() == 2) else if (eFaces.size() == 2)
{ {