From 787c90adeb1d0866f0ee0c966c9497f5dc40ee3b Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 3 Oct 2014 01:45:58 +0000 Subject: [PATCH] [Thermo] Make header files for SpeciesThermoInterpType descendants public --- {src => include/cantera}/thermo/ConstCpPoly.h | 0 {src => include/cantera}/thermo/Nasa9PolyMultiTempRegion.h | 0 {src => include/cantera}/thermo/NasaPoly2.h | 0 {src => include/cantera}/thermo/ShomatePoly.h | 0 src/thermo/ConstCpPoly.cpp | 2 +- src/thermo/GeneralSpeciesThermo.cpp | 6 +++--- src/thermo/Nasa9PolyMultiTempRegion.cpp | 2 +- src/thermo/ShomateThermo.h | 2 +- src/thermo/SpeciesThermoFactory.cpp | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename {src => include/cantera}/thermo/ConstCpPoly.h (100%) rename {src => include/cantera}/thermo/Nasa9PolyMultiTempRegion.h (100%) rename {src => include/cantera}/thermo/NasaPoly2.h (100%) rename {src => include/cantera}/thermo/ShomatePoly.h (100%) diff --git a/src/thermo/ConstCpPoly.h b/include/cantera/thermo/ConstCpPoly.h similarity index 100% rename from src/thermo/ConstCpPoly.h rename to include/cantera/thermo/ConstCpPoly.h diff --git a/src/thermo/Nasa9PolyMultiTempRegion.h b/include/cantera/thermo/Nasa9PolyMultiTempRegion.h similarity index 100% rename from src/thermo/Nasa9PolyMultiTempRegion.h rename to include/cantera/thermo/Nasa9PolyMultiTempRegion.h diff --git a/src/thermo/NasaPoly2.h b/include/cantera/thermo/NasaPoly2.h similarity index 100% rename from src/thermo/NasaPoly2.h rename to include/cantera/thermo/NasaPoly2.h diff --git a/src/thermo/ShomatePoly.h b/include/cantera/thermo/ShomatePoly.h similarity index 100% rename from src/thermo/ShomatePoly.h rename to include/cantera/thermo/ShomatePoly.h diff --git a/src/thermo/ConstCpPoly.cpp b/src/thermo/ConstCpPoly.cpp index d91d5a5e0..4de9d3722 100644 --- a/src/thermo/ConstCpPoly.cpp +++ b/src/thermo/ConstCpPoly.cpp @@ -6,7 +6,7 @@ */ // Copyright 2001 California Institute of Technology -#include "ConstCpPoly.h" +#include "cantera/thermo/ConstCpPoly.h" namespace Cantera { diff --git a/src/thermo/GeneralSpeciesThermo.cpp b/src/thermo/GeneralSpeciesThermo.cpp index 9ea6723de..baa9c0128 100644 --- a/src/thermo/GeneralSpeciesThermo.cpp +++ b/src/thermo/GeneralSpeciesThermo.cpp @@ -8,9 +8,9 @@ #include "cantera/thermo/GeneralSpeciesThermo.h" #include "cantera/thermo/NasaPoly1.h" -#include "NasaPoly2.h" -#include "ShomatePoly.h" -#include "ConstCpPoly.h" +#include "cantera/thermo/NasaPoly2.h" +#include "cantera/thermo/ShomatePoly.h" +#include "cantera/thermo/ConstCpPoly.h" #include "cantera/thermo/Mu0Poly.h" #include "cantera/thermo/AdsorbateThermo.h" #include "cantera/thermo/SpeciesThermoFactory.h" diff --git a/src/thermo/Nasa9PolyMultiTempRegion.cpp b/src/thermo/Nasa9PolyMultiTempRegion.cpp index 19bef3cd8..96e65bfe7 100644 --- a/src/thermo/Nasa9PolyMultiTempRegion.cpp +++ b/src/thermo/Nasa9PolyMultiTempRegion.cpp @@ -13,7 +13,7 @@ // Copyright 2007 Sandia National Laboratories #include "cantera/base/ctexceptions.h" -#include "Nasa9PolyMultiTempRegion.h" +#include "cantera/thermo/Nasa9PolyMultiTempRegion.h" using namespace std; diff --git a/src/thermo/ShomateThermo.h b/src/thermo/ShomateThermo.h index f5dcf9e80..4fecbfd8e 100644 --- a/src/thermo/ShomateThermo.h +++ b/src/thermo/ShomateThermo.h @@ -11,7 +11,7 @@ #define CT_SHOMATETHERMO_H #include "cantera/thermo/SpeciesThermoMgr.h" -#include "ShomatePoly.h" +#include "cantera/thermo/ShomatePoly.h" #include "cantera/base/global.h" #include "cantera/base/utilities.h" diff --git a/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp index 5d685950a..89ff0ca5d 100644 --- a/src/thermo/SpeciesThermoFactory.cpp +++ b/src/thermo/SpeciesThermoFactory.cpp @@ -14,7 +14,7 @@ #include "cantera/thermo/SimpleThermo.h" #include "cantera/thermo/GeneralSpeciesThermo.h" #include "cantera/thermo/Mu0Poly.h" -#include "Nasa9PolyMultiTempRegion.h" +#include "cantera/thermo/Nasa9PolyMultiTempRegion.h" #include "cantera/thermo/Nasa9Poly1.h" #include "cantera/thermo/StatMech.h"