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

GIT: Resolve conflict

Browse Source
This commit is contained in:
Andrew Heather
2016-06-10 16:05:48 +01:00
parent 1fd05b2d1b c91712fbc3
commit 7572c99c79
14 changed files with 116 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -25,6 +25,7 @@ License
#include "helpSolver.H"
#include "addToRunTimeSelectionTable.H"
#include "fvMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -63,6 +64,11 @@ void Foam::helpTypes::helpSolver::init()
helpType::init();
argList::validArgs.append("solver");
argList::addBoolOption
(
"read",
"read solver type from the system/controlDict"
);
}
@ -78,6 +84,11 @@ void Foam::helpTypes::helpSolver::execute
{
displayDoc(solver, ".*solvers/.*Foam/", true, "C");
}
else if (args.optionFound("read"))
{
mesh.time().controlDict().lookup("application") >> solver;
displayDoc(solver, ".*solvers/.*Foam/", true, "C");
}
else
{
displayDocOptions(".*solvers/.*Foam/", true, "C");