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

@@ -10,8 +10,8 @@
 #define CT_CABINET_H
 
 #include <vector>
-#include "stringUtils.h"
-#include "config.h"
+#include "kernel/stringUtils.h"
+#include "kernel/config.h"
 
 /**
  * Template for classes to hold pointers to objects. The Cabinet<M>

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"
 

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"

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. 

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;

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

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"
 

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;
 

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"

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"

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

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"

Cantera/clib/src/ctrpath.cpp

@@ -11,7 +11,7 @@
 
 // Cantera includes
 
-#include "ReactionPath.h"
+#include "kernel/ReactionPath.h"
 #include "Cabinet.h"
 #include "Storage.h"
 

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<Surf1D>*         Cabinet<Surf1D>::__storage = 0;
 
 //inline Surf1D* _surface(int i) {

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

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"
 

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

Cantera/cxx/src/cxxutils.cpp

@@ -4,7 +4,7 @@
 #pragma warning(disable:4503)
 #endif
 
-#include "ThermoPhase.h"
+#include "kernel/ThermoPhase.h"
 #include <stdio.h>
 
 using namespace std;

Cantera/cxx/src/importPhase.cpp

@@ -4,9 +4,8 @@
 
 #include <string>
 
-#include "ThermoPhase.h"
-#include "ThermoFactory.h"
-//#include "../include/importPhase.h"
+#include "kernel/ThermoPhase.h"
+#include "kernel/ThermoFactory.h"
 
 namespace Cantera {}
 

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"
 

Cantera/fortran/src/fctxml.cpp

@@ -13,7 +13,7 @@
 
 #include "flib_defs.h"
 
-#include "ctml.h"
+#include "kernel/ctml.h"
 
 #include <cstring>
 

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;
 

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,

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],

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 <cstdio>

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 <cstdio>

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 <cstdio>
 

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"

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
 

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 <cstdio>

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 <new>
 
 #include <cstdio>

test_problems/cathermo/testIAPWSPres/testPress.cpp

@@ -1,5 +1,5 @@
 
-#include "WaterPropsIAPWS.h"
+#include "kernel/WaterPropsIAPWS.h"
 #include <new>
 
 #include <cstdio>

test_problems/cathermo/testIAPWSTripP/testTripleP.cpp

@@ -1,5 +1,5 @@
 
-#include "WaterPropsIAPWS.h"
+#include "kernel/WaterPropsIAPWS.h"
 #include <new>
 
 #include <cstdio>

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 <new>
 
 #include <cstdio>

test_problems/cathermo/testWaterTP/testWaterSSTP.cpp

@@ -4,7 +4,7 @@
 
 #include "Cantera.h"
 #include "thermo.h"
-#include "WaterSSTP.h"
+#include "kernel/WaterSSTP.h"
 
 #include <cstdio>
 #include <cmath>

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 <new>
 
 #include <cstdio>

tools/src/ck2cti.cpp

@@ -40,9 +40,9 @@
 #include <string>
 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;
 

tools/src/cti2ctml.cpp

@@ -14,9 +14,9 @@
 #include <string>
 #include <vector>
 
-#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;