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 branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
henry
2008-07-23 17:54:37 +01:00
parent 2a01530fcf db00b5e1ad
commit 4d5ce2ea10
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/utilities/mesh/generation/blockMesh/addOptions.H
View File

@ -1,3 +1,4 @@
argList::noParallel(); argList::noParallel();
argList::validOptions.insert("blockTopology", ""); argList::validOptions.insert("blockTopology", "");
argList::validOptions.insert("dict", "dictionary");
# include "addRegionOption.H" # include "addRegionOption.H"

21
applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
View File

@ -77,11 +77,21 @@ int main(int argc, char *argv[])
Info<< nl << "Reading block mesh description dictionary" << endl; Info<< nl << "Reading block mesh description dictionary" << endl;
word dictName("blockMeshDict");
fileName dictPath(runTime.constant()/polyMeshDir);
if (args.options().found("dict"))
{
fileName userDict(args.options()["dict"]);
dictName = userDict.name();
dictPath = userDict.path();
}
IOobject meshDescriptionIOobject IOobject meshDescriptionIOobject
( (
"blockMeshDict", dictName,
runTime.constant(), dictPath,
polyMeshDir,
runTime, runTime,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE, IOobject::NO_WRITE,
@ -91,13 +101,14 @@ int main(int argc, char *argv[])
if (!meshDescriptionIOobject.headerOk()) if (!meshDescriptionIOobject.headerOk())
{ {
FatalErrorIn(args.executable()) FatalErrorIn(args.executable())
<< "Cannot open mesh description file " << nl << "Cannot open mesh description file: " << nl
<< runTime.constant()/polyMeshDir/"blockMeshDict" << nl << dictPath/dictName << nl
<< exit(FatalError); << exit(FatalError);
} }
IOdictionary meshDescription(meshDescriptionIOobject); IOdictionary meshDescription(meshDescriptionIOobject);
Info<< nl << "Creating block mesh" << endl; Info<< nl << "Creating block mesh" << endl;
blockMesh blocks(meshDescription); blockMesh blocks(meshDescription);

4
applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
View File

@ -95,8 +95,8 @@ int main(int argc, char *argv[])
<< exit(FatalError); << exit(FatalError);
} }
Info<< "\nCreating boundary-layer for U of thickness" << ybl.value() << " m" Info<< "\nCreating boundary-layer for U of thickness "
<< nl << endl; << ybl.value() << " m" << nl << endl;
// Modify velocity by applying a 1/7th power law boundary-layer // Modify velocity by applying a 1/7th power law boundary-layer
// u/U0 = (y/ybl)^(1/7) // u/U0 = (y/ybl)^(1/7)