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

STYLE: use foamVersion::api instead of OPENFOAM define

Browse Source 
- for referencing the etc locations, or reporting the current API
  value.
This commit is contained in:
Mark Olesen
2018-12-12 03:02:49 +01:00
parent 99b85e3b3d
commit d29388f1c5
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
View File

@ -31,6 +31,7 @@ License
#include "OSspecific.H" #include "OSspecific.H"
#include "etcFiles.H" #include "etcFiles.H"
#include "dictionary.H" #include "dictionary.H"
#include "foamVersion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -81,7 +82,7 @@ void Foam::dynamicCode::checkSecurity
<< " allowSystemOperations 1" << nl << nl << " allowSystemOperations 1" << nl << nl
<< "to the InfoSwitches setting in the system controlDict." << nl << "to the InfoSwitches setting in the system controlDict." << nl
<< "The system controlDict is any of" << nl << nl << "The system controlDict is any of" << nl << nl
<< " ~/.OpenFOAM/" << OPENFOAM << "/controlDict" << nl << " ~/.OpenFOAM/" << foamVersion::api << "/controlDict" << nl
<< " ~/.OpenFOAM/controlDict" << nl << " ~/.OpenFOAM/controlDict" << nl
<< " $WM_PROJECT_DIR/etc/controlDict" << nl << endl << " $WM_PROJECT_DIR/etc/controlDict" << nl << endl
<< exit(FatalIOError); << exit(FatalIOError);

6
src/OpenFOAM/global/argList/argList.C
View File

@ -1539,11 +1539,7 @@ void Foam::argList::displayDoc(bool source) const
CStringList command(stringOps::splitSpace(docBrowser)); CStringList command(stringOps::splitSpace(docBrowser));
Info Info
<< "OpenFOAM" << "OpenFOAM " << foamVersion::api << " documentation:" << nl
#if OPENFOAM
<< ' ' << OPENFOAM
#endif
<< " documentation:" << nl
<< " " << command << nl << endl; << " " << command << nl << endl;
Foam::system(command, true); Foam::system(command, true);

3
src/functionObjects/utilities/systemCall/systemCall.C
View File

@ -26,6 +26,7 @@ License
#include "systemCall.H" #include "systemCall.H"
#include "Time.H" #include "Time.H"
#include "dynamicCode.H" #include "dynamicCode.H"
#include "foamVersion.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -127,7 +128,7 @@ bool Foam::functionObjects::systemCall::read(const dictionary& dict)
<< " allowSystemOperations 1" << nl << nl << " allowSystemOperations 1" << nl << nl
<< "to the InfoSwitches setting in the system controlDict." << nl << "to the InfoSwitches setting in the system controlDict." << nl
<< "The system controlDict is any of" << nl << nl << "The system controlDict is any of" << nl << nl
<< " ~/.OpenFOAM/" << OPENFOAM << "/controlDict" << nl << " ~/.OpenFOAM/" << foamVersion::api << "/controlDict" << nl
<< " ~/.OpenFOAM/controlDict" << nl << " ~/.OpenFOAM/controlDict" << nl
<< " $WM_PROJECT_DIR/etc/controlDict" << nl << endl << " $WM_PROJECT_DIR/etc/controlDict" << nl << endl
<< exit(FatalError); << exit(FatalError);