COMP: Resolved some name clashes for #ifdef statements

applications/utilities/postProcessing/dataConversion/foamToEnsightParts/writeDimFields.H

@@ -32,8 +32,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef writeDimFields_H
+#ifndef ensightParts_writeDimFields_H
-#define writeDimFields_H
+#define ensightParts_writeDimFields_H
 
 #include "writeVolFields.H"
 

applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H

@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cut_H
+#ifndef searchableSurfaceModifiers_cut_H
-#define cut_H
+#define searchableSurfaceModifiers_cut_H
 
 #include "searchableSurfaceModifier.H"
 #include "wordRes.H"

src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H

@@ -61,8 +61,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef alphatJayatillekeWallFunctionFvPatchScalarField_H
+#ifndef compressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
-#define alphatJayatillekeWallFunctionFvPatchScalarField_H
+#define compressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 #include "turbulentFluidThermoModel.H"

src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H

@@ -60,8 +60,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef alphatJayatillekeWallFunctionFvPatchScalarField_H
+#ifndef incompressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
-#define alphatJayatillekeWallFunctionFvPatchScalarField_H
+#define incompressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 #include "turbulenceModel.H"

src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H

@@ -51,8 +51,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef DarcyForchheimer_H
+#ifndef porosityModels_DarcyForchheimer_H
-#define DarcyForchheimer_H
+#define porosityModels_DarcyForchheimer_H
 
 #include "porosityModel.H"
 #include "dimensionedTensor.H"

src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H

@@ -41,8 +41,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedCoeff_H
+#ifndef porosityModels_fixedCoeff_H
-#define fixedCoeff_H
+#define porosityModels_fixedCoeff_H
 
 #include "porosityModel.H"
 #include "dimensionedTensor.H"

src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H

@@ -45,8 +45,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef powerLaw_H
+#ifndef porosityModels_powerLaw_H
-#define powerLaw_H
+#define porosityModels_powerLaw_H
 
 #include "porosityModel.H"
 

src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H

@@ -78,8 +78,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef solidification_H
+#ifndef porosityModels_solidification_H
-#define solidification_H
+#define porosityModels_solidification_H
 
 #include "porosityModel.H"
 #include "Function1.H"

src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/LaunderSharmaKE/LaunderSharmaKE.H

@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef LaunderSharmaKE_H
+#ifndef incompressible_RASVariables_LaunderSharmaKE_H
-#define LaunderSharmaKE_H
+#define incompressible_RASVariables_LaunderSharmaKE_H
 
 #include "RASModelVariables.H"
 

src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.H

@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SpalartAllmaras_H
+#ifndef incompressible_RASVariables_SpalartAllmaras_H
-#define SpalartAllmaras_H
+#define incompressible_RASVariables_SpalartAllmaras_H
 
 #include "RASModelVariables.H"
 

src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kEpsilon/kEpsilon.H

@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef kEpsilon_H
+#ifndef incompressible_RASVariables_kEpsilon_H
-#define kEpsilon_H
+#define incompressible_RASVariables_kEpsilon_H
 
 #include "RASModelVariables.H"
 

src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.H

@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef kOmegaSST_H
+#ifndef incompressible_RASVariables_kOmegaSST_H
-#define kOmegaSST_H
+#define incompressible_RASVariables_kOmegaSST_H
 
 #include "RASModelVariables.H"
 

src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/laminar/laminar.H

@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef laminar_H
+#ifndef incompressible_RASVariables_laminar_H
-#define laminar_H
+#define incompressible_RASVariables_laminar_H
 
 #include "RASModelVariables.H"
 

src/regionModels/pyrolysisModels/thermo/thermo.H

@@ -32,8 +32,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef thermo_H
+#ifndef regionModels_pyrolysisModels_thermo_H
-#define thermo_H
+#define regionModels_pyrolysisModels_thermo_H
 
 #include "pyrolysisModel.H"
 #include "volFieldsFwd.H"

src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H

@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef heatTransferModel_H
+#ifndef regionModels_surfaceFilmModels_heatTransferModel_H
-#define heatTransferModel_H
+#define regionModels_surfaceFilmModels_heatTransferModel_H
 
 #include "filmSubModelBase.H"
 #include "runTimeSelectionTables.H"

src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H

@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef powerLaw_H
+#ifndef viscosityModels_powerLaw_H
-#define powerLaw_H
+#define viscosityModels_powerLaw_H
 
 #include "viscosityModel.H"
 #include "dimensionedScalar.H"