Removed name clash for Polynomial and ODE

This commit is contained in:
Dominik Christ 2015-08-04 11:50:44 +01:00
parent bd927880b7
commit 28eddd18e9
9 changed files with 16 additions and 16 deletions

View file

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "Polynomial.H"
#include "PolynomialTemplate.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

View file

@ -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
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "Polynomial.H"
#include "PolynomialTemplate.H"
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //

View file

@ -30,7 +30,7 @@ License
#include "rhoChemistryModel.H"
#include "EulerImplicit.H"
#include "ode.H"
#include "odeChemistrySolver.H"
#include "sequential.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "ode.H"
#include "odeChemistrySolver.H"
#include "ODEChemistryModel.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

View file

@ -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
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -39,7 +39,7 @@ SourceFiles
#include "specie.H"
#include "autoPtr.H"
#include "Polynomial.H"
#include "PolynomialTemplate.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -40,7 +40,7 @@ SourceFiles
#define hPolynomialThermo_H
#include "scalar.H"
#include "Polynomial.H"
#include "PolynomialTemplate.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View file

@ -36,7 +36,7 @@ SourceFiles
#ifndef polynomialTransport_H
#define polynomialTransport_H
#include "Polynomial.H"
#include "PolynomialTemplate.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //