From 8b699082c8d31d4ff94b23545b368188cc3c70dd Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 9 Jan 2012 17:31:21 +0000 Subject: [PATCH] Removed cantera/kernel from include path The "cantera/kernel" directory is now part of the include path only when building the Cantera kernel. All other modules include files in this directory as "kernel/header.h". This fixes a problem distinguishing between kernel/Kinetics.h and kinetics.h on Windows. --- Cantera/clib/src/Cabinet.h | 4 ++-- Cantera/clib/src/Storage.cpp | 4 ++-- Cantera/clib/src/Storage.h | 4 ++-- Cantera/clib/src/clib_defs.h | 2 +- Cantera/clib/src/ct.cpp | 18 +++++++++--------- Cantera/clib/src/ct.h | 2 +- Cantera/clib/src/ctbdry.cpp | 6 +++--- Cantera/clib/src/ctfunc.cpp | 4 ++-- Cantera/clib/src/ctmultiphase.cpp | 8 ++++---- Cantera/clib/src/ctonedim.cpp | 13 +++++-------- Cantera/clib/src/ctonedim.h | 2 +- Cantera/clib/src/ctreactor.cpp | 14 +++++++------- Cantera/clib/src/ctrpath.cpp | 2 +- Cantera/clib/src/ctsurf.cpp | 9 +++------ Cantera/clib/src/ctsurf.h | 2 +- Cantera/clib/src/ctxml.cpp | 3 +-- Cantera/clib/src/ctxml.h | 2 +- Cantera/cxx/src/cxxutils.cpp | 2 +- Cantera/cxx/src/importPhase.cpp | 5 ++--- Cantera/fortran/src/fct.cpp | 16 ++++++++-------- Cantera/fortran/src/fctxml.cpp | 2 +- Cantera/fortran/src/flib_defs.h | 2 +- Cantera/src/SConscript | 1 + SConstruct | 3 +-- .../cathermo/HMW_dupl_test/HMW_dupl_test.cpp | 2 +- .../cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp | 2 +- .../cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp | 2 +- .../cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp | 3 +-- .../cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp | 2 +- .../cathermo/HMW_test_3/HMW_test_3.cpp | 2 +- .../cathermo/testIAPWS/testIAPWSphi.cpp | 2 +- .../cathermo/testIAPWSPres/testPress.cpp | 2 +- .../cathermo/testIAPWSTripP/testTripleP.cpp | 2 +- .../cathermo/testWaterPDSS/testWaterPDSS.cpp | 16 ++++++++-------- .../cathermo/testWaterTP/testWaterSSTP.cpp | 2 +- test_problems/cathermo/wtWater/wtWater.cpp | 18 +++++++++--------- tools/src/ck2cti.cpp | 6 +++--- tools/src/cti2ctml.cpp | 6 +++--- 38 files changed, 94 insertions(+), 103 deletions(-) diff --git a/Cantera/clib/src/Cabinet.h b/Cantera/clib/src/Cabinet.h index 0369cbf72..7131d97c9 100755 --- a/Cantera/clib/src/Cabinet.h +++ b/Cantera/clib/src/Cabinet.h @@ -10,8 +10,8 @@ #define CT_CABINET_H #include -#include "stringUtils.h" -#include "config.h" +#include "kernel/stringUtils.h" +#include "kernel/config.h" /** * Template for classes to hold pointers to objects. The Cabinet diff --git a/Cantera/clib/src/Storage.cpp b/Cantera/clib/src/Storage.cpp index fea7dc4ad..4accef2cf 100755 --- a/Cantera/clib/src/Storage.cpp +++ b/Cantera/clib/src/Storage.cpp @@ -8,8 +8,8 @@ // Cantera includes -#include "Kinetics.h" -#include "TransportFactory.h" +#include "kernel/Kinetics.h" +#include "kernel/TransportFactory.h" #include "Storage.h" diff --git a/Cantera/clib/src/Storage.h b/Cantera/clib/src/Storage.h index 159570e84..e8c8a6272 100755 --- a/Cantera/clib/src/Storage.h +++ b/Cantera/clib/src/Storage.h @@ -9,8 +9,8 @@ #define CTC_STORAGE_H // Cantera includes -#include "Kinetics.h" -#include "TransportBase.h" +#include "kernel/Kinetics.h" +#include "kernel/TransportBase.h" #include "Cabinet.h" #include "clib_defs.h" diff --git a/Cantera/clib/src/clib_defs.h b/Cantera/clib/src/clib_defs.h index fe544211d..5131018ff 100755 --- a/Cantera/clib/src/clib_defs.h +++ b/Cantera/clib/src/clib_defs.h @@ -9,7 +9,7 @@ #ifndef CTC_DEFS_H #define CTC_DEFS_H -#include "ct_defs.h" +#include "kernel/ct_defs.h" #ifdef WIN32 // Either build as a DLL under Windows or not. diff --git a/Cantera/clib/src/ct.cpp b/Cantera/clib/src/ct.cpp index cbb1b52e4..858daf8f9 100755 --- a/Cantera/clib/src/ct.cpp +++ b/Cantera/clib/src/ct.cpp @@ -20,17 +20,17 @@ #include "ct.h" // Cantera includes -#include "equil.h" -#include "KineticsFactory.h" -#include "TransportFactory.h" -#include "ctml.h" -#include "importKinetics.h" -#include "ThermoFactory.h" -#include "ck2ct.h" +#include "kernel/equil.h" +#include "kernel/KineticsFactory.h" +#include "kernel/TransportFactory.h" +#include "kernel/ctml.h" +#include "kernel/importKinetics.h" +#include "kernel/ThermoFactory.h" +#include "kernel/ck2ct.h" #include "Storage.h" #include "Cabinet.h" -#include "InterfaceKinetics.h" -#include "PureFluidPhase.h" +#include "kernel/InterfaceKinetics.h" +#include "kernel/PureFluidPhase.h" using namespace std; diff --git a/Cantera/clib/src/ct.h b/Cantera/clib/src/ct.h index 8f543f7e5..11ad52a22 100755 --- a/Cantera/clib/src/ct.h +++ b/Cantera/clib/src/ct.h @@ -11,7 +11,7 @@ #include "clib_defs.h" #ifdef CANTERA_USE_INTERNAL -#include "config.h" +#include "kernel/config.h" #else #include "cantera/kernel/config.h" #endif diff --git a/Cantera/clib/src/ctbdry.cpp b/Cantera/clib/src/ctbdry.cpp index b362384a1..a1b423be3 100755 --- a/Cantera/clib/src/ctbdry.cpp +++ b/Cantera/clib/src/ctbdry.cpp @@ -17,9 +17,9 @@ // Cantera includes -#include "OneDim.h" -#include "Inlet1D.h" -#include "InterfaceKinetics.h" +#include "kernel/OneDim.h" +#include "kernel/Inlet1D.h" +#include "kernel/InterfaceKinetics.h" #include "Cabinet.h" #include "Storage.h" diff --git a/Cantera/clib/src/ctfunc.cpp b/Cantera/clib/src/ctfunc.cpp index 8e7fd442a..060adf783 100755 --- a/Cantera/clib/src/ctfunc.cpp +++ b/Cantera/clib/src/ctfunc.cpp @@ -14,8 +14,8 @@ #define CANTERA_USE_INTERNAL #include "ctfunc.h" -#include "Func1.h" -#include "ctexceptions.h" +#include "kernel/Func1.h" +#include "kernel/ctexceptions.h" using namespace Cantera; diff --git a/Cantera/clib/src/ctmultiphase.cpp b/Cantera/clib/src/ctmultiphase.cpp index e37c1dd5e..d1484271b 100644 --- a/Cantera/clib/src/ctmultiphase.cpp +++ b/Cantera/clib/src/ctmultiphase.cpp @@ -10,10 +10,10 @@ #include "ctmultiphase.h" // Cantera includes -#include "equil.h" -#include "MultiPhase.h" -#include "MultiPhaseEquil.h" -#include "vcs_MultiPhaseEquil.h" +#include "kernel/equil.h" +#include "kernel/MultiPhase.h" +#include "kernel/MultiPhaseEquil.h" +#include "kernel/vcs_MultiPhaseEquil.h" #include "Cabinet.h" #include "Storage.h" diff --git a/Cantera/clib/src/ctonedim.cpp b/Cantera/clib/src/ctonedim.cpp index 9295c2ed5..bf096c159 100644 --- a/Cantera/clib/src/ctonedim.cpp +++ b/Cantera/clib/src/ctonedim.cpp @@ -15,15 +15,12 @@ #define CANTERA_USE_INTERNAL #include "ctonedim.h" - // Cantera includes -#include "config.h" -#include "Sim1D.h" -#include "StFlow.h" -#include "Inlet1D.h" -#include "DenseMatrix.h" - - +#include "kernel/config.h" +#include "kernel/Sim1D.h" +#include "kernel/StFlow.h" +#include "kernel/Inlet1D.h" +#include "kernel/DenseMatrix.h" // local includes #include "Cabinet.h" diff --git a/Cantera/clib/src/ctonedim.h b/Cantera/clib/src/ctonedim.h index 6d374de5f..331689c35 100644 --- a/Cantera/clib/src/ctonedim.h +++ b/Cantera/clib/src/ctonedim.h @@ -11,7 +11,7 @@ #include "clib_defs.h" #ifdef CANTERA_USE_INTERNAL -#include "config.h" +#include "kernel/config.h" #else #include "cantera/kernel/config.h" #endif diff --git a/Cantera/clib/src/ctreactor.cpp b/Cantera/clib/src/ctreactor.cpp index 0e8fff638..9149b9d43 100755 --- a/Cantera/clib/src/ctreactor.cpp +++ b/Cantera/clib/src/ctreactor.cpp @@ -15,13 +15,13 @@ #include "ctreactor.h" // Cantera includes -#include "Reactor.h" -#include "FlowReactor.h" -#include "ConstPressureReactor.h" -#include "ReactorNet.h" -#include "Reservoir.h" -#include "Wall.h" -#include "flowControllers.h" +#include "kernel/Reactor.h" +#include "kernel/FlowReactor.h" +#include "kernel/ConstPressureReactor.h" +#include "kernel/ReactorNet.h" +#include "kernel/Reservoir.h" +#include "kernel/Wall.h" +#include "kernel/flowControllers.h" #include "Cabinet.h" #include "Storage.h" diff --git a/Cantera/clib/src/ctrpath.cpp b/Cantera/clib/src/ctrpath.cpp index 8de8aa1ef..e76ab7408 100755 --- a/Cantera/clib/src/ctrpath.cpp +++ b/Cantera/clib/src/ctrpath.cpp @@ -11,7 +11,7 @@ // Cantera includes -#include "ReactionPath.h" +#include "kernel/ReactionPath.h" #include "Cabinet.h" #include "Storage.h" diff --git a/Cantera/clib/src/ctsurf.cpp b/Cantera/clib/src/ctsurf.cpp index b7a5f9d93..af44aac11 100755 --- a/Cantera/clib/src/ctsurf.cpp +++ b/Cantera/clib/src/ctsurf.cpp @@ -15,11 +15,10 @@ #define CANTERA_USE_INTERNAL #include "ctsurf.h" - // Cantera includes -#include "SurfPhase.h" -#include "InterfaceKinetics.h" -#include "ImplicitSurfChem.h" +#include "kernel/SurfPhase.h" +#include "kernel/InterfaceKinetics.h" +#include "kernel/ImplicitSurfChem.h" #include "Cabinet.h" #include "Storage.h" @@ -27,8 +26,6 @@ using namespace std; using namespace Cantera; - - //Cabinet* Cabinet::__storage = 0; //inline Surf1D* _surface(int i) { diff --git a/Cantera/clib/src/ctsurf.h b/Cantera/clib/src/ctsurf.h index a995304ea..475957446 100755 --- a/Cantera/clib/src/ctsurf.h +++ b/Cantera/clib/src/ctsurf.h @@ -12,7 +12,7 @@ #include "clib_defs.h" #ifdef CANTERA_USE_INTERNAL -#include "config.h" +#include "kernel/config.h" #else #include "cantera/kernel/config.h" #endif diff --git a/Cantera/clib/src/ctxml.cpp b/Cantera/clib/src/ctxml.cpp index 57b237293..6681659bd 100644 --- a/Cantera/clib/src/ctxml.cpp +++ b/Cantera/clib/src/ctxml.cpp @@ -14,9 +14,8 @@ #define CANTERA_USE_INTERNAL #include "ctxml.h" - // Cantera includes -#include "ctml.h" +#include "kernel/ctml.h" #include "Cabinet.h" #include "Storage.h" diff --git a/Cantera/clib/src/ctxml.h b/Cantera/clib/src/ctxml.h index a03961eb0..6b3915f42 100644 --- a/Cantera/clib/src/ctxml.h +++ b/Cantera/clib/src/ctxml.h @@ -11,7 +11,7 @@ #include "clib_defs.h" #ifdef CANTERA_USE_INTERNAL -#include "config.h" +#include "kernel/config.h" #else #include "cantera/kernel/config.h" #endif diff --git a/Cantera/cxx/src/cxxutils.cpp b/Cantera/cxx/src/cxxutils.cpp index cedaddbaf..7018580ed 100644 --- a/Cantera/cxx/src/cxxutils.cpp +++ b/Cantera/cxx/src/cxxutils.cpp @@ -4,7 +4,7 @@ #pragma warning(disable:4503) #endif -#include "ThermoPhase.h" +#include "kernel/ThermoPhase.h" #include using namespace std; diff --git a/Cantera/cxx/src/importPhase.cpp b/Cantera/cxx/src/importPhase.cpp index 3bff771bb..622a7a1ea 100644 --- a/Cantera/cxx/src/importPhase.cpp +++ b/Cantera/cxx/src/importPhase.cpp @@ -4,9 +4,8 @@ #include -#include "ThermoPhase.h" -#include "ThermoFactory.h" -//#include "../include/importPhase.h" +#include "kernel/ThermoPhase.h" +#include "kernel/ThermoFactory.h" namespace Cantera {} diff --git a/Cantera/fortran/src/fct.cpp b/Cantera/fortran/src/fct.cpp index e74946f63..073a178a0 100644 --- a/Cantera/fortran/src/fct.cpp +++ b/Cantera/fortran/src/fct.cpp @@ -17,16 +17,16 @@ #endif // Cantera includes -#include "equil.h" -#include "KineticsFactory.h" -#include "TransportFactory.h" -#include "ThermoFactory.h" -#include "ctml.h" -#include "importKinetics.h" +#include "kernel/equil.h" +#include "kernel/KineticsFactory.h" +#include "kernel/TransportFactory.h" +#include "kernel/ThermoFactory.h" +#include "kernel/ctml.h" +#include "kernel/importKinetics.h" #include "clib/Storage.h" #include "clib/Cabinet.h" -#include "InterfaceKinetics.h" -#include "PureFluidPhase.h" +#include "kernel/InterfaceKinetics.h" +#include "kernel/PureFluidPhase.h" #include "flib_defs.h" diff --git a/Cantera/fortran/src/fctxml.cpp b/Cantera/fortran/src/fctxml.cpp index b745f9190..c583742aa 100644 --- a/Cantera/fortran/src/fctxml.cpp +++ b/Cantera/fortran/src/fctxml.cpp @@ -13,7 +13,7 @@ #include "flib_defs.h" -#include "ctml.h" +#include "kernel/ctml.h" #include diff --git a/Cantera/fortran/src/flib_defs.h b/Cantera/fortran/src/flib_defs.h index 43501532d..56f83ef18 100644 --- a/Cantera/fortran/src/flib_defs.h +++ b/Cantera/fortran/src/flib_defs.h @@ -16,7 +16,7 @@ #define ERR -999 #define DERR -999.999 -#include "config.h" +#include "kernel/config.h" typedef integer status_t; diff --git a/Cantera/src/SConscript b/Cantera/src/SConscript index 647abb22f..1646b071d 100644 --- a/Cantera/src/SConscript +++ b/Cantera/src/SConscript @@ -37,6 +37,7 @@ libs = [('base', 'ctbase', ['cpp'], baseSetup), for subdir, libname, extensions, setup in libs: localenv = env.Clone() + localenv.Append(CPPPATH=Dir('../include/cantera/kernel')) source = setup(localenv, subdir, extensions) for header in mglob(localenv, subdir, 'h'): h = localenv.Command('../include/cantera/kernel/%s' % header.name, header, diff --git a/SConstruct b/SConstruct index 6eeedce6b..e51a67193 100644 --- a/SConstruct +++ b/SConstruct @@ -788,8 +788,7 @@ demoTargets = [] env.SConsignFile() -env.Append(CPPPATH=[Dir('build/include/cantera/kernel'), - Dir('build/include/cantera'), +env.Append(CPPPATH=[Dir('build/include/cantera'), Dir('build/include')], LIBPATH=[Dir('build/lib')], CCFLAGS=[defaults.fPIC], diff --git a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp index bd10b9ae1..eb7dce991 100644 --- a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp +++ b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp @@ -21,7 +21,7 @@ #include "kernel/logger.h" #include "thermo.h" #include "TemperatureTable.h" -#include "HMWSoln.h" +#include "kernel/HMWSoln.h" #endif #include diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp index e8ecab23d..88eadeb92 100755 --- a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp +++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp @@ -21,7 +21,7 @@ #include "kernel/logger.h" #include "thermo.h" #include "TemperatureTable.h" -#include "HMWSoln.h" +#include "kernel/HMWSoln.h" #endif #include diff --git a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp index 772975c77..778105e93 100644 --- a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp +++ b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp @@ -13,7 +13,7 @@ #include "Cantera.h" #include "kernel/logger.h" -#include "HMWSoln.h" +#include "kernel/HMWSoln.h" #include diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp index 7e662a540..f9da5956f 100644 --- a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp +++ b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp @@ -16,9 +16,8 @@ #include "HMWSoln.h" #include "importCTML.h" #else -#include "ThermoPhase.h" - #include "Cantera.h" +#include "kernel/ThermoPhase.h" #include "kernel/logger.h" #include "thermo.h" #include "kernel/HMWSoln.h" diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp index 8e0a62845..507d936f6 100755 --- a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp +++ b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp @@ -22,7 +22,7 @@ #include "kernel/logger.h" #include "thermo.h" #include "TemperatureTable.h" -#include "HMWSoln.h" +#include "kernel/HMWSoln.h" #endif diff --git a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp index 7e8a75bb1..2eae0388a 100644 --- a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp +++ b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp @@ -11,7 +11,7 @@ #include "HMWSoln.h" #else #include "Cantera.h" -#include "HMWSoln.h" +#include "kernel/HMWSoln.h" #endif #include diff --git a/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp b/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp index e41c86332..56e4cccc1 100644 --- a/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp +++ b/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp @@ -1,7 +1,7 @@ /* * $Id: testIAPWSphi.cpp,v 1.2 2008/12/17 17:31:13 hkmoffa Exp $ */ -#include "WaterPropsIAPWSphi.h" +#include "kernel/WaterPropsIAPWSphi.h" #include #include diff --git a/test_problems/cathermo/testIAPWSPres/testPress.cpp b/test_problems/cathermo/testIAPWSPres/testPress.cpp index e800fa171..3b084e4f6 100644 --- a/test_problems/cathermo/testIAPWSPres/testPress.cpp +++ b/test_problems/cathermo/testIAPWSPres/testPress.cpp @@ -1,5 +1,5 @@ -#include "WaterPropsIAPWS.h" +#include "kernel/WaterPropsIAPWS.h" #include #include diff --git a/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp b/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp index eb49d628c..f31a7faf0 100644 --- a/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp +++ b/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp @@ -1,5 +1,5 @@ -#include "WaterPropsIAPWS.h" +#include "kernel/WaterPropsIAPWS.h" #include #include diff --git a/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp b/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp index f3f99a65f..a517e8a74 100644 --- a/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp +++ b/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp @@ -1,14 +1,14 @@ /* * $Id: testWaterPDSS.cpp,v 1.6 2008/12/17 17:31:13 hkmoffa Exp $ */ -#include "ct_defs.h" -#include "ctexceptions.h" -#include "global.h" -#include "xml.h" -#include "ctml.h" -#include "PDSS_Water.h" -#include "ThermoPhase.h" -#include "VPStandardStateTP.h" +#include "kernel/ct_defs.h" +#include "kernel/ctexceptions.h" +#include "kernel/global.h" +#include "kernel/xml.h" +#include "kernel/ctml.h" +#include "kernel/PDSS_Water.h" +#include "kernel/ThermoPhase.h" +#include "kernel/VPStandardStateTP.h" #include #include diff --git a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp index 332dc4a4c..cf5294aa7 100644 --- a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp +++ b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp @@ -4,7 +4,7 @@ #include "Cantera.h" #include "thermo.h" -#include "WaterSSTP.h" +#include "kernel/WaterSSTP.h" #include #include diff --git a/test_problems/cathermo/wtWater/wtWater.cpp b/test_problems/cathermo/wtWater/wtWater.cpp index 953f91cc8..e83a4a886 100644 --- a/test_problems/cathermo/wtWater/wtWater.cpp +++ b/test_problems/cathermo/wtWater/wtWater.cpp @@ -1,16 +1,16 @@ /* * $Id: testWaterPDSS.cpp,v 1.6 2008/12/17 17:31:13 hkmoffa Exp $ */ -#include "ct_defs.h" -#include "ctexceptions.h" -#include "global.h" -#include "xml.h" -#include "ctml.h" -#include "ThermoPhase.h" -#include "VPStandardStateTP.h" +#include "kernel/ct_defs.h" +#include "kernel/ctexceptions.h" +#include "kernel/global.h" +#include "kernel/xml.h" +#include "kernel/ctml.h" +#include "kernel/ThermoPhase.h" +#include "kernel/VPStandardStateTP.h" -#include "WaterSSTP.h" -#include "WaterTransport.h" +#include "kernel/WaterSSTP.h" +#include "kernel/WaterTransport.h" #include #include diff --git a/tools/src/ck2cti.cpp b/tools/src/ck2cti.cpp index 75768663a..c44d2bc97 100644 --- a/tools/src/ck2cti.cpp +++ b/tools/src/ck2cti.cpp @@ -40,9 +40,9 @@ #include using namespace std; -#include "ct_defs.h" -#include "global.h" -#include "ck2ct.h" +#include "kernel/ct_defs.h" +#include "kernel/global.h" +#include "kernel/ck2ct.h" using namespace Cantera; diff --git a/tools/src/cti2ctml.cpp b/tools/src/cti2ctml.cpp index ef2facb55..ffdcdb84b 100644 --- a/tools/src/cti2ctml.cpp +++ b/tools/src/cti2ctml.cpp @@ -14,9 +14,9 @@ #include #include -#include "ct_defs.h" -#include "xml.h" -#include "ctml.h" +#include "kernel/ct_defs.h" +#include "kernel/xml.h" +#include "kernel/ctml.h" using namespace Cantera; using namespace std;