diff --git a/src/clib/clib_defs.h b/include/cantera/clib/clib_defs.h similarity index 100% rename from src/clib/clib_defs.h rename to include/cantera/clib/clib_defs.h diff --git a/src/clib/ct.h b/include/cantera/clib/ct.h similarity index 100% rename from src/clib/ct.h rename to include/cantera/clib/ct.h diff --git a/src/clib/ctbdry.h b/include/cantera/clib/ctbdry.h similarity index 100% rename from src/clib/ctbdry.h rename to include/cantera/clib/ctbdry.h diff --git a/src/clib/ctfunc.h b/include/cantera/clib/ctfunc.h similarity index 100% rename from src/clib/ctfunc.h rename to include/cantera/clib/ctfunc.h diff --git a/src/clib/ctmultiphase.h b/include/cantera/clib/ctmultiphase.h similarity index 100% rename from src/clib/ctmultiphase.h rename to include/cantera/clib/ctmultiphase.h diff --git a/src/clib/ctonedim.h b/include/cantera/clib/ctonedim.h similarity index 100% rename from src/clib/ctonedim.h rename to include/cantera/clib/ctonedim.h diff --git a/src/clib/ctreactor.h b/include/cantera/clib/ctreactor.h similarity index 100% rename from src/clib/ctreactor.h rename to include/cantera/clib/ctreactor.h diff --git a/src/clib/ctrpath.h b/include/cantera/clib/ctrpath.h similarity index 100% rename from src/clib/ctrpath.h rename to include/cantera/clib/ctrpath.h diff --git a/src/clib/ctsurf.h b/include/cantera/clib/ctsurf.h similarity index 100% rename from src/clib/ctsurf.h rename to include/cantera/clib/ctsurf.h diff --git a/src/clib/ctxml.h b/include/cantera/clib/ctxml.h similarity index 100% rename from src/clib/ctxml.h rename to include/cantera/clib/ctxml.h diff --git a/src/clib/clib_utils.h b/src/clib/clib_utils.h index 5a8e108b7..512931a28 100644 --- a/src/clib/clib_utils.h +++ b/src/clib/clib_utils.h @@ -11,7 +11,7 @@ #include "cantera/base/global.h" #include "cantera/base/ctexceptions.h" #include "../base/application.h" -#include "clib_defs.h" +#include "cantera/clib/clib_defs.h" #include namespace Cantera diff --git a/src/clib/ct.cpp b/src/clib/ct.cpp index f1d12d2a7..ddbc55e1a 100644 --- a/src/clib/ct.cpp +++ b/src/clib/ct.cpp @@ -12,7 +12,7 @@ // at http://www.cantera.org/license.txt for license and copyright information. #define CANTERA_USE_INTERNAL -#include "ct.h" +#include "cantera/clib/ct.h" // Cantera includes #include "cantera/kinetics/KineticsFactory.h" diff --git a/src/clib/ctfunc.cpp b/src/clib/ctfunc.cpp index 863f8223e..319a1b8b9 100644 --- a/src/clib/ctfunc.cpp +++ b/src/clib/ctfunc.cpp @@ -6,7 +6,7 @@ // at http://www.cantera.org/license.txt for license and copyright information. #define CANTERA_USE_INTERNAL -#include "ctfunc.h" +#include "cantera/clib/ctfunc.h" #include "cantera/numerics/Func1.h" #include "cantera/base/ctexceptions.h" diff --git a/src/clib/ctmultiphase.cpp b/src/clib/ctmultiphase.cpp index c8d304083..3e6040de0 100644 --- a/src/clib/ctmultiphase.cpp +++ b/src/clib/ctmultiphase.cpp @@ -6,7 +6,7 @@ // at http://www.cantera.org/license.txt for license and copyright information. #define CANTERA_USE_INTERNAL -#include "ctmultiphase.h" +#include "cantera/clib/ctmultiphase.h" // Cantera includes #include "cantera/equil/MultiPhase.h" diff --git a/src/clib/ctonedim.cpp b/src/clib/ctonedim.cpp index c51b5d4f3..56792278a 100644 --- a/src/clib/ctonedim.cpp +++ b/src/clib/ctonedim.cpp @@ -7,7 +7,7 @@ #define CANTERA_USE_INTERNAL -#include "ctonedim.h" +#include "cantera/clib/ctonedim.h" // Cantera includes #include "cantera/oneD/Sim1D.h" diff --git a/src/clib/ctreactor.cpp b/src/clib/ctreactor.cpp index aadd135a0..b9610e7ab 100644 --- a/src/clib/ctreactor.cpp +++ b/src/clib/ctreactor.cpp @@ -6,7 +6,7 @@ // at http://www.cantera.org/license.txt for license and copyright information. #define CANTERA_USE_INTERNAL -#include "ctreactor.h" +#include "cantera/clib/ctreactor.h" // Cantera includes #include "cantera/zeroD/Reactor.h" diff --git a/src/clib/ctrpath.cpp b/src/clib/ctrpath.cpp index 29ea2e622..93067ef2f 100644 --- a/src/clib/ctrpath.cpp +++ b/src/clib/ctrpath.cpp @@ -6,7 +6,7 @@ // at http://www.cantera.org/license.txt for license and copyright information. #define CANTERA_USE_INTERNAL -#include "ctrpath.h" +#include "cantera/clib/ctrpath.h" // Cantera includes #include "cantera/kinetics/ReactionPath.h" diff --git a/src/clib/ctsurf.cpp b/src/clib/ctsurf.cpp index aa4949a2f..44275ecf3 100644 --- a/src/clib/ctsurf.cpp +++ b/src/clib/ctsurf.cpp @@ -7,7 +7,7 @@ // clib header information #define CANTERA_USE_INTERNAL -#include "ctsurf.h" +#include "cantera/clib/ctsurf.h" // Cantera includes #include "cantera/thermo/SurfPhase.h" diff --git a/src/clib/ctxml.cpp b/src/clib/ctxml.cpp index f57c6d929..b060654c3 100644 --- a/src/clib/ctxml.cpp +++ b/src/clib/ctxml.cpp @@ -6,7 +6,7 @@ // at http://www.cantera.org/license.txt for license and copyright information. #define CANTERA_USE_INTERNAL -#include "ctxml.h" +#include "cantera/clib/ctxml.h" // Cantera includes #include "cantera/base/ctml.h" diff --git a/src/fortran/fct.cpp b/src/fortran/fct.cpp index 319c71794..c7217ba44 100644 --- a/src/fortran/fct.cpp +++ b/src/fortran/fct.cpp @@ -19,8 +19,8 @@ #include "clib/Cabinet.h" #include "cantera/kinetics/InterfaceKinetics.h" -#include "clib/clib_defs.h" -#include "clib/ct.h" +#include "cantera/clib/clib_defs.h" +#include "cantera/clib/ct.h" using namespace Cantera; diff --git a/src/matlab/ctfunctions.cpp b/src/matlab/ctfunctions.cpp index 351907ed8..552e8428d 100644 --- a/src/matlab/ctfunctions.cpp +++ b/src/matlab/ctfunctions.cpp @@ -8,13 +8,13 @@ #include #include -#include "clib/ct.h" -#include "clib/ctreactor.h" -#include "clib/ctonedim.h" -#include "clib/ctmultiphase.h" -#include "clib/ctxml.h" -#include "clib/ctfunc.h" -#include "clib/ctrpath.h" +#include "cantera/clib/ct.h" +#include "cantera/clib/ctreactor.h" +#include "cantera/clib/ctonedim.h" +#include "cantera/clib/ctmultiphase.h" +#include "cantera/clib/ctxml.h" +#include "cantera/clib/ctfunc.h" +#include "cantera/clib/ctrpath.h" #include "ctmatutils.h" using namespace std; diff --git a/src/matlab/ctmethods.cpp b/src/matlab/ctmethods.cpp index 9456bf8e5..a85278414 100644 --- a/src/matlab/ctmethods.cpp +++ b/src/matlab/ctmethods.cpp @@ -14,7 +14,7 @@ #include -#include "clib/ct.h" +#include "cantera/clib/ct.h" #include "ctmatutils.h" #include "mllogger.h" diff --git a/src/matlab/flowdevicemethods.cpp b/src/matlab/flowdevicemethods.cpp index 036fe8e81..067decba0 100644 --- a/src/matlab/flowdevicemethods.cpp +++ b/src/matlab/flowdevicemethods.cpp @@ -2,8 +2,8 @@ // at http://www.cantera.org/license.txt for license and copyright information. #include "ctmatutils.h" -#include "clib/ctreactor.h" -#include "clib/ct.h" +#include "cantera/clib/ctreactor.h" +#include "cantera/clib/ct.h" void flowdevicemethods(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) diff --git a/src/matlab/funcmethods.cpp b/src/matlab/funcmethods.cpp index 876c3e898..d36e3cdc2 100644 --- a/src/matlab/funcmethods.cpp +++ b/src/matlab/funcmethods.cpp @@ -2,8 +2,8 @@ // at http://www.cantera.org/license.txt for license and copyright information. #include "ctmatutils.h" -#include "clib/ctfunc.h" -#include "clib/ct.h" +#include "cantera/clib/ctfunc.h" +#include "cantera/clib/ct.h" void funcmethods(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) diff --git a/src/matlab/kineticsmethods.cpp b/src/matlab/kineticsmethods.cpp index 7055ac116..a625bd1dd 100644 --- a/src/matlab/kineticsmethods.cpp +++ b/src/matlab/kineticsmethods.cpp @@ -2,7 +2,7 @@ // at http://www.cantera.org/license.txt for license and copyright information. #include "ctmatutils.h" -#include "clib/ct.h" +#include "cantera/clib/ct.h" void checkNArgs(const int n, const int nrhs) { diff --git a/src/matlab/mixturemethods.cpp b/src/matlab/mixturemethods.cpp index 957fbedc0..41ab3f5d2 100644 --- a/src/matlab/mixturemethods.cpp +++ b/src/matlab/mixturemethods.cpp @@ -8,8 +8,8 @@ #include #include -#include "clib/ctmultiphase.h" -#include "clib/ct.h" +#include "cantera/clib/ctmultiphase.h" +#include "cantera/clib/ct.h" #include "ctmatutils.h" using namespace std; diff --git a/src/matlab/onedimmethods.cpp b/src/matlab/onedimmethods.cpp index b4f66140c..96b1a6283 100644 --- a/src/matlab/onedimmethods.cpp +++ b/src/matlab/onedimmethods.cpp @@ -6,7 +6,7 @@ #include #include "ctmatutils.h" -#include "clib/ctonedim.h" +#include "cantera/clib/ctonedim.h" using namespace std; diff --git a/src/matlab/phasemethods.cpp b/src/matlab/phasemethods.cpp index d5793a06a..38bc5b135 100644 --- a/src/matlab/phasemethods.cpp +++ b/src/matlab/phasemethods.cpp @@ -6,7 +6,7 @@ // at http://www.cantera.org/license.txt for license and copyright information. #include "ctmatutils.h" -#include "clib/ct.h" +#include "cantera/clib/ct.h" #include diff --git a/src/matlab/reactormethods.cpp b/src/matlab/reactormethods.cpp index ee7dc0ab7..062a39d70 100644 --- a/src/matlab/reactormethods.cpp +++ b/src/matlab/reactormethods.cpp @@ -5,8 +5,8 @@ // This file is part of Cantera. See License.txt in the top-level directory or // at http://www.cantera.org/license.txt for license and copyright information. -#include "clib/ctreactor.h" -#include "clib/ct.h" +#include "cantera/clib/ctreactor.h" +#include "cantera/clib/ct.h" #include "ctmatutils.h" void reactormethods(int nlhs, mxArray* plhs[], diff --git a/src/matlab/reactornetmethods.cpp b/src/matlab/reactornetmethods.cpp index 22c893427..ade81f9e4 100644 --- a/src/matlab/reactornetmethods.cpp +++ b/src/matlab/reactornetmethods.cpp @@ -5,8 +5,8 @@ // This file is part of Cantera. See License.txt in the top-level directory or // at http://www.cantera.org/license.txt for license and copyright information. -#include "clib/ctreactor.h" -#include "clib/ct.h" +#include "cantera/clib/ctreactor.h" +#include "cantera/clib/ct.h" #include "ctmatutils.h" void reactornetmethods(int nlhs, mxArray* plhs[], diff --git a/src/matlab/reactorsurfacemethods.cpp b/src/matlab/reactorsurfacemethods.cpp index 57d9843b9..c78769650 100644 --- a/src/matlab/reactorsurfacemethods.cpp +++ b/src/matlab/reactorsurfacemethods.cpp @@ -5,8 +5,8 @@ // This file is part of Cantera. See License.txt in the top-level directory or // at http://www.cantera.org/license.txt for license and copyright information. -#include "clib/ctreactor.h" -#include "clib/ct.h" +#include "cantera/clib/ctreactor.h" +#include "cantera/clib/ct.h" #include "ctmatutils.h" void reactorsurfacemethods(int nlhs, mxArray* plhs[], diff --git a/src/matlab/surfmethods.cpp b/src/matlab/surfmethods.cpp index f22d69cfe..bac92c3a1 100644 --- a/src/matlab/surfmethods.cpp +++ b/src/matlab/surfmethods.cpp @@ -6,8 +6,8 @@ #include #include "ctmatutils.h" -#include "clib/ctsurf.h" -#include "clib/ct.h" +#include "cantera/clib/ctsurf.h" +#include "cantera/clib/ct.h" using namespace std; diff --git a/src/matlab/thermomethods.cpp b/src/matlab/thermomethods.cpp index 878d14663..a3173b5bc 100644 --- a/src/matlab/thermomethods.cpp +++ b/src/matlab/thermomethods.cpp @@ -5,7 +5,7 @@ // This file is part of Cantera. See License.txt in the top-level directory or // at http://www.cantera.org/license.txt for license and copyright information. -#include "clib/ct.h" +#include "cantera/clib/ct.h" #include "ctmatutils.h" #include diff --git a/src/matlab/transportmethods.cpp b/src/matlab/transportmethods.cpp index 66b3d2d53..22240cd86 100644 --- a/src/matlab/transportmethods.cpp +++ b/src/matlab/transportmethods.cpp @@ -3,7 +3,7 @@ #include -#include "clib/ct.h" +#include "cantera/clib/ct.h" #include "ctmatutils.h" void reportError(); diff --git a/src/matlab/wallmethods.cpp b/src/matlab/wallmethods.cpp index d60ea4e2d..47497ba4b 100644 --- a/src/matlab/wallmethods.cpp +++ b/src/matlab/wallmethods.cpp @@ -5,8 +5,8 @@ // This file is part of Cantera. See License.txt in the top-level directory or // at http://www.cantera.org/license.txt for license and copyright information. -#include "clib/ctreactor.h" -#include "clib/ct.h" +#include "cantera/clib/ctreactor.h" +#include "cantera/clib/ct.h" #include "ctmatutils.h" void wallmethods(int nlhs, mxArray* plhs[], diff --git a/src/matlab/xmlmethods.cpp b/src/matlab/xmlmethods.cpp index 519bd05a4..adf5a228d 100644 --- a/src/matlab/xmlmethods.cpp +++ b/src/matlab/xmlmethods.cpp @@ -5,8 +5,8 @@ // This file is part of Cantera. See License.txt in the top-level directory or // at http://www.cantera.org/license.txt for license and copyright information. -#include "clib/ctxml.h" -#include "clib/ct.h" +#include "cantera/clib/ctxml.h" +#include "cantera/clib/ct.h" #include "ctmatutils.h" void reportError();