From 28eddd18e922c04b482132453e2cecdbab957d43 Mon Sep 17 00:00:00 2001 From: Dominik Christ Date: Tue, 4 Aug 2015 11:50:44 +0100 Subject: [PATCH] Removed name clash for Polynomial and ODE --- .../PolynomialTemplate.C} | 2 +- .../PolynomialTemplate.H} | 10 +++++----- .../PolynomialTemplateIO.C} | 2 +- .../chemistrySolver/makeChemistrySolvers.C | 2 +- .../{ode/ode.C => odeSolver/odeChemistrySolver.C} | 2 +- .../{ode/ode.H => odeSolver/odeChemistrySolver.H} | 8 ++++---- .../equationOfState/icoPolynomial/icoPolynomial.H | 2 +- .../specie/thermo/hPolynomial/hPolynomialThermo.H | 2 +- .../specie/transport/polynomial/polynomialTransport.H | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename src/foam/primitives/functions/{Polynomial/Polynomial.C => PolynomialTemplate/PolynomialTemplate.C} (99%) rename src/foam/primitives/functions/{Polynomial/Polynomial.H => PolynomialTemplate/PolynomialTemplate.H} (96%) rename src/foam/primitives/functions/{Polynomial/PolynomialIO.C => PolynomialTemplate/PolynomialTemplateIO.C} (98%) rename src/thermophysicalModels/chemistryModel/chemistrySolver/{ode/ode.C => odeSolver/odeChemistrySolver.C} (98%) rename src/thermophysicalModels/chemistryModel/chemistrySolver/{ode/ode.H => odeSolver/odeChemistrySolver.H} (96%) diff --git a/src/foam/primitives/functions/Polynomial/Polynomial.C b/src/foam/primitives/functions/PolynomialTemplate/PolynomialTemplate.C similarity index 99% rename from src/foam/primitives/functions/Polynomial/Polynomial.C rename to src/foam/primitives/functions/PolynomialTemplate/PolynomialTemplate.C index 09cb51d00..63220ca68 100644 --- a/src/foam/primitives/functions/Polynomial/Polynomial.C +++ b/src/foam/primitives/functions/PolynomialTemplate/PolynomialTemplate.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "Polynomial.H" +#include "PolynomialTemplate.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/functions/Polynomial/Polynomial.H b/src/foam/primitives/functions/PolynomialTemplate/PolynomialTemplate.H similarity index 96% rename from src/foam/primitives/functions/Polynomial/Polynomial.H rename to src/foam/primitives/functions/PolynomialTemplate/PolynomialTemplate.H index f27f65c73..64f819e09 100644 --- a/src/foam/primitives/functions/Polynomial/Polynomial.H +++ b/src/foam/primitives/functions/PolynomialTemplate/PolynomialTemplate.H @@ -40,12 +40,12 @@ Description the base poly starts at order -1 SourceFiles - Polynomial.C + PolynomialTemplate.C \*---------------------------------------------------------------------------*/ -#ifndef Polynomial_H -#define Polynomial_H +#ifndef PolynomialTemplate_H +#define PolynomialTemplate_H #include "word.H" #include "scalar.H" @@ -151,8 +151,8 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Polynomial.C" -# include "PolynomialIO.C" +# include "PolynomialTemplate.C" +# include "PolynomialTemplateIO.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/foam/primitives/functions/Polynomial/PolynomialIO.C b/src/foam/primitives/functions/PolynomialTemplate/PolynomialTemplateIO.C similarity index 98% rename from src/foam/primitives/functions/Polynomial/PolynomialIO.C rename to src/foam/primitives/functions/PolynomialTemplate/PolynomialTemplateIO.C index 50739b3ec..40be5146f 100644 --- a/src/foam/primitives/functions/Polynomial/PolynomialIO.C +++ b/src/foam/primitives/functions/PolynomialTemplate/PolynomialTemplateIO.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "Polynomial.H" +#include "PolynomialTemplate.H" // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C index 4da70d4f7..d011697a5 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C @@ -30,7 +30,7 @@ License #include "rhoChemistryModel.H" #include "EulerImplicit.H" -#include "ode.H" +#include "odeChemistrySolver.H" #include "sequential.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/odeSolver/odeChemistrySolver.C similarity index 98% rename from src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C rename to src/thermophysicalModels/chemistryModel/chemistrySolver/odeSolver/odeChemistrySolver.C index 49c65b9de..71e914038 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/odeSolver/odeChemistrySolver.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "ode.H" +#include "odeChemistrySolver.H" #include "ODEChemistryModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/odeSolver/odeChemistrySolver.H similarity index 96% rename from src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H rename to src/thermophysicalModels/chemistryModel/chemistrySolver/odeSolver/odeChemistrySolver.H index 3fc79af40..adb758092 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/odeSolver/odeChemistrySolver.H @@ -28,12 +28,12 @@ Description An ODE solver for chemistry SourceFiles - ode.C + odeChemistrySolver.C \*---------------------------------------------------------------------------*/ -#ifndef ode_H -#define ode_H +#ifndef odeChemistrySolver_H +#define odeChemistrySolver_H #include "chemistrySolver.H" #include "ODESolver.H" @@ -108,7 +108,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ode.C" +# include "odeChemistrySolver.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H index ff5f9e540..2387339fd 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H @@ -39,7 +39,7 @@ SourceFiles #include "specie.H" #include "autoPtr.H" -#include "Polynomial.H" +#include "PolynomialTemplate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H index a2e8df623..fe79a959f 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H @@ -40,7 +40,7 @@ SourceFiles #define hPolynomialThermo_H #include "scalar.H" -#include "Polynomial.H" +#include "PolynomialTemplate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H index 08f55ca41..4b9a722e4 100644 --- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H +++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H @@ -36,7 +36,7 @@ SourceFiles #ifndef polynomialTransport_H #define polynomialTransport_H -#include "Polynomial.H" +#include "PolynomialTemplate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //