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

BUG: inconsistent ifdef detection for application -listXXX options

Browse Source 
- as part of the style change, include guards are increasingly
  prefixed with 'Foam_'
This commit is contained in:
Mark Olesen
2022-06-21 10:23:57 +02:00
parent 80b0f5f740
commit 2b86a22f56
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
View File

@ -198,8 +198,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef functionObject_H #ifndef Foam_functionObject_H
#define functionObject_H #define Foam_functionObject_H
#include "typeInfo.H" #include "typeInfo.H"
#include "autoPtr.H" #include "autoPtr.H"

8
src/OpenFOAM/include/setRootCaseListOptions.H
View File

@ -25,7 +25,7 @@ argList::addBoolOption
true // advanced true // advanced
); );
#ifdef fvPatchField_H #ifdef Foam_fvPatchField_H
argList::addBoolOption argList::addBoolOption
( (
"listScalarBCs", "listScalarBCs",
@ -40,7 +40,7 @@ argList::addBoolOption
); );
#endif #endif
#ifdef functionObject_H #ifdef Foam_functionObject_H
argList::addBoolOption argList::addBoolOption
( (
"listFunctionObjects", "listFunctionObjects",
@ -49,7 +49,7 @@ argList::addBoolOption
); );
#endif #endif
#ifdef fvOption_H #ifdef Foam_fvOption_H
argList::addBoolOption argList::addBoolOption
( (
"listFvOptions", "listFvOptions",
@ -58,7 +58,7 @@ argList::addBoolOption
); );
#endif #endif
#if defined(turbulentTransportModel_H) || defined(turbulentFluidThermoModel_H) #if defined(Foam_turbulentTransportModel_H) || defined(Foam_turbulentFluidThermoModel_H)
argList::addBoolOption argList::addBoolOption
( (
"listTurbulenceModels", "listTurbulenceModels",

18
src/OpenFOAM/include/setRootCaseListOutput.H
View File

@ -19,7 +19,7 @@
listOptions = true; listOptions = true;
} }
#ifdef fvPatchField_H #ifdef Foam_fvPatchField_H
if (args.found("listScalarBCs")) if (args.found("listScalarBCs"))
{ {
Info<< "scalarBCs" Info<< "scalarBCs"
@ -39,7 +39,7 @@
} }
#endif #endif
#ifdef functionObject_H #ifdef Foam_functionObject_H
if (args.found("listFunctionObjects")) if (args.found("listFunctionObjects"))
{ {
Info<< "functionObjects" Info<< "functionObjects"
@ -49,7 +49,7 @@
} }
#endif #endif
#ifdef fvOption_H #ifdef Foam_fvOption_H
if (args.found("listFvOptions")) if (args.found("listFvOptions"))
{ {
Info<< "fvOptions" Info<< "fvOptions"
@ -59,13 +59,13 @@
} }
#endif #endif
#ifdef turbulentTransportModel_H #if defined(Foam_turbulentTransportModel_H)
if (args.found("listTurbulenceModels")) if (args.found("listTurbulenceModels"))
{ {
Info<< "Turbulence models" Info<< "Turbulence models" << nl
<< incompressible::turbulenceModel:: << incompressible::turbulenceModel::
dictionaryConstructorTablePtr_->sortedToc() dictionaryConstructorTablePtr_->sortedToc()
<< endl; << nl << endl;
Info<< "RAS models" Info<< "RAS models"
<< incompressible::RASModel:: << incompressible::RASModel::
@ -78,13 +78,13 @@
<< endl; << endl;
listOptions = true; listOptions = true;
} }
#elif defined(turbulentFluidThermoModel_H) #elif defined(Foam_turbulentFluidThermoModel_H)
if (args.found("listTurbulenceModels")) if (args.found("listTurbulenceModels"))
{ {
Info<< "Turbulence models" Info<< "Turbulence models" << nl
<< compressible::turbulenceModel:: << compressible::turbulenceModel::
dictionaryConstructorTablePtr_->sortedToc() dictionaryConstructorTablePtr_->sortedToc()
<< endl; << nl << endl;
Info<< "RAS models" Info<< "RAS models"
<< compressible::RASModel:: << compressible::RASModel::

4
src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
View File

@ -42,8 +42,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef turbulentFluidThermoModel_H #ifndef Foam_turbulentFluidThermoModel_H
#define turbulentFluidThermoModel_H #define Foam_turbulentFluidThermoModel_H
#include "CompressibleTurbulenceModel.H" #include "CompressibleTurbulenceModel.H"
#include "ThermalDiffusivity.H" #include "ThermalDiffusivity.H"

4
src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
View File

@ -42,8 +42,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef turbulentTransportModel_H #ifndef Foam_turbulentTransportModel_H
#define turbulentTransportModel_H #define Foam_turbulentTransportModel_H
#include "IncompressibleTurbulenceModel.H" #include "IncompressibleTurbulenceModel.H"
#include "laminarModel.H" #include "laminarModel.H"