mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge commit 'OpenCFD/master' into olesenm
This commit is contained in:
@ -89,11 +89,13 @@ using namespace Foam;
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
argList::validArgs.append("Neutral file");
|
||||
argList::validOptions.insert("overwrite", "");
|
||||
|
||||
# include "setRootCase.H"
|
||||
# include "createTime.H"
|
||||
|
||||
fileName neuFile(args.additionalArgs()[0]);
|
||||
bool overwrite = args.options().found("overwrite");
|
||||
|
||||
|
||||
IFstream str(neuFile);
|
||||
@ -298,7 +300,10 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
|
||||
runTime++;
|
||||
if (!overwrite)
|
||||
{
|
||||
runTime++;
|
||||
}
|
||||
|
||||
polyMesh mesh
|
||||
(
|
||||
@ -321,7 +326,7 @@ int main(int argc, char *argv[])
|
||||
Info<< "Writing mesh to " << runTime.constant() << endl << endl;
|
||||
|
||||
mesh.write();
|
||||
|
||||
|
||||
|
||||
Info<< "End\n" << endl;
|
||||
|
||||
|
||||
@ -43,12 +43,14 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
argList::noParallel();
|
||||
argList::validArgs.append("feature angle[0-180]");
|
||||
argList::validOptions.insert("overwrite", "");
|
||||
|
||||
# include "setRootCase.H"
|
||||
# include "createTime.H"
|
||||
# include "createPolyMesh.H"
|
||||
|
||||
scalar featureAngle(readScalar(IStringStream(args.additionalArgs()[0])()));
|
||||
bool overwrite = args.options().found("overwrite");
|
||||
|
||||
scalar minCos = Foam::cos(featureAngle * mathematicalConstant::pi/180.0);
|
||||
|
||||
@ -58,7 +60,10 @@ int main(int argc, char *argv[])
|
||||
|
||||
polyDualMesh dualMesh(mesh, minCos);
|
||||
|
||||
runTime++;
|
||||
if (!overwrite)
|
||||
{
|
||||
runTime++;
|
||||
}
|
||||
|
||||
Pout<< "Writing dualMesh to " << runTime.timeName() << endl;
|
||||
|
||||
|
||||
@ -75,12 +75,14 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
argList::validArgs.append("file prefix");
|
||||
argList::validOptions.insert("noFaceFile", "");
|
||||
argList::validOptions.insert("overwrite", "");
|
||||
|
||||
# include "setRootCase.H"
|
||||
# include "createTime.H"
|
||||
|
||||
|
||||
bool readFaceFile = !args.options().found("noFaceFile");
|
||||
bool overwrite = args.options().found("overwrite");
|
||||
|
||||
fileName prefix(args.additionalArgs()[0]);
|
||||
|
||||
@ -244,7 +246,7 @@ int main(int argc, char *argv[])
|
||||
<< "Element attributes (third elemenent in .ele header)"
|
||||
<< " not used" << endl;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
const cellModel& tet = *(cellModeller::lookup("tet"));
|
||||
@ -438,7 +440,7 @@ int main(int argc, char *argv[])
|
||||
word defaultFacesType = polyPatch::typeName;
|
||||
wordList patchPhysicalTypes(nPatches, polyPatch::typeName);
|
||||
|
||||
|
||||
|
||||
if (readFaceFile)
|
||||
{
|
||||
// Sort boundaryFaces by patch using boundaryPatch.
|
||||
@ -464,7 +466,10 @@ int main(int argc, char *argv[])
|
||||
Info<< endl;
|
||||
}
|
||||
|
||||
runTime++;
|
||||
if (!overwrite)
|
||||
{
|
||||
runTime++;
|
||||
}
|
||||
|
||||
polyMesh mesh
|
||||
(
|
||||
@ -487,7 +492,7 @@ int main(int argc, char *argv[])
|
||||
Info<< "Writing mesh to " << runTime.constant() << endl << endl;
|
||||
|
||||
mesh.write();
|
||||
|
||||
|
||||
|
||||
Info<< "End\n" << endl;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user