From a310345b9e220260029466425d5ee7d53f6230ee Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sun, 12 Feb 2012 02:44:14 +0000 Subject: [PATCH] Updated #includes to reflect new header file locations --- include/cantera/Cantera.h | 14 ++--- include/cantera/Edge.h | 6 +- include/cantera/GRI30.h | 8 +-- include/cantera/IdealGasMix.h | 8 +-- include/cantera/IncompressibleSolid.h | 4 +- include/cantera/Metal.h | 4 +- include/cantera/PureFluid.h | 4 +- include/cantera/electrolyteThermo.h | 28 ++++----- include/cantera/equil/ChemEquil.h | 10 ++-- include/cantera/equil/MultiPhase.h | 6 +- include/cantera/equil/MultiPhaseEquil.h | 2 +- include/cantera/equil/vcs_MultiPhaseEquil.h | 2 +- include/cantera/equilibrium.h | 8 +-- include/cantera/integrators.h | 6 +- include/cantera/kinetics.h | 10 ++-- include/cantera/kinetics/AqueousKinetics.h | 4 +- include/cantera/kinetics/FalloffFactory.h | 4 +- include/cantera/kinetics/GasKinetics.h | 4 +- include/cantera/kinetics/Group.h | 2 +- include/cantera/kinetics/InterfaceKinetics.h | 4 +- include/cantera/kinetics/Kinetics.h | 6 +- include/cantera/kinetics/KineticsFactory.h | 4 +- include/cantera/kinetics/RateCoeffMgr.h | 6 +- include/cantera/kinetics/ReactionPath.h | 4 +- include/cantera/kinetics/ReactionStoichMgr.h | 2 +- include/cantera/kinetics/RxnRates.h | 2 +- include/cantera/kinetics/ThirdBodyMgr.h | 4 +- include/cantera/kinetics/importKinetics.h | 2 +- include/cantera/kinetics/reaction_defs.h | 2 +- include/cantera/numerics.h | 8 +-- include/cantera/numerics/ArrayViewer.h | 8 +-- include/cantera/numerics/BandMatrix.h | 6 +- include/cantera/numerics/DAE_Solver.h | 4 +- include/cantera/numerics/DenseMatrix.h | 4 +- include/cantera/numerics/Func1.h | 2 +- include/cantera/numerics/FuncEval.h | 2 +- include/cantera/numerics/GeneralMatrix.h | 2 +- include/cantera/numerics/IDA_Solver.h | 2 +- include/cantera/numerics/Integrator.h | 4 +- include/cantera/numerics/ResidEval.h | 4 +- include/cantera/numerics/ctlapack.h | 2 +- include/cantera/numerics/funcs.h | 2 +- include/cantera/numerics/polyfit.h | 2 +- include/cantera/numerics/solveProb.h | 2 +- include/cantera/oneD/Domain1D.h | 6 +- include/cantera/oneD/Inlet1D.h | 6 +- include/cantera/oneD/MultiJac.h | 2 +- include/cantera/oneD/Sim1D.h | 2 +- include/cantera/oneD/StFlow.h | 10 ++-- include/cantera/oneD/Surf1D.h | 6 +- include/cantera/onedim.h | 16 ++--- include/cantera/radiation.h | 4 +- include/cantera/reactionpaths.h | 2 +- include/cantera/solvers.h | 4 +- include/cantera/spectra.h | 4 +- include/cantera/spectra/LineBroadener.h | 4 +- include/cantera/spectra/rotor.h | 2 +- include/cantera/surface.h | 4 +- include/cantera/thermo.h | 14 ++--- include/cantera/thermo/ConstDensityThermo.h | 4 +- include/cantera/thermo/Constituents.h | 8 +-- include/cantera/thermo/Crystal.h | 2 +- include/cantera/thermo/DebyeHuckel.h | 2 +- include/cantera/thermo/Elements.h | 2 +- include/cantera/thermo/GeneralSpeciesThermo.h | 2 +- include/cantera/thermo/IdealGasPhase.h | 4 +- include/cantera/thermo/LatticePhase.h | 6 +- include/cantera/thermo/LatticeSolidPhase.h | 6 +- include/cantera/thermo/MixtureFugacityTP.h | 2 +- include/cantera/thermo/Nasa9Poly1.h | 2 +- include/cantera/thermo/NasaPoly1.h | 2 +- include/cantera/thermo/PDSS.h | 2 +- include/cantera/thermo/PDSS_Water.h | 2 +- include/cantera/thermo/Phase.h | 4 +- include/cantera/thermo/SpeciesThermo.h | 2 +- include/cantera/thermo/SpeciesThermoFactory.h | 4 +- include/cantera/thermo/SpeciesThermoMgr.h | 6 +- include/cantera/thermo/State.h | 4 +- include/cantera/thermo/ThermoFactory.h | 4 +- include/cantera/thermo/VPSSMgr.h | 2 +- include/cantera/thermo/VPSSMgr_ConstVol.h | 2 +- include/cantera/thermo/VPSSMgr_General.h | 2 +- include/cantera/thermo/VPSSMgr_IdealGas.h | 2 +- include/cantera/thermo/WaterProps.h | 2 +- include/cantera/thermo/WaterPropsIAPWS.h | 2 +- include/cantera/thermo/WaterPropsIAPWSphi.h | 2 +- include/cantera/thermo/speciesThermoTypes.h | 6 +- include/cantera/transport.h | 10 ++-- include/cantera/transport/AqueousTransport.h | 2 +- include/cantera/transport/DustyGasTransport.h | 2 +- include/cantera/transport/LTPspecies.h | 4 +- .../cantera/transport/LiquidTranInteraction.h | 6 +- include/cantera/transport/LiquidTransport.h | 2 +- .../cantera/transport/LiquidTransportData.h | 4 +- .../cantera/transport/LiquidTransportParams.h | 6 +- include/cantera/transport/MixTransport.h | 2 +- include/cantera/transport/MultiTransport.h | 2 +- include/cantera/transport/SimpleTransport.h | 2 +- include/cantera/transport/SolidTransport.h | 2 +- include/cantera/transport/TransportBase.h | 4 +- include/cantera/transport/TransportFactory.h | 4 +- include/cantera/transport/TransportParams.h | 4 +- include/cantera/transport/WaterTransport.h | 2 +- include/cantera/zeroD/FlowDevice.h | 6 +- include/cantera/zeroD/Reactor.h | 2 +- include/cantera/zeroD/ReactorBase.h | 2 +- include/cantera/zeroD/ReactorFactory.h | 2 +- include/cantera/zeroD/ReactorNet.h | 6 +- include/cantera/zeroD/Wall.h | 6 +- include/cantera/zeroD/flowControllers.h | 2 +- include/cantera/zerodim.h | 14 ++--- src/apps/ck2cti.cpp | 6 +- src/apps/csvdiff.cpp | 4 +- src/apps/cti2ctml.cpp | 6 +- src/apps/mdp_allo.cpp | 2 +- src/base/LogPrintCtrl.cpp | 2 +- src/base/LogPrintCtrl.h | 2 +- src/base/PrintCtrl.cpp | 2 +- src/base/checkFinite.cpp | 2 +- src/base/clockWC.cpp | 2 +- src/base/ct2ctml.cpp | 10 ++-- src/base/ctml.cpp | 6 +- src/base/mdp_allo.cpp | 2 +- src/base/misc.cpp | 14 ++--- src/base/plots.cpp | 2 +- src/base/plots.h | 4 +- src/base/stringUtils.cpp | 10 ++-- src/base/units.h | 4 +- src/base/xml.cpp | 8 +-- src/clib/Cabinet.h | 4 +- src/clib/Storage.cpp | 4 +- src/clib/Storage.h | 4 +- src/clib/clib_defs.h | 2 +- src/clib/ct.cpp | 18 +++--- src/clib/ct.h | 4 +- src/clib/ctbdry.cpp | 6 +- src/clib/ctfunc.cpp | 4 +- src/clib/ctmultiphase.cpp | 8 +-- src/clib/ctonedim.cpp | 10 ++-- src/clib/ctonedim.h | 4 +- src/clib/ctreactor.cpp | 14 ++--- src/clib/ctrpath.cpp | 2 +- src/clib/ctsurf.cpp | 6 +- src/clib/ctsurf.h | 4 +- src/clib/ctxml.cpp | 2 +- src/clib/ctxml.h | 4 +- src/converters/CKReader.cpp | 2 +- src/converters/NASA9Parser.cpp | 2 +- src/converters/Species.h | 2 +- src/converters/ck2ct.cpp | 8 +-- src/converters/ck2ct.h | 2 +- src/converters/ckr_defs.h | 2 +- src/converters/thermoFunctions.cpp | 2 +- src/equil/BasisOptimize.cpp | 8 +-- src/equil/ChemEquil.cpp | 18 +++--- src/equil/MultiPhase.cpp | 12 ++-- src/equil/MultiPhaseEquil.cpp | 8 +-- src/equil/PropertyCalculator.h | 2 +- src/equil/equilibrate.cpp | 10 ++-- src/equil/vcs_MultiPhaseEquil.cpp | 18 +++--- src/equil/vcs_SpeciesProperties.cpp | 2 +- src/equil/vcs_VolPhase.cpp | 4 +- src/equil/vcs_equilibrate.cpp | 16 ++--- src/equil/vcs_inest.cpp | 2 +- src/equil/vcs_internal.h | 6 +- src/equil/vcs_nondim.cpp | 2 +- src/equil/vcs_prob.cpp | 4 +- src/equil/vcs_prob.h | 2 +- src/equil/vcs_root1d.cpp | 2 +- src/equil/vcs_solve.cpp | 2 +- src/equil/vcs_solve.h | 4 +- src/equil/vcs_solve_TP.cpp | 2 +- src/equil/vcs_solve_phaseStability.cpp | 2 +- src/equil/vcs_species_thermo.cpp | 2 +- src/fortran/fct.cpp | 16 ++--- src/fortran/fctxml.cpp | 2 +- src/fortran/flib_defs.h | 2 +- src/kinetics/AqueousKinetics.cpp | 4 +- src/kinetics/FalloffFactory.cpp | 4 +- src/kinetics/GRI_30_Kinetics.cpp | 10 ++-- src/kinetics/GasKinetics.cpp | 8 +-- src/kinetics/Group.cpp | 2 +- src/kinetics/ImplicitSurfChem.cpp | 2 +- src/kinetics/ImplicitSurfChem.h | 8 +-- src/kinetics/InterfaceKinetics.cpp | 8 +-- src/kinetics/Kinetics.cpp | 6 +- src/kinetics/KineticsFactory.cpp | 14 ++--- src/kinetics/ReactionData.h | 2 +- src/kinetics/ReactionPath.cpp | 8 +-- src/kinetics/ReactionStoichMgr.cpp | 4 +- src/kinetics/StoichManager.h | 2 +- src/kinetics/importKinetics.cpp | 28 ++++----- src/kinetics/solveSP.cpp | 4 +- src/kinetics/solveSP.h | 4 +- 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/mllogger.h | 2 +- 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/BEulerInt.cpp | 2 +- src/numerics/BEulerInt.h | 18 +++--- src/numerics/BandMatrix.cpp | 12 ++-- src/numerics/CVodeInt.h | 8 +-- src/numerics/CVodesIntegrator.cpp | 4 +- src/numerics/CVodesIntegrator.h | 8 +-- src/numerics/DenseMatrix.cpp | 12 ++-- src/numerics/Func1.cpp | 6 +- src/numerics/GeneralMatrix.cpp | 2 +- src/numerics/IDA_Solver.cpp | 4 +- src/numerics/NonlinearSolver.cpp | 14 ++--- src/numerics/ODE_integrators.cpp | 4 +- src/numerics/ResidJacEval.cpp | 6 +- src/numerics/RootFind.cpp | 10 ++-- src/numerics/SquareMatrix.cpp | 10 ++-- src/numerics/funcs.cpp | 12 ++-- src/numerics/lapack.h | 2 +- src/numerics/solveProb.cpp | 6 +- src/oneD/Domain1D.cpp | 2 +- src/oneD/MultiJac.cpp | 2 +- src/oneD/MultiNewton.cpp | 8 +-- src/oneD/OneDim.cpp | 8 +-- src/oneD/Resid1D.h | 6 +- src/oneD/Sim1D.cpp | 4 +- src/oneD/StFlow.cpp | 8 +-- src/oneD/boundaries1D.cpp | 2 +- src/oneD/newton_utils.cpp | 4 +- src/oneD/refine.cpp | 4 +- src/python/pycantera.cpp | 4 +- src/python/pylogger.h | 2 +- src/spectra/LineBroadener.cpp | 4 +- src/spectra/Nuclei.h | 2 +- src/spectra/rotor.cpp | 4 +- src/thermo/ConstCpPoly.h | 2 +- src/thermo/ConstDensityThermo.cpp | 8 +-- src/thermo/Constituents.cpp | 4 +- src/thermo/DebyeHuckel.cpp | 8 +-- src/thermo/Elements.cpp | 10 ++-- src/thermo/FixedChemPotSSTP.cpp | 12 ++-- src/thermo/GeneralSpeciesThermo.cpp | 8 +-- src/thermo/GibbsExcessVPSSTP.cpp | 2 +- src/thermo/HMWSoln.cpp | 8 +-- src/thermo/HMWSoln_input.cpp | 8 +-- src/thermo/IdealGasPhase.cpp | 8 +-- src/thermo/IdealMolalSoln.cpp | 4 +- src/thermo/IdealSolidSolnPhase.cpp | 2 +- src/thermo/IdealSolnGasVPSS.cpp | 10 ++-- src/thermo/IonsFromNeutralVPSSTP.cpp | 8 +-- src/thermo/LatticePhase.cpp | 12 ++-- src/thermo/LatticeSolidPhase.cpp | 16 ++--- src/thermo/MargulesVPSSTP.cpp | 4 +- src/thermo/MetalSHEelectrons.cpp | 8 +-- src/thermo/MineralEQ3.cpp | 12 ++-- src/thermo/MixedSolventElectrolyte.cpp | 4 +- src/thermo/MixtureFugacityTP.cpp | 6 +- src/thermo/MolalityVPSSTP.cpp | 2 +- src/thermo/MolarityIonicVPSSTP.cpp | 4 +- src/thermo/Mu0Poly.cpp | 10 ++-- src/thermo/Mu0Poly.h | 2 +- src/thermo/Nasa9Poly1.cpp | 2 +- src/thermo/Nasa9PolyMultiTempRegion.cpp | 4 +- src/thermo/Nasa9PolyMultiTempRegion.h | 4 +- src/thermo/NasaPoly2.h | 2 +- src/thermo/NasaThermo.h | 10 ++-- src/thermo/PDSS.cpp | 14 ++--- src/thermo/PDSS_ConstVol.cpp | 12 ++-- src/thermo/PDSS_HKFT.cpp | 8 +-- src/thermo/PDSS_IdealGas.cpp | 12 ++-- src/thermo/PDSS_IonsFromNeutral.cpp | 14 ++--- src/thermo/PDSS_SSVol.cpp | 12 ++-- src/thermo/PDSS_Water.cpp | 16 ++--- src/thermo/Phase.cpp | 8 +-- src/thermo/PhaseCombo_Interaction.cpp | 4 +- src/thermo/PseudoBinaryVPSSTP.cpp | 2 +- src/thermo/PureFluidPhase.cpp | 8 +-- src/thermo/RedlichKisterVPSSTP.cpp | 2 +- src/thermo/RedlichKisterVPSSTP.h | 4 +- src/thermo/RedlichKwongMFTP.cpp | 8 +-- src/thermo/SemiconductorPhase.cpp | 2 +- src/thermo/ShomatePoly.h | 2 +- src/thermo/ShomateThermo.h | 4 +- src/thermo/SingleSpeciesTP.cpp | 2 +- src/thermo/SpeciesThermoFactory.cpp | 24 ++++---- src/thermo/SpeciesThermoInterpType.cpp | 8 +-- src/thermo/State.cpp | 8 +-- src/thermo/StoichSubstance.cpp | 8 +-- src/thermo/StoichSubstanceSSTP.cpp | 10 ++-- src/thermo/SurfPhase.cpp | 6 +- src/thermo/ThermoFactory.cpp | 58 +++++++++---------- src/thermo/ThermoPhase.cpp | 4 +- src/thermo/VPSSMgr.cpp | 10 ++-- src/thermo/VPSSMgrFactory.cpp | 34 +++++------ src/thermo/VPSSMgrFactory.h | 8 +-- src/thermo/VPSSMgr_ConstVol.cpp | 10 ++-- src/thermo/VPSSMgr_General.cpp | 22 +++---- src/thermo/VPSSMgr_IdealGas.cpp | 12 ++-- src/thermo/VPSSMgr_Water_ConstVol.cpp | 8 +-- src/thermo/VPSSMgr_Water_HKFT.cpp | 8 +-- src/thermo/VPStandardStateTP.cpp | 6 +- src/thermo/WaterProps.cpp | 8 +-- src/thermo/WaterPropsIAPWS.cpp | 6 +- src/thermo/WaterPropsIAPWSphi.cpp | 2 +- src/thermo/WaterSSTP.cpp | 10 ++-- src/thermo/phasereport.cpp | 6 +- src/tpx/CarbonDioxide.h | 2 +- src/tpx/HFC134a.h | 2 +- src/tpx/Heptane.h | 2 +- src/tpx/Hydrogen.h | 2 +- src/tpx/Methane.h | 2 +- src/tpx/Nitrogen.h | 2 +- src/tpx/Oxygen.h | 2 +- src/tpx/RedlichKwong.h | 2 +- src/tpx/Sub.cpp | 2 +- src/tpx/Water.h | 2 +- src/tpx/lk.h | 2 +- src/tpx/utils.cpp | 2 +- src/transport/AqueousTransport.cpp | 14 ++--- src/transport/DustyGasTransport.cpp | 4 +- src/transport/FtnTransport.h | 2 +- src/transport/LTPspecies.cpp | 2 +- src/transport/L_matrix.h | 4 +- src/transport/LiquidTranInteraction.cpp | 6 +- src/transport/LiquidTransport.cpp | 12 ++-- src/transport/LiquidTransportData.cpp | 2 +- src/transport/LiquidTransportParams.cpp | 6 +- src/transport/MMCollisionInt.cpp | 8 +-- src/transport/MMCollisionInt.h | 2 +- src/transport/MixTransport.cpp | 10 ++-- src/transport/MultiTransport.cpp | 18 +++--- src/transport/SimpleTransport.cpp | 12 ++-- src/transport/SolidTransport.cpp | 6 +- src/transport/TortuosityBase.cpp | 2 +- src/transport/TortuosityBase.h | 2 +- src/transport/TortuosityBruggeman.cpp | 2 +- src/transport/TortuosityMaxwell.cpp | 2 +- src/transport/TortuosityPercolation.cpp | 2 +- src/transport/TransportBase.cpp | 16 ++--- src/transport/TransportFactory.cpp | 36 ++++++------ src/transport/TransportParams.cpp | 4 +- src/transport/WaterTransport.cpp | 20 +++---- src/zeroD/ConstPressureReactor.cpp | 10 ++-- src/zeroD/FlowDevice.cpp | 6 +- src/zeroD/FlowReactor.cpp | 2 +- src/zeroD/Reactor.cpp | 10 ++-- src/zeroD/ReactorBase.cpp | 6 +- src/zeroD/ReactorFactory.cpp | 10 ++-- src/zeroD/ReactorNet.cpp | 8 +-- src/zeroD/Wall.cpp | 10 ++-- 358 files changed, 1061 insertions(+), 1061 deletions(-) diff --git a/include/cantera/Cantera.h b/include/cantera/Cantera.h index 69bcc727c..5019b8b18 100755 --- a/include/cantera/Cantera.h +++ b/include/cantera/Cantera.h @@ -7,25 +7,25 @@ #ifndef CANTERA_H_INCL #define CANTERA_H_INCL -#include "kernel/ct_defs.h" +#include "base/ct_defs.h" // some useful functions -#include "kernel/global.h" +#include "base/global.h" // the CanteraError exception class -#include "kernel/ctexceptions.h" +#include "base/ctexceptions.h" // The Cantera logger class -#include "kernel/logger.h" +#include "base/logger.h" // Include the timer -#include "kernel/clockWC.h" +#include "base/clockWC.h" // Include routines for reading and writing XML files -#include "kernel/xml.h" +#include "base/xml.h" // Include string utility routines -#include "kernel/stringUtils.h" +#include "base/stringUtils.h" #endif diff --git a/include/cantera/Edge.h b/include/cantera/Edge.h index a70ea35dd..9ec7a0ad5 100644 --- a/include/cantera/Edge.h +++ b/include/cantera/Edge.h @@ -3,9 +3,9 @@ #include -#include "kernel/EdgePhase.h" -#include "kernel/EdgeKinetics.h" -#include "kernel/importKinetics.h" +#include "thermo/EdgePhase.h" +#include "kinetics/EdgeKinetics.h" +#include "kinetics/importKinetics.h" namespace Cantera { diff --git a/include/cantera/GRI30.h b/include/cantera/GRI30.h index 3b6fd8351..4a01e0cc9 100644 --- a/include/cantera/GRI30.h +++ b/include/cantera/GRI30.h @@ -3,10 +3,10 @@ #include -#include "kernel/IdealGasPhase.h" -#include "kernel/GRI_30_Kinetics.h" -#include "kernel/importKinetics.h" -#include "kernel/stringUtils.h" +#include "thermo/IdealGasPhase.h" +#include "kinetics/GRI_30_Kinetics.h" +#include "kinetics/importKinetics.h" +#include "base/stringUtils.h" namespace Cantera { diff --git a/include/cantera/IdealGasMix.h b/include/cantera/IdealGasMix.h index 00a8b1fd8..acd9febe7 100644 --- a/include/cantera/IdealGasMix.h +++ b/include/cantera/IdealGasMix.h @@ -3,10 +3,10 @@ #include -#include "kernel/IdealGasPhase.h" -#include "kernel/GasKinetics.h" -#include "kernel/importKinetics.h" -#include "kernel/stringUtils.h" +#include "thermo/IdealGasPhase.h" +#include "kinetics/GasKinetics.h" +#include "kinetics/importKinetics.h" +#include "base/stringUtils.h" namespace Cantera { diff --git a/include/cantera/IncompressibleSolid.h b/include/cantera/IncompressibleSolid.h index 38d0f62ee..cd0d8ae29 100644 --- a/include/cantera/IncompressibleSolid.h +++ b/include/cantera/IncompressibleSolid.h @@ -3,8 +3,8 @@ #include -#include "kernel/ConstDensityThermo.h" -#include "kernel/importKinetics.h" +#include "thermo/ConstDensityThermo.h" +#include "kinetics/importKinetics.h" namespace Cantera { diff --git a/include/cantera/Metal.h b/include/cantera/Metal.h index 62076b3f8..1fa35fe60 100644 --- a/include/cantera/Metal.h +++ b/include/cantera/Metal.h @@ -3,8 +3,8 @@ #include -#include "kernel/MetalPhase.h" -#include "kernel/importKinetics.h" +#include "thermo/MetalPhase.h" +#include "kinetics/importKinetics.h" namespace Cantera { diff --git a/include/cantera/PureFluid.h b/include/cantera/PureFluid.h index fdcc9296f..9ff149587 100644 --- a/include/cantera/PureFluid.h +++ b/include/cantera/PureFluid.h @@ -3,9 +3,9 @@ #include -#include "kernel/PureFluidPhase.h" +#include "thermo/PureFluidPhase.h" #include "kinetics.h" -#include "kernel/stringUtils.h" +#include "base/stringUtils.h" namespace Cantera { diff --git a/include/cantera/electrolyteThermo.h b/include/cantera/electrolyteThermo.h index aef557f24..71e4c9498 100644 --- a/include/cantera/electrolyteThermo.h +++ b/include/cantera/electrolyteThermo.h @@ -11,20 +11,20 @@ #ifdef WITH_ELECTROLYTES -#include "kernel/electrolytes.h" -#include "kernel/MolalityVPSSTP.h" -#include "kernel/VPStandardStateTP.h" -#include "kernel/IdealMolalSoln.h" -#include "kernel/WaterPropsIAPWS.h" -#include "kernel/WaterProps.h" -#include "kernel/PDSS.h" -#include "kernel/PDSS_Water.h" -#include "kernel/PDSS_HKFT.h" -#include "kernel/HMWSoln.h" -#include "kernel/DebyeHuckel.h" -#include "kernel/WaterSSTP.h" -#include "kernel/VPSSMgr_Water_HKFT.h" -#include "kernel/VPSSMgr_Water_ConstVol.h" +#include "thermo/electrolytes.h" +#include "thermo/MolalityVPSSTP.h" +#include "thermo/VPStandardStateTP.h" +#include "thermo/IdealMolalSoln.h" +#include "thermo/WaterPropsIAPWS.h" +#include "thermo/WaterProps.h" +#include "thermo/PDSS.h" +#include "thermo/PDSS_Water.h" +#include "thermo/PDSS_HKFT.h" +#include "thermo/HMWSoln.h" +#include "thermo/DebyeHuckel.h" +#include "thermo/WaterSSTP.h" +#include "thermo/VPSSMgr_Water_HKFT.h" +#include "thermo/VPSSMgr_Water_ConstVol.h" #endif #endif diff --git a/include/cantera/equil/ChemEquil.h b/include/cantera/equil/ChemEquil.h index 8e0aaa9cb..54d3f8395 100644 --- a/include/cantera/equil/ChemEquil.h +++ b/include/cantera/equil/ChemEquil.h @@ -13,11 +13,11 @@ // Cantera includes -#include "ct_defs.h" -#include "vec_functions.h" -#include "ctexceptions.h" -#include "ThermoPhase.h" -#include "DenseMatrix.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/vec_functions.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/numerics/DenseMatrix.h" #include "MultiPhaseEquil.h" diff --git a/include/cantera/equil/MultiPhase.h b/include/cantera/equil/MultiPhase.h index 56207ae13..c50b80786 100644 --- a/include/cantera/equil/MultiPhase.h +++ b/include/cantera/equil/MultiPhase.h @@ -9,9 +9,9 @@ #ifndef CT_MULTIPHASE_H #define CT_MULTIPHASE_H -#include "ct_defs.h" -#include "DenseMatrix.h" -#include "ThermoPhase.h" +#include "cantera/base/ct_defs.h" +#include "cantera/numerics/DenseMatrix.h" +#include "cantera/thermo/ThermoPhase.h" namespace Cantera { diff --git a/include/cantera/equil/MultiPhaseEquil.h b/include/cantera/equil/MultiPhaseEquil.h index 29fcec623..044be68ce 100644 --- a/include/cantera/equil/MultiPhaseEquil.h +++ b/include/cantera/equil/MultiPhaseEquil.h @@ -1,7 +1,7 @@ #ifndef CT_MULTIPHASE_EQUIL #define CT_MULTIPHASE_EQUIL -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "MultiPhase.h" namespace Cantera diff --git a/include/cantera/equil/vcs_MultiPhaseEquil.h b/include/cantera/equil/vcs_MultiPhaseEquil.h index 5af018477..2d7cc2e0b 100644 --- a/include/cantera/equil/vcs_MultiPhaseEquil.h +++ b/include/cantera/equil/vcs_MultiPhaseEquil.h @@ -5,7 +5,7 @@ #ifndef VCS_MULTIPHASEEQUIL_H #define VCS_MULTIPHASEEQUIL_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "MultiPhase.h" #include "vcs_defs.h" diff --git a/include/cantera/equilibrium.h b/include/cantera/equilibrium.h index 7faf2ac37..4608aeb31 100644 --- a/include/cantera/equilibrium.h +++ b/include/cantera/equilibrium.h @@ -5,11 +5,11 @@ */ #ifndef CT_EQUIL_INCL #define CT_EQUIL_INCL -#include "kernel/equil.h" -#include "kernel/ChemEquil.h" -#include "kernel/MultiPhaseEquil.h" +#include "equil/equil.h" +#include "equil/ChemEquil.h" +#include "equil/MultiPhaseEquil.h" #ifdef WITH_VCSNONIDEAL -#include "kernel/vcs_MultiPhaseEquil.h" +#include "equil/vcs_MultiPhaseEquil.h" #endif #endif diff --git a/include/cantera/integrators.h b/include/cantera/integrators.h index de9d23719..f62d0b6fb 100755 --- a/include/cantera/integrators.h +++ b/include/cantera/integrators.h @@ -5,8 +5,8 @@ #ifndef CT_INTEG_H_INCL #define CT_INTEG_H_INCL -#include "kernel/Integrator.h" -#include "kernel/DAE_Solver.h" -#include "kernel/IDA_Solver.h" +#include "numerics/Integrator.h" +#include "numerics/DAE_Solver.h" +#include "numerics/IDA_Solver.h" #endif diff --git a/include/cantera/kinetics.h b/include/cantera/kinetics.h index 9b33c024a..743a6b17a 100644 --- a/include/cantera/kinetics.h +++ b/include/cantera/kinetics.h @@ -3,10 +3,10 @@ #include "thermo.h" -#include "kernel/Kinetics.h" -#include "kernel/InterfaceKinetics.h" -#include "kernel/GasKinetics.h" -#include "kernel/KineticsFactory.h" -#include "kernel/importKinetics.h" +#include "kinetics/Kinetics.h" +#include "kinetics/InterfaceKinetics.h" +#include "kinetics/GasKinetics.h" +#include "kinetics/KineticsFactory.h" +#include "kinetics/importKinetics.h" #endif diff --git a/include/cantera/kinetics/AqueousKinetics.h b/include/cantera/kinetics/AqueousKinetics.h index 86872b855..de84cbc07 100644 --- a/include/cantera/kinetics/AqueousKinetics.h +++ b/include/cantera/kinetics/AqueousKinetics.h @@ -12,10 +12,10 @@ #include #include -#include "mix_defs.h" +#include "cantera/thermo/mix_defs.h" #include "Kinetics.h" -#include "utilities.h" +#include "cantera/base/utilities.h" #include "ReactionStoichMgr.h" #include "ThirdBodyMgr.h" diff --git a/include/cantera/kinetics/FalloffFactory.h b/include/cantera/kinetics/FalloffFactory.h index 8e19b9cbe..c2d0924eb 100644 --- a/include/cantera/kinetics/FalloffFactory.h +++ b/include/cantera/kinetics/FalloffFactory.h @@ -9,9 +9,9 @@ #ifndef CT_NEWFALLOFF_H #define CT_NEWFALLOFF_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "reaction_defs.h" -#include "FactoryBase.h" +#include "cantera/base/FactoryBase.h" #if defined(THREAD_SAFE_CANTERA) #include diff --git a/include/cantera/kinetics/GasKinetics.h b/include/cantera/kinetics/GasKinetics.h index 90b4ef477..ec5b4002d 100644 --- a/include/cantera/kinetics/GasKinetics.h +++ b/include/cantera/kinetics/GasKinetics.h @@ -13,10 +13,10 @@ #include #include -#include "mix_defs.h" +#include "cantera/thermo/mix_defs.h" #include "Kinetics.h" -#include "utilities.h" +#include "cantera/base/utilities.h" #include "ReactionStoichMgr.h" #include "ThirdBodyMgr.h" diff --git a/include/cantera/kinetics/Group.h b/include/cantera/kinetics/Group.h index 4f6cdbbf0..b23679f87 100644 --- a/include/cantera/kinetics/Group.h +++ b/include/cantera/kinetics/Group.h @@ -7,7 +7,7 @@ #ifndef CT_RXNPATH_GROUP #define CT_RXNPATH_GROUP -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index a3364da4a..5c437c8bb 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -11,10 +11,10 @@ #include #include -#include "mix_defs.h" +#include "cantera/thermo/mix_defs.h" #include "Kinetics.h" -#include "utilities.h" +#include "cantera/base/utilities.h" #include "RateCoeffMgr.h" #include "ReactionStoichMgr.h" diff --git a/include/cantera/kinetics/Kinetics.h b/include/cantera/kinetics/Kinetics.h index c9c927542..3f86f31fc 100644 --- a/include/cantera/kinetics/Kinetics.h +++ b/include/cantera/kinetics/Kinetics.h @@ -10,9 +10,9 @@ #ifndef CT_KINETICS_H #define CT_KINETICS_H -#include "ctexceptions.h" -#include "ThermoPhase.h" -#include "mix_defs.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/thermo/mix_defs.h" namespace Cantera { diff --git a/include/cantera/kinetics/KineticsFactory.h b/include/cantera/kinetics/KineticsFactory.h index b4ae55fd1..131be41d9 100644 --- a/include/cantera/kinetics/KineticsFactory.h +++ b/include/cantera/kinetics/KineticsFactory.h @@ -8,8 +8,8 @@ #define KINETICS_FACTORY_H #include "Kinetics.h" -#include "xml.h" -#include "FactoryBase.h" +#include "cantera/base/xml.h" +#include "cantera/base/FactoryBase.h" #if defined(THREAD_SAFE_CANTERA) #include diff --git a/include/cantera/kinetics/RateCoeffMgr.h b/include/cantera/kinetics/RateCoeffMgr.h index 55ffa3289..d416af0ff 100644 --- a/include/cantera/kinetics/RateCoeffMgr.h +++ b/include/cantera/kinetics/RateCoeffMgr.h @@ -7,11 +7,11 @@ #ifndef CT_RATECOEFF_MGR_H #define CT_RATECOEFF_MGR_H -#include "utilities.h" +#include "cantera/base/utilities.h" #include "RxnRates.h" -#include "ct_defs.h" -#include "ctexceptions.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" namespace Cantera diff --git a/include/cantera/kinetics/ReactionPath.h b/include/cantera/kinetics/ReactionPath.h index 100fb5787..f0f9f4981 100644 --- a/include/cantera/kinetics/ReactionPath.h +++ b/include/cantera/kinetics/ReactionPath.h @@ -10,8 +10,8 @@ #define CT_RXNPATH_H // Cantera includes -#include "ct_defs.h" -#include "DenseMatrix.h" +#include "cantera/base/ct_defs.h" +#include "cantera/numerics/DenseMatrix.h" #include "Group.h" #include "Kinetics.h" diff --git a/include/cantera/kinetics/ReactionStoichMgr.h b/include/cantera/kinetics/ReactionStoichMgr.h index cb385a5de..450645ac7 100644 --- a/include/cantera/kinetics/ReactionStoichMgr.h +++ b/include/cantera/kinetics/ReactionStoichMgr.h @@ -6,7 +6,7 @@ #ifndef CT_RXN_STOICH #define CT_RXN_STOICH -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/include/cantera/kinetics/RxnRates.h b/include/cantera/kinetics/RxnRates.h index 66da23a23..55aa8981b 100644 --- a/include/cantera/kinetics/RxnRates.h +++ b/include/cantera/kinetics/RxnRates.h @@ -9,7 +9,7 @@ #define CT_RXNRATES_H #include "reaction_defs.h" -#include "ctexceptions.h" +#include "cantera/base/ctexceptions.h" namespace Cantera { diff --git a/include/cantera/kinetics/ThirdBodyMgr.h b/include/cantera/kinetics/ThirdBodyMgr.h index c08cb7ff1..abd43ecad 100644 --- a/include/cantera/kinetics/ThirdBodyMgr.h +++ b/include/cantera/kinetics/ThirdBodyMgr.h @@ -10,8 +10,8 @@ #include -#include "ct_defs.h" -#include "utilities.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/utilities.h" #include "Enhanced3BConc.h" diff --git a/include/cantera/kinetics/importKinetics.h b/include/cantera/kinetics/importKinetics.h index 9554fd748..702c4b322 100644 --- a/include/cantera/kinetics/importKinetics.h +++ b/include/cantera/kinetics/importKinetics.h @@ -17,7 +17,7 @@ #include -#include "ThermoPhase.h" +#include "cantera/thermo/ThermoPhase.h" #include "Kinetics.h" namespace Cantera diff --git a/include/cantera/kinetics/reaction_defs.h b/include/cantera/kinetics/reaction_defs.h index 498b65b09..c03f60c45 100644 --- a/include/cantera/kinetics/reaction_defs.h +++ b/include/cantera/kinetics/reaction_defs.h @@ -8,7 +8,7 @@ #ifndef CT_RXN_DEFS_H #define CT_RXN_DEFS_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/include/cantera/numerics.h b/include/cantera/numerics.h index 0aa803eac..4950b6d19 100755 --- a/include/cantera/numerics.h +++ b/include/cantera/numerics.h @@ -1,9 +1,9 @@ #ifndef CT_NUM_H_INCL #define CT_NUM_H_INCL -#include "kernel/DenseMatrix.h" -#include "kernel/BandMatrix.h" -#include "kernel/SquareMatrix.h" -#include "kernel/NonlinearSolver.h" +#include "numerics/DenseMatrix.h" +#include "numerics/BandMatrix.h" +#include "numerics/SquareMatrix.h" +#include "numerics/NonlinearSolver.h" #endif diff --git a/include/cantera/numerics/ArrayViewer.h b/include/cantera/numerics/ArrayViewer.h index 816a51b64..0ab91a710 100644 --- a/include/cantera/numerics/ArrayViewer.h +++ b/include/cantera/numerics/ArrayViewer.h @@ -9,10 +9,10 @@ #ifndef CT_ARRAYVIEWER_H #define CT_ARRAYVIEWER_H -#include "ct_defs.h" -#include "ctexceptions.h" -#include "stringUtils.h" -#include "utilities.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/utilities.h" namespace Cantera { diff --git a/include/cantera/numerics/BandMatrix.h b/include/cantera/numerics/BandMatrix.h index dc78ac246..f9b758ce2 100644 --- a/include/cantera/numerics/BandMatrix.h +++ b/include/cantera/numerics/BandMatrix.h @@ -11,10 +11,10 @@ #ifndef CT_BANDMATRIX_H #define CT_BANDMATRIX_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "ctlapack.h" -#include "utilities.h" -#include "ctexceptions.h" +#include "cantera/base/utilities.h" +#include "cantera/base/ctexceptions.h" #include "GeneralMatrix.h" namespace Cantera diff --git a/include/cantera/numerics/DAE_Solver.h b/include/cantera/numerics/DAE_Solver.h index 87c18210c..ebe17e057 100644 --- a/include/cantera/numerics/DAE_Solver.h +++ b/include/cantera/numerics/DAE_Solver.h @@ -17,9 +17,9 @@ #include -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "ResidJacEval.h" -#include "global.h" +#include "cantera/base/global.h" namespace Cantera { diff --git a/include/cantera/numerics/DenseMatrix.h b/include/cantera/numerics/DenseMatrix.h index 75b2d08bc..3a89e1fba 100644 --- a/include/cantera/numerics/DenseMatrix.h +++ b/include/cantera/numerics/DenseMatrix.h @@ -11,8 +11,8 @@ #ifndef CT_DENSEMATRIX_H #define CT_DENSEMATRIX_H -#include "ct_defs.h" -#include "Array.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/Array.h" namespace Cantera { diff --git a/include/cantera/numerics/Func1.h b/include/cantera/numerics/Func1.h index 60c7e2634..afc90031c 100644 --- a/include/cantera/numerics/Func1.h +++ b/include/cantera/numerics/Func1.h @@ -9,7 +9,7 @@ #undef DEBUG_FUNC -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include #include diff --git a/include/cantera/numerics/FuncEval.h b/include/cantera/numerics/FuncEval.h index 4a1764849..29467acda 100644 --- a/include/cantera/numerics/FuncEval.h +++ b/include/cantera/numerics/FuncEval.h @@ -8,7 +8,7 @@ #ifndef CT_FUNCEVAL_H #define CT_FUNCEVAL_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/include/cantera/numerics/GeneralMatrix.h b/include/cantera/numerics/GeneralMatrix.h index 2aadb4cb4..b9942b52b 100644 --- a/include/cantera/numerics/GeneralMatrix.h +++ b/include/cantera/numerics/GeneralMatrix.h @@ -18,7 +18,7 @@ #ifndef CT_GENERALMATRIX_H #define CT_GENERALMATRIX_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/include/cantera/numerics/IDA_Solver.h b/include/cantera/numerics/IDA_Solver.h index b8b121d7a..f0fe46187 100644 --- a/include/cantera/numerics/IDA_Solver.h +++ b/include/cantera/numerics/IDA_Solver.h @@ -19,7 +19,7 @@ #include #include "DAE_Solver.h" -#include "ctexceptions.h" +#include "cantera/base/ctexceptions.h" #ifdef HAS_SUNDIALS diff --git a/include/cantera/numerics/Integrator.h b/include/cantera/numerics/Integrator.h index 28f076814..a772218a8 100644 --- a/include/cantera/numerics/Integrator.h +++ b/include/cantera/numerics/Integrator.h @@ -12,8 +12,8 @@ #define CT_INTEGRATOR_H #include "FuncEval.h" -#include "ct_defs.h" -#include "global.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/global.h" namespace Cantera { diff --git a/include/cantera/numerics/ResidEval.h b/include/cantera/numerics/ResidEval.h index a0cfb3e0a..a994a35f7 100644 --- a/include/cantera/numerics/ResidEval.h +++ b/include/cantera/numerics/ResidEval.h @@ -16,8 +16,8 @@ #pragma warning(disable:4503) #endif -#include "ct_defs.h" -#include "ctexceptions.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" namespace Cantera { diff --git a/include/cantera/numerics/ctlapack.h b/include/cantera/numerics/ctlapack.h index 3054a06ad..44adf855c 100644 --- a/include/cantera/numerics/ctlapack.h +++ b/include/cantera/numerics/ctlapack.h @@ -11,7 +11,7 @@ #undef NO_FTN_STRING_LEN_AT_END #endif -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" typedef double doublereal; typedef int integer; diff --git a/include/cantera/numerics/funcs.h b/include/cantera/numerics/funcs.h index ca2048b19..36d6b5872 100644 --- a/include/cantera/numerics/funcs.h +++ b/include/cantera/numerics/funcs.h @@ -9,7 +9,7 @@ #ifndef CT_FUNCS_H #define CT_FUNCS_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/include/cantera/numerics/polyfit.h b/include/cantera/numerics/polyfit.h index f752f17cb..e7c0a3330 100644 --- a/include/cantera/numerics/polyfit.h +++ b/include/cantera/numerics/polyfit.h @@ -11,7 +11,7 @@ #include -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/include/cantera/numerics/solveProb.h b/include/cantera/numerics/solveProb.h index bc6ff8b66..ca80dd582 100644 --- a/include/cantera/numerics/solveProb.h +++ b/include/cantera/numerics/solveProb.h @@ -21,7 +21,7 @@ #include -#include "Array.h" +#include "cantera/base/Array.h" #include "ResidEval.h" //! Solution Methods diff --git a/include/cantera/oneD/Domain1D.h b/include/cantera/oneD/Domain1D.h index 09d3f8b63..30b937c8d 100644 --- a/include/cantera/oneD/Domain1D.h +++ b/include/cantera/oneD/Domain1D.h @@ -9,9 +9,9 @@ #define CT_DOMAIN1D_H -#include "xml.h" -#include "stringUtils.h" -#include "ctexceptions.h" +#include "cantera/base/xml.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/ctexceptions.h" #include "refine.h" diff --git a/include/cantera/oneD/Inlet1D.h b/include/cantera/oneD/Inlet1D.h index 21f9ddb36..c6b3d1dd5 100644 --- a/include/cantera/oneD/Inlet1D.h +++ b/include/cantera/oneD/Inlet1D.h @@ -12,11 +12,11 @@ #define CT_BDRY1D_H #include "Domain1D.h" -#include "SurfPhase.h" -#include "InterfaceKinetics.h" +#include "cantera/thermo/SurfPhase.h" +#include "cantera/kinetics/InterfaceKinetics.h" #include "StFlow.h" #include "OneDim.h" -#include "ctml.h" +#include "cantera/base/ctml.h" namespace Cantera { diff --git a/include/cantera/oneD/MultiJac.h b/include/cantera/oneD/MultiJac.h index d71029476..8177c7396 100644 --- a/include/cantera/oneD/MultiJac.h +++ b/include/cantera/oneD/MultiJac.h @@ -9,7 +9,7 @@ #ifndef CT_MULTIJAC_H #define CT_MULTIJAC_H -#include "BandMatrix.h" +#include "cantera/numerics/BandMatrix.h" #include "OneDim.h" #include "time.h" diff --git a/include/cantera/oneD/Sim1D.h b/include/cantera/oneD/Sim1D.h index aab387650..6b7982035 100644 --- a/include/cantera/oneD/Sim1D.h +++ b/include/cantera/oneD/Sim1D.h @@ -6,7 +6,7 @@ #define CT_SIM1D_H #include "OneDim.h" -#include "funcs.h" +#include "cantera/numerics/funcs.h" namespace Cantera { diff --git a/include/cantera/oneD/StFlow.h b/include/cantera/oneD/StFlow.h index 3ae73c667..e1c2a6d38 100644 --- a/include/cantera/oneD/StFlow.h +++ b/include/cantera/oneD/StFlow.h @@ -7,12 +7,12 @@ #ifndef CT_STFLOW_H #define CT_STFLOW_H -#include "TransportBase.h" +#include "cantera/transport/TransportBase.h" #include "Domain1D.h" -#include "Array.h" -#include "IdealGasPhase.h" -#include "Kinetics.h" -#include "funcs.h" +#include "cantera/base/Array.h" +#include "cantera/thermo/IdealGasPhase.h" +#include "cantera/kinetics/Kinetics.h" +#include "cantera/numerics/funcs.h" //#include "../flowBoundaries.h" diff --git a/include/cantera/oneD/Surf1D.h b/include/cantera/oneD/Surf1D.h index 5d057bce3..e3c523240 100644 --- a/include/cantera/oneD/Surf1D.h +++ b/include/cantera/oneD/Surf1D.h @@ -4,11 +4,11 @@ dep #define CT_SURF1D_H #include "Domain1D.h" -#include "SurfPhase.h" -#include "InterfaceKinetics.h" +#include "cantera/thermo/SurfPhase.h" +#include "cantera/kinetics/InterfaceKinetics.h" #include "StFlow.h" #include "OneDim.h" -#include "ctml.h" +#include "cantera/base/ctml.h" namespace Cantera { diff --git a/include/cantera/onedim.h b/include/cantera/onedim.h index 7278bb023..29bbe3612 100755 --- a/include/cantera/onedim.h +++ b/include/cantera/onedim.h @@ -1,13 +1,13 @@ #ifndef CT_INCL_ONEDIM_H #define CT_INCL_ONEDIM_H -#include "kernel/Sim1D.h" -#include "kernel/OneDim.h" -#include "kernel/Domain1D.h" -#include "kernel/Inlet1D.h" -#include "kernel/Surf1D.h" -#include "kernel/MultiNewton.h" -#include "kernel/MultiJac.h" -#include "kernel/StFlow.h" +#include "oneD/Sim1D.h" +#include "oneD/OneDim.h" +#include "oneD/Domain1D.h" +#include "oneD/Inlet1D.h" +#include "oneD/Surf1D.h" +#include "oneD/MultiNewton.h" +#include "oneD/MultiJac.h" +#include "oneD/StFlow.h" #endif diff --git a/include/cantera/radiation.h b/include/cantera/radiation.h index b48640c6e..51bf4355a 100644 --- a/include/cantera/radiation.h +++ b/include/cantera/radiation.h @@ -1,8 +1,8 @@ #ifndef CT_RAD_H_INCL #define CT_RAD_H_INCL -#include "kernel/rotor.h" -#include "kernel/LineBroadener.h" +#include "spectra/rotor.h" +#include "spectra/LineBroadener.h" //#include "kernel/AbsorptionLine.h" #endif diff --git a/include/cantera/reactionpaths.h b/include/cantera/reactionpaths.h index 3450ae2cf..22e1451d4 100644 --- a/include/cantera/reactionpaths.h +++ b/include/cantera/reactionpaths.h @@ -1,6 +1,6 @@ #ifndef CT_RXNPATHS_H #define CT_RXNPATHS_H -#include "kernel/ReactionPath.h" +#include "kinetics/ReactionPath.h" #endif diff --git a/include/cantera/solvers.h b/include/cantera/solvers.h index b8c76bf2a..3930ea5b2 100644 --- a/include/cantera/solvers.h +++ b/include/cantera/solvers.h @@ -5,8 +5,8 @@ #ifndef CT_SOLVERS_H_INCL #define CT_SOLVERS_H_INCL -#include "kernel/ResidEval.h" +#include "numerics/ResidEval.h" -#include "kernel/solveProb.h" +#include "numerics/solveProb.h" #endif diff --git a/include/cantera/spectra.h b/include/cantera/spectra.h index 58ccdac61..d32a2e60a 100644 --- a/include/cantera/spectra.h +++ b/include/cantera/spectra.h @@ -1,8 +1,8 @@ #ifndef CT_SPECTRA_H_INCL #define CT_SECTRA_H_INCL -#include "kernel/LineBroadener.h" -#include "kernel/rotor.h" +#include "spectra/LineBroadener.h" +#include "spectra/rotor.h" //#include "kernel/AbsorptionLine.h" #endif diff --git a/include/cantera/spectra/LineBroadener.h b/include/cantera/spectra/LineBroadener.h index e089b800f..ad412475a 100644 --- a/include/cantera/spectra/LineBroadener.h +++ b/include/cantera/spectra/LineBroadener.h @@ -4,8 +4,8 @@ * @ingroup spectroscopy */ -#include "ct_defs.h" -#include "ctexceptions.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" namespace Cantera { diff --git a/include/cantera/spectra/rotor.h b/include/cantera/spectra/rotor.h index c429d38c5..d7bf84b1b 100644 --- a/include/cantera/spectra/rotor.h +++ b/include/cantera/spectra/rotor.h @@ -13,7 +13,7 @@ * molecules. */ -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" /** * Namespace for spectroscopic functions and classes. diff --git a/include/cantera/surface.h b/include/cantera/surface.h index c530b61ab..d3d16ab47 100755 --- a/include/cantera/surface.h +++ b/include/cantera/surface.h @@ -1,7 +1,7 @@ #ifndef CT_SURFACE_INCL #define CT_SURFACE_INCL -#include "SurfPhase.h" -#include "InterfaceKinetics.h" +#include "thermo/SurfPhase.h" +#include "kinetics/InterfaceKinetics.h" #endif diff --git a/include/cantera/thermo.h b/include/cantera/thermo.h index 7e75a974d..dd0ad596c 100644 --- a/include/cantera/thermo.h +++ b/include/cantera/thermo.h @@ -9,15 +9,15 @@ #ifndef CT_THERMO_INCL #define CT_THERMO_INCL -#include "kernel/ThermoFactory.h" -#include "kernel/SurfPhase.h" -#include "kernel/EdgePhase.h" +#include "thermo/ThermoFactory.h" +#include "thermo/SurfPhase.h" +#include "thermo/EdgePhase.h" #ifdef WITH_IDEAL_SOLUTIONS -#include "kernel/GibbsExcessVPSSTP.h" -#include "kernel/MargulesVPSSTP.h" +#include "thermo/GibbsExcessVPSSTP.h" +#include "thermo/MargulesVPSSTP.h" #endif @@ -30,8 +30,8 @@ #ifdef WITH_LATTICE_SOLID -#include "kernel/LatticePhase.h" -#include "kernel/LatticeSolidPhase.h" +#include "thermo/LatticePhase.h" +#include "thermo/LatticeSolidPhase.h" #endif diff --git a/include/cantera/thermo/ConstDensityThermo.h b/include/cantera/thermo/ConstDensityThermo.h index 0d2d00ffd..b22e0828b 100644 --- a/include/cantera/thermo/ConstDensityThermo.h +++ b/include/cantera/thermo/ConstDensityThermo.h @@ -10,11 +10,11 @@ #ifndef CT_CONSTRHOTHERMO_H #define CT_CONSTRHOTHERMO_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "mix_defs.h" #include "ThermoPhase.h" #include "SpeciesThermo.h" -#include "utilities.h" +#include "cantera/base/utilities.h" namespace Cantera { diff --git a/include/cantera/thermo/Constituents.h b/include/cantera/thermo/Constituents.h index 14269d108..850d4d806 100644 --- a/include/cantera/thermo/Constituents.h +++ b/include/cantera/thermo/Constituents.h @@ -10,12 +10,12 @@ #define CT_CONSTIT_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "SpeciesThermo.h" -#include "ctexceptions.h" -#include "stringUtils.h" -#include "xml.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/xml.h" #include "Elements.h" namespace Cantera diff --git a/include/cantera/thermo/Crystal.h b/include/cantera/thermo/Crystal.h index 60e6f2e3c..7b51dfafe 100644 --- a/include/cantera/thermo/Crystal.h +++ b/include/cantera/thermo/Crystal.h @@ -4,7 +4,7 @@ #ifndef CT_CRYSTAL_H #define CT_CRYSTAL_H -#include "MultiPhase.h" +#include "cantera/equil/MultiPhase.h" namespace Cantera { diff --git a/include/cantera/thermo/DebyeHuckel.h b/include/cantera/thermo/DebyeHuckel.h index 73562fb1e..58f64a7bb 100644 --- a/include/cantera/thermo/DebyeHuckel.h +++ b/include/cantera/thermo/DebyeHuckel.h @@ -18,7 +18,7 @@ #include "MolalityVPSSTP.h" #include "electrolytes.h" -#include "Array.h" +#include "cantera/base/Array.h" namespace Cantera { diff --git a/include/cantera/thermo/Elements.h b/include/cantera/thermo/Elements.h index 1ead473e5..175f9c378 100644 --- a/include/cantera/thermo/Elements.h +++ b/include/cantera/thermo/Elements.h @@ -12,7 +12,7 @@ #undef USE_DGG_CODE -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera diff --git a/include/cantera/thermo/GeneralSpeciesThermo.h b/include/cantera/thermo/GeneralSpeciesThermo.h index dac8d42ce..1295bee1d 100644 --- a/include/cantera/thermo/GeneralSpeciesThermo.h +++ b/include/cantera/thermo/GeneralSpeciesThermo.h @@ -9,7 +9,7 @@ #ifndef CT_GENERALSPECIESTHERMO_H #define CT_GENERALSPECIESTHERMO_H #include -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "SpeciesThermoMgr.h" #include "NasaPoly1.h" #include "Nasa9Poly1.h" diff --git a/include/cantera/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h index 669e7d224..d9e1c3244 100644 --- a/include/cantera/thermo/IdealGasPhase.h +++ b/include/cantera/thermo/IdealGasPhase.h @@ -10,11 +10,11 @@ #ifndef CT_IDEALGASPHASE_H #define CT_IDEALGASPHASE_H -//#include "ct_defs.h" +//#include "cantera/base/ct_defs.h" #include "mix_defs.h" #include "ThermoPhase.h" #include "SpeciesThermo.h" -#include "utilities.h" +#include "cantera/base/utilities.h" namespace Cantera { diff --git a/include/cantera/thermo/LatticePhase.h b/include/cantera/thermo/LatticePhase.h index 0f0a2ddd2..df6a95227 100644 --- a/include/cantera/thermo/LatticePhase.h +++ b/include/cantera/thermo/LatticePhase.h @@ -10,15 +10,15 @@ #ifndef CT_LATTICE_H #define CT_LATTICE_H -#include "config.h" +#include "cantera/base/config.h" #ifdef WITH_LATTICE_SOLID -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "mix_defs.h" #include "ThermoPhase.h" #include "SpeciesThermo.h" -#include "utilities.h" +#include "cantera/base/utilities.h" namespace Cantera { diff --git a/include/cantera/thermo/LatticeSolidPhase.h b/include/cantera/thermo/LatticeSolidPhase.h index c83d05a49..a75b94c6e 100644 --- a/include/cantera/thermo/LatticeSolidPhase.h +++ b/include/cantera/thermo/LatticeSolidPhase.h @@ -11,17 +11,17 @@ #ifndef CT_LATTICESOLID_H #define CT_LATTICESOLID_H -#include "config.h" +#include "cantera/base/config.h" #ifdef WITH_LATTICE_SOLID -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "mix_defs.h" #include "ThermoPhase.h" #include "SpeciesThermo.h" #include "LatticePhase.h" -#include "utilities.h" +#include "cantera/base/utilities.h" diff --git a/include/cantera/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h index f9c9f75b8..af0d0684d 100644 --- a/include/cantera/thermo/MixtureFugacityTP.h +++ b/include/cantera/thermo/MixtureFugacityTP.h @@ -20,7 +20,7 @@ #include "ThermoPhase.h" #include "VPSSMgr.h" -#include "ResidEval.h" +#include "cantera/numerics/ResidEval.h" namespace Cantera { diff --git a/include/cantera/thermo/Nasa9Poly1.h b/include/cantera/thermo/Nasa9Poly1.h index a2596ca92..dcb8604f6 100644 --- a/include/cantera/thermo/Nasa9Poly1.h +++ b/include/cantera/thermo/Nasa9Poly1.h @@ -17,7 +17,7 @@ #ifndef CT_NASA9POLY1_H #define CT_NASA9POLY1_H -#include "global.h" +#include "cantera/base/global.h" #include "SpeciesThermoInterpType.h" namespace Cantera diff --git a/include/cantera/thermo/NasaPoly1.h b/include/cantera/thermo/NasaPoly1.h index 2d90d5068..12a1c6ce9 100644 --- a/include/cantera/thermo/NasaPoly1.h +++ b/include/cantera/thermo/NasaPoly1.h @@ -15,7 +15,7 @@ // Copyright 2001 California Institute of Technology -#include "global.h" +#include "cantera/base/global.h" #include "SpeciesThermoInterpType.h" namespace Cantera diff --git a/include/cantera/thermo/PDSS.h b/include/cantera/thermo/PDSS.h index c8ac4146f..b91a6269f 100644 --- a/include/cantera/thermo/PDSS.h +++ b/include/cantera/thermo/PDSS.h @@ -11,7 +11,7 @@ */ #ifndef CT_PDSS_H #define CT_PDSS_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "mix_defs.h" class WaterPropsIAPWS; diff --git a/include/cantera/thermo/PDSS_Water.h b/include/cantera/thermo/PDSS_Water.h index ed98a9d52..bc4393806 100644 --- a/include/cantera/thermo/PDSS_Water.h +++ b/include/cantera/thermo/PDSS_Water.h @@ -12,7 +12,7 @@ #ifndef CT_PDSS_WATER_H #define CT_PDSS_WATER_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "PDSS.h" #include "VPStandardStateTP.h" diff --git a/include/cantera/thermo/Phase.h b/include/cantera/thermo/Phase.h index 77deacb72..339e7c46d 100644 --- a/include/cantera/thermo/Phase.h +++ b/include/cantera/thermo/Phase.h @@ -13,9 +13,9 @@ #include "State.h" #include "Constituents.h" -#include "vec_functions.h" +#include "cantera/base/vec_functions.h" -#include "ctml.h" +#include "cantera/base/ctml.h" namespace Cantera { diff --git a/include/cantera/thermo/SpeciesThermo.h b/include/cantera/thermo/SpeciesThermo.h index 8bbddf6c5..4f16cb5aa 100644 --- a/include/cantera/thermo/SpeciesThermo.h +++ b/include/cantera/thermo/SpeciesThermo.h @@ -10,7 +10,7 @@ #ifndef CT_SPECIESTHERMO_H #define CT_SPECIESTHERMO_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/include/cantera/thermo/SpeciesThermoFactory.h b/include/cantera/thermo/SpeciesThermoFactory.h index 243ef0bcd..68b85349b 100644 --- a/include/cantera/thermo/SpeciesThermoFactory.h +++ b/include/cantera/thermo/SpeciesThermoFactory.h @@ -11,8 +11,8 @@ #define SPECIESTHERMO_FACTORY_H #include "SpeciesThermo.h" -#include "ctexceptions.h" -#include "FactoryBase.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/FactoryBase.h" namespace Cantera diff --git a/include/cantera/thermo/SpeciesThermoMgr.h b/include/cantera/thermo/SpeciesThermoMgr.h index e08bf9850..af5ccf821 100644 --- a/include/cantera/thermo/SpeciesThermoMgr.h +++ b/include/cantera/thermo/SpeciesThermoMgr.h @@ -12,9 +12,9 @@ #ifndef CT_SPECIESTHERMO_MGR_H #define CT_SPECIESTHERMO_MGR_H -#include "ct_defs.h" -#include "ctexceptions.h" -#include "stringUtils.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/stringUtils.h" #include "SpeciesThermo.h" #include diff --git a/include/cantera/thermo/State.h b/include/cantera/thermo/State.h index d96806477..449fe925d 100644 --- a/include/cantera/thermo/State.h +++ b/include/cantera/thermo/State.h @@ -13,8 +13,8 @@ #ifndef CT_STATE2_H #define CT_STATE2_H -#include "ct_defs.h" -#include "utilities.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/utilities.h" namespace Cantera { diff --git a/include/cantera/thermo/ThermoFactory.h b/include/cantera/thermo/ThermoFactory.h index 3531c46df..72e0a9eb7 100644 --- a/include/cantera/thermo/ThermoFactory.h +++ b/include/cantera/thermo/ThermoFactory.h @@ -11,13 +11,13 @@ #define THERMO_FACTORY_H #include "ThermoPhase.h" -#include "xml.h" +#include "cantera/base/xml.h" #if defined(THREAD_SAFE_CANTERA) #include #endif -#include "FactoryBase.h" +#include "cantera/base/FactoryBase.h" namespace Cantera { diff --git a/include/cantera/thermo/VPSSMgr.h b/include/cantera/thermo/VPSSMgr.h index 7481d94e3..52f2d958f 100644 --- a/include/cantera/thermo/VPSSMgr.h +++ b/include/cantera/thermo/VPSSMgr.h @@ -15,7 +15,7 @@ #ifndef CT_VPSSMGR_H #define CT_VPSSMGR_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "mix_defs.h" namespace Cantera diff --git a/include/cantera/thermo/VPSSMgr_ConstVol.h b/include/cantera/thermo/VPSSMgr_ConstVol.h index 58dbed460..7c07705be 100644 --- a/include/cantera/thermo/VPSSMgr_ConstVol.h +++ b/include/cantera/thermo/VPSSMgr_ConstVol.h @@ -14,7 +14,7 @@ #ifndef CT_VPSSMGR_CONSTVOL_H #define CT_VPSSMGR_CONSTVOL_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "VPSSMgr.h" namespace Cantera diff --git a/include/cantera/thermo/VPSSMgr_General.h b/include/cantera/thermo/VPSSMgr_General.h index 76bfa6dbd..9bfd43e48 100644 --- a/include/cantera/thermo/VPSSMgr_General.h +++ b/include/cantera/thermo/VPSSMgr_General.h @@ -15,7 +15,7 @@ #ifndef CT_VPSSMGR_GENERAL_H #define CT_VPSSMGR_GENERAL_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "VPSSMgr.h" namespace Cantera diff --git a/include/cantera/thermo/VPSSMgr_IdealGas.h b/include/cantera/thermo/VPSSMgr_IdealGas.h index d6d0129b4..24b054fcf 100644 --- a/include/cantera/thermo/VPSSMgr_IdealGas.h +++ b/include/cantera/thermo/VPSSMgr_IdealGas.h @@ -15,7 +15,7 @@ #ifndef CT_VPSSMGR_IDEALGAS_H #define CT_VPSSMGR_IDEALGAS_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "PDSS.h" #include "VPSSMgr.h" diff --git a/include/cantera/thermo/WaterProps.h b/include/cantera/thermo/WaterProps.h index 20cbce12c..c15ccbca7 100644 --- a/include/cantera/thermo/WaterProps.h +++ b/include/cantera/thermo/WaterProps.h @@ -14,7 +14,7 @@ #define CT_WATERPROPS_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { class WaterPropsIAPWS; diff --git a/include/cantera/thermo/WaterPropsIAPWS.h b/include/cantera/thermo/WaterPropsIAPWS.h index b9301874a..e4aea56af 100644 --- a/include/cantera/thermo/WaterPropsIAPWS.h +++ b/include/cantera/thermo/WaterPropsIAPWS.h @@ -13,7 +13,7 @@ #define WATERPROPSIAPWS_H #include "WaterPropsIAPWSphi.h" -#include "config.h" +#include "cantera/base/config.h" typedef double doublereal; diff --git a/include/cantera/thermo/WaterPropsIAPWSphi.h b/include/cantera/thermo/WaterPropsIAPWSphi.h index c38bce637..a0dd9feeb 100644 --- a/include/cantera/thermo/WaterPropsIAPWSphi.h +++ b/include/cantera/thermo/WaterPropsIAPWSphi.h @@ -13,7 +13,7 @@ #ifndef WATERPROPSIAPWSPHI_H #define WATERPROPSIAPWSPHI_H -#include "config.h" +#include "cantera/base/config.h" typedef double doublereal; diff --git a/include/cantera/thermo/speciesThermoTypes.h b/include/cantera/thermo/speciesThermoTypes.h index 9c98ba6e6..aad23f8e2 100644 --- a/include/cantera/thermo/speciesThermoTypes.h +++ b/include/cantera/thermo/speciesThermoTypes.h @@ -68,10 +68,10 @@ //! A general object is called with the pressure set at the reference state. #define PDSS_TYPE 37 -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" -#include "stringUtils.h" -#include "global.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/global.h" namespace Cantera { diff --git a/include/cantera/transport.h b/include/cantera/transport.h index 035753e74..600afcedb 100755 --- a/include/cantera/transport.h +++ b/include/cantera/transport.h @@ -9,9 +9,9 @@ #ifndef CT_TRANSPORT_INCL #define CT_TRANSPORT_INCL -#include "kernel/TransportFactory.h" -#include "kernel/DustyGasTransport.h" -#include "kernel/MultiTransport.h" -#include "kernel/MixTransport.h" -#include "kernel/LiquidTransport.h" +#include "transport/TransportFactory.h" +#include "transport/DustyGasTransport.h" +#include "transport/MultiTransport.h" +#include "transport/MixTransport.h" +#include "transport/LiquidTransport.h" #endif diff --git a/include/cantera/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h index ebb63d596..c4c950165 100644 --- a/include/cantera/transport/AqueousTransport.h +++ b/include/cantera/transport/AqueousTransport.h @@ -11,7 +11,7 @@ // Cantera includes #include "TransportBase.h" -#include "DenseMatrix.h" +#include "cantera/numerics/DenseMatrix.h" #include "TransportParams.h" #include "LiquidTransportParams.h" diff --git a/include/cantera/transport/DustyGasTransport.h b/include/cantera/transport/DustyGasTransport.h index 6f1d26880..488db1bfd 100644 --- a/include/cantera/transport/DustyGasTransport.h +++ b/include/cantera/transport/DustyGasTransport.h @@ -13,7 +13,7 @@ // Cantera includes #include "TransportBase.h" -#include "DenseMatrix.h" +#include "cantera/numerics/DenseMatrix.h" namespace Cantera diff --git a/include/cantera/transport/LTPspecies.h b/include/cantera/transport/LTPspecies.h index 0333f697e..6099abff3 100644 --- a/include/cantera/transport/LTPspecies.h +++ b/include/cantera/transport/LTPspecies.h @@ -13,9 +13,9 @@ #define CT_LTPSPECIES_H // Cantera includes -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "TransportBase.h" -#include "FactoryBase.h" +#include "cantera/base/FactoryBase.h" // STL includes #include diff --git a/include/cantera/transport/LiquidTranInteraction.h b/include/cantera/transport/LiquidTranInteraction.h index a6706afda..8d85eb8cc 100644 --- a/include/cantera/transport/LiquidTranInteraction.h +++ b/include/cantera/transport/LiquidTranInteraction.h @@ -12,12 +12,12 @@ #ifndef CT_LIQUIDTRANINTERACTION_H #define CT_LIQUIDTRANINTERACTION_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "TransportBase.h" #include "TransportParams.h" #include "LiquidTransportData.h" -#include "xml.h" -#include "XML_Writer.h" +#include "cantera/base/xml.h" +#include "cantera/base/XML_Writer.h" namespace Cantera { diff --git a/include/cantera/transport/LiquidTransport.h b/include/cantera/transport/LiquidTransport.h index 89e8720d4..b35bde925 100644 --- a/include/cantera/transport/LiquidTransport.h +++ b/include/cantera/transport/LiquidTransport.h @@ -16,7 +16,7 @@ // Cantera includes #include "TransportBase.h" -#include "DenseMatrix.h" +#include "cantera/numerics/DenseMatrix.h" #include "TransportParams.h" #include "LiquidTransportParams.h" diff --git a/include/cantera/transport/LiquidTransportData.h b/include/cantera/transport/LiquidTransportData.h index 2490c943e..c70bca420 100644 --- a/include/cantera/transport/LiquidTransportData.h +++ b/include/cantera/transport/LiquidTransportData.h @@ -11,9 +11,9 @@ #include // Cantera includes -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "TransportBase.h" -#include "FactoryBase.h" +#include "cantera/base/FactoryBase.h" #include "LTPspecies.h" namespace Cantera diff --git a/include/cantera/transport/LiquidTransportParams.h b/include/cantera/transport/LiquidTransportParams.h index e312066e0..957302b5a 100644 --- a/include/cantera/transport/LiquidTransportParams.h +++ b/include/cantera/transport/LiquidTransportParams.h @@ -13,13 +13,13 @@ #ifndef CT_LIQUIDTRANSPORTPARAMS_H #define CT_LIQUIDTRANSPORTPARAMS_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "TransportBase.h" #include "TransportParams.h" #include "LiquidTransportData.h" #include "LiquidTranInteraction.h" -#include "xml.h" -#include "XML_Writer.h" +#include "cantera/base/xml.h" +#include "cantera/base/XML_Writer.h" #include diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h index a8f933afa..86bd40c59 100644 --- a/include/cantera/transport/MixTransport.h +++ b/include/cantera/transport/MixTransport.h @@ -19,7 +19,7 @@ // Cantera includes #include "TransportBase.h" -#include "DenseMatrix.h" +#include "cantera/numerics/DenseMatrix.h" namespace Cantera { diff --git a/include/cantera/transport/MultiTransport.h b/include/cantera/transport/MultiTransport.h index 640456261..add591c26 100644 --- a/include/cantera/transport/MultiTransport.h +++ b/include/cantera/transport/MultiTransport.h @@ -14,7 +14,7 @@ // Cantera includes #include "TransportBase.h" -#include "DenseMatrix.h" +#include "cantera/numerics/DenseMatrix.h" namespace Cantera { diff --git a/include/cantera/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h index bfcc32f78..aa6ce9d24 100644 --- a/include/cantera/transport/SimpleTransport.h +++ b/include/cantera/transport/SimpleTransport.h @@ -18,7 +18,7 @@ // Cantera includes #include "TransportBase.h" -#include "DenseMatrix.h" +#include "cantera/numerics/DenseMatrix.h" #include "TransportParams.h" #include "LiquidTransportParams.h" diff --git a/include/cantera/transport/SolidTransport.h b/include/cantera/transport/SolidTransport.h index d416efb6c..0627f294b 100644 --- a/include/cantera/transport/SolidTransport.h +++ b/include/cantera/transport/SolidTransport.h @@ -19,7 +19,7 @@ // Cantera includes #include "TransportBase.h" -#include "DenseMatrix.h" +#include "cantera/numerics/DenseMatrix.h" namespace Cantera { diff --git a/include/cantera/transport/TransportBase.h b/include/cantera/transport/TransportBase.h index dff6936e6..e91096e05 100644 --- a/include/cantera/transport/TransportBase.h +++ b/include/cantera/transport/TransportBase.h @@ -21,8 +21,8 @@ #ifndef CT_TRANSPORTBASE_H #define CT_TRANSPORTBASE_H -#include "ThermoPhase.h" -#include "DenseMatrix.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/numerics/DenseMatrix.h" namespace Cantera { diff --git a/include/cantera/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h index d51666878..c0c16c1a7 100644 --- a/include/cantera/transport/TransportFactory.h +++ b/include/cantera/transport/TransportFactory.h @@ -15,9 +15,9 @@ #include // Cantera includes -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include "TransportBase.h" -#include "FactoryBase.h" +#include "cantera/base/FactoryBase.h" //#include "LiquidTransportData.h" #include "LiquidTransportParams.h" diff --git a/include/cantera/transport/TransportParams.h b/include/cantera/transport/TransportParams.h index c379ee34b..3f2d7f172 100644 --- a/include/cantera/transport/TransportParams.h +++ b/include/cantera/transport/TransportParams.h @@ -9,8 +9,8 @@ #include -#include "ct_defs.h" -#include "DenseMatrix.h" +#include "cantera/base/ct_defs.h" +#include "cantera/numerics/DenseMatrix.h" #include "TransportBase.h" namespace Cantera diff --git a/include/cantera/transport/WaterTransport.h b/include/cantera/transport/WaterTransport.h index c6be8771f..04004beed 100644 --- a/include/cantera/transport/WaterTransport.h +++ b/include/cantera/transport/WaterTransport.h @@ -16,7 +16,7 @@ // Cantera includes #include "TransportBase.h" -#include "DenseMatrix.h" +#include "cantera/numerics/DenseMatrix.h" #include "LiquidTransportParams.h" namespace Cantera diff --git a/include/cantera/zeroD/FlowDevice.h b/include/cantera/zeroD/FlowDevice.h index 631f7ea5f..09b730d42 100644 --- a/include/cantera/zeroD/FlowDevice.h +++ b/include/cantera/zeroD/FlowDevice.h @@ -7,9 +7,9 @@ #ifndef CT_FLOWDEVICE_H #define CT_FLOWDEVICE_H -#include "ct_defs.h" -#include "global.h" -#include "stringUtils.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/global.h" +#include "cantera/base/stringUtils.h" namespace Cantera { diff --git a/include/cantera/zeroD/Reactor.h b/include/cantera/zeroD/Reactor.h index 9a7834a50..f3e18b570 100644 --- a/include/cantera/zeroD/Reactor.h +++ b/include/cantera/zeroD/Reactor.h @@ -8,7 +8,7 @@ #define CT_REACTOR_H #include "ReactorBase.h" -#include "Kinetics.h" +#include "cantera/kinetics/Kinetics.h" namespace Cantera { diff --git a/include/cantera/zeroD/ReactorBase.h b/include/cantera/zeroD/ReactorBase.h index 6171659f2..3cd0df488 100644 --- a/include/cantera/zeroD/ReactorBase.h +++ b/include/cantera/zeroD/ReactorBase.h @@ -6,7 +6,7 @@ #ifndef CT_REACTORBASE_H #define CT_REACTORBASE_H -#include "ThermoPhase.h" +#include "cantera/thermo/ThermoPhase.h" /// Namespace for classes implementing zero-dimensional reactor networks. namespace Cantera diff --git a/include/cantera/zeroD/ReactorFactory.h b/include/cantera/zeroD/ReactorFactory.h index 7ba2f81ec..9342bb1d7 100644 --- a/include/cantera/zeroD/ReactorFactory.h +++ b/include/cantera/zeroD/ReactorFactory.h @@ -8,7 +8,7 @@ #define REACTOR_FACTORY_H #include "ReactorBase.h" -#include "FactoryBase.h" +#include "cantera/base/FactoryBase.h" #if defined(THREAD_SAFE_CANTERA) #include diff --git a/include/cantera/zeroD/ReactorNet.h b/include/cantera/zeroD/ReactorNet.h index 933c09412..ffb1dfcad 100644 --- a/include/cantera/zeroD/ReactorNet.h +++ b/include/cantera/zeroD/ReactorNet.h @@ -7,9 +7,9 @@ #define CT_REACTORNET_H #include "Reactor.h" -#include "FuncEval.h" -#include "Integrator.h" -#include "Array.h" +#include "cantera/numerics/FuncEval.h" +#include "cantera/numerics/Integrator.h" +#include "cantera/base/Array.h" namespace Cantera { diff --git a/include/cantera/zeroD/Wall.h b/include/cantera/zeroD/Wall.h index 514bfb969..dc64e14d4 100644 --- a/include/cantera/zeroD/Wall.h +++ b/include/cantera/zeroD/Wall.h @@ -7,9 +7,9 @@ #ifndef CT_WALL_H #define CT_WALL_H -#include "ct_defs.h" -#include "ctexceptions.h" -#include "Func1.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/numerics/Func1.h" namespace Cantera { diff --git a/include/cantera/zeroD/flowControllers.h b/include/cantera/zeroD/flowControllers.h index cc491c061..de2f0da8f 100644 --- a/include/cantera/zeroD/flowControllers.h +++ b/include/cantera/zeroD/flowControllers.h @@ -12,7 +12,7 @@ #include "FlowDevice.h" #include "ReactorBase.h" //#include "PID_Controller.h" -#include "Func1.h" +#include "cantera/numerics/Func1.h" namespace Cantera { diff --git a/include/cantera/zerodim.h b/include/cantera/zerodim.h index 4351d6f36..797917612 100644 --- a/include/cantera/zerodim.h +++ b/include/cantera/zerodim.h @@ -1,12 +1,12 @@ #ifndef CT_INCL_ZERODIM_H #define CT_INCL_ZERODIM_H -#include "kernel/Reactor.h" -#include "kernel/ReactorNet.h" -#include "kernel/Reservoir.h" -#include "kernel/Wall.h" -#include "kernel/flowControllers.h" -#include "kernel/FlowReactor.h" -#include "kernel/ConstPressureReactor.h" +#include "zeroD/Reactor.h" +#include "zeroD/ReactorNet.h" +#include "zeroD/Reservoir.h" +#include "zeroD/Wall.h" +#include "zeroD/flowControllers.h" +#include "zeroD/FlowReactor.h" +#include "zeroD/ConstPressureReactor.h" #endif diff --git a/src/apps/ck2cti.cpp b/src/apps/ck2cti.cpp index 640faddbc..cb8a34a49 100644 --- a/src/apps/ck2cti.cpp +++ b/src/apps/ck2cti.cpp @@ -34,9 +34,9 @@ #include using namespace std; -#include "kernel/ct_defs.h" -#include "kernel/global.h" -#include "kernel/ck2ct.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/global.h" +#include "converters/ck2ct.h" using namespace Cantera; diff --git a/src/apps/csvdiff.cpp b/src/apps/csvdiff.cpp index 6f7075d12..462095a46 100644 --- a/src/apps/csvdiff.cpp +++ b/src/apps/csvdiff.cpp @@ -26,7 +26,7 @@ #include #include #include -#include "kernel/config.h" +#include "cantera/base/config.h" #ifndef _MSC_VER #include #else @@ -40,7 +40,7 @@ using namespace std; #include #endif -#include "mdp_allo.h" +#include "cantera/base/mdp_allo.h" #include "tok_input_util.h" #ifndef MAX diff --git a/src/apps/cti2ctml.cpp b/src/apps/cti2ctml.cpp index 24f8885a8..dfffecad9 100644 --- a/src/apps/cti2ctml.cpp +++ b/src/apps/cti2ctml.cpp @@ -18,9 +18,9 @@ #include #include -#include "kernel/ct_defs.h" -#include "kernel/xml.h" -#include "kernel/ctml.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" using namespace Cantera; using namespace std; diff --git a/src/apps/mdp_allo.cpp b/src/apps/mdp_allo.cpp index 82b08d9f5..294021d95 100644 --- a/src/apps/mdp_allo.cpp +++ b/src/apps/mdp_allo.cpp @@ -5,7 +5,7 @@ #include #include -#include "mdp_allo.h" +#include "cantera/base/mdp_allo.h" /* * Allocate global storage for 2 debugging ints that are used in IO of diff --git a/src/base/LogPrintCtrl.cpp b/src/base/LogPrintCtrl.cpp index d5ff9272e..6402c7168 100644 --- a/src/base/LogPrintCtrl.cpp +++ b/src/base/LogPrintCtrl.cpp @@ -16,7 +16,7 @@ #include #include "LogPrintCtrl.h" -#include "global.h" +#include "cantera/base/global.h" using namespace std; diff --git a/src/base/LogPrintCtrl.h b/src/base/LogPrintCtrl.h index b14799775..4635fc617 100644 --- a/src/base/LogPrintCtrl.h +++ b/src/base/LogPrintCtrl.h @@ -15,7 +15,7 @@ #include -#include "PrintCtrl.h" +#include "cantera/base/PrintCtrl.h" namespace Cantera { diff --git a/src/base/PrintCtrl.cpp b/src/base/PrintCtrl.cpp index 19a78d8dc..1ae44c145 100644 --- a/src/base/PrintCtrl.cpp +++ b/src/base/PrintCtrl.cpp @@ -15,7 +15,7 @@ #include #include -#include "PrintCtrl.h" +#include "cantera/base/PrintCtrl.h" using namespace std; diff --git a/src/base/checkFinite.cpp b/src/base/checkFinite.cpp index 57b0b5e11..6fb1194b1 100644 --- a/src/base/checkFinite.cpp +++ b/src/base/checkFinite.cpp @@ -10,7 +10,7 @@ * See file License.txt for licensing information. */ -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include #include diff --git a/src/base/clockWC.cpp b/src/base/clockWC.cpp index f8e30a37a..e8562b409 100644 --- a/src/base/clockWC.cpp +++ b/src/base/clockWC.cpp @@ -11,7 +11,7 @@ */ #include -#include "clockWC.h" +#include "cantera/base/clockWC.h" namespace Cantera { diff --git a/src/base/ct2ctml.cpp b/src/base/ct2ctml.cpp index 86624ea3f..b3adfcded 100644 --- a/src/base/ct2ctml.cpp +++ b/src/base/ct2ctml.cpp @@ -5,11 +5,11 @@ */ // Copyright 2001-2005 California Institute of Technology -#include "ct_defs.h" -#include "ctexceptions.h" -#include "ctml.h" -#include "global.h" -#include "stringUtils.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/ctml.h" +#include "cantera/base/global.h" +#include "cantera/base/stringUtils.h" #include #include diff --git a/src/base/ctml.cpp b/src/base/ctml.cpp index 9d40242ab..a354da20c 100644 --- a/src/base/ctml.cpp +++ b/src/base/ctml.cpp @@ -5,14 +5,14 @@ */ // Copyright 2002 California Institute of Technology -#include "ctml.h" +#include "cantera/base/ctml.h" //@{ #define CTML_VERSION_1_4_1 //@} -#include "global.h" -#include "stringUtils.h" +#include "cantera/base/global.h" +#include "cantera/base/stringUtils.h" #include #include diff --git a/src/base/mdp_allo.cpp b/src/base/mdp_allo.cpp index 8bc28aa82..96a44a61f 100644 --- a/src/base/mdp_allo.cpp +++ b/src/base/mdp_allo.cpp @@ -19,7 +19,7 @@ #include #include -#include "mdp_allo.h" +#include "cantera/base/mdp_allo.h" using namespace std; diff --git a/src/base/misc.cpp b/src/base/misc.cpp index d471ceb4a..7134a45da 100644 --- a/src/base/misc.cpp +++ b/src/base/misc.cpp @@ -13,14 +13,14 @@ // RFB:TODO May need OS specifc include to use varargs.h instead #include -#include "global.h" -#include "ctexceptions.h" -#include "stringUtils.h" +#include "cantera/base/global.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/stringUtils.h" #include "units.h" -#include "xml.h" -#include "ctml.h" -#include "FactoryBase.h" -#include "logger.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/base/FactoryBase.h" +#include "cantera/base/logger.h" #include diff --git a/src/base/plots.cpp b/src/base/plots.cpp index 5ea216134..cba12e1cc 100644 --- a/src/base/plots.cpp +++ b/src/base/plots.cpp @@ -3,7 +3,7 @@ */ // Copyright 2002 California Institute of Technology -#include "plots.h" +#include "cantera/base/plots.h" using namespace std; diff --git a/src/base/plots.h b/src/base/plots.h index e62e0574f..310ff6b57 100644 --- a/src/base/plots.h +++ b/src/base/plots.h @@ -9,8 +9,8 @@ #define CT_PLOTS_H -#include "Array.h" -#include "ctexceptions.h" +#include "cantera/base/Array.h" +#include "cantera/base/ctexceptions.h" #include #include diff --git a/src/base/stringUtils.cpp b/src/base/stringUtils.cpp index 1c9d38761..d4b254507 100644 --- a/src/base/stringUtils.cpp +++ b/src/base/stringUtils.cpp @@ -6,7 +6,7 @@ // Copyright 2001 California Institute of Technology //@{ -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #ifdef _MSC_VER #define SNPRINTF _snprintf @@ -15,10 +15,10 @@ #endif //@} -#include "stringUtils.h" -#include "ctexceptions.h" -#include "global.h" -#include "ctml.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/global.h" +#include "cantera/base/ctml.h" #include diff --git a/src/base/units.h b/src/base/units.h index be0515954..6faca1896 100644 --- a/src/base/units.h +++ b/src/base/units.h @@ -11,8 +11,8 @@ #ifndef CT_UNITS_H #define CT_UNITS_H -#include "ct_defs.h" -#include "ctexceptions.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" #include diff --git a/src/base/xml.cpp b/src/base/xml.cpp index e32b85826..935b8c898 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -6,7 +6,7 @@ */ // Copyright 2001 California Institute of Technology -#include "config.h" +#include "cantera/base/config.h" #ifdef HAS_SSTREAM #include #endif @@ -14,9 +14,9 @@ #include using namespace std; -#include "xml.h" -#include "global.h" -#include "stringUtils.h" +#include "cantera/base/xml.h" +#include "cantera/base/global.h" +#include "cantera/base/stringUtils.h" #include #include diff --git a/src/clib/Cabinet.h b/src/clib/Cabinet.h index 97bf8e48b..96f2d756d 100644 --- a/src/clib/Cabinet.h +++ b/src/clib/Cabinet.h @@ -5,8 +5,8 @@ #define CT_CABINET_H #include -#include "kernel/stringUtils.h" -#include "kernel/config.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/config.h" /** * Template for classes to hold pointers to objects. The Cabinet diff --git a/src/clib/Storage.cpp b/src/clib/Storage.cpp index 3d75bd5fe..dedfb4749 100644 --- a/src/clib/Storage.cpp +++ b/src/clib/Storage.cpp @@ -2,8 +2,8 @@ * @file Storage.cpp */ // Cantera includes -#include "kernel/Kinetics.h" -#include "kernel/TransportFactory.h" +#include "cantera/kinetics/Kinetics.h" +#include "cantera/transport/TransportFactory.h" #include "Storage.h" diff --git a/src/clib/Storage.h b/src/clib/Storage.h index 1cc5d8d04..d9fddab49 100644 --- a/src/clib/Storage.h +++ b/src/clib/Storage.h @@ -5,8 +5,8 @@ #define CTC_STORAGE_H // Cantera includes -#include "kernel/Kinetics.h" -#include "kernel/TransportBase.h" +#include "cantera/kinetics/Kinetics.h" +#include "cantera/transport/TransportBase.h" #include "Cabinet.h" #include "clib_defs.h" diff --git a/src/clib/clib_defs.h b/src/clib/clib_defs.h index 0cfc77c8c..c15347cca 100644 --- a/src/clib/clib_defs.h +++ b/src/clib/clib_defs.h @@ -4,7 +4,7 @@ #ifndef CTC_DEFS_H #define CTC_DEFS_H -#include "kernel/ct_defs.h" +#include "cantera/base/ct_defs.h" #ifdef _WIN32 // Either build as a DLL under Windows or not. diff --git a/src/clib/ct.cpp b/src/clib/ct.cpp index 9289d2606..599de935b 100644 --- a/src/clib/ct.cpp +++ b/src/clib/ct.cpp @@ -12,17 +12,17 @@ #include "ct.h" // Cantera includes -#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 "cantera/equil/equil.h" +#include "cantera/kinetics/KineticsFactory.h" +#include "cantera/transport/TransportFactory.h" +#include "cantera/base/ctml.h" +#include "cantera/kinetics/importKinetics.h" +#include "cantera/thermo/ThermoFactory.h" +#include "converters/ck2ct.h" #include "Storage.h" #include "Cabinet.h" -#include "kernel/InterfaceKinetics.h" -#include "kernel/PureFluidPhase.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "cantera/thermo/PureFluidPhase.h" using namespace std; diff --git a/src/clib/ct.h b/src/clib/ct.h index e9280684e..184703025 100644 --- a/src/clib/ct.h +++ b/src/clib/ct.h @@ -7,9 +7,9 @@ #include "clib_defs.h" #ifdef CANTERA_USE_INTERNAL -#include "kernel/config.h" +#include "cantera/base/config.h" #else -#include "cantera/kernel/config.h" +#include "cantera/base/config.h" #endif diff --git a/src/clib/ctbdry.cpp b/src/clib/ctbdry.cpp index 30af76f93..0387efaaf 100644 --- a/src/clib/ctbdry.cpp +++ b/src/clib/ctbdry.cpp @@ -5,9 +5,9 @@ #include "ctbdry.h" // Cantera includes -#include "kernel/OneDim.h" -#include "kernel/Inlet1D.h" -#include "kernel/InterfaceKinetics.h" +#include "cantera/oneD/OneDim.h" +#include "cantera/oneD/Inlet1D.h" +#include "cantera/kinetics/InterfaceKinetics.h" #include "Cabinet.h" #include "Storage.h" diff --git a/src/clib/ctfunc.cpp b/src/clib/ctfunc.cpp index 758c79a1e..f7fe12294 100644 --- a/src/clib/ctfunc.cpp +++ b/src/clib/ctfunc.cpp @@ -4,8 +4,8 @@ #define CANTERA_USE_INTERNAL #include "ctfunc.h" -#include "kernel/Func1.h" -#include "kernel/ctexceptions.h" +#include "cantera/numerics/Func1.h" +#include "cantera/base/ctexceptions.h" #include "Cabinet.h" diff --git a/src/clib/ctmultiphase.cpp b/src/clib/ctmultiphase.cpp index 1e263f22f..ecca9abef 100644 --- a/src/clib/ctmultiphase.cpp +++ b/src/clib/ctmultiphase.cpp @@ -5,10 +5,10 @@ #include "ctmultiphase.h" // Cantera includes -#include "kernel/equil.h" -#include "kernel/MultiPhase.h" -#include "kernel/MultiPhaseEquil.h" -#include "kernel/vcs_MultiPhaseEquil.h" +#include "cantera/equil/equil.h" +#include "cantera/equil/MultiPhase.h" +#include "cantera/equil/MultiPhaseEquil.h" +#include "cantera/equil/vcs_MultiPhaseEquil.h" #include "Cabinet.h" #include "Storage.h" diff --git a/src/clib/ctonedim.cpp b/src/clib/ctonedim.cpp index 4dfd55eed..19a0b8e71 100644 --- a/src/clib/ctonedim.cpp +++ b/src/clib/ctonedim.cpp @@ -6,11 +6,11 @@ #include "ctonedim.h" // Cantera includes -#include "kernel/config.h" -#include "kernel/Sim1D.h" -#include "kernel/StFlow.h" -#include "kernel/Inlet1D.h" -#include "kernel/DenseMatrix.h" +#include "cantera/base/config.h" +#include "cantera/oneD/Sim1D.h" +#include "cantera/oneD/StFlow.h" +#include "cantera/oneD/Inlet1D.h" +#include "cantera/numerics/DenseMatrix.h" // local includes #include "Cabinet.h" diff --git a/src/clib/ctonedim.h b/src/clib/ctonedim.h index 1008e1b9a..5d564a28c 100644 --- a/src/clib/ctonedim.h +++ b/src/clib/ctonedim.h @@ -7,9 +7,9 @@ #include "clib_defs.h" #ifdef CANTERA_USE_INTERNAL -#include "kernel/config.h" +#include "cantera/base/config.h" #else -#include "cantera/kernel/config.h" +#include "cantera/base/config.h" #endif extern "C" { diff --git a/src/clib/ctreactor.cpp b/src/clib/ctreactor.cpp index 6ced9d628..85fac03b9 100644 --- a/src/clib/ctreactor.cpp +++ b/src/clib/ctreactor.cpp @@ -5,13 +5,13 @@ #include "ctreactor.h" // Cantera includes -#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 "cantera/zeroD/Reactor.h" +#include "cantera/zeroD/FlowReactor.h" +#include "cantera/zeroD/ConstPressureReactor.h" +#include "cantera/zeroD/ReactorNet.h" +#include "cantera/zeroD/Reservoir.h" +#include "cantera/zeroD/Wall.h" +#include "cantera/zeroD/flowControllers.h" #include "Cabinet.h" #include "Storage.h" diff --git a/src/clib/ctrpath.cpp b/src/clib/ctrpath.cpp index 5ef4681af..49ce8d816 100644 --- a/src/clib/ctrpath.cpp +++ b/src/clib/ctrpath.cpp @@ -7,7 +7,7 @@ // Cantera includes -#include "kernel/ReactionPath.h" +#include "cantera/kinetics/ReactionPath.h" #include "Cabinet.h" #include "Storage.h" diff --git a/src/clib/ctsurf.cpp b/src/clib/ctsurf.cpp index 6c4c74072..97ed4eae3 100644 --- a/src/clib/ctsurf.cpp +++ b/src/clib/ctsurf.cpp @@ -6,9 +6,9 @@ #include "ctsurf.h" // Cantera includes -#include "kernel/SurfPhase.h" -#include "kernel/InterfaceKinetics.h" -#include "kernel/ImplicitSurfChem.h" +#include "cantera/thermo/SurfPhase.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "kinetics/ImplicitSurfChem.h" #include "Cabinet.h" #include "Storage.h" diff --git a/src/clib/ctsurf.h b/src/clib/ctsurf.h index f42b41868..17e914957 100644 --- a/src/clib/ctsurf.h +++ b/src/clib/ctsurf.h @@ -8,9 +8,9 @@ #include "clib_defs.h" #ifdef CANTERA_USE_INTERNAL -#include "kernel/config.h" +#include "cantera/base/config.h" #else -#include "cantera/kernel/config.h" +#include "cantera/base/config.h" #endif extern "C" { diff --git a/src/clib/ctxml.cpp b/src/clib/ctxml.cpp index 663618ece..f6765cffd 100644 --- a/src/clib/ctxml.cpp +++ b/src/clib/ctxml.cpp @@ -5,7 +5,7 @@ #include "ctxml.h" // Cantera includes -#include "kernel/ctml.h" +#include "cantera/base/ctml.h" #include "Cabinet.h" #include "Storage.h" diff --git a/src/clib/ctxml.h b/src/clib/ctxml.h index 7d3b04954..421c29a72 100644 --- a/src/clib/ctxml.h +++ b/src/clib/ctxml.h @@ -7,9 +7,9 @@ #include "clib_defs.h" #ifdef CANTERA_USE_INTERNAL -#include "kernel/config.h" +#include "cantera/base/config.h" #else -#include "cantera/kernel/config.h" +#include "cantera/base/config.h" #endif extern "C" { diff --git a/src/converters/CKReader.cpp b/src/converters/CKReader.cpp index 32515eb11..74c1ddefa 100644 --- a/src/converters/CKReader.cpp +++ b/src/converters/CKReader.cpp @@ -22,7 +22,7 @@ using namespace std; #include #include "ckr_defs.h" -//#include "global.h" +//#include "cantera/base/global.h" //#define APP Cantera::Application namespace ckr diff --git a/src/converters/NASA9Parser.cpp b/src/converters/NASA9Parser.cpp index ba9868451..0698d91fa 100644 --- a/src/converters/NASA9Parser.cpp +++ b/src/converters/NASA9Parser.cpp @@ -15,7 +15,7 @@ #include "ckr_utils.h" #include "writelog.h" #include -//#include "../stringUtils.h" +//#include "cantera/base/stringUtils.h" #include #include diff --git a/src/converters/Species.h b/src/converters/Species.h index c443c4de9..0091fbc76 100644 --- a/src/converters/Species.h +++ b/src/converters/Species.h @@ -13,7 +13,7 @@ #include #include -//#include "Cantera.h" +//#include "cantera/Cantera.h" namespace ckr diff --git a/src/converters/ck2ct.cpp b/src/converters/ck2ct.cpp index 4e001e2c6..c858cee99 100644 --- a/src/converters/ck2ct.cpp +++ b/src/converters/ck2ct.cpp @@ -6,7 +6,7 @@ #include #include -#include "config.h" +#include "cantera/base/config.h" #ifdef HAS_SSTREAM #include @@ -18,10 +18,10 @@ using namespace std; #include "writelog.h" #include "ck2ct.h" -#include "stringUtils.h" +#include "cantera/base/stringUtils.h" #include -#include "ct_defs.h" -#include "ctml.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctml.h" using namespace Cantera; diff --git a/src/converters/ck2ct.h b/src/converters/ck2ct.h index 7ebd2fb8f..94dc1d61f 100644 --- a/src/converters/ck2ct.h +++ b/src/converters/ck2ct.h @@ -5,7 +5,7 @@ #include #include -//#include "ctml.h" +//#include "cantera/base/ctml.h" namespace ckr { diff --git a/src/converters/ckr_defs.h b/src/converters/ckr_defs.h index 87183a0cd..0615076d2 100644 --- a/src/converters/ckr_defs.h +++ b/src/converters/ckr_defs.h @@ -10,7 +10,7 @@ #ifndef CKR_DEFS_H #define CKR_DEFS_H -//#include "config.h" +//#include "cantera/base/config.h" #include #include #include diff --git a/src/converters/thermoFunctions.cpp b/src/converters/thermoFunctions.cpp index 49fb4ff3f..5f851ff62 100644 --- a/src/converters/thermoFunctions.cpp +++ b/src/converters/thermoFunctions.cpp @@ -11,7 +11,7 @@ #include using namespace std; -//#include "Cantera.h" +//#include "cantera/Cantera.h" namespace ckr { diff --git a/src/equil/BasisOptimize.cpp b/src/equil/BasisOptimize.cpp index 83a01f94e..8964e2500 100644 --- a/src/equil/BasisOptimize.cpp +++ b/src/equil/BasisOptimize.cpp @@ -3,10 +3,10 @@ * Functions which calculation optimized basis of the * stoichiometric coefficient matrix (see /ref equil functions) */ -#include "ct_defs.h" -#include "global.h" -#include "ThermoPhase.h" -#include "MultiPhase.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/global.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/equil/MultiPhase.h" #include diff --git a/src/equil/ChemEquil.cpp b/src/equil/ChemEquil.cpp index cbbb9df72..b6a21cad8 100644 --- a/src/equil/ChemEquil.cpp +++ b/src/equil/ChemEquil.cpp @@ -8,19 +8,19 @@ #include -#include "ChemEquil.h" -#include "DenseMatrix.h" +#include "cantera/equil/ChemEquil.h" +#include "cantera/numerics/DenseMatrix.h" -#include "ct_defs.h" -#include "global.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/global.h" #include "PropertyCalculator.h" -#include "ctexceptions.h" -#include "vec_functions.h" -#include "stringUtils.h" -#include "MultiPhase.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/vec_functions.h" +#include "cantera/base/stringUtils.h" +#include "cantera/equil/MultiPhase.h" #ifdef DEBUG_MODE -#include "PrintCtrl.h" +#include "cantera/base/PrintCtrl.h" #endif using namespace std; diff --git a/src/equil/MultiPhase.cpp b/src/equil/MultiPhase.cpp index cd8ad5f69..9cb9a49b7 100644 --- a/src/equil/MultiPhase.cpp +++ b/src/equil/MultiPhase.cpp @@ -3,13 +3,13 @@ * Definitions for the \link Cantera::MultiPhase MultiPhase\endlink * object that is used to set up multiphase equilibrium problems (see \ref equilfunctions). */ -#include "MultiPhase.h" -#include "MultiPhaseEquil.h" +#include "cantera/equil/MultiPhase.h" +#include "cantera/equil/MultiPhaseEquil.h" -#include "ThermoPhase.h" -#include "DenseMatrix.h" -#include "stringUtils.h" -#include "global.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/numerics/DenseMatrix.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/global.h" using namespace std; diff --git a/src/equil/MultiPhaseEquil.cpp b/src/equil/MultiPhaseEquil.cpp index ee466b740..6dad4494f 100644 --- a/src/equil/MultiPhaseEquil.cpp +++ b/src/equil/MultiPhaseEquil.cpp @@ -1,12 +1,12 @@ /** * @file MultiPhaseEquil.cpp */ -#include "MultiPhaseEquil.h" -#include "MultiPhase.h" +#include "cantera/equil/MultiPhaseEquil.h" +#include "cantera/equil/MultiPhase.h" #ifdef WITH_ELECTROLYTES -#include "MolalityVPSSTP.h" +#include "cantera/thermo/MolalityVPSSTP.h" #endif -#include "global.h" +#include "cantera/base/global.h" #include #include diff --git a/src/equil/PropertyCalculator.h b/src/equil/PropertyCalculator.h index 9ca6a4332..ef337e639 100644 --- a/src/equil/PropertyCalculator.h +++ b/src/equil/PropertyCalculator.h @@ -7,7 +7,7 @@ #ifndef CT_PROP_CALC_H #define CT_PROP_CALC_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include namespace Cantera diff --git a/src/equil/equilibrate.cpp b/src/equil/equilibrate.cpp index e02047d61..057593d6f 100644 --- a/src/equil/equilibrate.cpp +++ b/src/equil/equilibrate.cpp @@ -3,11 +3,11 @@ * Driver routines for the chemical equilibrium solvers. * */ -#include "equil.h" -#include "ChemEquil.h" -#include "MultiPhaseEquil.h" -#include "vcs_MultiPhaseEquil.h" -#include "global.h" +#include "cantera/equil/equil.h" +#include "cantera/equil/ChemEquil.h" +#include "cantera/equil/MultiPhaseEquil.h" +#include "cantera/equil/vcs_MultiPhaseEquil.h" +#include "cantera/base/global.h" namespace Cantera { diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp index 956e79207..69680c416 100644 --- a/src/equil/vcs_MultiPhaseEquil.cpp +++ b/src/equil/vcs_MultiPhaseEquil.cpp @@ -8,7 +8,7 @@ * U.S. Government retains certain rights in this software. */ -#include "vcs_MultiPhaseEquil.h" +#include "cantera/equil/vcs_MultiPhaseEquil.h" #include "vcs_prob.h" #include "vcs_internal.h" #include "vcs_VolPhase.h" @@ -18,18 +18,18 @@ #include "vcs_solve.h" -#include "ct_defs.h" -#include "mix_defs.h" -#include "clockWC.h" -#include "ThermoPhase.h" -#include "speciesThermoTypes.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/base/clockWC.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/thermo/speciesThermoTypes.h" #ifdef WITH_IDEAL_SOLUTIONS -#include "IdealSolidSolnPhase.h" +#include "cantera/thermo/IdealSolidSolnPhase.h" #endif #ifdef WITH_ELECTROLYTES -#include "IdealMolalSoln.h" +#include "cantera/thermo/IdealMolalSoln.h" #endif -#include "ChemEquil.h" +#include "cantera/equil/ChemEquil.h" #include #include diff --git a/src/equil/vcs_SpeciesProperties.cpp b/src/equil/vcs_SpeciesProperties.cpp index 7317e508a..b6b32e7c6 100644 --- a/src/equil/vcs_SpeciesProperties.cpp +++ b/src/equil/vcs_SpeciesProperties.cpp @@ -1,7 +1,7 @@ /** * @file vcs_SpeciesProperties.cpp */ -#include "vcs_defs.h" +#include "cantera/equil/vcs_defs.h" #include "vcs_SpeciesProperties.h" #include "vcs_VolPhase.h" #include "vcs_species_thermo.h" diff --git a/src/equil/vcs_VolPhase.cpp b/src/equil/vcs_VolPhase.cpp index b0ee973f5..4063edaa8 100644 --- a/src/equil/vcs_VolPhase.cpp +++ b/src/equil/vcs_VolPhase.cpp @@ -12,8 +12,8 @@ #include "vcs_species_thermo.h" #include "vcs_solve.h" -#include "ThermoPhase.h" -#include "mix_defs.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/thermo/mix_defs.h" #include #include diff --git a/src/equil/vcs_equilibrate.cpp b/src/equil/vcs_equilibrate.cpp index 5d3a597d8..71d15b4d7 100644 --- a/src/equil/vcs_equilibrate.cpp +++ b/src/equil/vcs_equilibrate.cpp @@ -7,7 +7,7 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "vcs_MultiPhaseEquil.h" +#include "cantera/equil/vcs_MultiPhaseEquil.h" #include "vcs_prob.h" #include "vcs_internal.h" #include "vcs_VolPhase.h" @@ -15,18 +15,18 @@ #include "vcs_SpeciesProperties.h" #include "vcs_VolPhase.h" #include "vcs_solve.h" -#include "equil.h" +#include "cantera/equil/equil.h" -#include "ct_defs.h" -#include "mix_defs.h" -#include "speciesThermoTypes.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/speciesThermoTypes.h" #ifdef WITH_IDEAL_SOLUTIONS -#include "IdealSolidSolnPhase.h" +#include "cantera/thermo/IdealSolidSolnPhase.h" #endif #ifdef WITH_ELECTROLYTES -#include "IdealMolalSoln.h" +#include "cantera/thermo/IdealMolalSoln.h" #endif -#include "ChemEquil.h" +#include "cantera/equil/ChemEquil.h" #include #include diff --git a/src/equil/vcs_inest.cpp b/src/equil/vcs_inest.cpp index 69ae87f38..49b17b486 100644 --- a/src/equil/vcs_inest.cpp +++ b/src/equil/vcs_inest.cpp @@ -12,7 +12,7 @@ #include "vcs_internal.h" #include "vcs_VolPhase.h" -#include "clockWC.h" +#include "cantera/base/clockWC.h" #include #include diff --git a/src/equil/vcs_internal.h b/src/equil/vcs_internal.h index 49375e734..0ac17680a 100644 --- a/src/equil/vcs_internal.h +++ b/src/equil/vcs_internal.h @@ -13,11 +13,11 @@ #include -#include "vcs_defs.h" +#include "cantera/equil/vcs_defs.h" #include "vcs_DoubleStarStar.h" #include "vcs_Exception.h" -#include "global.h" +#include "cantera/base/global.h" namespace VCSnonideal { @@ -283,7 +283,7 @@ typedef double(*VCS_FUNC_PTR)(double xval, double Vtarget, #include #include - #include "Cantera.h" + #include "cantera/Cantera.h" #include "kernel/vcs_internal.h" const double g_cgs = 980.; diff --git a/src/equil/vcs_nondim.cpp b/src/equil/vcs_nondim.cpp index bcdec01b7..c707495ae 100644 --- a/src/equil/vcs_nondim.cpp +++ b/src/equil/vcs_nondim.cpp @@ -11,7 +11,7 @@ #include "vcs_solve.h" #include "vcs_internal.h" #include "vcs_VolPhase.h" -#include "stringUtils.h" +#include "cantera/base/stringUtils.h" #include #include diff --git a/src/equil/vcs_prob.cpp b/src/equil/vcs_prob.cpp index f7bc2d663..048a39d0c 100644 --- a/src/equil/vcs_prob.cpp +++ b/src/equil/vcs_prob.cpp @@ -14,8 +14,8 @@ #include "vcs_species_thermo.h" #include "vcs_internal.h" -#include "ThermoPhase.h" -#include "MolalityVPSSTP.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/thermo/MolalityVPSSTP.h" #include #include diff --git a/src/equil/vcs_prob.h b/src/equil/vcs_prob.h index c338565fe..ad1f9e9ce 100644 --- a/src/equil/vcs_prob.h +++ b/src/equil/vcs_prob.h @@ -13,7 +13,7 @@ #include "vcs_DoubleStarStar.h" #include "vcs_IntStarStar.h" -#include "vcs_defs.h" +#include "cantera/equil/vcs_defs.h" #include #include diff --git a/src/equil/vcs_root1d.cpp b/src/equil/vcs_root1d.cpp index c1390ef00..88644b9fc 100644 --- a/src/equil/vcs_root1d.cpp +++ b/src/equil/vcs_root1d.cpp @@ -53,7 +53,7 @@ static void print_funcEval(FILE* fp, double xval, double fval, int its) * #include * #include * - * #include "Cantera.h" + * #include "cantera/Cantera.h" * #include "kernel/vcs_internal.h" * * const double g_cgs = 980.; diff --git a/src/equil/vcs_solve.cpp b/src/equil/vcs_solve.cpp index 4a13b7b2d..9bffefa7a 100644 --- a/src/equil/vcs_solve.cpp +++ b/src/equil/vcs_solve.cpp @@ -18,7 +18,7 @@ #include "vcs_SpeciesProperties.h" #include "vcs_species_thermo.h" -#include "clockWC.h" +#include "cantera/base/clockWC.h" #include #include "math.h" diff --git a/src/equil/vcs_solve.h b/src/equil/vcs_solve.h index 3c1961691..3c062a4b0 100644 --- a/src/equil/vcs_solve.h +++ b/src/equil/vcs_solve.h @@ -26,8 +26,8 @@ #include #include -#include "ct_defs.h" -#include "vcs_defs.h" +#include "cantera/base/ct_defs.h" +#include "cantera/equil/vcs_defs.h" #include "vcs_DoubleStarStar.h" #include "vcs_IntStarStar.h" diff --git a/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp index f5c20e143..f4eb9aab9 100644 --- a/src/equil/vcs_solve_TP.cpp +++ b/src/equil/vcs_solve_TP.cpp @@ -18,7 +18,7 @@ #include "vcs_VolPhase.h" #include "vcs_species_thermo.h" -#include "clockWC.h" +#include "cantera/base/clockWC.h" using namespace std; diff --git a/src/equil/vcs_solve_phaseStability.cpp b/src/equil/vcs_solve_phaseStability.cpp index 91ca3340f..61100f730 100644 --- a/src/equil/vcs_solve_phaseStability.cpp +++ b/src/equil/vcs_solve_phaseStability.cpp @@ -22,7 +22,7 @@ #include "vcs_species_thermo.h" #include "vcs_prob.h" -#include "clockWC.h" +#include "cantera/base/clockWC.h" #ifdef WIN32 #pragma warning(disable:4996) diff --git a/src/equil/vcs_species_thermo.cpp b/src/equil/vcs_species_thermo.cpp index 5f87f1467..bd9755b11 100644 --- a/src/equil/vcs_species_thermo.cpp +++ b/src/equil/vcs_species_thermo.cpp @@ -12,7 +12,7 @@ #include "vcs_solve.h" #include "vcs_species_thermo.h" -#include "vcs_defs.h" +#include "cantera/equil/vcs_defs.h" #include "vcs_VolPhase.h" #include "vcs_Exception.h" diff --git a/src/fortran/fct.cpp b/src/fortran/fct.cpp index feac916cf..627132ef8 100644 --- a/src/fortran/fct.cpp +++ b/src/fortran/fct.cpp @@ -7,16 +7,16 @@ * pointers are passed to or from the calling application. */ // Cantera includes -#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 "cantera/equil/equil.h" +#include "cantera/kinetics/KineticsFactory.h" +#include "cantera/transport/TransportFactory.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/base/ctml.h" +#include "cantera/kinetics/importKinetics.h" #include "clib/Storage.h" #include "clib/Cabinet.h" -#include "kernel/InterfaceKinetics.h" -#include "kernel/PureFluidPhase.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "cantera/thermo/PureFluidPhase.h" #include "flib_defs.h" diff --git a/src/fortran/fctxml.cpp b/src/fortran/fctxml.cpp index 732c1aaeb..32e99dc07 100644 --- a/src/fortran/fctxml.cpp +++ b/src/fortran/fctxml.cpp @@ -7,7 +7,7 @@ #include "flib_defs.h" -#include "kernel/ctml.h" +#include "cantera/base/ctml.h" #include diff --git a/src/fortran/flib_defs.h b/src/fortran/flib_defs.h index 62fb8c949..470a46978 100644 --- a/src/fortran/flib_defs.h +++ b/src/fortran/flib_defs.h @@ -14,7 +14,7 @@ #define ERR -999 #define DERR -999.999 -#include "kernel/config.h" +#include "cantera/base/config.h" typedef integer status_t; diff --git a/src/kinetics/AqueousKinetics.cpp b/src/kinetics/AqueousKinetics.cpp index f3a87a643..f9511087e 100644 --- a/src/kinetics/AqueousKinetics.cpp +++ b/src/kinetics/AqueousKinetics.cpp @@ -11,9 +11,9 @@ * U.S. Government retains certain rights in this software. */ -#include "AqueousKinetics.h" +#include "cantera/kinetics/AqueousKinetics.h" #include "ReactionData.h" -#include "RateCoeffMgr.h" +#include "cantera/kinetics/RateCoeffMgr.h" #include using namespace std; diff --git a/src/kinetics/FalloffFactory.cpp b/src/kinetics/FalloffFactory.cpp index 32331629c..c0bf062a6 100644 --- a/src/kinetics/FalloffFactory.cpp +++ b/src/kinetics/FalloffFactory.cpp @@ -3,8 +3,8 @@ */ // Copyright 2001 California Institute of Technology -#include "FalloffFactory.h" -#include "ctexceptions.h" +#include "cantera/kinetics/FalloffFactory.h" +#include "cantera/base/ctexceptions.h" #include diff --git a/src/kinetics/GRI_30_Kinetics.cpp b/src/kinetics/GRI_30_Kinetics.cpp index f4fa28a48..ad7e26ede 100644 --- a/src/kinetics/GRI_30_Kinetics.cpp +++ b/src/kinetics/GRI_30_Kinetics.cpp @@ -6,14 +6,14 @@ // Copyright 2001 California Institute of Technology -#include "GRI_30_Kinetics.h" +#include "cantera/kinetics/GRI_30_Kinetics.h" #include "ReactionData.h" //#include "StoichManager.h" -#include "Enhanced3BConc.h" -#include "ThirdBodyMgr.h" -#include "RateCoeffMgr.h" -#include "IdealGasPhase.h" +#include "cantera/kinetics/Enhanced3BConc.h" +#include "cantera/kinetics/ThirdBodyMgr.h" +#include "cantera/kinetics/RateCoeffMgr.h" +#include "cantera/thermo/IdealGasPhase.h" #include using namespace std; diff --git a/src/kinetics/GasKinetics.cpp b/src/kinetics/GasKinetics.cpp index b810f1f82..f260cffa9 100644 --- a/src/kinetics/GasKinetics.cpp +++ b/src/kinetics/GasKinetics.cpp @@ -7,12 +7,12 @@ // Copyright 2001 California Institute of Technology -#include "GasKinetics.h" +#include "cantera/kinetics/GasKinetics.h" #include "ReactionData.h" -#include "Enhanced3BConc.h" -#include "ThirdBodyMgr.h" -#include "RateCoeffMgr.h" +#include "cantera/kinetics/Enhanced3BConc.h" +#include "cantera/kinetics/ThirdBodyMgr.h" +#include "cantera/kinetics/RateCoeffMgr.h" //#include "../user/grirxnstoich.h" diff --git a/src/kinetics/Group.cpp b/src/kinetics/Group.cpp index af098b009..0e2252f69 100644 --- a/src/kinetics/Group.cpp +++ b/src/kinetics/Group.cpp @@ -8,7 +8,7 @@ // reaction path analysis support -#include "Group.h" +#include "cantera/kinetics/Group.h" #include #include diff --git a/src/kinetics/ImplicitSurfChem.cpp b/src/kinetics/ImplicitSurfChem.cpp index 36378d3b4..7ed469c22 100644 --- a/src/kinetics/ImplicitSurfChem.cpp +++ b/src/kinetics/ImplicitSurfChem.cpp @@ -7,7 +7,7 @@ // Copyright 2001 California Institute of Technology #include "ImplicitSurfChem.h" -#include "Integrator.h" +#include "cantera/numerics/Integrator.h" #include "solveSP.h" using namespace std; diff --git a/src/kinetics/ImplicitSurfChem.h b/src/kinetics/ImplicitSurfChem.h index 9fe35cf2e..df609c2b9 100644 --- a/src/kinetics/ImplicitSurfChem.h +++ b/src/kinetics/ImplicitSurfChem.h @@ -9,10 +9,10 @@ #ifndef CT_IMPSURFCHEM_H #define CT_IMPSURFCHEM_H -#include "FuncEval.h" -#include "Integrator.h" -#include "InterfaceKinetics.h" -#include "SurfPhase.h" +#include "cantera/numerics/FuncEval.h" +#include "cantera/numerics/Integrator.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "cantera/thermo/SurfPhase.h" #include "solveSP.h" namespace Cantera diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index 94f89ebeb..4bd9f9320 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -5,12 +5,12 @@ // Copyright 2002 California Institute of Technology -#include "InterfaceKinetics.h" -#include "EdgeKinetics.h" -#include "SurfPhase.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "cantera/kinetics/EdgeKinetics.h" +#include "cantera/thermo/SurfPhase.h" #include "ReactionData.h" -#include "RateCoeffMgr.h" +#include "cantera/kinetics/RateCoeffMgr.h" #include "ImplicitSurfChem.h" diff --git a/src/kinetics/Kinetics.cpp b/src/kinetics/Kinetics.cpp index 1eaca3e27..5b07aad2c 100644 --- a/src/kinetics/Kinetics.cpp +++ b/src/kinetics/Kinetics.cpp @@ -8,10 +8,10 @@ */ // Copyright 2001-2004 California Institute of Technology -#include "InterfaceKinetics.h" -#include "SurfPhase.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "cantera/thermo/SurfPhase.h" #include "StoichManager.h" -#include "RateCoeffMgr.h" +#include "cantera/kinetics/RateCoeffMgr.h" #include "ImplicitSurfChem.h" diff --git a/src/kinetics/KineticsFactory.cpp b/src/kinetics/KineticsFactory.cpp index 884d3a38a..98dd005a4 100644 --- a/src/kinetics/KineticsFactory.cpp +++ b/src/kinetics/KineticsFactory.cpp @@ -3,14 +3,14 @@ */ // Copyright 2001 California Institute of Technology -#include "KineticsFactory.h" +#include "cantera/kinetics/KineticsFactory.h" -#include "GasKinetics.h" -#include "GRI_30_Kinetics.h" -#include "InterfaceKinetics.h" -#include "EdgeKinetics.h" -#include "importKinetics.h" -#include "AqueousKinetics.h" +#include "cantera/kinetics/GasKinetics.h" +#include "cantera/kinetics/GRI_30_Kinetics.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "cantera/kinetics/EdgeKinetics.h" +#include "cantera/kinetics/importKinetics.h" +#include "cantera/kinetics/AqueousKinetics.h" using namespace std; diff --git a/src/kinetics/ReactionData.h b/src/kinetics/ReactionData.h index a31224b94..c84e02c91 100644 --- a/src/kinetics/ReactionData.h +++ b/src/kinetics/ReactionData.h @@ -8,7 +8,7 @@ #ifndef CT_REACTION_DATA_H #define CT_REACTION_DATA_H -#include "reaction_defs.h" +#include "cantera/kinetics/reaction_defs.h" namespace Cantera { diff --git a/src/kinetics/ReactionPath.cpp b/src/kinetics/ReactionPath.cpp index e4d27e91c..9e383389e 100644 --- a/src/kinetics/ReactionPath.cpp +++ b/src/kinetics/ReactionPath.cpp @@ -4,10 +4,10 @@ */ // Copyright 2001 California Institute of Technology -#include "ReactionPath.h" -#include "Kinetics.h" -#include "reaction_defs.h" -#include "Group.h" +#include "cantera/kinetics/ReactionPath.h" +#include "cantera/kinetics/Kinetics.h" +#include "cantera/kinetics/reaction_defs.h" +#include "cantera/kinetics/Group.h" using namespace std; diff --git a/src/kinetics/ReactionStoichMgr.cpp b/src/kinetics/ReactionStoichMgr.cpp index 6c39c59dc..83877b782 100644 --- a/src/kinetics/ReactionStoichMgr.cpp +++ b/src/kinetics/ReactionStoichMgr.cpp @@ -5,9 +5,9 @@ /// //------------------------------------------------ -#include "ReactionStoichMgr.h" +#include "cantera/kinetics/ReactionStoichMgr.h" #include "StoichManager.h" -#include "ctexceptions.h" +#include "cantera/base/ctexceptions.h" #include "ReactionData.h" using namespace std; diff --git a/src/kinetics/StoichManager.h b/src/kinetics/StoichManager.h index c87b9bff1..ca3a329fb 100644 --- a/src/kinetics/StoichManager.h +++ b/src/kinetics/StoichManager.h @@ -7,7 +7,7 @@ #ifndef CT_STOICH_MGR_H #define CT_STOICH_MGR_H -#include "stringUtils.h" +#include "cantera/base/stringUtils.h" namespace Cantera { diff --git a/src/kinetics/importKinetics.cpp b/src/kinetics/importKinetics.cpp index f6486ccc0..9bd400871 100644 --- a/src/kinetics/importKinetics.cpp +++ b/src/kinetics/importKinetics.cpp @@ -11,26 +11,26 @@ */ // Copyright 2002 California Institute of Technology -#include "importKinetics.h" -#include "mix_defs.h" +#include "cantera/kinetics/importKinetics.h" +#include "cantera/thermo/mix_defs.h" #include #include // Cantera includes -#include "speciesThermoTypes.h" -#include "ThermoPhase.h" -#include "SurfPhase.h" -#include "EdgePhase.h" -#include "ThermoFactory.h" -#include "SpeciesThermoFactory.h" -#include "KineticsFactory.h" -#include "reaction_defs.h" +#include "cantera/thermo/speciesThermoTypes.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/thermo/SurfPhase.h" +#include "cantera/thermo/EdgePhase.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/thermo/SpeciesThermoFactory.h" +#include "cantera/kinetics/KineticsFactory.h" +#include "cantera/kinetics/reaction_defs.h" #include "ReactionData.h" -#include "global.h" -#include "stringUtils.h" +#include "cantera/base/global.h" +#include "cantera/base/stringUtils.h" -#include "xml.h" -#include "ctml.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" #include diff --git a/src/kinetics/solveSP.cpp b/src/kinetics/solveSP.cpp index dbff93ebc..722e9c3ec 100644 --- a/src/kinetics/solveSP.cpp +++ b/src/kinetics/solveSP.cpp @@ -9,8 +9,8 @@ */ #include "solveSP.h" -#include "clockWC.h" -#include "ctlapack.h" +#include "cantera/base/clockWC.h" +#include "cantera/numerics/ctlapack.h" /* Standard include files */ diff --git a/src/kinetics/solveSP.h b/src/kinetics/solveSP.h index ef17b156e..471326108 100644 --- a/src/kinetics/solveSP.h +++ b/src/kinetics/solveSP.h @@ -14,10 +14,10 @@ #define SOLVESP_H #include "ImplicitSurfChem.h" -#include "InterfaceKinetics.h" +#include "cantera/kinetics/InterfaceKinetics.h" #include -#include "Array.h" +#include "cantera/base/Array.h" //! Solution Methods /*! diff --git a/src/matlab/ctfunctions.cpp b/src/matlab/ctfunctions.cpp index 4ee0c0763..f56326e2f 100644 --- a/src/matlab/ctfunctions.cpp +++ b/src/matlab/ctfunctions.cpp @@ -4,9 +4,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "ctmatutils.h" using namespace std; diff --git a/src/matlab/ctmethods.cpp b/src/matlab/ctmethods.cpp index 5080a63f5..7ab6c8191 100644 --- a/src/matlab/ctmethods.cpp +++ b/src/matlab/ctmethods.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include "ctmatutils.h" #include "mllogger.h" diff --git a/src/matlab/flowdevicemethods.cpp b/src/matlab/flowdevicemethods.cpp index c5f1d5177..d11d1455a 100644 --- a/src/matlab/flowdevicemethods.cpp +++ b/src/matlab/flowdevicemethods.cpp @@ -1,6 +1,6 @@ #include "ctmatutils.h" -#include -#include +#include +#include //const double Undef = -999.123; diff --git a/src/matlab/funcmethods.cpp b/src/matlab/funcmethods.cpp index 9daddad01..272902801 100644 --- a/src/matlab/funcmethods.cpp +++ b/src/matlab/funcmethods.cpp @@ -1,6 +1,6 @@ #include "ctmatutils.h" -#include -#include +#include +#include void funcmethods(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) diff --git a/src/matlab/kineticsmethods.cpp b/src/matlab/kineticsmethods.cpp index 6a8f7a339..2096ca43b 100644 --- a/src/matlab/kineticsmethods.cpp +++ b/src/matlab/kineticsmethods.cpp @@ -1,5 +1,5 @@ #include "ctmatutils.h" -#include +#include void checkNArgs(const int n, const int nrhs) { diff --git a/src/matlab/mixturemethods.cpp b/src/matlab/mixturemethods.cpp index 00f41d59c..32cd6c846 100644 --- a/src/matlab/mixturemethods.cpp +++ b/src/matlab/mixturemethods.cpp @@ -3,8 +3,8 @@ */ #include -#include -#include +#include +#include #include "ctmatutils.h" using namespace std; diff --git a/src/matlab/mllogger.h b/src/matlab/mllogger.h index c58413a29..d1fc8ddcd 100644 --- a/src/matlab/mllogger.h +++ b/src/matlab/mllogger.h @@ -5,7 +5,7 @@ #define MLLOGGER_H #include "ctmatutils.h" -#include "cantera/kernel/logger.h" +#include "cantera/base/logger.h" #include diff --git a/src/matlab/onedimmethods.cpp b/src/matlab/onedimmethods.cpp index 618985a08..92ec2ccb8 100644 --- a/src/matlab/onedimmethods.cpp +++ b/src/matlab/onedimmethods.cpp @@ -2,7 +2,7 @@ #include #include "ctmatutils.h" -#include +#include using namespace std; diff --git a/src/matlab/phasemethods.cpp b/src/matlab/phasemethods.cpp index ece3f4b65..f7ea25008 100644 --- a/src/matlab/phasemethods.cpp +++ b/src/matlab/phasemethods.cpp @@ -3,7 +3,7 @@ */ #include "ctmatutils.h" -#include +#include void phasemethods(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) diff --git a/src/matlab/reactormethods.cpp b/src/matlab/reactormethods.cpp index 411757615..e1157bf4a 100644 --- a/src/matlab/reactormethods.cpp +++ b/src/matlab/reactormethods.cpp @@ -2,8 +2,8 @@ * @file reactormethods.cpp */ -#include -#include +#include +#include #include "ctmatutils.h" void reactormethods(int nlhs, mxArray* plhs[], diff --git a/src/matlab/reactornetmethods.cpp b/src/matlab/reactornetmethods.cpp index 07ba54fac..dba4097d6 100644 --- a/src/matlab/reactornetmethods.cpp +++ b/src/matlab/reactornetmethods.cpp @@ -2,8 +2,8 @@ * @file reactornetmethods.cpp */ -#include -#include +#include +#include #include "ctmatutils.h" //const double Undef = -999.123; diff --git a/src/matlab/surfmethods.cpp b/src/matlab/surfmethods.cpp index 3a2f756a7..d028a473b 100644 --- a/src/matlab/surfmethods.cpp +++ b/src/matlab/surfmethods.cpp @@ -2,8 +2,8 @@ #include #include "ctmatutils.h" -#include -#include +#include +#include using namespace std; diff --git a/src/matlab/thermomethods.cpp b/src/matlab/thermomethods.cpp index 19ea9ea2a..44a7aeda5 100644 --- a/src/matlab/thermomethods.cpp +++ b/src/matlab/thermomethods.cpp @@ -2,7 +2,7 @@ * @file thermomethods.cpp */ -#include +#include #include "ctmatutils.h" static void thermoset(int nlhs, mxArray* plhs[], diff --git a/src/matlab/transportmethods.cpp b/src/matlab/transportmethods.cpp index f7b126645..a82f7ff07 100644 --- a/src/matlab/transportmethods.cpp +++ b/src/matlab/transportmethods.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include "ctmatutils.h" void reportError(); diff --git a/src/matlab/wallmethods.cpp b/src/matlab/wallmethods.cpp index 41cb15035..f5759f95c 100644 --- a/src/matlab/wallmethods.cpp +++ b/src/matlab/wallmethods.cpp @@ -2,8 +2,8 @@ * @file wallmethods.cpp */ -#include -#include +#include +#include #include "ctmatutils.h" //const double Undef = -999.123; diff --git a/src/matlab/xmlmethods.cpp b/src/matlab/xmlmethods.cpp index 1c7cbd0e7..ac7c8a340 100644 --- a/src/matlab/xmlmethods.cpp +++ b/src/matlab/xmlmethods.cpp @@ -2,8 +2,8 @@ * @file xmlmethods.cpp */ -#include -#include +#include +#include #include "ctmatutils.h" void reportError(); diff --git a/src/numerics/BEulerInt.cpp b/src/numerics/BEulerInt.cpp index f88c2d519..7e414b9d7 100644 --- a/src/numerics/BEulerInt.cpp +++ b/src/numerics/BEulerInt.cpp @@ -13,7 +13,7 @@ #include "BEulerInt.h" -#include "mdp_allo.h" +#include "cantera/base/mdp_allo.h" #include using namespace std; diff --git a/src/numerics/BEulerInt.h b/src/numerics/BEulerInt.h index 59c6953c6..9269c54ab 100644 --- a/src/numerics/BEulerInt.h +++ b/src/numerics/BEulerInt.h @@ -15,19 +15,19 @@ #ifndef CT_BEULERINT_H #define CT_BEULERINT_H -#include "ct_defs.h" -#include "ctlapack.h" -#include "utilities.h" -#include "ctexceptions.h" +#include "cantera/base/ct_defs.h" +#include "cantera/numerics/ctlapack.h" +#include "cantera/base/utilities.h" +#include "cantera/base/ctexceptions.h" -#include "Integrator.h" -#include "ResidJacEval.h" +#include "cantera/numerics/Integrator.h" +#include "cantera/numerics/ResidJacEval.h" -#include "GeneralMatrix.h" -#include "NonlinearSolver.h" +#include "cantera/numerics/GeneralMatrix.h" +#include "cantera/numerics/NonlinearSolver.h" -#include "mdp_allo.h" +#include "cantera/base/mdp_allo.h" #ifndef MAX # define MAX(x,y) (( (x) > (y) ) ? (x) : (y)) diff --git a/src/numerics/BandMatrix.cpp b/src/numerics/BandMatrix.cpp index 43d5aef4b..ad1481b05 100644 --- a/src/numerics/BandMatrix.cpp +++ b/src/numerics/BandMatrix.cpp @@ -6,12 +6,12 @@ // Copyright 2001 California Institute of Technology -#include "BandMatrix.h" -#include "ctlapack.h" -#include "utilities.h" -#include "ctexceptions.h" -#include "stringUtils.h" -#include "global.h" +#include "cantera/numerics/BandMatrix.h" +#include "cantera/numerics/ctlapack.h" +#include "cantera/base/utilities.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/global.h" #include using namespace std; diff --git a/src/numerics/CVodeInt.h b/src/numerics/CVodeInt.h index 3614a4a11..353ceb6b0 100644 --- a/src/numerics/CVodeInt.h +++ b/src/numerics/CVodeInt.h @@ -6,10 +6,10 @@ #ifndef CT_CVODEINT_H #define CT_CVODEINT_H -#include "Integrator.h" -#include "FuncEval.h" -#include "ctexceptions.h" -#include "ct_defs.h" +#include "cantera/numerics/Integrator.h" +#include "cantera/numerics/FuncEval.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp index b62c6ea86..137ff5a6b 100644 --- a/src/numerics/CVodesIntegrator.cpp +++ b/src/numerics/CVodesIntegrator.cpp @@ -4,10 +4,10 @@ */ // Copyright 2001 California Institute of Technology -#include "config.h" +#include "cantera/base/config.h" #include "CVodesIntegrator.h" -#include "stringUtils.h" +#include "cantera/base/stringUtils.h" #include using namespace std; diff --git a/src/numerics/CVodesIntegrator.h b/src/numerics/CVodesIntegrator.h index 063135332..5a83cc006 100644 --- a/src/numerics/CVodesIntegrator.h +++ b/src/numerics/CVodesIntegrator.h @@ -8,10 +8,10 @@ #ifdef HAS_SUNDIALS -#include "Integrator.h" -#include "FuncEval.h" -#include "ctexceptions.h" -#include "ct_defs.h" +#include "cantera/numerics/Integrator.h" +#include "cantera/numerics/FuncEval.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/ct_defs.h" #ifdef SUNDIALS_VERSION_22 #include diff --git a/src/numerics/DenseMatrix.cpp b/src/numerics/DenseMatrix.cpp index b6ac441b3..0f8ef4a2e 100644 --- a/src/numerics/DenseMatrix.cpp +++ b/src/numerics/DenseMatrix.cpp @@ -4,12 +4,12 @@ // Copyright 2001 California Institute of Technology -#include "ct_defs.h" -#include "ctlapack.h" -#include "utilities.h" -#include "DenseMatrix.h" -#include "stringUtils.h" -#include "global.h" +#include "cantera/base/ct_defs.h" +#include "cantera/numerics/ctlapack.h" +#include "cantera/base/utilities.h" +#include "cantera/numerics/DenseMatrix.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/global.h" namespace Cantera { diff --git a/src/numerics/Func1.cpp b/src/numerics/Func1.cpp index 4880b14db..b7f476f90 100644 --- a/src/numerics/Func1.cpp +++ b/src/numerics/Func1.cpp @@ -1,6 +1,6 @@ -#include "Func1.h" -#include "stringUtils.h" -#include "global.h" +#include "cantera/numerics/Func1.h" +#include "cantera/base/stringUtils.h" +#include "cantera/base/global.h" using namespace std; diff --git a/src/numerics/GeneralMatrix.cpp b/src/numerics/GeneralMatrix.cpp index 8f03f3a37..1c984c0df 100644 --- a/src/numerics/GeneralMatrix.cpp +++ b/src/numerics/GeneralMatrix.cpp @@ -13,7 +13,7 @@ * See file License.txt for licensing information. */ -#include "GeneralMatrix.h" +#include "cantera/numerics/GeneralMatrix.h" using namespace std; namespace Cantera diff --git a/src/numerics/IDA_Solver.cpp b/src/numerics/IDA_Solver.cpp index 8c9b2253d..db58c0b09 100644 --- a/src/numerics/IDA_Solver.cpp +++ b/src/numerics/IDA_Solver.cpp @@ -5,8 +5,8 @@ // Copyright 2006 California Institute of Technology -#include "IDA_Solver.h" -#include "stringUtils.h" +#include "cantera/numerics/IDA_Solver.h" +#include "cantera/base/stringUtils.h" #include diff --git a/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp index dbfd783e8..41afb2b7e 100644 --- a/src/numerics/NonlinearSolver.cpp +++ b/src/numerics/NonlinearSolver.cpp @@ -18,14 +18,14 @@ #include -#include "SquareMatrix.h" -#include "GeneralMatrix.h" -#include "NonlinearSolver.h" -#include "ctlapack.h" +#include "cantera/numerics/SquareMatrix.h" +#include "cantera/numerics/GeneralMatrix.h" +#include "cantera/numerics/NonlinearSolver.h" +#include "cantera/numerics/ctlapack.h" -#include "clockWC.h" -#include "vec_functions.h" -#include "mdp_allo.h" +#include "cantera/base/clockWC.h" +#include "cantera/base/vec_functions.h" +#include "cantera/base/mdp_allo.h" #include #include diff --git a/src/numerics/ODE_integrators.cpp b/src/numerics/ODE_integrators.cpp index 6cef09dfa..252da5e45 100644 --- a/src/numerics/ODE_integrators.cpp +++ b/src/numerics/ODE_integrators.cpp @@ -1,5 +1,5 @@ -#include "ct_defs.h" -#include "Integrator.h" +#include "cantera/base/ct_defs.h" +#include "cantera/numerics/Integrator.h" #ifdef HAS_SUNDIALS diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp index 3ee65b505..dc137d22c 100644 --- a/src/numerics/ResidJacEval.cpp +++ b/src/numerics/ResidJacEval.cpp @@ -13,9 +13,9 @@ * See file License.txt for licensing information. */ -#include "ct_defs.h" -#include "ctlapack.h" -#include "ResidJacEval.h" +#include "cantera/base/ct_defs.h" +#include "cantera/numerics/ctlapack.h" +#include "cantera/numerics/ResidJacEval.h" #include #include diff --git a/src/numerics/RootFind.cpp b/src/numerics/RootFind.cpp index 08616634a..c8bda69dc 100644 --- a/src/numerics/RootFind.cpp +++ b/src/numerics/RootFind.cpp @@ -11,19 +11,19 @@ * See file License.txt for licensing information. */ -#include "ct_defs.h" -#include "RootFind.h" +#include "cantera/base/ct_defs.h" +#include "cantera/numerics/RootFind.h" // turn on debugging for now #ifndef DEBUG_MODE #define DEBUG_MODE #endif -#include "global.h" +#include "cantera/base/global.h" #ifdef DEBUG_MODE -#include "mdp_allo.h" +#include "cantera/base/mdp_allo.h" #endif -#include "stringUtils.h" +#include "cantera/base/stringUtils.h" /* Standard include files */ #include diff --git a/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp index 659de69ca..1788a5a4d 100644 --- a/src/numerics/SquareMatrix.cpp +++ b/src/numerics/SquareMatrix.cpp @@ -13,11 +13,11 @@ * See file License.txt for licensing information. */ -#include "ct_defs.h" -#include "stringUtils.h" -#include "ctlapack.h" -#include "SquareMatrix.h" -#include "global.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/stringUtils.h" +#include "cantera/numerics/ctlapack.h" +#include "cantera/numerics/SquareMatrix.h" +#include "cantera/base/global.h" #include #include diff --git a/src/numerics/funcs.cpp b/src/numerics/funcs.cpp index 24f4fda8f..adbd3acbb 100644 --- a/src/numerics/funcs.cpp +++ b/src/numerics/funcs.cpp @@ -12,12 +12,12 @@ using namespace std; -#include "ctlapack.h" -#include "ct_defs.h" -#include "ctexceptions.h" -#include "stringUtils.h" -#include "funcs.h" -#include "polyfit.h" +#include "cantera/numerics/ctlapack.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/stringUtils.h" +#include "cantera/numerics/funcs.h" +#include "cantera/numerics/polyfit.h" #ifndef FTN_TRAILING_UNDERSCORE #define _DPOLFT_ dpolft diff --git a/src/numerics/lapack.h b/src/numerics/lapack.h index cc9311cb6..746c9d20b 100644 --- a/src/numerics/lapack.h +++ b/src/numerics/lapack.h @@ -2,7 +2,7 @@ // Copyright 2001 California Institute of Technology. // All rights reserved. -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #ifndef LAPACK_H #define LAPACK_H diff --git a/src/numerics/solveProb.cpp b/src/numerics/solveProb.cpp index aa0cfd940..d0a5c58b4 100644 --- a/src/numerics/solveProb.cpp +++ b/src/numerics/solveProb.cpp @@ -11,9 +11,9 @@ * See file License.txt for licensing information. */ -#include "solveProb.h" -#include "clockWC.h" -#include "ctlapack.h" +#include "cantera/numerics/solveProb.h" +#include "cantera/base/clockWC.h" +#include "cantera/numerics/ctlapack.h" /* Standard include files */ diff --git a/src/oneD/Domain1D.cpp b/src/oneD/Domain1D.cpp index 815055e60..5196083ee 100644 --- a/src/oneD/Domain1D.cpp +++ b/src/oneD/Domain1D.cpp @@ -3,7 +3,7 @@ * */ -#include "Domain1D.h" +#include "cantera/oneD/Domain1D.h" using namespace std; diff --git a/src/oneD/MultiJac.cpp b/src/oneD/MultiJac.cpp index 3391e4839..ad02dcf85 100644 --- a/src/oneD/MultiJac.cpp +++ b/src/oneD/MultiJac.cpp @@ -8,7 +8,7 @@ * Copyright 2002 California Institute of Technology */ -#include "MultiJac.h" +#include "cantera/oneD/MultiJac.h" using namespace std; namespace Cantera diff --git a/src/oneD/MultiNewton.cpp b/src/oneD/MultiNewton.cpp index 571fc378b..7dbd1192a 100644 --- a/src/oneD/MultiNewton.cpp +++ b/src/oneD/MultiNewton.cpp @@ -11,11 +11,11 @@ #include using namespace std; -#include "MultiNewton.h" +#include "cantera/oneD/MultiNewton.h" -#include "ctexceptions.h" -#include "vec_functions.h" -#include "stringUtils.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/vec_functions.h" +#include "cantera/base/stringUtils.h" #include #include diff --git a/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp index e3b7fe472..b4d336e00 100644 --- a/src/oneD/OneDim.cpp +++ b/src/oneD/OneDim.cpp @@ -1,8 +1,8 @@ -#include "MultiJac.h" -#include "MultiNewton.h" -#include "OneDim.h" +#include "cantera/oneD/MultiJac.h" +#include "cantera/oneD/MultiNewton.h" +#include "cantera/oneD/OneDim.h" -#include "ctml.h" +#include "cantera/base/ctml.h" using namespace ctml; using namespace std; diff --git a/src/oneD/Resid1D.h b/src/oneD/Resid1D.h index 0fb492db2..e89f290ae 100644 --- a/src/oneD/Resid1D.h +++ b/src/oneD/Resid1D.h @@ -15,9 +15,9 @@ /* * NOTE: I don't think this file is used any longer. Thus, this is deprecated. */ -#include "../ctexceptions.h" -#include "../xml.h" -#include "refine.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/xml.h" +#include "cantera/oneD/refine.h" namespace Cantera diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp index a3ed676af..128933e37 100644 --- a/src/oneD/Sim1D.cpp +++ b/src/oneD/Sim1D.cpp @@ -2,8 +2,8 @@ * @file Sim1D.cpp */ -#include "Sim1D.h" -#include "MultiJac.h" +#include "cantera/oneD/Sim1D.h" +#include "cantera/oneD/MultiJac.h" #include diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp index 512ade2c6..0e922dd1c 100644 --- a/src/oneD/StFlow.cpp +++ b/src/oneD/StFlow.cpp @@ -6,10 +6,10 @@ #include #include -#include "StFlow.h" -#include "ArrayViewer.h" -#include "ctml.h" -#include "MultiJac.h" +#include "cantera/oneD/StFlow.h" +#include "cantera/numerics/ArrayViewer.h" +#include "cantera/base/ctml.h" +#include "cantera/oneD/MultiJac.h" using namespace ctml; using namespace std; diff --git a/src/oneD/boundaries1D.cpp b/src/oneD/boundaries1D.cpp index 38dca815f..39400eaf5 100644 --- a/src/oneD/boundaries1D.cpp +++ b/src/oneD/boundaries1D.cpp @@ -3,7 +3,7 @@ */ // Copyright 2002-3 California Institute of Technology -#include "Inlet1D.h" +#include "cantera/oneD/Inlet1D.h" using namespace std; diff --git a/src/oneD/newton_utils.cpp b/src/oneD/newton_utils.cpp index 6b02e9de0..58343884e 100644 --- a/src/oneD/newton_utils.cpp +++ b/src/oneD/newton_utils.cpp @@ -2,8 +2,8 @@ * @file newton_utils.cpp */ -#include "ct_defs.h" -#include "Domain1D.h" +#include "cantera/base/ct_defs.h" +#include "cantera/oneD/Domain1D.h" using namespace std; diff --git a/src/oneD/refine.cpp b/src/oneD/refine.cpp index 1e2b0f1d9..7c0e12e45 100644 --- a/src/oneD/refine.cpp +++ b/src/oneD/refine.cpp @@ -1,8 +1,8 @@ #include #include -#include "Domain1D.h" +#include "cantera/oneD/Domain1D.h" -#include "refine.h" +#include "cantera/oneD/refine.h" using namespace std; diff --git a/src/python/pycantera.cpp b/src/python/pycantera.cpp index 86530371c..7707b7867 100644 --- a/src/python/pycantera.cpp +++ b/src/python/pycantera.cpp @@ -5,7 +5,7 @@ * */ -#include "cantera/kernel/config.h" +#include "cantera/base/config.h" #include "Python.h" @@ -67,7 +67,7 @@ pyct_appdelete(PyObject* self, PyObject* args) #include "methods.h" #include "pylogger.h" -//#include "../../src/global.h" +//#include "cantera/base/global.h" extern "C" { /* Initialization function for the module */ diff --git a/src/python/pylogger.h b/src/python/pylogger.h index 00b0a2473..be0c18376 100644 --- a/src/python/pylogger.h +++ b/src/python/pylogger.h @@ -3,7 +3,7 @@ #include "Python.h" #include -#include "cantera/kernel/logger.h" +#include "cantera/base/logger.h" static std::string ss = "print \"\"\" "; diff --git a/src/spectra/LineBroadener.cpp b/src/spectra/LineBroadener.cpp index 558e218fe..ef44991b8 100644 --- a/src/spectra/LineBroadener.cpp +++ b/src/spectra/LineBroadener.cpp @@ -1,4 +1,4 @@ -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #include #ifdef USE_BOOST_MATH @@ -6,7 +6,7 @@ using boost::math::erf; #endif -#include "LineBroadener.h" +#include "cantera/spectra/LineBroadener.h" using namespace std; using namespace Cantera; diff --git a/src/spectra/Nuclei.h b/src/spectra/Nuclei.h index 0f0218f6d..f8678d44f 100644 --- a/src/spectra/Nuclei.h +++ b/src/spectra/Nuclei.h @@ -5,7 +5,7 @@ #ifndef CT_NUCL_H #define CT_NUCL_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/src/spectra/rotor.cpp b/src/spectra/rotor.cpp index 608cfb513..089b4038a 100644 --- a/src/spectra/rotor.cpp +++ b/src/spectra/rotor.cpp @@ -2,8 +2,8 @@ * @file rotor.cpp * */ -#include "ct_defs.h" -#include "rotor.h" +#include "cantera/base/ct_defs.h" +#include "cantera/spectra/rotor.h" using namespace std; using namespace Cantera; diff --git a/src/thermo/ConstCpPoly.h b/src/thermo/ConstCpPoly.h index ca5a98f5c..07ef86418 100644 --- a/src/thermo/ConstCpPoly.h +++ b/src/thermo/ConstCpPoly.h @@ -10,7 +10,7 @@ #ifndef CT_CONSTCPPOLY_H #define CT_CONSTCPPOLY_H -#include "SpeciesThermoInterpType.h" +#include "cantera/thermo/SpeciesThermoInterpType.h" namespace Cantera { diff --git a/src/thermo/ConstDensityThermo.cpp b/src/thermo/ConstDensityThermo.cpp index 7af72f6b1..9c4fd9049 100644 --- a/src/thermo/ConstDensityThermo.cpp +++ b/src/thermo/ConstDensityThermo.cpp @@ -6,10 +6,10 @@ */ // Copyright 2002 California Institute of Technology -#include "ct_defs.h" -#include "mix_defs.h" -#include "ConstDensityThermo.h" -#include "SpeciesThermo.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/ConstDensityThermo.h" +#include "cantera/thermo/SpeciesThermo.h" #include diff --git a/src/thermo/Constituents.cpp b/src/thermo/Constituents.cpp index 8122bd14c..03cfd7d93 100644 --- a/src/thermo/Constituents.cpp +++ b/src/thermo/Constituents.cpp @@ -5,8 +5,8 @@ */ // Copyright 2001 California Institute of Technology -#include "Constituents.h" -#include "Elements.h" +#include "cantera/thermo/Constituents.h" +#include "cantera/thermo/Elements.h" using namespace std; namespace Cantera diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp index 5e5f96786..a930aacae 100644 --- a/src/thermo/DebyeHuckel.cpp +++ b/src/thermo/DebyeHuckel.cpp @@ -17,10 +17,10 @@ #define MAX(x,y) (( (x) > (y) ) ? (x) : (y)) #endif -#include "DebyeHuckel.h" -#include "ThermoFactory.h" -#include "WaterProps.h" -#include "PDSS_Water.h" +#include "cantera/thermo/DebyeHuckel.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/thermo/WaterProps.h" +#include "cantera/thermo/PDSS_Water.h" #include #include diff --git a/src/thermo/Elements.cpp b/src/thermo/Elements.cpp index 7a391c4c4..054192935 100644 --- a/src/thermo/Elements.cpp +++ b/src/thermo/Elements.cpp @@ -8,11 +8,11 @@ */ // Copyright 2003 California Institute of Technology -#include "Elements.h" -#include "xml.h" -#include "ctml.h" -#include "ctexceptions.h" -#include "stringUtils.h" +#include "cantera/thermo/Elements.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/stringUtils.h" using namespace ctml; using namespace std; diff --git a/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp index 576ef9648..7e8501b12 100644 --- a/src/thermo/FixedChemPotSSTP.cpp +++ b/src/thermo/FixedChemPotSSTP.cpp @@ -16,15 +16,15 @@ * $Id: FixedChemPotSSTP.cpp 255 2009-11-09 23:36:49Z hkmoffa $ */ -#include "ct_defs.h" -#include "mix_defs.h" -#include "FixedChemPotSSTP.h" -#include "SpeciesThermo.h" -#include "ThermoFactory.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/FixedChemPotSSTP.h" +#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/thermo/ThermoFactory.h" #include -#include "SimpleThermo.h" +#include "cantera/thermo/SimpleThermo.h" namespace Cantera { //==================================================================================================================== diff --git a/src/thermo/GeneralSpeciesThermo.cpp b/src/thermo/GeneralSpeciesThermo.cpp index 07b51895d..6a07f7e60 100644 --- a/src/thermo/GeneralSpeciesThermo.cpp +++ b/src/thermo/GeneralSpeciesThermo.cpp @@ -6,17 +6,17 @@ */ // Copyright 2001-2004 California Institute of Technology -#include "GeneralSpeciesThermo.h" -#include "NasaPoly1.h" +#include "cantera/thermo/GeneralSpeciesThermo.h" +#include "cantera/thermo/NasaPoly1.h" #include "NasaPoly2.h" #include "ShomatePoly.h" #include "ConstCpPoly.h" #include "Mu0Poly.h" #ifdef WITH_ADSORBATE -#include "AdsorbateThermo.h" +#include "cantera/thermo/AdsorbateThermo.h" #endif -#include "SpeciesThermoFactory.h" +#include "cantera/thermo/SpeciesThermoFactory.h" #include using namespace std; diff --git a/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp index eaededad1..07188293a 100644 --- a/src/thermo/GibbsExcessVPSSTP.cpp +++ b/src/thermo/GibbsExcessVPSSTP.cpp @@ -16,7 +16,7 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "GibbsExcessVPSSTP.h" +#include "cantera/thermo/GibbsExcessVPSSTP.h" #include using namespace std; diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index e09f85b8c..84e52109d 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -22,10 +22,10 @@ #define MAX(x,y) (( (x) > (y) ) ? (x) : (y)) #endif //@} -#include "HMWSoln.h" -#include "ThermoFactory.h" -#include "WaterProps.h" -#include "PDSS_Water.h" +#include "cantera/thermo/HMWSoln.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/thermo/WaterProps.h" +#include "cantera/thermo/PDSS_Water.h" #include #include diff --git a/src/thermo/HMWSoln_input.cpp b/src/thermo/HMWSoln_input.cpp index 6928e7fac..12ce5aa80 100644 --- a/src/thermo/HMWSoln_input.cpp +++ b/src/thermo/HMWSoln_input.cpp @@ -12,10 +12,10 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "HMWSoln.h" -#include "ThermoFactory.h" -#include "WaterProps.h" -#include "PDSS_Water.h" +#include "cantera/thermo/HMWSoln.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/thermo/WaterProps.h" +#include "cantera/thermo/PDSS_Water.h" #include #include diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index 82d985dab..3fd598827 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -5,10 +5,10 @@ * and class \link Cantera::IdealGasPhase IdealGasPhase\endlink). */ -#include "ct_defs.h" -#include "mix_defs.h" -#include "IdealGasPhase.h" -#include "SpeciesThermo.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/IdealGasPhase.h" +#include "cantera/thermo/SpeciesThermo.h" using namespace std; diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp index c5b395c4f..80a6b8895 100644 --- a/src/thermo/IdealMolalSoln.cpp +++ b/src/thermo/IdealMolalSoln.cpp @@ -17,8 +17,8 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "IdealMolalSoln.h" -#include "ThermoFactory.h" +#include "cantera/thermo/IdealMolalSoln.h" +#include "cantera/thermo/ThermoFactory.h" #include //@{ diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp index 464a589b6..b2a84a522 100644 --- a/src/thermo/IdealSolidSolnPhase.cpp +++ b/src/thermo/IdealSolidSolnPhase.cpp @@ -10,7 +10,7 @@ * retains certain rights in this software. */ -#include "IdealSolidSolnPhase.h" +#include "cantera/thermo/IdealSolidSolnPhase.h" #include using namespace std; diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index 4a5a8388c..40bda11c8 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -12,11 +12,11 @@ * U.S. Government retains certain rights in this software. */ -#include "IdealSolnGasVPSS.h" -#include "VPSSMgr.h" -#include "PDSS.h" -#include "mix_defs.h" -#include "ThermoFactory.h" +#include "cantera/thermo/IdealSolnGasVPSS.h" +#include "cantera/thermo/VPSSMgr.h" +#include "cantera/thermo/PDSS.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/ThermoFactory.h" using namespace std; diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp index 6ce97f169..2eb5cf9d2 100644 --- a/src/thermo/IonsFromNeutralVPSSTP.cpp +++ b/src/thermo/IonsFromNeutralVPSSTP.cpp @@ -16,11 +16,11 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "IonsFromNeutralVPSSTP.h" -#include "ThermoFactory.h" +#include "cantera/thermo/IonsFromNeutralVPSSTP.h" +#include "cantera/thermo/ThermoFactory.h" -#include "PDSS_IonsFromNeutral.h" -#include "mix_defs.h" +#include "cantera/thermo/PDSS_IonsFromNeutral.h" +#include "cantera/thermo/mix_defs.h" #include #include diff --git a/src/thermo/LatticePhase.cpp b/src/thermo/LatticePhase.cpp index b197ad481..5e352b23b 100644 --- a/src/thermo/LatticePhase.cpp +++ b/src/thermo/LatticePhase.cpp @@ -7,14 +7,14 @@ * (see \ref thermoprops and class \link Cantera::LatticePhase LatticePhase\endlink). * */ -#include "config.h" +#include "cantera/base/config.h" #ifdef WITH_LATTICE_SOLID -#include "ct_defs.h" -#include "mix_defs.h" -#include "LatticePhase.h" -#include "SpeciesThermo.h" -#include "ThermoFactory.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/LatticePhase.h" +#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/thermo/ThermoFactory.h" #include diff --git a/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp index 432658e8d..d9f29d1a7 100644 --- a/src/thermo/LatticeSolidPhase.cpp +++ b/src/thermo/LatticeSolidPhase.cpp @@ -6,16 +6,16 @@ * (see \ref thermoprops and class \link Cantera::LatticeSolidPhase LatticeSolidPhase\endlink). */ -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" #ifdef WITH_LATTICE_SOLID -#include "mix_defs.h" -#include "LatticeSolidPhase.h" -#include "LatticePhase.h" -#include "SpeciesThermo.h" -#include "ThermoFactory.h" -#include "SpeciesThermoFactory.h" -#include "GeneralSpeciesThermo.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/LatticeSolidPhase.h" +#include "cantera/thermo/LatticePhase.h" +#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/thermo/SpeciesThermoFactory.h" +#include "cantera/thermo/GeneralSpeciesThermo.h" #include #ifndef MIN diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index 85dc2f99d..09d7a93fa 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -11,8 +11,8 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "MargulesVPSSTP.h" -#include "ThermoFactory.h" +#include "cantera/thermo/MargulesVPSSTP.h" +#include "cantera/thermo/ThermoFactory.h" #include using namespace std; diff --git a/src/thermo/MetalSHEelectrons.cpp b/src/thermo/MetalSHEelectrons.cpp index 79ef0a5c3..2830864a7 100644 --- a/src/thermo/MetalSHEelectrons.cpp +++ b/src/thermo/MetalSHEelectrons.cpp @@ -12,11 +12,11 @@ * U.S. Government retains certain rights in this software. * */ -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" -#include "MetalSHEelectrons.h" -#include "SingleSpeciesTP.h" -#include "ThermoFactory.h" +#include "cantera/thermo/MetalSHEelectrons.h" +#include "cantera/thermo/SingleSpeciesTP.h" +#include "cantera/thermo/ThermoFactory.h" #include using namespace std; diff --git a/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp index b721b4365..a0671714b 100644 --- a/src/thermo/MineralEQ3.cpp +++ b/src/thermo/MineralEQ3.cpp @@ -12,13 +12,13 @@ * * Copyright 2001 California Institute of Technology */ -#include "ct_defs.h" -#include "mix_defs.h" -#include "MineralEQ3.h" -#include "SpeciesThermo.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/MineralEQ3.h" +#include "cantera/thermo/SpeciesThermo.h" -#include "ThermoFactory.h" -#include "MineralEQ3.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/thermo/MineralEQ3.h" #include diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp index e563db1f0..0a8adc648 100644 --- a/src/thermo/MixedSolventElectrolyte.cpp +++ b/src/thermo/MixedSolventElectrolyte.cpp @@ -17,8 +17,8 @@ */ -#include "MixedSolventElectrolyte.h" -#include "ThermoFactory.h" +#include "cantera/thermo/MixedSolventElectrolyte.h" +#include "cantera/thermo/ThermoFactory.h" #include using namespace std; diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index 7f9de8e53..44ed21f5c 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -22,9 +22,9 @@ #pragma warning(disable:4503) #endif -#include "MixtureFugacityTP.h" -#include "VPSSMgr.h" -#include "PDSS.h" +#include "cantera/thermo/MixtureFugacityTP.h" +#include "cantera/thermo/VPSSMgr.h" +#include "cantera/thermo/PDSS.h" #ifndef MIN diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index a4de48c49..aa77927d0 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -16,7 +16,7 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "MolalityVPSSTP.h" +#include "cantera/thermo/MolalityVPSSTP.h" #include using namespace std; diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp index 341054091..b3bddf66f 100644 --- a/src/thermo/MolarityIonicVPSSTP.cpp +++ b/src/thermo/MolarityIonicVPSSTP.cpp @@ -22,8 +22,8 @@ */ -#include "MolarityIonicVPSSTP.h" -#include "ThermoFactory.h" +#include "cantera/thermo/MolarityIonicVPSSTP.h" +#include "cantera/thermo/ThermoFactory.h" #include using namespace std; diff --git a/src/thermo/Mu0Poly.cpp b/src/thermo/Mu0Poly.cpp index 34186132e..09fc760cc 100644 --- a/src/thermo/Mu0Poly.cpp +++ b/src/thermo/Mu0Poly.cpp @@ -6,11 +6,11 @@ * (see \ref spthermo and class \link Cantera::Mu0Poly Mu0Poly\endlink). */ #include "Mu0Poly.h" -#include "ctexceptions.h" -#include "speciesThermoTypes.h" -#include "SpeciesThermo.h" -#include "xml.h" -#include "ctml.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/thermo/speciesThermoTypes.h" +#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" using namespace std; using namespace ctml; diff --git a/src/thermo/Mu0Poly.h b/src/thermo/Mu0Poly.h index e5349194c..c25a835d4 100644 --- a/src/thermo/Mu0Poly.h +++ b/src/thermo/Mu0Poly.h @@ -8,7 +8,7 @@ #ifndef CT_MU0POLY_H #define CT_MU0POLY_H -#include "SpeciesThermoInterpType.h" +#include "cantera/thermo/SpeciesThermoInterpType.h" namespace Cantera { diff --git a/src/thermo/Nasa9Poly1.cpp b/src/thermo/Nasa9Poly1.cpp index f95fa45b5..445ebe458 100644 --- a/src/thermo/Nasa9Poly1.cpp +++ b/src/thermo/Nasa9Poly1.cpp @@ -11,7 +11,7 @@ */ // Copyright 2007 Sandia National Laboratories -#include "Nasa9Poly1.h" +#include "cantera/thermo/Nasa9Poly1.h" namespace Cantera { diff --git a/src/thermo/Nasa9PolyMultiTempRegion.cpp b/src/thermo/Nasa9PolyMultiTempRegion.cpp index 5802a2819..f00b26aa7 100644 --- a/src/thermo/Nasa9PolyMultiTempRegion.cpp +++ b/src/thermo/Nasa9PolyMultiTempRegion.cpp @@ -12,8 +12,8 @@ */ // Copyright 2007 Sandia National Laboratories -#include "global.h" -#include "ctexceptions.h" +#include "cantera/base/global.h" +#include "cantera/base/ctexceptions.h" #include "Nasa9PolyMultiTempRegion.h" using namespace std; diff --git a/src/thermo/Nasa9PolyMultiTempRegion.h b/src/thermo/Nasa9PolyMultiTempRegion.h index 977380290..39845a01d 100644 --- a/src/thermo/Nasa9PolyMultiTempRegion.h +++ b/src/thermo/Nasa9PolyMultiTempRegion.h @@ -16,8 +16,8 @@ // Copyright 2007 Sandia National Laboratories -#include "global.h" -#include "Nasa9Poly1.h" +#include "cantera/base/global.h" +#include "cantera/thermo/Nasa9Poly1.h" namespace Cantera { diff --git a/src/thermo/NasaPoly2.h b/src/thermo/NasaPoly2.h index 6a3798703..bd44c6036 100644 --- a/src/thermo/NasaPoly2.h +++ b/src/thermo/NasaPoly2.h @@ -13,7 +13,7 @@ #ifndef CT_NASAPOLY2_H #define CT_NASAPOLY2_H -#include "SpeciesThermoInterpType.h" +#include "cantera/thermo/SpeciesThermoInterpType.h" namespace Cantera { diff --git a/src/thermo/NasaThermo.h b/src/thermo/NasaThermo.h index c8bd14a21..552f9650c 100644 --- a/src/thermo/NasaThermo.h +++ b/src/thermo/NasaThermo.h @@ -11,11 +11,11 @@ #define CT_NASATHERMO_H #include -#include "SpeciesThermoMgr.h" -#include "NasaPoly1.h" -#include "speciesThermoTypes.h" -//#include "polyfit.h" -#include "global.h" +#include "cantera/thermo/SpeciesThermoMgr.h" +#include "cantera/thermo/NasaPoly1.h" +#include "cantera/thermo/speciesThermoTypes.h" +//#include "cantera/numerics/polyfit.h" +#include "cantera/base/global.h" namespace Cantera { diff --git a/src/thermo/PDSS.cpp b/src/thermo/PDSS.cpp index cc5ddc2a2..7a5809b49 100644 --- a/src/thermo/PDSS.cpp +++ b/src/thermo/PDSS.cpp @@ -9,15 +9,15 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "ct_defs.h" -#include "xml.h" -#include "ctml.h" -#include "PDSS.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/PDSS.h" -#include "ThermoFactory.h" -#include "SpeciesThermo.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/thermo/SpeciesThermo.h" -#include "VPStandardStateTP.h" +#include "cantera/thermo/VPStandardStateTP.h" namespace Cantera { diff --git a/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp index faed11afc..20a40d93d 100644 --- a/src/thermo/PDSS_ConstVol.cpp +++ b/src/thermo/PDSS_ConstVol.cpp @@ -8,13 +8,13 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "ct_defs.h" -#include "xml.h" -#include "ctml.h" -#include "PDSS_ConstVol.h" -#include "ThermoFactory.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/PDSS_ConstVol.h" +#include "cantera/thermo/ThermoFactory.h" -#include "VPStandardStateTP.h" +#include "cantera/thermo/VPStandardStateTP.h" using namespace std; diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp index 64394e886..583c9a849 100644 --- a/src/thermo/PDSS_HKFT.cpp +++ b/src/thermo/PDSS_HKFT.cpp @@ -11,10 +11,10 @@ * U.S. Government retains certain rights in this software. */ -#include "ctml.h" -#include "PDSS_HKFT.h" -#include "WaterProps.h" -#include "PDSS_Water.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/PDSS_HKFT.h" +#include "cantera/thermo/WaterProps.h" +#include "cantera/thermo/PDSS_Water.h" #include diff --git a/src/thermo/PDSS_IdealGas.cpp b/src/thermo/PDSS_IdealGas.cpp index 337ed6028..c459d3a9e 100644 --- a/src/thermo/PDSS_IdealGas.cpp +++ b/src/thermo/PDSS_IdealGas.cpp @@ -8,13 +8,13 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "ct_defs.h" -#include "xml.h" -#include "ctml.h" -#include "PDSS_IdealGas.h" -#include "ThermoFactory.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/PDSS_IdealGas.h" +#include "cantera/thermo/ThermoFactory.h" -#include "VPStandardStateTP.h" +#include "cantera/thermo/VPStandardStateTP.h" using namespace std; diff --git a/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp index 6329e04c6..211fa6a5a 100644 --- a/src/thermo/PDSS_IonsFromNeutral.cpp +++ b/src/thermo/PDSS_IonsFromNeutral.cpp @@ -8,14 +8,14 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "ct_defs.h" -#include "xml.h" -#include "ctml.h" -#include "PDSS_IonsFromNeutral.h" -#include "ThermoFactory.h" -#include "IonsFromNeutralVPSSTP.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/PDSS_IonsFromNeutral.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/thermo/IonsFromNeutralVPSSTP.h" -#include "VPStandardStateTP.h" +#include "cantera/thermo/VPStandardStateTP.h" using namespace std; diff --git a/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp index 2d6a39b51..c5d353f62 100644 --- a/src/thermo/PDSS_SSVol.cpp +++ b/src/thermo/PDSS_SSVol.cpp @@ -8,13 +8,13 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "ct_defs.h" -#include "xml.h" -#include "ctml.h" -#include "PDSS_SSVol.h" -#include "ThermoFactory.h" +#include "cantera/base/ct_defs.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/PDSS_SSVol.h" +#include "cantera/thermo/ThermoFactory.h" -#include "VPStandardStateTP.h" +#include "cantera/thermo/VPStandardStateTP.h" using namespace std; diff --git a/src/thermo/PDSS_Water.cpp b/src/thermo/PDSS_Water.cpp index e4e129db2..044f309a6 100644 --- a/src/thermo/PDSS_Water.cpp +++ b/src/thermo/PDSS_Water.cpp @@ -7,16 +7,16 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" -#include "xml.h" -#include "ctml.h" -#include "PDSS_Water.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/PDSS_Water.h" -#include "WaterPropsIAPWS.h" -#include "ThermoFactory.h" -#include "WaterProps.h" -#include "VPStandardStateTP.h" +#include "cantera/thermo/WaterPropsIAPWS.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/thermo/WaterProps.h" +#include "cantera/thermo/VPStandardStateTP.h" #include diff --git a/src/thermo/Phase.cpp b/src/thermo/Phase.cpp index 97cfc1646..e0d8eb6d4 100644 --- a/src/thermo/Phase.cpp +++ b/src/thermo/Phase.cpp @@ -7,10 +7,10 @@ // Copyright 2001 California Institute of Technology -#include "ct_defs.h" -#include "Phase.h" -#include "vec_functions.h" -#include "ctexceptions.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/Phase.h" +#include "cantera/base/vec_functions.h" +#include "cantera/base/ctexceptions.h" using namespace std; diff --git a/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp index f3d627c38..d163d1690 100644 --- a/src/thermo/PhaseCombo_Interaction.cpp +++ b/src/thermo/PhaseCombo_Interaction.cpp @@ -13,8 +13,8 @@ */ -#include "PhaseCombo_Interaction.h" -#include "ThermoFactory.h" +#include "cantera/thermo/PhaseCombo_Interaction.h" +#include "cantera/thermo/ThermoFactory.h" #include using namespace std; diff --git a/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp index 148738cc8..6fde19920 100644 --- a/src/thermo/PseudoBinaryVPSSTP.cpp +++ b/src/thermo/PseudoBinaryVPSSTP.cpp @@ -16,7 +16,7 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "PseudoBinaryVPSSTP.h" +#include "cantera/thermo/PseudoBinaryVPSSTP.h" #include diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp index 7390f8b8f..3aa033d1c 100644 --- a/src/thermo/PureFluidPhase.cpp +++ b/src/thermo/PureFluidPhase.cpp @@ -5,13 +5,13 @@ * and supercritical fluid (see \ref thermoprops * and class \link Cantera::PureFluidPhase PureFluidPhase\endlink). */ -#include "xml.h" -#include "PureFluidPhase.h" +#include "cantera/base/xml.h" +#include "cantera/thermo/PureFluidPhase.h" #ifdef WITH_PURE_FLUIDS -#include "../../../ext/tpx/Sub.h" -#include "../../../ext/tpx/utils.h" +#include "cantera/tpx/Sub.h" +#include "cantera/tpx/utils.h" #include #include diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp index 258db8c4c..3ee78e006 100644 --- a/src/thermo/RedlichKisterVPSSTP.cpp +++ b/src/thermo/RedlichKisterVPSSTP.cpp @@ -18,7 +18,7 @@ #include "RedlichKisterVPSSTP.h" -#include "ThermoFactory.h" +#include "cantera/thermo/ThermoFactory.h" #include using namespace std; diff --git a/src/thermo/RedlichKisterVPSSTP.h b/src/thermo/RedlichKisterVPSSTP.h index 51da1d7a2..5777e07a4 100644 --- a/src/thermo/RedlichKisterVPSSTP.h +++ b/src/thermo/RedlichKisterVPSSTP.h @@ -23,8 +23,8 @@ #ifndef CT_REDLICHKISTERVPSSTP_H #define CT_REDLICHKISTERVPSSTP_H -#include "GibbsExcessVPSSTP.h" -#include "Array.h" +#include "cantera/thermo/GibbsExcessVPSSTP.h" +#include "cantera/base/Array.h" namespace Cantera { diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index 23b44bbc6..74269a24b 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -23,12 +23,12 @@ #pragma warning(disable:4503) #endif -#include "RedlichKwongMFTP.h" +#include "cantera/thermo/RedlichKwongMFTP.h" -#include "mix_defs.h" -#include "ThermoFactory.h" -#include "RootFind.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/ThermoFactory.h" +#include "cantera/numerics/RootFind.h" using namespace std; diff --git a/src/thermo/SemiconductorPhase.cpp b/src/thermo/SemiconductorPhase.cpp index 957d10116..d62760eee 100644 --- a/src/thermo/SemiconductorPhase.cpp +++ b/src/thermo/SemiconductorPhase.cpp @@ -1,5 +1,5 @@ -#include "SemiconductorPhase.h" +#include "cantera/thermo/SemiconductorPhase.h" using namespace std; diff --git a/src/thermo/ShomatePoly.h b/src/thermo/ShomatePoly.h index ffbaf2d7a..126714eb5 100644 --- a/src/thermo/ShomatePoly.h +++ b/src/thermo/ShomatePoly.h @@ -13,7 +13,7 @@ #ifndef CT_SHOMATEPOLY1_H #define CT_SHOMATEPOLY1_H -#include "SpeciesThermoInterpType.h" +#include "cantera/thermo/SpeciesThermoInterpType.h" namespace Cantera { diff --git a/src/thermo/ShomateThermo.h b/src/thermo/ShomateThermo.h index 03541dca9..11259383b 100644 --- a/src/thermo/ShomateThermo.h +++ b/src/thermo/ShomateThermo.h @@ -11,9 +11,9 @@ #ifndef CT_SHOMATETHERMO_H #define CT_SHOMATETHERMO_H -#include "SpeciesThermoMgr.h" +#include "cantera/thermo/SpeciesThermoMgr.h" #include "ShomatePoly.h" -#include "speciesThermoTypes.h" +#include "cantera/thermo/speciesThermoTypes.h" namespace Cantera { diff --git a/src/thermo/SingleSpeciesTP.cpp b/src/thermo/SingleSpeciesTP.cpp index 368df3e5f..b50dd6e8c 100644 --- a/src/thermo/SingleSpeciesTP.cpp +++ b/src/thermo/SingleSpeciesTP.cpp @@ -10,7 +10,7 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "SingleSpeciesTP.h" +#include "cantera/thermo/SingleSpeciesTP.h" using namespace std; diff --git a/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp index 9640e05d4..7c3002487 100644 --- a/src/thermo/SpeciesThermoFactory.cpp +++ b/src/thermo/SpeciesThermoFactory.cpp @@ -6,29 +6,29 @@ */ // Copyright 2001 California Institute of Technology -#include "SpeciesThermoFactory.h" +#include "cantera/thermo/SpeciesThermoFactory.h" using namespace std; -#include "SpeciesThermo.h" +#include "cantera/thermo/SpeciesThermo.h" #include "NasaThermo.h" #include "ShomateThermo.h" -#include "SimpleThermo.h" -#include "GeneralSpeciesThermo.h" +#include "cantera/thermo/SimpleThermo.h" +#include "cantera/thermo/GeneralSpeciesThermo.h" #include "Mu0Poly.h" #include "Nasa9PolyMultiTempRegion.h" -#include "Nasa9Poly1.h" +#include "cantera/thermo/Nasa9Poly1.h" #ifdef WITH_ADSORBATE -#include "AdsorbateThermo.h" +#include "cantera/thermo/AdsorbateThermo.h" #endif -#include "SpeciesThermoMgr.h" -#include "speciesThermoTypes.h" -#include "VPSSMgr.h" -#include "VPStandardStateTP.h" +#include "cantera/thermo/SpeciesThermoMgr.h" +#include "cantera/thermo/speciesThermoTypes.h" +#include "cantera/thermo/VPSSMgr.h" +#include "cantera/thermo/VPStandardStateTP.h" -#include "xml.h" -#include "ctml.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" #include diff --git a/src/thermo/SpeciesThermoInterpType.cpp b/src/thermo/SpeciesThermoInterpType.cpp index 41d0ac976..42f0df876 100644 --- a/src/thermo/SpeciesThermoInterpType.cpp +++ b/src/thermo/SpeciesThermoInterpType.cpp @@ -4,10 +4,10 @@ */ // Copyright 2007 Sandia National Laboratories -#include "SpeciesThermoInterpType.h" -#include "VPSSMgr.h" -#include "PDSS.h" -#include "ctexceptions.h" +#include "cantera/thermo/SpeciesThermoInterpType.h" +#include "cantera/thermo/VPSSMgr.h" +#include "cantera/thermo/PDSS.h" +#include "cantera/base/ctexceptions.h" namespace Cantera { diff --git a/src/thermo/State.cpp b/src/thermo/State.cpp index 644597c4e..360c82cdd 100644 --- a/src/thermo/State.cpp +++ b/src/thermo/State.cpp @@ -10,10 +10,10 @@ * See file License.txt for licensing information */ -#include "utilities.h" -#include "ctexceptions.h" -#include "stringUtils.h" -#include "State.h" +#include "cantera/base/utilities.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/stringUtils.h" +#include "cantera/thermo/State.h" //#ifdef DARWIN //#include diff --git a/src/thermo/StoichSubstance.cpp b/src/thermo/StoichSubstance.cpp index 67378de44..86ccea88f 100644 --- a/src/thermo/StoichSubstance.cpp +++ b/src/thermo/StoichSubstance.cpp @@ -6,10 +6,10 @@ // Copyright 2001 California Institute of Technology -#include "ct_defs.h" -#include "mix_defs.h" -#include "StoichSubstance.h" -#include "SpeciesThermo.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/StoichSubstance.h" +#include "cantera/thermo/SpeciesThermo.h" namespace Cantera { diff --git a/src/thermo/StoichSubstanceSSTP.cpp b/src/thermo/StoichSubstanceSSTP.cpp index 4dfd08282..15b8a6d39 100644 --- a/src/thermo/StoichSubstanceSSTP.cpp +++ b/src/thermo/StoichSubstanceSSTP.cpp @@ -12,11 +12,11 @@ * * Copyright 2001 California Institute of Technology */ -#include "ct_defs.h" -#include "mix_defs.h" -#include "StoichSubstanceSSTP.h" -#include "SpeciesThermo.h" -#include "ThermoFactory.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/mix_defs.h" +#include "cantera/thermo/StoichSubstanceSSTP.h" +#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/thermo/ThermoFactory.h" #include diff --git a/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp index 7cf47b4da..4c13126e3 100644 --- a/src/thermo/SurfPhase.cpp +++ b/src/thermo/SurfPhase.cpp @@ -7,9 +7,9 @@ */ // Copyright 2002 California Institute of Technology -#include "SurfPhase.h" -#include "EdgePhase.h" -#include "ThermoFactory.h" +#include "cantera/thermo/SurfPhase.h" +#include "cantera/thermo/EdgePhase.h" +#include "cantera/thermo/ThermoFactory.h" using namespace ctml; diff --git a/src/thermo/ThermoFactory.cpp b/src/thermo/ThermoFactory.cpp index 5d6573f99..021c3e912 100644 --- a/src/thermo/ThermoFactory.cpp +++ b/src/thermo/ThermoFactory.cpp @@ -6,73 +6,73 @@ */ // Copyright 2001 California Institute of Technology -#include "ThermoFactory.h" +#include "cantera/thermo/ThermoFactory.h" -#include "speciesThermoTypes.h" -#include "SpeciesThermoFactory.h" -#include "IdealGasPhase.h" -#include "VPSSMgr.h" +#include "cantera/thermo/speciesThermoTypes.h" +#include "cantera/thermo/SpeciesThermoFactory.h" +#include "cantera/thermo/IdealGasPhase.h" +#include "cantera/thermo/VPSSMgr.h" #include "VPSSMgrFactory.h" #ifdef WITH_IDEAL_SOLUTIONS -#include "IdealSolidSolnPhase.h" -#include "MargulesVPSSTP.h" +#include "cantera/thermo/IdealSolidSolnPhase.h" +#include "cantera/thermo/MargulesVPSSTP.h" #include "RedlichKisterVPSSTP.h" -#include "IonsFromNeutralVPSSTP.h" -#include "PhaseCombo_Interaction.h" +#include "cantera/thermo/IonsFromNeutralVPSSTP.h" +#include "cantera/thermo/PhaseCombo_Interaction.h" #endif #ifdef WITH_PURE_FLUIDS -#include "PureFluidPhase.h" +#include "cantera/thermo/PureFluidPhase.h" #endif #ifdef WITH_REAL_GASSES -#include "RedlichKwongMFTP.h" +#include "cantera/thermo/RedlichKwongMFTP.h" #endif -#include "ConstDensityThermo.h" -#include "SurfPhase.h" -#include "EdgePhase.h" +#include "cantera/thermo/ConstDensityThermo.h" +#include "cantera/thermo/SurfPhase.h" +#include "cantera/thermo/EdgePhase.h" #ifdef WITH_METAL -#include "MetalPhase.h" +#include "cantera/thermo/MetalPhase.h" #endif #ifdef WITH_SEMICONDUCTOR -#include "SemiconductorPhase.h" +#include "cantera/thermo/SemiconductorPhase.h" #endif #undef USE_SSTP #ifdef WITH_STOICH_SUBSTANCE #ifdef USE_SSTP -#include "StoichSubstanceSSTP.h" +#include "cantera/thermo/StoichSubstanceSSTP.h" #else -#include "StoichSubstance.h" +#include "cantera/thermo/StoichSubstance.h" #endif #endif #ifdef WITH_STOICH_SUBSTANCE -#include "MineralEQ3.h" -#include "MetalSHEelectrons.h" -#include "FixedChemPotSSTP.h" +#include "cantera/thermo/MineralEQ3.h" +#include "cantera/thermo/MetalSHEelectrons.h" +#include "cantera/thermo/FixedChemPotSSTP.h" #endif //#include "importCTML.h" #ifdef WITH_LATTICE_SOLID -#include "LatticeSolidPhase.h" -#include "LatticePhase.h" +#include "cantera/thermo/LatticeSolidPhase.h" +#include "cantera/thermo/LatticePhase.h" #endif #ifdef WITH_ELECTROLYTES -#include "HMWSoln.h" -#include "DebyeHuckel.h" -#include "IdealMolalSoln.h" -#include "MolarityIonicVPSSTP.h" -#include "MixedSolventElectrolyte.h" +#include "cantera/thermo/HMWSoln.h" +#include "cantera/thermo/DebyeHuckel.h" +#include "cantera/thermo/IdealMolalSoln.h" +#include "cantera/thermo/MolarityIonicVPSSTP.h" +#include "cantera/thermo/MixedSolventElectrolyte.h" #endif -#include "IdealSolnGasVPSS.h" +#include "cantera/thermo/IdealSolnGasVPSS.h" #include diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp index c332b8a1b..ef062dbc5 100644 --- a/src/thermo/ThermoPhase.cpp +++ b/src/thermo/ThermoPhase.cpp @@ -7,8 +7,8 @@ // Copyright 2002 California Institute of Technology -#include "ThermoPhase.h" -#include "mdp_allo.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/base/mdp_allo.h" #include //@{ diff --git a/src/thermo/VPSSMgr.cpp b/src/thermo/VPSSMgr.cpp index fa1fc40bf..7ba2fd737 100644 --- a/src/thermo/VPSSMgr.cpp +++ b/src/thermo/VPSSMgr.cpp @@ -12,11 +12,11 @@ * U.S. Government retains certain rights in this software. */ -#include "VPSSMgr.h" -#include "VPStandardStateTP.h" -#include "SpeciesThermoFactory.h" -#include "PDSS.h" -#include "GeneralSpeciesThermo.h" +#include "cantera/thermo/VPSSMgr.h" +#include "cantera/thermo/VPStandardStateTP.h" +#include "cantera/thermo/SpeciesThermoFactory.h" +#include "cantera/thermo/PDSS.h" +#include "cantera/thermo/GeneralSpeciesThermo.h" using namespace std; diff --git a/src/thermo/VPSSMgrFactory.cpp b/src/thermo/VPSSMgrFactory.cpp index 1883c4706..03c1113e7 100644 --- a/src/thermo/VPSSMgrFactory.cpp +++ b/src/thermo/VPSSMgrFactory.cpp @@ -11,31 +11,31 @@ * U.S. Government retains certain rights in this software. */ -#include "SpeciesThermo.h" +#include "cantera/thermo/SpeciesThermo.h" -#include "VPSSMgr.h" +#include "cantera/thermo/VPSSMgr.h" #include "VPSSMgrFactory.h" -#include "VPStandardStateTP.h" +#include "cantera/thermo/VPStandardStateTP.h" -#include "VPSSMgr_IdealGas.h" -#include "VPSSMgr_ConstVol.h" -#include "VPSSMgr_Water_ConstVol.h" -#include "VPSSMgr_Water_HKFT.h" -#include "VPSSMgr_General.h" +#include "cantera/thermo/VPSSMgr_IdealGas.h" +#include "cantera/thermo/VPSSMgr_ConstVol.h" +#include "cantera/thermo/VPSSMgr_Water_ConstVol.h" +#include "cantera/thermo/VPSSMgr_Water_HKFT.h" +#include "cantera/thermo/VPSSMgr_General.h" -#include "VPSSMgr_types.h" +#include "cantera/thermo/VPSSMgr_types.h" -#include "SpeciesThermoMgr.h" -#include "speciesThermoTypes.h" -#include "SpeciesThermo.h" -#include "SpeciesThermoFactory.h" -#include "GeneralSpeciesThermo.h" +#include "cantera/thermo/SpeciesThermoMgr.h" +#include "cantera/thermo/speciesThermoTypes.h" +#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/thermo/SpeciesThermoFactory.h" +#include "cantera/thermo/GeneralSpeciesThermo.h" -#include "mix_defs.h" +#include "cantera/thermo/mix_defs.h" -#include "xml.h" -#include "ctml.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" using namespace ctml; using namespace std; diff --git a/src/thermo/VPSSMgrFactory.h b/src/thermo/VPSSMgrFactory.h index 73effc29d..604cf28c8 100644 --- a/src/thermo/VPSSMgrFactory.h +++ b/src/thermo/VPSSMgrFactory.h @@ -13,10 +13,10 @@ #ifndef VPSSSPECIESTHERMO_FACTORY_H #define VPSSSPECIESTHERMO_FACTORY_H -#include "SpeciesThermo.h" -#include "ctexceptions.h" -#include "FactoryBase.h" -#include "VPSSMgr.h" +#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/FactoryBase.h" +#include "cantera/thermo/VPSSMgr.h" namespace Cantera { diff --git a/src/thermo/VPSSMgr_ConstVol.cpp b/src/thermo/VPSSMgr_ConstVol.cpp index e3a32c5d7..16f2bc8f1 100644 --- a/src/thermo/VPSSMgr_ConstVol.cpp +++ b/src/thermo/VPSSMgr_ConstVol.cpp @@ -12,11 +12,11 @@ * U.S. Government retains certain rights in this software. */ -#include "VPSSMgr_ConstVol.h" -#include "xml.h" -#include "VPStandardStateTP.h" -#include "SpeciesThermoFactory.h" -#include "PDSS_ConstVol.h" +#include "cantera/thermo/VPSSMgr_ConstVol.h" +#include "cantera/base/xml.h" +#include "cantera/thermo/VPStandardStateTP.h" +#include "cantera/thermo/SpeciesThermoFactory.h" +#include "cantera/thermo/PDSS_ConstVol.h" using namespace std; diff --git a/src/thermo/VPSSMgr_General.cpp b/src/thermo/VPSSMgr_General.cpp index 04397c883..3ea61b461 100644 --- a/src/thermo/VPSSMgr_General.cpp +++ b/src/thermo/VPSSMgr_General.cpp @@ -12,17 +12,17 @@ * U.S. Government retains certain rights in this software. */ -#include "VPSSMgr_General.h" -#include "PDSS.h" -#include "xml.h" -#include "ctml.h" -#include "PDSS_IdealGas.h" -#include "PDSS_Water.h" -#include "PDSS_ConstVol.h" -#include "PDSS_SSVol.h" -#include "PDSS_HKFT.h" -#include "PDSS_IonsFromNeutral.h" -#include "GeneralSpeciesThermo.h" +#include "cantera/thermo/VPSSMgr_General.h" +#include "cantera/thermo/PDSS.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/PDSS_IdealGas.h" +#include "cantera/thermo/PDSS_Water.h" +#include "cantera/thermo/PDSS_ConstVol.h" +#include "cantera/thermo/PDSS_SSVol.h" +#include "cantera/thermo/PDSS_HKFT.h" +#include "cantera/thermo/PDSS_IonsFromNeutral.h" +#include "cantera/thermo/GeneralSpeciesThermo.h" using namespace std; diff --git a/src/thermo/VPSSMgr_IdealGas.cpp b/src/thermo/VPSSMgr_IdealGas.cpp index cda8a9a7b..de4876d54 100644 --- a/src/thermo/VPSSMgr_IdealGas.cpp +++ b/src/thermo/VPSSMgr_IdealGas.cpp @@ -12,12 +12,12 @@ * U.S. Government retains certain rights in this software. */ -#include "VPSSMgr_IdealGas.h" -#include "utilities.h" -#include "xml.h" -#include "ctml.h" -#include "SpeciesThermoFactory.h" -#include "PDSS_IdealGas.h" +#include "cantera/thermo/VPSSMgr_IdealGas.h" +#include "cantera/base/utilities.h" +#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/SpeciesThermoFactory.h" +#include "cantera/thermo/PDSS_IdealGas.h" using namespace std; using namespace ctml; diff --git a/src/thermo/VPSSMgr_Water_ConstVol.cpp b/src/thermo/VPSSMgr_Water_ConstVol.cpp index 0f5075297..be7b6775c 100644 --- a/src/thermo/VPSSMgr_Water_ConstVol.cpp +++ b/src/thermo/VPSSMgr_Water_ConstVol.cpp @@ -14,10 +14,10 @@ * U.S. Government retains certain rights in this software. */ -#include "VPSSMgr_Water_ConstVol.h" -#include "PDSS_Water.h" -#include "PDSS_ConstVol.h" -#include "GeneralSpeciesThermo.h" +#include "cantera/thermo/VPSSMgr_Water_ConstVol.h" +#include "cantera/thermo/PDSS_Water.h" +#include "cantera/thermo/PDSS_ConstVol.h" +#include "cantera/thermo/GeneralSpeciesThermo.h" using namespace std; diff --git a/src/thermo/VPSSMgr_Water_HKFT.cpp b/src/thermo/VPSSMgr_Water_HKFT.cpp index a5073ff6f..6237a2ab7 100644 --- a/src/thermo/VPSSMgr_Water_HKFT.cpp +++ b/src/thermo/VPSSMgr_Water_HKFT.cpp @@ -14,10 +14,10 @@ * U.S. Government retains certain rights in this software. */ -#include "VPSSMgr_Water_HKFT.h" -#include "PDSS_Water.h" -#include "PDSS_HKFT.h" -#include "GeneralSpeciesThermo.h" +#include "cantera/thermo/VPSSMgr_Water_HKFT.h" +#include "cantera/thermo/PDSS_Water.h" +#include "cantera/thermo/PDSS_HKFT.h" +#include "cantera/thermo/GeneralSpeciesThermo.h" using namespace std; diff --git a/src/thermo/VPStandardStateTP.cpp b/src/thermo/VPStandardStateTP.cpp index 960e06594..ecd52c99a 100644 --- a/src/thermo/VPStandardStateTP.cpp +++ b/src/thermo/VPStandardStateTP.cpp @@ -11,9 +11,9 @@ * U.S. Government retains certain rights in this software. */ -#include "VPStandardStateTP.h" -#include "VPSSMgr.h" -#include "PDSS.h" +#include "cantera/thermo/VPStandardStateTP.h" +#include "cantera/thermo/VPSSMgr.h" +#include "cantera/thermo/PDSS.h" using namespace std; diff --git a/src/thermo/WaterProps.cpp b/src/thermo/WaterProps.cpp index a7df1686b..f1f7638b4 100644 --- a/src/thermo/WaterProps.cpp +++ b/src/thermo/WaterProps.cpp @@ -12,10 +12,10 @@ #endif //@} -#include "WaterProps.h" -#include "ctml.h" -#include "PDSS_Water.h" -#include "WaterPropsIAPWS.h" +#include "cantera/thermo/WaterProps.h" +#include "cantera/base/ctml.h" +#include "cantera/thermo/PDSS_Water.h" +#include "cantera/thermo/WaterPropsIAPWS.h" #include diff --git a/src/thermo/WaterPropsIAPWS.cpp b/src/thermo/WaterPropsIAPWS.cpp index 042cfad05..4d8b90e29 100644 --- a/src/thermo/WaterPropsIAPWS.cpp +++ b/src/thermo/WaterPropsIAPWS.cpp @@ -9,9 +9,9 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "WaterPropsIAPWS.h" -#include "ctexceptions.h" -#include "stringUtils.h" +#include "cantera/thermo/WaterPropsIAPWS.h" +#include "cantera/base/ctexceptions.h" +#include "cantera/base/stringUtils.h" #include #include #include diff --git a/src/thermo/WaterPropsIAPWSphi.cpp b/src/thermo/WaterPropsIAPWSphi.cpp index 58e9aabd1..eba402dd3 100644 --- a/src/thermo/WaterPropsIAPWSphi.cpp +++ b/src/thermo/WaterPropsIAPWSphi.cpp @@ -8,7 +8,7 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "WaterPropsIAPWSphi.h" +#include "cantera/thermo/WaterPropsIAPWSphi.h" #include #include diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp index d491b978c..07f13edb7 100644 --- a/src/thermo/WaterSSTP.cpp +++ b/src/thermo/WaterSSTP.cpp @@ -8,12 +8,12 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "xml.h" -#include "WaterSSTP.h" -#include "WaterPropsIAPWS.h" +#include "cantera/base/xml.h" +#include "cantera/thermo/WaterSSTP.h" +#include "cantera/thermo/WaterPropsIAPWS.h" //#include "importCTML.h" -#include "WaterProps.h" -#include "ThermoFactory.h" +#include "cantera/thermo/WaterProps.h" +#include "cantera/thermo/ThermoFactory.h" #include using namespace std; diff --git a/src/thermo/phasereport.cpp b/src/thermo/phasereport.cpp index 496d2e746..370456036 100644 --- a/src/thermo/phasereport.cpp +++ b/src/thermo/phasereport.cpp @@ -5,9 +5,9 @@ // Copyright 2001 California Institute of Technology -#include "ThermoPhase.h" -#include "PureFluidPhase.h" -#include "mix_defs.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/thermo/PureFluidPhase.h" +#include "cantera/thermo/mix_defs.h" #include diff --git a/src/tpx/CarbonDioxide.h b/src/tpx/CarbonDioxide.h index bc6e49fbc..3196e2a85 100644 --- a/src/tpx/CarbonDioxide.h +++ b/src/tpx/CarbonDioxide.h @@ -1,7 +1,7 @@ #ifndef TPX_CARBONDIOXIDE_H #define TPX_CARBONDIOXIDE_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" diff --git a/src/tpx/HFC134a.h b/src/tpx/HFC134a.h index c73b456d2..13702ae0a 100644 --- a/src/tpx/HFC134a.h +++ b/src/tpx/HFC134a.h @@ -1,7 +1,7 @@ #ifndef TPX_HFC134_H #define TPX_HFC134_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" namespace tpx { diff --git a/src/tpx/Heptane.h b/src/tpx/Heptane.h index a7c846cfd..835e125aa 100644 --- a/src/tpx/Heptane.h +++ b/src/tpx/Heptane.h @@ -1,7 +1,7 @@ #ifndef TPX_HEPTANE_H #define TPX_HEPTANE_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" diff --git a/src/tpx/Hydrogen.h b/src/tpx/Hydrogen.h index 6c1719669..5cb22ac2d 100644 --- a/src/tpx/Hydrogen.h +++ b/src/tpx/Hydrogen.h @@ -1,7 +1,7 @@ #ifndef TPX_HYDROGEN_H #define TPX_HYDROGEN_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" namespace tpx { diff --git a/src/tpx/Methane.h b/src/tpx/Methane.h index ff70ecc48..61ef1d7cf 100644 --- a/src/tpx/Methane.h +++ b/src/tpx/Methane.h @@ -1,7 +1,7 @@ #ifndef TPX_METHANE_H #define TPX_METHANE_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" namespace tpx { diff --git a/src/tpx/Nitrogen.h b/src/tpx/Nitrogen.h index ef1028990..8f9c28bcc 100644 --- a/src/tpx/Nitrogen.h +++ b/src/tpx/Nitrogen.h @@ -2,7 +2,7 @@ #ifndef TPX_NITROGEN_H #define TPX_NITROGEN_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" namespace tpx { diff --git a/src/tpx/Oxygen.h b/src/tpx/Oxygen.h index 4d4a7cd40..e3006b602 100644 --- a/src/tpx/Oxygen.h +++ b/src/tpx/Oxygen.h @@ -1,7 +1,7 @@ #ifndef TPX_OXYGEN_H #define TPX_OXYGEN_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" namespace tpx { diff --git a/src/tpx/RedlichKwong.h b/src/tpx/RedlichKwong.h index d573a6e24..1790a6aa7 100644 --- a/src/tpx/RedlichKwong.h +++ b/src/tpx/RedlichKwong.h @@ -1,7 +1,7 @@ #ifndef TPX_RK_H #define TPX_RK_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" #include namespace tpx diff --git a/src/tpx/Sub.cpp b/src/tpx/Sub.cpp index 423485796..5925eb773 100644 --- a/src/tpx/Sub.cpp +++ b/src/tpx/Sub.cpp @@ -2,7 +2,7 @@ * The Substance class * D. Goodwin, Caltech Nov. 1996 */ -#include "Sub.h" +#include "cantera/tpx/Sub.h" #include #include #include diff --git a/src/tpx/Water.h b/src/tpx/Water.h index 985afd4ac..9a8ed358b 100644 --- a/src/tpx/Water.h +++ b/src/tpx/Water.h @@ -1,7 +1,7 @@ #ifndef TPX_WATER_H #define TPX_WATER_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" namespace tpx { diff --git a/src/tpx/lk.h b/src/tpx/lk.h index b8f4197d9..a709f9ce1 100644 --- a/src/tpx/lk.h +++ b/src/tpx/lk.h @@ -1,7 +1,7 @@ #ifndef TPX_LK_H #define TPX_LK_H -#include "Sub.h" +#include "cantera/tpx/Sub.h" namespace tpx { diff --git a/src/tpx/utils.cpp b/src/tpx/utils.cpp index b448bc7a7..2005af52c 100644 --- a/src/tpx/utils.cpp +++ b/src/tpx/utils.cpp @@ -1,5 +1,5 @@ #include "subs.h" -#include "utils.h" +#include "cantera/tpx/utils.h" using std::string; diff --git a/src/transport/AqueousTransport.cpp b/src/transport/AqueousTransport.cpp index 4bab1b572..cd36794a5 100644 --- a/src/transport/AqueousTransport.cpp +++ b/src/transport/AqueousTransport.cpp @@ -3,15 +3,15 @@ * Transport properties for aqueous systems */ -#include "ThermoPhase.h" -#include "AqueousTransport.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/transport/AqueousTransport.h" -#include "utilities.h" -#include "TransportParams.h" -#include "LiquidTransportParams.h" -#include "TransportFactory.h" +#include "cantera/base/utilities.h" +#include "cantera/transport/TransportParams.h" +#include "cantera/transport/LiquidTransportParams.h" +#include "cantera/transport/TransportFactory.h" -#include "ctlapack.h" +#include "cantera/numerics/ctlapack.h" #include using namespace std; diff --git a/src/transport/DustyGasTransport.cpp b/src/transport/DustyGasTransport.cpp index e99ee307b..c9bb1bdd2 100644 --- a/src/transport/DustyGasTransport.cpp +++ b/src/transport/DustyGasTransport.cpp @@ -10,8 +10,8 @@ * See file License.txt for licensing information */ -#include "ThermoPhase.h" -#include "DustyGasTransport.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/transport/DustyGasTransport.h" using namespace std; diff --git a/src/transport/FtnTransport.h b/src/transport/FtnTransport.h index 141752d62..c43a152b6 100644 --- a/src/transport/FtnTransport.h +++ b/src/transport/FtnTransport.h @@ -13,7 +13,7 @@ #ifndef CT_FTNTRANSPORT_H #define CT_FTNTRANSPORT_H -#include "TransportBase.h" +#include "cantera/transport/TransportBase.h" /** diff --git a/src/transport/LTPspecies.cpp b/src/transport/LTPspecies.cpp index be10d8941..705d3c662 100644 --- a/src/transport/LTPspecies.cpp +++ b/src/transport/LTPspecies.cpp @@ -11,7 +11,7 @@ * $Revision$ * */ -#include "LTPspecies.h" +#include "cantera/transport/LTPspecies.h" using namespace std; using namespace ctml; diff --git a/src/transport/L_matrix.h b/src/transport/L_matrix.h index 9f17b6934..9755583ae 100644 --- a/src/transport/L_matrix.h +++ b/src/transport/L_matrix.h @@ -7,8 +7,8 @@ #ifndef CT_LMATRIX_H #define CT_LMATRIX_H -#include "DenseMatrix.h" -#include "ct_defs.h" +#include "cantera/numerics/DenseMatrix.h" +#include "cantera/base/ct_defs.h" #include diff --git a/src/transport/LiquidTranInteraction.cpp b/src/transport/LiquidTranInteraction.cpp index 9ab41c48b..9cb540b7c 100644 --- a/src/transport/LiquidTranInteraction.cpp +++ b/src/transport/LiquidTranInteraction.cpp @@ -9,10 +9,10 @@ * $Revision$ */ -#include "LiquidTransportParams.h" +#include "cantera/transport/LiquidTransportParams.h" #include -#include "IonsFromNeutralVPSSTP.h" -#include "MargulesVPSSTP.h" +#include "cantera/thermo/IonsFromNeutralVPSSTP.h" +#include "cantera/thermo/MargulesVPSSTP.h" #include using namespace std; using namespace ctml; diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index 811459072..23ac91aed 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -2,14 +2,14 @@ * @file LiquidTransport.cpp * Mixture-averaged transport properties for ideal gas mixtures. */ -#include "ThermoPhase.h" -#include "LiquidTransport.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/transport/LiquidTransport.h" -#include "utilities.h" -#include "LiquidTransportParams.h" -#include "TransportFactory.h" +#include "cantera/base/utilities.h" +#include "cantera/transport/LiquidTransportParams.h" +#include "cantera/transport/TransportFactory.h" -#include "ctlapack.h" +#include "cantera/numerics/ctlapack.h" #include using namespace std; diff --git a/src/transport/LiquidTransportData.cpp b/src/transport/LiquidTransportData.cpp index 6281d8ea9..f922b2522 100644 --- a/src/transport/LiquidTransportData.cpp +++ b/src/transport/LiquidTransportData.cpp @@ -8,7 +8,7 @@ * $Revision$ */ -#include "LiquidTransportData.h" +#include "cantera/transport/LiquidTransportData.h" using namespace std; #ifndef SAFE_DELETE diff --git a/src/transport/LiquidTransportParams.cpp b/src/transport/LiquidTransportParams.cpp index 21bc7b58b..72105a130 100644 --- a/src/transport/LiquidTransportParams.cpp +++ b/src/transport/LiquidTransportParams.cpp @@ -9,10 +9,10 @@ * $Revision$ */ -#include "LiquidTransportParams.h" +#include "cantera/transport/LiquidTransportParams.h" #include -#include "IonsFromNeutralVPSSTP.h" -#include "MargulesVPSSTP.h" +#include "cantera/thermo/IonsFromNeutralVPSSTP.h" +#include "cantera/thermo/MargulesVPSSTP.h" #include using namespace std; diff --git a/src/transport/MMCollisionInt.cpp b/src/transport/MMCollisionInt.cpp index 0a7bba26d..8ca32d238 100644 --- a/src/transport/MMCollisionInt.cpp +++ b/src/transport/MMCollisionInt.cpp @@ -4,10 +4,10 @@ // Copyright 2001 California Institute of Technology */ #include "MMCollisionInt.h" -#include "utilities.h" -#include "polyfit.h" -#include "xml.h" -#include "XML_Writer.h" +#include "cantera/base/utilities.h" +#include "cantera/numerics/polyfit.h" +#include "cantera/base/xml.h" +#include "cantera/base/XML_Writer.h" #include diff --git a/src/transport/MMCollisionInt.h b/src/transport/MMCollisionInt.h index b35a0b82a..14e6abc4f 100644 --- a/src/transport/MMCollisionInt.h +++ b/src/transport/MMCollisionInt.h @@ -8,7 +8,7 @@ #define CT_MMCOLLISIONINT_H #include -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera { diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index 19420f377..76364f6d8 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -4,12 +4,12 @@ */ // copyright 2001 California Institute of Technology -#include "ThermoPhase.h" -#include "MixTransport.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/transport/MixTransport.h" -#include "utilities.h" -#include "TransportParams.h" -#include "TransportFactory.h" +#include "cantera/base/utilities.h" +#include "cantera/transport/TransportParams.h" +#include "cantera/transport/TransportFactory.h" #include using namespace std; diff --git a/src/transport/MultiTransport.cpp b/src/transport/MultiTransport.cpp index e108e5fec..d820b62c7 100644 --- a/src/transport/MultiTransport.cpp +++ b/src/transport/MultiTransport.cpp @@ -7,19 +7,19 @@ * See file License.txt for licensing information */ -#include "ThermoPhase.h" +#include "cantera/thermo/ThermoPhase.h" -#include "MultiTransport.h" -#include "ctlapack.h" +#include "cantera/transport/MultiTransport.h" +#include "cantera/numerics/ctlapack.h" -#include "DenseMatrix.h" -#include "utilities.h" -#include "utilities.h" +#include "cantera/numerics/DenseMatrix.h" +#include "cantera/base/utilities.h" +#include "cantera/base/utilities.h" #include "L_matrix.h" -#include "TransportParams.h" -#include "IdealGasPhase.h" +#include "cantera/transport/TransportParams.h" +#include "cantera/thermo/IdealGasPhase.h" -#include "TransportFactory.h" +#include "cantera/transport/TransportFactory.h" #include using namespace std; diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index d0ed2d883..a88c49059 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -2,14 +2,14 @@ * @file SimpleTransport.cpp * Simple mostly constant transport properties */ -#include "ThermoPhase.h" -#include "SimpleTransport.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/transport/SimpleTransport.h" -#include "utilities.h" -#include "LiquidTransportParams.h" -#include "TransportFactory.h" +#include "cantera/base/utilities.h" +#include "cantera/transport/LiquidTransportParams.h" +#include "cantera/transport/TransportFactory.h" -#include "ctlapack.h" +#include "cantera/numerics/ctlapack.h" #include using namespace std; diff --git a/src/transport/SolidTransport.cpp b/src/transport/SolidTransport.cpp index 665bc5cb5..e81d0dd36 100644 --- a/src/transport/SolidTransport.cpp +++ b/src/transport/SolidTransport.cpp @@ -6,10 +6,10 @@ */ // copyright 2008 California Institute of Technology -#include "ThermoPhase.h" -#include "SolidTransport.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/transport/SolidTransport.h" -#include "utilities.h" +#include "cantera/base/utilities.h" #include using namespace std; diff --git a/src/transport/TortuosityBase.cpp b/src/transport/TortuosityBase.cpp index f54259c33..5f65c2fcb 100644 --- a/src/transport/TortuosityBase.cpp +++ b/src/transport/TortuosityBase.cpp @@ -16,7 +16,7 @@ */ #include "TortuosityBase.h" -#include "ctexceptions.h" +#include "cantera/base/ctexceptions.h" #include diff --git a/src/transport/TortuosityBase.h b/src/transport/TortuosityBase.h index 39050a0d0..4c10e8119 100644 --- a/src/transport/TortuosityBase.h +++ b/src/transport/TortuosityBase.h @@ -17,7 +17,7 @@ #ifndef CT_TORTUOSITYBASE_H #define CT_TORTUOSITYBASE_H -#include "ct_defs.h" +#include "cantera/base/ct_defs.h" namespace Cantera diff --git a/src/transport/TortuosityBruggeman.cpp b/src/transport/TortuosityBruggeman.cpp index 6e905f85f..8da143362 100644 --- a/src/transport/TortuosityBruggeman.cpp +++ b/src/transport/TortuosityBruggeman.cpp @@ -16,7 +16,7 @@ */ #include "TortuosityBruggeman.h" -#include "ctexceptions.h" +#include "cantera/base/ctexceptions.h" #include diff --git a/src/transport/TortuosityMaxwell.cpp b/src/transport/TortuosityMaxwell.cpp index 3f8d74cbe..31a28fca5 100644 --- a/src/transport/TortuosityMaxwell.cpp +++ b/src/transport/TortuosityMaxwell.cpp @@ -16,7 +16,7 @@ */ #include "TortuosityMaxwell.h" -#include "ctexceptions.h" +#include "cantera/base/ctexceptions.h" #include diff --git a/src/transport/TortuosityPercolation.cpp b/src/transport/TortuosityPercolation.cpp index 72d261e85..d778c3217 100644 --- a/src/transport/TortuosityPercolation.cpp +++ b/src/transport/TortuosityPercolation.cpp @@ -16,7 +16,7 @@ */ #include "TortuosityPercolation.h" -#include "ctexceptions.h" +#include "cantera/base/ctexceptions.h" #include diff --git a/src/transport/TransportBase.cpp b/src/transport/TransportBase.cpp index 7782720bd..0d3569a44 100644 --- a/src/transport/TransportBase.cpp +++ b/src/transport/TransportBase.cpp @@ -2,16 +2,16 @@ * @file TransportBase.cpp * Mixture-averaged transport properties for ideal gas mixtures. */ -#include "ThermoPhase.h" -#include "LiquidTransport.h" -#include "ctexceptions.h" +#include "cantera/thermo/ThermoPhase.h" +#include "cantera/transport/LiquidTransport.h" +#include "cantera/base/ctexceptions.h" -#include "utilities.h" -#include "LiquidTransportParams.h" -#include "TransportFactory.h" -#include "stringUtils.h" +#include "cantera/base/utilities.h" +#include "cantera/transport/LiquidTransportParams.h" +#include "cantera/transport/TransportFactory.h" +#include "cantera/base/stringUtils.h" -#include "ctlapack.h" +#include "cantera/numerics/ctlapack.h" #include using namespace std; diff --git a/src/transport/TransportFactory.cpp b/src/transport/TransportFactory.cpp index 84fcfdca9..abb477dd7 100644 --- a/src/transport/TransportFactory.cpp +++ b/src/transport/TransportFactory.cpp @@ -4,34 +4,34 @@ * Implementation file for class TransportFactory. */ -#include "ThermoPhase.h" +#include "cantera/thermo/ThermoPhase.h" // known transport models -#include "MultiTransport.h" -#include "MixTransport.h" -#include "SolidTransport.h" -#include "DustyGasTransport.h" -#include "SimpleTransport.h" +#include "cantera/transport/MultiTransport.h" +#include "cantera/transport/MixTransport.h" +#include "cantera/transport/SolidTransport.h" +#include "cantera/transport/DustyGasTransport.h" +#include "cantera/transport/SimpleTransport.h" #ifdef WITH_IDEAL_SOLUTIONS -#include "LiquidTransport.h" +#include "cantera/transport/LiquidTransport.h" #endif #ifdef WITH_ELECTROLYTES -#include "AqueousTransport.h" +#include "cantera/transport/AqueousTransport.h" #endif -#include "TransportFactory.h" +#include "cantera/transport/TransportFactory.h" -#include "polyfit.h" +#include "cantera/numerics/polyfit.h" #include "MMCollisionInt.h" -#include "xml.h" -#include "XML_Writer.h" -#include "TransportParams.h" -#include "LiquidTransportParams.h" -#include "LiquidTranInteraction.h" -#include "global.h" -#include "IdealGasPhase.h" -#include "ctml.h" +#include "cantera/base/xml.h" +#include "cantera/base/XML_Writer.h" +#include "cantera/transport/TransportParams.h" +#include "cantera/transport/LiquidTransportParams.h" +#include "cantera/transport/LiquidTranInteraction.h" +#include "cantera/base/global.h" +#include "cantera/thermo/IdealGasPhase.h" +#include "cantera/base/ctml.h" #include #include diff --git a/src/transport/TransportParams.cpp b/src/transport/TransportParams.cpp index c1b51d49e..2639a1560 100644 --- a/src/transport/TransportParams.cpp +++ b/src/transport/TransportParams.cpp @@ -11,10 +11,10 @@ * $Revision$ */ -#include "TransportParams.h" +#include "cantera/transport/TransportParams.h" #ifdef DEBUG_MODE -#include "XML_Writer.h" +#include "cantera/base/XML_Writer.h" #endif using namespace std; diff --git a/src/transport/WaterTransport.cpp b/src/transport/WaterTransport.cpp index ef2ff41b9..ceb010ced 100644 --- a/src/transport/WaterTransport.cpp +++ b/src/transport/WaterTransport.cpp @@ -1,14 +1,14 @@ -#include "ct_defs.h" -#include "WaterPropsIAPWS.h" -#include "TransportBase.h" -#include "DenseMatrix.h" -#include "LiquidTransportParams.h" -#include "VPStandardStateTP.h" +#include "cantera/base/ct_defs.h" +#include "cantera/thermo/WaterPropsIAPWS.h" +#include "cantera/transport/TransportBase.h" +#include "cantera/numerics/DenseMatrix.h" +#include "cantera/transport/LiquidTransportParams.h" +#include "cantera/thermo/VPStandardStateTP.h" -#include "WaterTransport.h" -#include "PDSS_Water.h" -#include "WaterSSTP.h" -#include "WaterProps.h" +#include "cantera/transport/WaterTransport.h" +#include "cantera/thermo/PDSS_Water.h" +#include "cantera/thermo/WaterSSTP.h" +#include "cantera/thermo/WaterProps.h" #include using namespace std; diff --git a/src/zeroD/ConstPressureReactor.cpp b/src/zeroD/ConstPressureReactor.cpp index 3406b0d17..cb9a6f7a6 100644 --- a/src/zeroD/ConstPressureReactor.cpp +++ b/src/zeroD/ConstPressureReactor.cpp @@ -6,11 +6,11 @@ // Copyright 2001 California Institute of Technology -#include "ConstPressureReactor.h" -#include "FlowDevice.h" -#include "Wall.h" -#include "InterfaceKinetics.h" -#include "SurfPhase.h" +#include "cantera/zeroD/ConstPressureReactor.h" +#include "cantera/zeroD/FlowDevice.h" +#include "cantera/zeroD/Wall.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "cantera/thermo/SurfPhase.h" using namespace std; diff --git a/src/zeroD/FlowDevice.cpp b/src/zeroD/FlowDevice.cpp index c2cbd7bff..dbef937d9 100644 --- a/src/zeroD/FlowDevice.cpp +++ b/src/zeroD/FlowDevice.cpp @@ -1,7 +1,7 @@ -#include "FlowDevice.h" -#include "ReactorBase.h" -#include "Func1.h" +#include "cantera/zeroD/FlowDevice.h" +#include "cantera/zeroD/ReactorBase.h" +#include "cantera/numerics/Func1.h" using namespace std; using namespace Cantera; diff --git a/src/zeroD/FlowReactor.cpp b/src/zeroD/FlowReactor.cpp index 892a1feec..f98801fd3 100644 --- a/src/zeroD/FlowReactor.cpp +++ b/src/zeroD/FlowReactor.cpp @@ -6,7 +6,7 @@ // Copyright 2001 California Institute of Technology -#include "FlowReactor.h" +#include "cantera/zeroD/FlowReactor.h" using namespace std; diff --git a/src/zeroD/Reactor.cpp b/src/zeroD/Reactor.cpp index e421ae0f1..dfd521ef6 100644 --- a/src/zeroD/Reactor.cpp +++ b/src/zeroD/Reactor.cpp @@ -6,12 +6,12 @@ // Copyright 2001 California Institute of Technology -#include "Reactor.h" +#include "cantera/zeroD/Reactor.h" //#include "../CVode.h" -#include "FlowDevice.h" -#include "Wall.h" -#include "InterfaceKinetics.h" -#include "SurfPhase.h" +#include "cantera/zeroD/FlowDevice.h" +#include "cantera/zeroD/Wall.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "cantera/thermo/SurfPhase.h" using namespace std; diff --git a/src/zeroD/ReactorBase.cpp b/src/zeroD/ReactorBase.cpp index 331ef5ead..589ea57fe 100644 --- a/src/zeroD/ReactorBase.cpp +++ b/src/zeroD/ReactorBase.cpp @@ -4,9 +4,9 @@ // Copyright 2001 California Institute of Technology -#include "ReactorBase.h" -#include "FlowDevice.h" -#include "Wall.h" +#include "cantera/zeroD/ReactorBase.h" +#include "cantera/zeroD/FlowDevice.h" +#include "cantera/zeroD/Wall.h" using namespace std; namespace Cantera diff --git a/src/zeroD/ReactorFactory.cpp b/src/zeroD/ReactorFactory.cpp index 6a1319351..4b803fe5d 100644 --- a/src/zeroD/ReactorFactory.cpp +++ b/src/zeroD/ReactorFactory.cpp @@ -3,12 +3,12 @@ */ // Copyright 2006 California Institute of Technology -#include "ReactorFactory.h" +#include "cantera/zeroD/ReactorFactory.h" -#include "Reservoir.h" -#include "Reactor.h" -#include "FlowReactor.h" -#include "ConstPressureReactor.h" +#include "cantera/zeroD/Reservoir.h" +#include "cantera/zeroD/Reactor.h" +#include "cantera/zeroD/FlowReactor.h" +#include "cantera/zeroD/ConstPressureReactor.h" using namespace std; namespace Cantera diff --git a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp index 076e9b1c3..4260b515f 100644 --- a/src/zeroD/ReactorNet.cpp +++ b/src/zeroD/ReactorNet.cpp @@ -1,7 +1,7 @@ -#include "ReactorNet.h" -#include "Integrator.h" -#include "FlowDevice.h" -#include "Wall.h" +#include "cantera/zeroD/ReactorNet.h" +#include "cantera/numerics/Integrator.h" +#include "cantera/zeroD/FlowDevice.h" +#include "cantera/zeroD/Wall.h" using namespace std; using namespace Cantera; diff --git a/src/zeroD/Wall.cpp b/src/zeroD/Wall.cpp index c18732a73..37deb912a 100644 --- a/src/zeroD/Wall.cpp +++ b/src/zeroD/Wall.cpp @@ -1,9 +1,9 @@ -#include "Wall.h" -#include "ReactorBase.h" -#include "Func1.h" -#include "InterfaceKinetics.h" -#include "SurfPhase.h" +#include "cantera/zeroD/Wall.h" +#include "cantera/zeroD/ReactorBase.h" +#include "cantera/numerics/Func1.h" +#include "cantera/kinetics/InterfaceKinetics.h" +#include "cantera/thermo/SurfPhase.h" using namespace std; using namespace Cantera;