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

ENH: Use IOdictionary instead of dictionary

Browse Source
This commit is contained in:
andy
2011-12-12 11:20:59 +00:00
parent 02c96d5629
commit 547dfe2d7c
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2007-2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -47,7 +47,6 @@ Description
using namespace Foam; using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -62,9 +61,23 @@ int main(int argc, char *argv[])
// Read control dictionary // Read control dictionary
// ~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~
dictionary controlDict(IFstream("system/" + args.executable() + "Dict")()); IOdictionary controlDict
dictionary shortEdgeFilterDict(controlDict.subDict("shortEdgeFilter")); (
dictionary extrusionDict(controlDict.subDict("extrusion")); IOobject
(
args.executable() + "Dict",
runTime.system(),
runTime,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
const dictionary& shortEdgeFilterDict
(
controlDict.subDict("shortEdgeFilter")
);
const dictionary& extrusionDict(controlDict.subDict("extrusion"));
Switch extrude(extrusionDict.lookup("extrude")); Switch extrude(extrusionDict.lookup("extrude"));
const bool overwrite = args.optionFound("overwrite"); const bool overwrite = args.optionFound("overwrite");
@ -97,17 +110,16 @@ int main(int argc, char *argv[])
while (runTime.loop()) while (runTime.loop())
{ {
Info<< nl << "Time = " << runTime.timeName() << endl; Info<< nl << "Time = " << runTime.timeName() << nl
<< "Relaxation = " << relax->relaxation() << endl;
Info<< "Relaxation = " << relax->relaxation() << endl;
mesh.newPoints(relax->relaxation()); mesh.newPoints(relax->relaxation());
} }
mesh.write(); mesh.write();
Info<< "Finished Delaunay in = " Info<< "Finished Delaunay in = " << runTime.cpuTimeIncrement() << " s."
<< runTime.cpuTimeIncrement() << " s." << endl; << endl;
Info<< "Begin filtering short edges:" << endl; Info<< "Begin filtering short edges:" << endl;
shortEdgeFilter2D sef(mesh, shortEdgeFilterDict); shortEdgeFilter2D sef(mesh, shortEdgeFilterDict);
@ -120,8 +132,8 @@ int main(int argc, char *argv[])
Info<< "Write .obj file of the 2D mesh: MeshedSurface.obj" << endl; Info<< "Write .obj file of the 2D mesh: MeshedSurface.obj" << endl;
sef.fMesh().write("MeshedSurface.obj"); sef.fMesh().write("MeshedSurface.obj");
Info<< "Finished filtering in = " Info<< "Finished filtering in = " << runTime.cpuTimeIncrement() << " s."
<< runTime.cpuTimeIncrement() << " s." << endl; << endl;
Info<< "Begin constructing a polyMesh:" << endl; Info<< "Begin constructing a polyMesh:" << endl;