From b3ae0c92086cefb1a7994ad2dba15c802bf9c0b7 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 15 Mar 2012 19:52:16 +0000 Subject: [PATCH] Use quotes instead of angle brackets for non-system header #includes --- doc/doxygen/demo1.cpp | 6 ++-- doc/doxygen/demo1a.cpp | 2 +- doc/doxygen/demoequil.cpp | 4 +-- doc/doxygen/edemo.cpp | 2 +- include/cantera/numerics/IDA_Solver.h | 4 +-- samples/cxx/NASA_coeffs/NASA_coeffs.cpp | 2 +- samples/cxx/bvp/AxiStagnBVP.cpp | 2 +- samples/cxx/bvp/AxiStagnBVP.h | 2 +- samples/cxx/bvp/BoundaryValueProblem.h | 4 +-- samples/cxx/bvp/blasius.cpp | 2 +- samples/cxx/combustor/combustor.cpp | 4 +-- samples/cxx/demo.cpp | 6 ++-- samples/cxx/flamespeed/flamespeed.cpp | 6 ++-- samples/cxx/kinetics1/example_utils.h | 4 +-- samples/cxx/kinetics1/kinetics1.cpp | 6 ++-- samples/cxx/rankine/rankine.cpp | 2 +- samples/f77/demo_ftnlib.cpp | 6 ++-- src/matlab/ctfunctions.cpp | 6 ++-- src/matlab/ctmethods.cpp | 2 +- src/matlab/flowdevicemethods.cpp | 4 +-- src/matlab/funcmethods.cpp | 4 +-- src/matlab/kineticsmethods.cpp | 2 +- src/matlab/mixturemethods.cpp | 4 +-- src/matlab/onedimmethods.cpp | 2 +- src/matlab/phasemethods.cpp | 2 +- src/matlab/reactormethods.cpp | 4 +-- src/matlab/reactornetmethods.cpp | 4 +-- src/matlab/surfmethods.cpp | 4 +-- src/matlab/thermomethods.cpp | 2 +- src/matlab/transportmethods.cpp | 2 +- src/matlab/wallmethods.cpp | 4 +-- src/matlab/xmlmethods.cpp | 4 +-- src/numerics/CVodesIntegrator.cpp | 34 ++++++++++----------- src/numerics/CVodesIntegrator.h | 4 +-- src/numerics/IDA_Solver.cpp | 14 ++++----- test_problems/cxx_ex/equil_example1.cpp | 4 +-- test_problems/cxx_ex/example_utils.h | 4 +-- test_problems/cxx_ex/kinetics_example1.cpp | 4 +-- test_problems/cxx_ex/kinetics_example2.cpp | 4 +-- test_problems/cxx_ex/kinetics_example3.cpp | 4 +-- test_problems/cxx_ex/rxnpath_example1.cpp | 6 ++-- test_problems/cxx_ex/transport_example1.cpp | 4 +-- test_problems/cxx_ex/transport_example2.cpp | 6 ++-- test_problems/rankine_democxx/rankine.cpp | 2 +- 44 files changed, 102 insertions(+), 102 deletions(-) diff --git a/doc/doxygen/demo1.cpp b/doc/doxygen/demo1.cpp index 814290b2d..f54e5ca85 100644 --- a/doc/doxygen/demo1.cpp +++ b/doc/doxygen/demo1.cpp @@ -1,6 +1,6 @@ -#include // defines class IdealGasMix -#include // chemical equilibrium -#include // transport properties +#include "cantera/IdealGasMix.h" // defines class IdealGasMix +#include "cantera/equilibrium.h" // chemical equilibrium +#include "cantera/transport.h" // transport properties using namespace Cantera; diff --git a/doc/doxygen/demo1a.cpp b/doc/doxygen/demo1a.cpp index bde08e4a6..e2156d1d7 100644 --- a/doc/doxygen/demo1a.cpp +++ b/doc/doxygen/demo1a.cpp @@ -1,4 +1,4 @@ -#include +#include "cantera/thermo.h" using namespace Cantera; diff --git a/doc/doxygen/demoequil.cpp b/doc/doxygen/demoequil.cpp index 20f1b38d7..dd6f775bf 100644 --- a/doc/doxygen/demoequil.cpp +++ b/doc/doxygen/demoequil.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "cantera/equilibrium.h" +#include "cantera/thermo.h" using namespace Cantera; diff --git a/doc/doxygen/edemo.cpp b/doc/doxygen/edemo.cpp index 03ff41a71..e59229541 100644 --- a/doc/doxygen/edemo.cpp +++ b/doc/doxygen/edemo.cpp @@ -1,4 +1,4 @@ -#include +#include "cantera/base/ctexceptions.h" void demoprog() { diff --git a/include/cantera/numerics/IDA_Solver.h b/include/cantera/numerics/IDA_Solver.h index f0fe46187..23b526cf1 100644 --- a/include/cantera/numerics/IDA_Solver.h +++ b/include/cantera/numerics/IDA_Solver.h @@ -24,9 +24,9 @@ #ifdef HAS_SUNDIALS #ifdef SUNDIALS_VERSION_22 -#include +#include "nvector_serial.h" #else -#include +#include "sundials/sundials_nvector.h" // These constants are defined internally in the ida package, ida.c #define IDA_NN 0 diff --git a/samples/cxx/NASA_coeffs/NASA_coeffs.cpp b/samples/cxx/NASA_coeffs/NASA_coeffs.cpp index 9a608f250..4b0942066 100644 --- a/samples/cxx/NASA_coeffs/NASA_coeffs.cpp +++ b/samples/cxx/NASA_coeffs/NASA_coeffs.cpp @@ -1,4 +1,4 @@ -#include // defines class IdealGasMix +#include "cantera/IdealGasMix.h" // defines class IdealGasMix #include #include diff --git a/samples/cxx/bvp/AxiStagnBVP.cpp b/samples/cxx/bvp/AxiStagnBVP.cpp index 316361881..171a30e86 100644 --- a/samples/cxx/bvp/AxiStagnBVP.cpp +++ b/samples/cxx/bvp/AxiStagnBVP.cpp @@ -1,6 +1,6 @@ /// @file AxiStagnBVP.cpp -#include +#include "cantera/Cantera.h" #include "AxiStagnBVP.h" AxiStagnBVP::AxiStagnBVP(int nsp, int np, double L) : diff --git a/samples/cxx/bvp/AxiStagnBVP.h b/samples/cxx/bvp/AxiStagnBVP.h index a19cb8e09..dde114273 100644 --- a/samples/cxx/bvp/AxiStagnBVP.h +++ b/samples/cxx/bvp/AxiStagnBVP.h @@ -1,6 +1,6 @@ /// @file AxiStagnBVP.h -#include +#include "cantera/Cantera.h" #include "BoundaryValueProblem.h" diff --git a/samples/cxx/bvp/BoundaryValueProblem.h b/samples/cxx/bvp/BoundaryValueProblem.h index c06189ffb..446aad134 100644 --- a/samples/cxx/bvp/BoundaryValueProblem.h +++ b/samples/cxx/bvp/BoundaryValueProblem.h @@ -6,8 +6,8 @@ #ifndef BVP_H #define BVP_H -#include -#include +#include "cantera/Cantera.h" +#include "cantera/onedim.h" /// Namespace for the boundary value problem package. namespace BVP diff --git a/samples/cxx/bvp/blasius.cpp b/samples/cxx/bvp/blasius.cpp index 2b2133458..a05df1bc4 100644 --- a/samples/cxx/bvp/blasius.cpp +++ b/samples/cxx/bvp/blasius.cpp @@ -1,7 +1,7 @@ /// @file blasius.cpp /// The Blasius boundary layer -#include +#include "cantera/Cantera.h" #include "BoundaryValueProblem.h" diff --git a/samples/cxx/combustor/combustor.cpp b/samples/cxx/combustor/combustor.cpp index c36a2f646..596ac395e 100644 --- a/samples/cxx/combustor/combustor.cpp +++ b/samples/cxx/combustor/combustor.cpp @@ -7,8 +7,8 @@ // igniter is a pulsed flow of atomic hydrogen. After the igniter is // turned off, the system approaches the steady burning solution.""" -#include -#include +#include "cantera/zerodim.h" +#include "cantera/IdealGasMix.h" using namespace Cantera; diff --git a/samples/cxx/demo.cpp b/samples/cxx/demo.cpp index f9f5b0092..64e3f2f6e 100644 --- a/samples/cxx/demo.cpp +++ b/samples/cxx/demo.cpp @@ -11,9 +11,9 @@ // provide a simplified interface to the Cantera header files. If you need // to include core headers directly, use the format "cantera/module/*.h". -#include // defines class IdealGasMix -#include // chemical equilibrium -#include // transport properties +#include "cantera/IdealGasMix.h" // defines class IdealGasMix +#include "cantera/equilibrium.h" // chemical equilibrium +#include "cantera/transport.h" // transport properties // All Cantera kernel names are in namespace Cantera. You can either // reference everything as Cantera::, or include the following diff --git a/samples/cxx/flamespeed/flamespeed.cpp b/samples/cxx/flamespeed/flamespeed.cpp index 0528bbdea..4b2d16bcd 100644 --- a/samples/cxx/flamespeed/flamespeed.cpp +++ b/samples/cxx/flamespeed/flamespeed.cpp @@ -8,9 +8,9 @@ #include "cantera/oneD/Sim1D.h" #include "cantera/oneD/Inlet1D.h" #include "cantera/oneD/StFlow.h" -#include -#include -#include +#include "cantera/IdealGasMix.h" +#include "cantera/equilibrium.h" +#include "cantera/transport.h" using namespace Cantera; using std::cout; diff --git a/samples/cxx/kinetics1/example_utils.h b/samples/cxx/kinetics1/example_utils.h index 694ae103f..6dfbbdd4a 100644 --- a/samples/cxx/kinetics1/example_utils.h +++ b/samples/cxx/kinetics1/example_utils.h @@ -1,8 +1,8 @@ #ifndef CT_EXAMPLE_UTILS_H #define CT_EXAMPLE_UTILS_H -#include -#include +#include "cantera/base/Array.h" +#include "cantera/base/plots.h" // Save the temperature, density, pressure, and mole fractions at one // time diff --git a/samples/cxx/kinetics1/kinetics1.cpp b/samples/cxx/kinetics1/kinetics1.cpp index 42eae6e5a..97f609ee5 100644 --- a/samples/cxx/kinetics1/kinetics1.cpp +++ b/samples/cxx/kinetics1/kinetics1.cpp @@ -6,9 +6,9 @@ // ///////////////////////////////////////////////////////////// -#include -#include -#include +#include "cantera/zerodim.h" +#include "cantera/IdealGasMix.h" +#include "cantera/numerics.h" #include #include "example_utils.h" diff --git a/samples/cxx/rankine/rankine.cpp b/samples/cxx/rankine/rankine.cpp index a3b2b0ae6..dbe455b08 100644 --- a/samples/cxx/rankine/rankine.cpp +++ b/samples/cxx/rankine/rankine.cpp @@ -3,7 +3,7 @@ #include #include -#include // defines class Water +#include "cantera/PureFluid.h" // defines class Water using namespace Cantera; using namespace std; diff --git a/samples/f77/demo_ftnlib.cpp b/samples/f77/demo_ftnlib.cpp index d29ebe4fd..fe348edd7 100644 --- a/samples/f77/demo_ftnlib.cpp +++ b/samples/f77/demo_ftnlib.cpp @@ -26,7 +26,7 @@ */ // add any other Cantera header files you need here -#include +#include "cantera/IdealGasMix.h" using namespace Cantera; using std::string; @@ -45,12 +45,12 @@ IdealGasMix* _gasptr() #define WITH_TRANSPORT #ifdef WITH_EQUIL -#include +#include "cantera/equilibrium.h" #endif #ifdef WITH_TRANSPORT -#include +#include "cantera/transport.h" // store a pointer to a transport manager static Transport* _trans = 0; diff --git a/src/matlab/ctfunctions.cpp b/src/matlab/ctfunctions.cpp index 61d2c31b9..8629b5b15 100644 --- a/src/matlab/ctfunctions.cpp +++ b/src/matlab/ctfunctions.cpp @@ -4,9 +4,9 @@ #include #include -#include -#include -#include +#include "clib/ct.h" +#include "clib/ctonedim.h" +#include "clib/ctxml.h" #include "ctmatutils.h" using namespace std; diff --git a/src/matlab/ctmethods.cpp b/src/matlab/ctmethods.cpp index 47a50824b..579ed5149 100644 --- a/src/matlab/ctmethods.cpp +++ b/src/matlab/ctmethods.cpp @@ -11,7 +11,7 @@ #include -#include +#include "clib/ct.h" #include "ctmatutils.h" #include "mllogger.h" diff --git a/src/matlab/flowdevicemethods.cpp b/src/matlab/flowdevicemethods.cpp index d11d1455a..4aa8b0b12 100644 --- a/src/matlab/flowdevicemethods.cpp +++ b/src/matlab/flowdevicemethods.cpp @@ -1,6 +1,6 @@ #include "ctmatutils.h" -#include -#include +#include "clib/ctreactor.h" +#include "clib/ct.h" //const double Undef = -999.123; diff --git a/src/matlab/funcmethods.cpp b/src/matlab/funcmethods.cpp index 272902801..e874d304f 100644 --- a/src/matlab/funcmethods.cpp +++ b/src/matlab/funcmethods.cpp @@ -1,6 +1,6 @@ #include "ctmatutils.h" -#include -#include +#include "clib/ctfunc.h" +#include "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 2096ca43b..715785bf5 100644 --- a/src/matlab/kineticsmethods.cpp +++ b/src/matlab/kineticsmethods.cpp @@ -1,5 +1,5 @@ #include "ctmatutils.h" -#include +#include "clib/ct.h" void checkNArgs(const int n, const int nrhs) { diff --git a/src/matlab/mixturemethods.cpp b/src/matlab/mixturemethods.cpp index 1b732dac9..fe1676b55 100644 --- a/src/matlab/mixturemethods.cpp +++ b/src/matlab/mixturemethods.cpp @@ -3,8 +3,8 @@ */ #include -#include -#include +#include "clib/ctmultiphase.h" +#include "clib/ct.h" #include "ctmatutils.h" using namespace std; diff --git a/src/matlab/onedimmethods.cpp b/src/matlab/onedimmethods.cpp index f90ecf766..e5f9a40d0 100644 --- a/src/matlab/onedimmethods.cpp +++ b/src/matlab/onedimmethods.cpp @@ -2,7 +2,7 @@ #include #include "ctmatutils.h" -#include +#include "clib/ctonedim.h" using namespace std; using namespace Cantera; diff --git a/src/matlab/phasemethods.cpp b/src/matlab/phasemethods.cpp index 47bcbe1f5..b6b83ec09 100644 --- a/src/matlab/phasemethods.cpp +++ b/src/matlab/phasemethods.cpp @@ -3,7 +3,7 @@ */ #include "ctmatutils.h" -#include +#include "clib/ct.h" void phasemethods(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) diff --git a/src/matlab/reactormethods.cpp b/src/matlab/reactormethods.cpp index e2fe81309..85b2e0a9b 100644 --- a/src/matlab/reactormethods.cpp +++ b/src/matlab/reactormethods.cpp @@ -2,8 +2,8 @@ * @file reactormethods.cpp */ -#include -#include +#include "clib/ctreactor.h" +#include "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 2a8a8c8ba..4eacdb932 100644 --- a/src/matlab/reactornetmethods.cpp +++ b/src/matlab/reactornetmethods.cpp @@ -2,8 +2,8 @@ * @file reactornetmethods.cpp */ -#include -#include +#include "clib/ctreactor.h" +#include "clib/ct.h" #include "ctmatutils.h" //const double Undef = -999.123; diff --git a/src/matlab/surfmethods.cpp b/src/matlab/surfmethods.cpp index e76658d69..e1bddb999 100644 --- a/src/matlab/surfmethods.cpp +++ b/src/matlab/surfmethods.cpp @@ -2,8 +2,8 @@ #include #include "ctmatutils.h" -#include -#include +#include "clib/ctsurf.h" +#include "clib/ct.h" using namespace std; diff --git a/src/matlab/thermomethods.cpp b/src/matlab/thermomethods.cpp index d6d2a47ee..6fc80dd21 100644 --- a/src/matlab/thermomethods.cpp +++ b/src/matlab/thermomethods.cpp @@ -2,7 +2,7 @@ * @file thermomethods.cpp */ -#include +#include "clib/ct.h" #include "ctmatutils.h" static void thermoset(int nlhs, mxArray* plhs[], diff --git a/src/matlab/transportmethods.cpp b/src/matlab/transportmethods.cpp index 1d483fe82..0163f661f 100644 --- a/src/matlab/transportmethods.cpp +++ b/src/matlab/transportmethods.cpp @@ -1,6 +1,6 @@ #include -#include +#include "clib/ct.h" #include "ctmatutils.h" void reportError(); diff --git a/src/matlab/wallmethods.cpp b/src/matlab/wallmethods.cpp index 5a56c2b6f..c9912716c 100644 --- a/src/matlab/wallmethods.cpp +++ b/src/matlab/wallmethods.cpp @@ -2,8 +2,8 @@ * @file wallmethods.cpp */ -#include -#include +#include "clib/ctreactor.h" +#include "clib/ct.h" #include "ctmatutils.h" //const double Undef = -999.123; diff --git a/src/matlab/xmlmethods.cpp b/src/matlab/xmlmethods.cpp index 4fb8ed6f0..0bfc39319 100644 --- a/src/matlab/xmlmethods.cpp +++ b/src/matlab/xmlmethods.cpp @@ -2,8 +2,8 @@ * @file xmlmethods.cpp */ -#include -#include +#include "clib/ctxml.h" +#include "clib/ct.h" #include "ctmatutils.h" void reportError(); diff --git a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp index 42bd0238a..ea4c5a5ee 100644 --- a/src/numerics/CVodesIntegrator.cpp +++ b/src/numerics/CVodesIntegrator.cpp @@ -14,27 +14,27 @@ using namespace std; #ifdef SUNDIALS_VERSION_22 -#include -#include -#include -#include -#include -#include -#include -#include +#include "sundials_types.h" +#include "sundials_math.h" +#include "cvodes.h" +#include "cvodes_dense.h" +#include "cvodes_diag.h" +#include "cvodes_spgmr.h" +#include "cvodes_band.h" +#include "nvector_serial.h" #else #if defined(SUNDIALS_VERSION_23) || defined (SUNDIALS_VERSION_24) -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "sundials/sundials_types.h" +#include "sundials/sundials_math.h" +#include "sundials/sundials_nvector.h" +#include "nvector/nvector_serial.h" +#include "cvodes/cvodes.h" +#include "cvodes/cvodes_dense.h" +#include "cvodes/cvodes_diag.h" +#include "cvodes/cvodes_spgmr.h" +#include "cvodes/cvodes_band.h" #else diff --git a/src/numerics/CVodesIntegrator.h b/src/numerics/CVodesIntegrator.h index fcd0a5044..f23f925d9 100644 --- a/src/numerics/CVodesIntegrator.h +++ b/src/numerics/CVodesIntegrator.h @@ -14,9 +14,9 @@ #include "cantera/base/ct_defs.h" #ifdef SUNDIALS_VERSION_22 -#include +#include "nvector_serial.h" #else -#include +#include "sundials/sundials_nvector.h" #endif namespace Cantera diff --git a/src/numerics/IDA_Solver.cpp b/src/numerics/IDA_Solver.cpp index 12c7a162d..e1f972079 100644 --- a/src/numerics/IDA_Solver.cpp +++ b/src/numerics/IDA_Solver.cpp @@ -11,13 +11,13 @@ #include #ifdef SUNDIALS_VERSION_24 -#include -#include -#include -#include -#include -#include -#include +#include "sundials/sundials_types.h" +#include "sundials/sundials_math.h" +#include "ida/ida.h" +#include "ida/ida_dense.h" +#include "ida/ida_spgmr.h" +#include "ida/ida_band.h" +#include "nvector/nvector_serial.h" using namespace std; diff --git a/test_problems/cxx_ex/equil_example1.cpp b/test_problems/cxx_ex/equil_example1.cpp index 4b51dd9d5..0d8d74a25 100644 --- a/test_problems/cxx_ex/equil_example1.cpp +++ b/test_problems/cxx_ex/equil_example1.cpp @@ -6,9 +6,9 @@ ///////////////////////////////////////////////////////////// #include "example_utils.h" -#include +#include "cantera/equilibrium.h" -#include +#include "cantera/IdealGasMix.h" using namespace Cantera; //------------------------------------------------------------------- diff --git a/test_problems/cxx_ex/example_utils.h b/test_problems/cxx_ex/example_utils.h index f6be1c753..3492b8ac9 100644 --- a/test_problems/cxx_ex/example_utils.h +++ b/test_problems/cxx_ex/example_utils.h @@ -1,8 +1,8 @@ #ifndef CT_EXAMPLE_UTILS_H #define CT_EXAMPLE_UTILS_H -#include -#include +#include "cantera/base/Array.h" +#include "cantera/base/plots.h" // Save the temperature, density, pressure, and mole fractions at one // time diff --git a/test_problems/cxx_ex/kinetics_example1.cpp b/test_problems/cxx_ex/kinetics_example1.cpp index 7d3f8e2ed..0808bbd1a 100644 --- a/test_problems/cxx_ex/kinetics_example1.cpp +++ b/test_problems/cxx_ex/kinetics_example1.cpp @@ -6,8 +6,8 @@ // ///////////////////////////////////////////////////////////// -#include -#include +#include "cantera/zerodim.h" +#include "cantera/IdealGasMix.h" #include "example_utils.h" using namespace Cantera; using namespace std; diff --git a/test_problems/cxx_ex/kinetics_example2.cpp b/test_problems/cxx_ex/kinetics_example2.cpp index af590bfa8..5391803ef 100644 --- a/test_problems/cxx_ex/kinetics_example2.cpp +++ b/test_problems/cxx_ex/kinetics_example2.cpp @@ -6,8 +6,8 @@ // ///////////////////////////////////////////////////////////// -#include -#include +#include "cantera/GRI30.h" +#include "cantera/zerodim.h" #include "example_utils.h" using namespace Cantera; diff --git a/test_problems/cxx_ex/kinetics_example3.cpp b/test_problems/cxx_ex/kinetics_example3.cpp index 683606f13..971a7aa02 100644 --- a/test_problems/cxx_ex/kinetics_example3.cpp +++ b/test_problems/cxx_ex/kinetics_example3.cpp @@ -6,8 +6,8 @@ // ///////////////////////////////////////////////////////////// -#include -#include +#include "cantera/zerodim.h" +#include "cantera/IdealGasMix.h" #include "example_utils.h" using namespace Cantera; diff --git a/test_problems/cxx_ex/rxnpath_example1.cpp b/test_problems/cxx_ex/rxnpath_example1.cpp index 51b343470..ec6feaf30 100644 --- a/test_problems/cxx_ex/rxnpath_example1.cpp +++ b/test_problems/cxx_ex/rxnpath_example1.cpp @@ -6,10 +6,10 @@ // ///////////////////////////////////////////////////////////// -#include +#include "cantera/zerodim.h" #include "example_utils.h" -#include -#include +#include "cantera/reactionpaths.h" +#include "cantera/IdealGasMix.h" // #include diff --git a/test_problems/cxx_ex/transport_example1.cpp b/test_problems/cxx_ex/transport_example1.cpp index 62d4c3a7f..a6af34af0 100644 --- a/test_problems/cxx_ex/transport_example1.cpp +++ b/test_problems/cxx_ex/transport_example1.cpp @@ -6,9 +6,9 @@ // ///////////////////////////////////////////////////////////// -#include +#include "cantera/transport.h" #include "example_utils.h" -#include +#include "cantera/IdealGasMix.h" using namespace Cantera; using std::cout; diff --git a/test_problems/cxx_ex/transport_example2.cpp b/test_problems/cxx_ex/transport_example2.cpp index 67910658f..2cf6700ed 100644 --- a/test_problems/cxx_ex/transport_example2.cpp +++ b/test_problems/cxx_ex/transport_example2.cpp @@ -6,10 +6,10 @@ // ///////////////////////////////////////////////////////////// -#include +#include "cantera/transport.h" #include "example_utils.h" -#include -#include +#include "cantera/equilibrium.h" +#include "cantera/IdealGasMix.h" using namespace Cantera; using std::cout; diff --git a/test_problems/rankine_democxx/rankine.cpp b/test_problems/rankine_democxx/rankine.cpp index 77bdfebf6..c2b4cc19a 100644 --- a/test_problems/rankine_democxx/rankine.cpp +++ b/test_problems/rankine_democxx/rankine.cpp @@ -3,7 +3,7 @@ #include #include -#include // defines class Water +#include "cantera/PureFluid.h" // defines class Water using namespace Cantera; using namespace std;