Merge branch 'master' into cvm

This commit is contained in:
graham
2009-04-13 13:11:00 +01:00
41 changed files with 1982 additions and 909 deletions

View File

@ -274,6 +274,14 @@ addLayersControls
// Create buffer region for new layer terminations
nBufferCellsNoExtrude 0;
// Overall max number of layer addition iterations
nLayerIter 50;
// Max number of iterations after which relaxed meshQuality controls
// get used.
nRelaxedIter 20;
}
@ -335,6 +343,16 @@ meshQualityControls
nSmoothScale 4;
//- amount to scale back displacement at error points
errorReduction 0.75;
// Optional : some meshing phases allow usage of relaxed rules.
// See e.g. addLayersControls::nRelaxedIter.
relaxed
{
//- Maximum non-orthogonality allowed. Set to 180 to disable.
maxNonOrtho 75;
}
}

View File

@ -171,11 +171,11 @@ int main(int argc, char *argv[])
argList::validArgs.clear();
argList::validArgs.append("surface file");
argList::validOptions.insert("noSelfIntersection", "");
argList::validOptions.insert("checkSelfIntersection", "");
argList::validOptions.insert("verbose", "");
argList args(argc, argv);
bool checkSelfIntersection = !args.options().found("noSelfIntersection");
bool checkSelfIntersection = args.options().found("checkSelfIntersection");
bool verbose = args.options().found("verbose");
fileName surfFileName(args.additionalArgs()[0]);