Commit 780a0bc4 authored by Andrew Heather's avatar Andrew Heather

COMP: Resolved some name clashes for #ifdef statements

parent ce6c2e05
......@@ -32,8 +32,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef writeDimFields_H
#define writeDimFields_H
#ifndef ensightParts_writeDimFields_H
#define ensightParts_writeDimFields_H
#include "writeVolFields.H"
......
......@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef cut_H
#define cut_H
#ifndef searchableSurfaceModifiers_cut_H
#define searchableSurfaceModifiers_cut_H
#include "searchableSurfaceModifier.H"
#include "wordRes.H"
......
......@@ -61,8 +61,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef alphatJayatillekeWallFunctionFvPatchScalarField_H
#define alphatJayatillekeWallFunctionFvPatchScalarField_H
#ifndef compressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
#define compressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
#include "turbulentFluidThermoModel.H"
......
......@@ -60,8 +60,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef alphatJayatillekeWallFunctionFvPatchScalarField_H
#define alphatJayatillekeWallFunctionFvPatchScalarField_H
#ifndef incompressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
#define incompressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
#include "turbulenceModel.H"
......
......@@ -51,8 +51,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef DarcyForchheimer_H
#define DarcyForchheimer_H
#ifndef porosityModels_DarcyForchheimer_H
#define porosityModels_DarcyForchheimer_H
#include "porosityModel.H"
#include "dimensionedTensor.H"
......
......@@ -41,8 +41,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef fixedCoeff_H
#define fixedCoeff_H
#ifndef porosityModels_fixedCoeff_H
#define porosityModels_fixedCoeff_H
#include "porosityModel.H"
#include "dimensionedTensor.H"
......
......@@ -45,8 +45,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef powerLaw_H
#define powerLaw_H
#ifndef porosityModels_powerLaw_H
#define porosityModels_powerLaw_H
#include "porosityModel.H"
......
......@@ -78,8 +78,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef solidification_H
#define solidification_H
#ifndef porosityModels_solidification_H
#define porosityModels_solidification_H
#include "porosityModel.H"
#include "Function1.H"
......
......@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef LaunderSharmaKE_H
#define LaunderSharmaKE_H
#ifndef incompressible_RASVariables_LaunderSharmaKE_H
#define incompressible_RASVariables_LaunderSharmaKE_H
#include "RASModelVariables.H"
......
......@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef SpalartAllmaras_H
#define SpalartAllmaras_H
#ifndef incompressible_RASVariables_SpalartAllmaras_H
#define incompressible_RASVariables_SpalartAllmaras_H
#include "RASModelVariables.H"
......
......@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef kEpsilon_H
#define kEpsilon_H
#ifndef incompressible_RASVariables_kEpsilon_H
#define incompressible_RASVariables_kEpsilon_H
#include "RASModelVariables.H"
......
......@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef kOmegaSST_H
#define kOmegaSST_H
#ifndef incompressible_RASVariables_kOmegaSST_H
#define incompressible_RASVariables_kOmegaSST_H
#include "RASModelVariables.H"
......
......@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef laminar_H
#define laminar_H
#ifndef incompressible_RASVariables_laminar_H
#define incompressible_RASVariables_laminar_H
#include "RASModelVariables.H"
......
......@@ -32,8 +32,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef thermo_H
#define thermo_H
#ifndef regionModels_pyrolysisModels_thermo_H
#define regionModels_pyrolysisModels_thermo_H
#include "pyrolysisModel.H"
#include "volFieldsFwd.H"
......
......@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef heatTransferModel_H
#define heatTransferModel_H
#ifndef regionModels_surfaceFilmModels_heatTransferModel_H
#define regionModels_surfaceFilmModels_heatTransferModel_H
#include "filmSubModelBase.H"
#include "runTimeSelectionTables.H"
......
......@@ -34,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef powerLaw_H
#define powerLaw_H
#ifndef viscosityModels_powerLaw_H
#define viscosityModels_powerLaw_H
#include "viscosityModel.H"
#include "dimensionedScalar.H"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment