From 002c1587619293a2aeeb394b467badd02a676520 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 28 Aug 2014 16:54:13 +0000 Subject: [PATCH] Cleanup include statements Move includes from header to implementation files where possible, and remove unnecessary includes. --- include/cantera/base/Array.h | 2 -- include/cantera/base/ctml.h | 6 +++++- include/cantera/base/utilities.h | 1 - include/cantera/base/vec_functions.h | 2 -- include/cantera/equil/ChemEquil.h | 5 +---- include/cantera/equil/MultiPhase.h | 1 - include/cantera/equil/MultiPhaseEquil.h | 1 - include/cantera/equil/vcs_MultiPhaseEquil.h | 2 -- include/cantera/equil/vcs_internal.h | 3 --- include/cantera/equil/vcs_prob.h | 2 -- include/cantera/kinetics/AqueousKinetics.h | 6 ------ include/cantera/kinetics/FalloffFactory.h | 1 - include/cantera/kinetics/GasKinetics.h | 4 ---- include/cantera/kinetics/Group.h | 2 -- include/cantera/kinetics/ImplicitSurfChem.h | 3 --- include/cantera/kinetics/InterfaceKinetics.h | 3 --- include/cantera/kinetics/Kinetics.h | 1 - include/cantera/kinetics/KineticsFactory.h | 1 - include/cantera/kinetics/RateCoeffMgr.h | 5 ----- include/cantera/kinetics/ReactionPath.h | 2 -- include/cantera/kinetics/ReactionStoichMgr.h | 2 +- include/cantera/kinetics/RxnRates.h | 2 -- include/cantera/kinetics/ThirdBodyMgr.h | 3 --- include/cantera/kinetics/importKinetics.h | 1 - include/cantera/kinetics/solveSP.h | 1 - include/cantera/numerics/BEulerInt.h | 6 ------ include/cantera/numerics/BandMatrix.h | 3 --- include/cantera/numerics/CVodesIntegrator.h | 2 -- include/cantera/numerics/DenseMatrix.h | 1 + include/cantera/numerics/IDA_Solver.h | 1 - include/cantera/numerics/Integrator.h | 1 - include/cantera/oneD/Domain1D.h | 2 +- include/cantera/oneD/Inlet1D.h | 2 -- include/cantera/oneD/MultiJac.h | 1 - include/cantera/oneD/Sim1D.h | 1 - include/cantera/oneD/StFlow.h | 4 ++-- include/cantera/thermo/AdsorbateThermo.h | 1 - include/cantera/thermo/ConstDensityThermo.h | 3 --- include/cantera/thermo/DebyeHuckel.h | 1 - include/cantera/thermo/EdgePhase.h | 2 -- include/cantera/thermo/FixedChemPotSSTP.h | 2 -- include/cantera/thermo/GeneralSpeciesThermo.h | 7 ++----- include/cantera/thermo/GibbsExcessVPSSTP.h | 1 + include/cantera/thermo/HMWSoln.h | 2 +- include/cantera/thermo/IdealGasPhase.h | 2 -- include/cantera/thermo/IdealSolidSolnPhase.h | 3 --- include/cantera/thermo/IdealSolnGasVPSS.h | 1 - include/cantera/thermo/LatticePhase.h | 5 ----- include/cantera/thermo/LatticeSolidPhase.h | 5 ----- include/cantera/thermo/MaskellSolidSolnPhase.h | 4 ---- include/cantera/thermo/MetalPhase.h | 2 +- include/cantera/thermo/MetalSHEelectrons.h | 1 - include/cantera/thermo/MineralEQ3.h | 3 --- include/cantera/thermo/MixtureFugacityTP.h | 1 - include/cantera/thermo/Nasa9Poly1.h | 2 +- include/cantera/thermo/NasaPoly1.h | 2 -- include/cantera/thermo/PDSS_Water.h | 4 +--- include/cantera/thermo/Phase.h | 3 +-- include/cantera/thermo/RedlichKisterVPSSTP.h | 1 - include/cantera/thermo/RedlichKwongMFTP.h | 1 + include/cantera/thermo/SemiconductorPhase.h | 1 + include/cantera/thermo/SpeciesThermoInterpType.h | 6 +++--- include/cantera/thermo/SpeciesThermoMgr.h | 1 - include/cantera/thermo/StoichSubstance.h | 1 - include/cantera/thermo/StoichSubstanceSSTP.h | 2 -- include/cantera/thermo/VPSSMgr.h | 1 - include/cantera/thermo/VPSSMgr_ConstVol.h | 1 - include/cantera/thermo/VPSSMgr_General.h | 1 - include/cantera/thermo/VPSSMgr_IdealGas.h | 2 -- include/cantera/thermo/WaterPropsIAPWS.h | 1 - include/cantera/transport/AqueousTransport.h | 2 -- include/cantera/transport/GasTransport.h | 1 + include/cantera/transport/LTPspecies.h | 1 - .../cantera/transport/LiquidTranInteraction.h | 2 -- include/cantera/transport/LiquidTransport.h | 1 - include/cantera/transport/LiquidTransportData.h | 1 - .../cantera/transport/LiquidTransportParams.h | 3 --- include/cantera/transport/SimpleTransport.h | 3 --- include/cantera/transport/SolidTransport.h | 1 - include/cantera/transport/SolidTransportData.h | 2 -- include/cantera/transport/TransportBase.h | 1 - include/cantera/transport/TransportFactory.h | 2 -- include/cantera/transport/WaterTransport.h | 2 -- include/cantera/zeroD/IdealGasReactor.h | 1 - include/cantera/zeroD/Wall.h | 1 - src/base/application.cpp | 3 --- src/base/ct2ctml.cpp | 4 ---- src/base/ctexceptions.cpp | 4 ---- src/base/ctml.cpp | 2 +- src/base/global.cpp | 2 -- src/base/stringUtils.cpp | 1 - src/base/xml.cpp | 9 +++------ src/clib/clib_defs.h | 1 - src/clib/ct.cpp | 1 - src/clib/ctonedim.cpp | 4 +--- src/clib/ctreactor.cpp | 2 -- src/clib/ctsurf.cpp | 2 -- src/equil/BasisOptimize.cpp | 1 - src/equil/ChemEquil.cpp | 7 +------ src/equil/MultiPhase.cpp | 4 ---- src/equil/MultiPhaseEquil.cpp | 2 -- src/equil/equilibrate.cpp | 3 --- src/equil/vcs_Gibbs.cpp | 2 -- src/equil/vcs_MultiPhaseEquil.cpp | 4 ---- src/equil/vcs_SpeciesProperties.cpp | 4 ---- src/equil/vcs_TP.cpp | 2 -- src/equil/vcs_VolPhase.cpp | 2 -- src/equil/vcs_elem.cpp | 3 --- src/equil/vcs_elem_rearrange.cpp | 2 +- src/equil/vcs_equilibrate.cpp | 11 ----------- src/equil/vcs_inest.cpp | 1 - src/equil/vcs_nondim.cpp | 1 - src/equil/vcs_phaseStability.cpp | 6 +----- src/equil/vcs_prep.cpp | 2 -- src/equil/vcs_prob.cpp | 4 +--- src/equil/vcs_rank.cpp | 8 -------- src/equil/vcs_rearrange.cpp | 1 - src/equil/vcs_report.cpp | 3 +-- src/equil/vcs_root1d.cpp | 1 + src/equil/vcs_rxnadj.cpp | 3 +-- src/equil/vcs_setMolesLinProg.cpp | 3 --- src/equil/vcs_solve.cpp | 2 -- src/equil/vcs_solve_TP.cpp | 2 -- src/equil/vcs_solve_phaseStability.cpp | 5 ----- src/equil/vcs_species_thermo.cpp | 1 - src/equil/vcs_util.cpp | 2 ++ src/fortran/fct.cpp | 1 - src/kinetics/AqueousKinetics.cpp | 4 +--- src/kinetics/ElectrodeKinetics.cpp | 1 + src/kinetics/FalloffFactory.cpp | 2 +- src/kinetics/GasKinetics.cpp | 5 ----- src/kinetics/Group.cpp | 1 + src/kinetics/ImplicitSurfChem.cpp | 2 +- src/kinetics/InterfaceKinetics.cpp | 3 +-- src/kinetics/Kinetics.cpp | 7 +------ src/kinetics/KineticsFactory.cpp | 1 + src/kinetics/ReactionPath.cpp | 2 -- src/kinetics/ReactionStoichMgr.cpp | 1 - src/kinetics/importKinetics.cpp | 16 ++-------------- src/kinetics/solveSP.cpp | 3 ++- src/numerics/BEulerInt.cpp | 1 + src/numerics/BandMatrix.cpp | 2 -- src/numerics/CVodesIntegrator.cpp | 3 --- src/numerics/DenseMatrix.cpp | 3 --- src/numerics/Func1.cpp | 1 - src/numerics/NonlinearSolver.cpp | 5 ----- src/numerics/RootFind.cpp | 1 - src/numerics/SquareMatrix.cpp | 1 - src/numerics/funcs.cpp | 3 --- src/oneD/Domain1D.cpp | 1 - src/oneD/MultiJac.cpp | 2 ++ src/oneD/MultiNewton.cpp | 4 +--- src/oneD/OneDim.cpp | 2 +- src/oneD/Sim1D.cpp | 3 +++ src/oneD/StFlow.cpp | 6 ++---- src/oneD/boundaries1D.cpp | 2 ++ src/oneD/refine.cpp | 4 ---- src/thermo/ConstDensityThermo.cpp | 3 +-- src/thermo/DebyeHuckel.cpp | 4 ++-- src/thermo/Elements.cpp | 2 -- src/thermo/FixedChemPotSSTP.cpp | 4 ++-- src/thermo/GeneralSpeciesThermo.cpp | 1 + src/thermo/GibbsExcessVPSSTP.cpp | 2 -- src/thermo/HMWSoln.cpp | 2 +- src/thermo/HMWSoln_input.cpp | 3 ++- src/thermo/IdealGasPhase.cpp | 4 +--- src/thermo/IdealMolalSoln.cpp | 2 ++ src/thermo/IdealSolidSolnPhase.cpp | 3 +++ src/thermo/IdealSolnGasVPSS.cpp | 3 +-- src/thermo/LatticePhase.cpp | 6 ++---- src/thermo/LatticeSolidPhase.cpp | 6 ++---- src/thermo/MargulesVPSSTP.cpp | 4 +--- src/thermo/MaskellSolidSolnPhase.cpp | 3 +-- src/thermo/MetalSHEelectrons.cpp | 5 ++--- src/thermo/MineralEQ3.cpp | 5 +---- src/thermo/MixedSolventElectrolyte.cpp | 4 +--- src/thermo/MixtureFugacityTP.cpp | 5 ++--- src/thermo/MolalityVPSSTP.cpp | 3 +-- src/thermo/Mu0Poly.cpp | 3 --- src/thermo/Nasa9PolyMultiTempRegion.cpp | 1 - src/thermo/Nasa9PolyMultiTempRegion.h | 1 - src/thermo/NasaThermo.cpp | 1 - src/thermo/NasaThermo.h | 2 -- src/thermo/PDSS.cpp | 6 ------ src/thermo/PDSS_ConstVol.cpp | 4 ---- src/thermo/PDSS_HKFT.cpp | 2 +- src/thermo/PDSS_IdealGas.cpp | 3 --- src/thermo/PDSS_IonsFromNeutral.cpp | 4 ---- src/thermo/PDSS_SSVol.cpp | 4 ---- src/thermo/PDSS_Water.cpp | 7 ------- src/thermo/Phase.cpp | 2 +- src/thermo/PhaseCombo_Interaction.cpp | 4 +--- src/thermo/PureFluidPhase.cpp | 1 - src/thermo/RedlichKisterVPSSTP.cpp | 4 +--- src/thermo/RedlichKwongMFTP.cpp | 1 + src/thermo/ShomatePoly.h | 1 - src/thermo/ShomateThermo.h | 2 +- src/thermo/SingleSpeciesTP.cpp | 1 + src/thermo/SpeciesThermoFactory.cpp | 3 +-- src/thermo/SpeciesThermoInterpType.cpp | 1 - src/thermo/StoichSubstance.cpp | 4 +--- src/thermo/StoichSubstanceSSTP.cpp | 5 ++--- src/thermo/SurfPhase.cpp | 2 ++ src/thermo/ThermoPhase.cpp | 2 ++ src/thermo/VPSSMgr.cpp | 1 + src/thermo/VPSSMgrFactory.cpp | 14 +------------- src/thermo/VPSSMgrFactory.h | 1 - src/thermo/VPSSMgr_ConstVol.cpp | 3 +-- src/thermo/VPSSMgr_General.cpp | 4 ++-- src/thermo/VPSSMgr_IdealGas.cpp | 2 -- src/thermo/VPSSMgr_Water_ConstVol.cpp | 2 ++ src/thermo/VPSSMgr_Water_HKFT.cpp | 2 ++ src/thermo/VPStandardStateTP.cpp | 2 -- src/thermo/WaterProps.cpp | 1 - src/thermo/WaterSSTP.cpp | 1 - src/transport/AqueousTransport.cpp | 6 ------ src/transport/DustyGasTransport.cpp | 1 - src/transport/LTPspecies.cpp | 2 ++ src/transport/LiquidTranInteraction.cpp | 1 + src/transport/LiquidTransport.cpp | 5 ----- src/transport/LiquidTransportParams.cpp | 2 -- src/transport/MMCollisionInt.cpp | 3 --- src/transport/MixTransport.cpp | 4 ---- src/transport/MultiTransport.cpp | 2 -- src/transport/PecosTransport.cpp | 3 --- src/transport/SimpleTransport.cpp | 5 ----- src/transport/SolidTransport.cpp | 3 +-- src/transport/TransportBase.cpp | 9 +-------- src/transport/TransportFactory.cpp | 12 +----------- src/transport/WaterTransport.cpp | 10 ++-------- src/zeroD/FlowReactor.cpp | 1 + src/zeroD/IdealGasReactor.cpp | 3 --- src/zeroD/Reactor.cpp | 1 - src/zeroD/ReactorNet.cpp | 1 - src/zeroD/Wall.cpp | 3 +-- test_problems/cathermo/VPissp/ISSPTester.cpp | 3 +-- test_problems/cathermo/ims/IMSTester.cpp | 1 + test_problems/cathermo/issp/ISSPTester.cpp | 2 +- .../cathermo/testWaterPDSS/testWaterPDSS.cpp | 10 ++-------- test_problems/cathermo/wtWater/wtWater.cpp | 9 --------- test_problems/cxx_ex/examples.cpp | 2 +- 241 files changed, 132 insertions(+), 556 deletions(-) diff --git a/include/cantera/base/Array.h b/include/cantera/base/Array.h index eb173962e..fcb9da3e6 100644 --- a/include/cantera/base/Array.h +++ b/include/cantera/base/Array.h @@ -7,8 +7,6 @@ #ifndef CT_ARRAY_H #define CT_ARRAY_H -#include "ct_defs.h" -#include "ctexceptions.h" #include "utilities.h" #include diff --git a/include/cantera/base/ctml.h b/include/cantera/base/ctml.h index 11ddb16eb..4cba4450e 100644 --- a/include/cantera/base/ctml.h +++ b/include/cantera/base/ctml.h @@ -11,7 +11,11 @@ #include "ct_defs.h" #include "xml.h" -#include "Array.h" + +namespace Cantera +{ +class Array2D; +} //! The ctml namespace adds functionality to the XML object, by providing //! standard functions that read, write, and interpret XML files and diff --git a/include/cantera/base/utilities.h b/include/cantera/base/utilities.h index 005c96731..51c4fdf10 100644 --- a/include/cantera/base/utilities.h +++ b/include/cantera/base/utilities.h @@ -20,7 +20,6 @@ #include "global.h" #include -#include namespace Cantera { diff --git a/include/cantera/base/vec_functions.h b/include/cantera/base/vec_functions.h index 619ff4f1e..528c367ea 100644 --- a/include/cantera/base/vec_functions.h +++ b/include/cantera/base/vec_functions.h @@ -11,9 +11,7 @@ #include "ct_defs.h" #include "utilities.h" -#include #include -#include #include #include diff --git a/include/cantera/equil/ChemEquil.h b/include/cantera/equil/ChemEquil.h index a07366c9d..9ec23f577 100644 --- a/include/cantera/equil/ChemEquil.h +++ b/include/cantera/equil/ChemEquil.h @@ -10,18 +10,15 @@ // Cantera includes #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" #include namespace Cantera { +class DenseMatrix; /// map property strings to integers int _equilflag(const char* xy); diff --git a/include/cantera/equil/MultiPhase.h b/include/cantera/equil/MultiPhase.h index ca992084d..da63a8424 100644 --- a/include/cantera/equil/MultiPhase.h +++ b/include/cantera/equil/MultiPhase.h @@ -8,7 +8,6 @@ #ifndef CT_MULTIPHASE_H #define CT_MULTIPHASE_H -#include "cantera/base/ct_defs.h" #include "cantera/numerics/DenseMatrix.h" #include "cantera/thermo/ThermoPhase.h" diff --git a/include/cantera/equil/MultiPhaseEquil.h b/include/cantera/equil/MultiPhaseEquil.h index ba86e3963..b47c55e7b 100644 --- a/include/cantera/equil/MultiPhaseEquil.h +++ b/include/cantera/equil/MultiPhaseEquil.h @@ -2,7 +2,6 @@ #ifndef CT_MULTIPHASE_EQUIL #define CT_MULTIPHASE_EQUIL -#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 e01e757d8..1382bae7e 100644 --- a/include/cantera/equil/vcs_MultiPhaseEquil.h +++ b/include/cantera/equil/vcs_MultiPhaseEquil.h @@ -5,9 +5,7 @@ #ifndef VCS_MULTIPHASEEQUIL_H #define VCS_MULTIPHASEEQUIL_H -#include "cantera/base/ct_defs.h" #include "MultiPhase.h" -#include "vcs_defs.h" #include "vcs_solve.h" #include "vcs_prob.h" diff --git a/include/cantera/equil/vcs_internal.h b/include/cantera/equil/vcs_internal.h index 7dea18f44..c524ed426 100644 --- a/include/cantera/equil/vcs_internal.h +++ b/include/cantera/equil/vcs_internal.h @@ -11,9 +11,6 @@ #ifndef _VCS_INTERNAL_H #define _VCS_INTERNAL_H -#include - -#include "cantera/equil/vcs_defs.h" #include "cantera/base/global.h" namespace VCSnonideal diff --git a/include/cantera/equil/vcs_prob.h b/include/cantera/equil/vcs_prob.h index d41d42cb0..faac6fc65 100644 --- a/include/cantera/equil/vcs_prob.h +++ b/include/cantera/equil/vcs_prob.h @@ -12,8 +12,6 @@ #define _VCS_PROB_H #include "cantera/base/Array.h" -#include "cantera/equil/vcs_defs.h" -#include namespace VCSnonideal { diff --git a/include/cantera/kinetics/AqueousKinetics.h b/include/cantera/kinetics/AqueousKinetics.h index f8e52e0da..5255e93dc 100644 --- a/include/cantera/kinetics/AqueousKinetics.h +++ b/include/cantera/kinetics/AqueousKinetics.h @@ -9,14 +9,8 @@ #ifndef CT_AQUEOUSKINETICS_H #define CT_AQUEOUSKINETICS_H -#include "cantera/thermo/mix_defs.h" #include "Kinetics.h" - -#include "cantera/base/utilities.h" - #include "ReactionStoichMgr.h" -#include "ThirdBodyMgr.h" -#include "FalloffMgr.h" #include "RateCoeffMgr.h" namespace Cantera diff --git a/include/cantera/kinetics/FalloffFactory.h b/include/cantera/kinetics/FalloffFactory.h index 1fea22ff3..77678ce05 100644 --- a/include/cantera/kinetics/FalloffFactory.h +++ b/include/cantera/kinetics/FalloffFactory.h @@ -10,7 +10,6 @@ #define CT_NEWFALLOFF_H #include "cantera/base/ct_defs.h" -#include "reaction_defs.h" #include "cantera/base/FactoryBase.h" #include "cantera/base/ct_thread.h" diff --git a/include/cantera/kinetics/GasKinetics.h b/include/cantera/kinetics/GasKinetics.h index 8758d02bb..abbc5b3d5 100644 --- a/include/cantera/kinetics/GasKinetics.h +++ b/include/cantera/kinetics/GasKinetics.h @@ -9,11 +9,7 @@ #ifndef CT_GASKINETICS_H #define CT_GASKINETICS_H -#include "cantera/thermo/mix_defs.h" #include "Kinetics.h" - -#include "cantera/base/utilities.h" - #include "ReactionStoichMgr.h" #include "ThirdBodyMgr.h" #include "FalloffMgr.h" diff --git a/include/cantera/kinetics/Group.h b/include/cantera/kinetics/Group.h index da2316dbc..31bfbd602 100644 --- a/include/cantera/kinetics/Group.h +++ b/include/cantera/kinetics/Group.h @@ -9,8 +9,6 @@ #include "cantera/base/ct_defs.h" -#include - namespace Cantera { diff --git a/include/cantera/kinetics/ImplicitSurfChem.h b/include/cantera/kinetics/ImplicitSurfChem.h index 11883c58f..6a6c6425c 100644 --- a/include/cantera/kinetics/ImplicitSurfChem.h +++ b/include/cantera/kinetics/ImplicitSurfChem.h @@ -9,11 +9,8 @@ #ifndef CT_IMPSURFCHEM_H #define CT_IMPSURFCHEM_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/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index 0c14bc8bc..a6a4aed82 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -8,11 +8,8 @@ #ifndef CT_IFACEKINETICS_H #define CT_IFACEKINETICS_H -#include "cantera/thermo/mix_defs.h" #include "Kinetics.h" #include "cantera/kinetics/RxnMolChange.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 f820331c6..c06e7af0b 100644 --- a/include/cantera/kinetics/Kinetics.h +++ b/include/cantera/kinetics/Kinetics.h @@ -10,7 +10,6 @@ #ifndef CT_KINETICS_H #define CT_KINETICS_H -#include "cantera/base/ctexceptions.h" #include "cantera/thermo/ThermoPhase.h" #include "cantera/thermo/mix_defs.h" diff --git a/include/cantera/kinetics/KineticsFactory.h b/include/cantera/kinetics/KineticsFactory.h index f7fef2646..1541c90f9 100644 --- a/include/cantera/kinetics/KineticsFactory.h +++ b/include/cantera/kinetics/KineticsFactory.h @@ -8,7 +8,6 @@ #define KINETICS_FACTORY_H #include "Kinetics.h" -#include "cantera/base/xml.h" #include "cantera/base/FactoryBase.h" #include "cantera/base/ct_thread.h" diff --git a/include/cantera/kinetics/RateCoeffMgr.h b/include/cantera/kinetics/RateCoeffMgr.h index f22b98c06..7d267607d 100644 --- a/include/cantera/kinetics/RateCoeffMgr.h +++ b/include/cantera/kinetics/RateCoeffMgr.h @@ -7,13 +7,8 @@ #ifndef CT_RATECOEFF_MGR_H #define CT_RATECOEFF_MGR_H -#include "cantera/base/utilities.h" #include "RxnRates.h" -#include "cantera/base/ct_defs.h" -#include "cantera/base/ctexceptions.h" -#include "cantera/base/stringUtils.h" - namespace Cantera { diff --git a/include/cantera/kinetics/ReactionPath.h b/include/cantera/kinetics/ReactionPath.h index bc9db6eb6..8beb817b7 100644 --- a/include/cantera/kinetics/ReactionPath.h +++ b/include/cantera/kinetics/ReactionPath.h @@ -9,8 +9,6 @@ #ifndef CT_RXNPATH_H #define CT_RXNPATH_H -// Cantera includes -#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 88168c2b0..ba9ad2ff9 100644 --- a/include/cantera/kinetics/ReactionStoichMgr.h +++ b/include/cantera/kinetics/ReactionStoichMgr.h @@ -6,8 +6,8 @@ #ifndef CT_RXN_STOICH #define CT_RXN_STOICH -#include "cantera/base/ct_defs.h" #include "cantera/kinetics/StoichManager.h" + namespace Cantera { diff --git a/include/cantera/kinetics/RxnRates.h b/include/cantera/kinetics/RxnRates.h index 266f471a9..6a41e162b 100644 --- a/include/cantera/kinetics/RxnRates.h +++ b/include/cantera/kinetics/RxnRates.h @@ -8,9 +8,7 @@ #ifndef CT_RXNRATES_H #define CT_RXNRATES_H -#include "reaction_defs.h" #include "ReactionData.h" - #include "cantera/base/ctexceptions.h" #include "cantera/base/stringUtils.h" diff --git a/include/cantera/kinetics/ThirdBodyMgr.h b/include/cantera/kinetics/ThirdBodyMgr.h index 09dd979fd..ed1c78ae2 100644 --- a/include/cantera/kinetics/ThirdBodyMgr.h +++ b/include/cantera/kinetics/ThirdBodyMgr.h @@ -8,9 +8,6 @@ #ifndef CT_THIRDBODY_MGR_H #define CT_THIRDBODY_MGR_H -#include - -#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 828a1bfc6..e821d0cf1 100644 --- a/include/cantera/kinetics/importKinetics.h +++ b/include/cantera/kinetics/importKinetics.h @@ -15,7 +15,6 @@ #ifndef CT_IMPORTKINETICS_H #define CT_IMPORTKINETICS_H -#include "cantera/thermo/ThermoPhase.h" #include "Kinetics.h" namespace Cantera diff --git a/include/cantera/kinetics/solveSP.h b/include/cantera/kinetics/solveSP.h index 464b291df..4fe776dc5 100644 --- a/include/cantera/kinetics/solveSP.h +++ b/include/cantera/kinetics/solveSP.h @@ -12,7 +12,6 @@ #ifndef SOLVESP_H #define SOLVESP_H -#include "ImplicitSurfChem.h" #include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/numerics/SquareMatrix.h" diff --git a/include/cantera/numerics/BEulerInt.h b/include/cantera/numerics/BEulerInt.h index 423c4d311..c52b92b6d 100644 --- a/include/cantera/numerics/BEulerInt.h +++ b/include/cantera/numerics/BEulerInt.h @@ -11,15 +11,9 @@ #ifndef CT_BEULERINT_H #define CT_BEULERINT_H -#include "cantera/base/ct_defs.h" -#include "cantera/base/utilities.h" -#include "cantera/base/ctexceptions.h" - #include "cantera/numerics/Integrator.h" #include "cantera/numerics/ResidJacEval.h" - #include "cantera/numerics/GeneralMatrix.h" -#include "cantera/numerics/NonlinearSolver.h" #define OPT_SIZE 10 diff --git a/include/cantera/numerics/BandMatrix.h b/include/cantera/numerics/BandMatrix.h index 65b0a4909..be470fc18 100644 --- a/include/cantera/numerics/BandMatrix.h +++ b/include/cantera/numerics/BandMatrix.h @@ -10,9 +10,6 @@ #ifndef CT_BANDMATRIX_H #define CT_BANDMATRIX_H -#include "cantera/base/ct_defs.h" -#include "cantera/base/utilities.h" -#include "cantera/base/ctexceptions.h" #include "GeneralMatrix.h" namespace Cantera diff --git a/include/cantera/numerics/CVodesIntegrator.h b/include/cantera/numerics/CVodesIntegrator.h index d0ec09762..97a5dd3ad 100644 --- a/include/cantera/numerics/CVodesIntegrator.h +++ b/include/cantera/numerics/CVodesIntegrator.h @@ -7,9 +7,7 @@ #define CT_CVODESWRAPPER_H #include "cantera/numerics/Integrator.h" -#include "cantera/numerics/FuncEval.h" #include "cantera/base/ctexceptions.h" -#include "cantera/base/ct_defs.h" #ifdef HAS_SUNDIALS diff --git a/include/cantera/numerics/DenseMatrix.h b/include/cantera/numerics/DenseMatrix.h index 9861c8210..62acdc3f8 100644 --- a/include/cantera/numerics/DenseMatrix.h +++ b/include/cantera/numerics/DenseMatrix.h @@ -12,6 +12,7 @@ #define CT_DENSEMATRIX_H #include "cantera/base/ct_defs.h" +#include "cantera/base/ctexceptions.h" #include "cantera/base/Array.h" namespace Cantera diff --git a/include/cantera/numerics/IDA_Solver.h b/include/cantera/numerics/IDA_Solver.h index 8d1629a9a..3462ed165 100644 --- a/include/cantera/numerics/IDA_Solver.h +++ b/include/cantera/numerics/IDA_Solver.h @@ -9,7 +9,6 @@ #define CT_IDA_SOLVER_H #include "DAE_Solver.h" -#include "cantera/base/ctexceptions.h" #if HAS_SUNDIALS diff --git a/include/cantera/numerics/Integrator.h b/include/cantera/numerics/Integrator.h index fac74afb6..880b29cf6 100644 --- a/include/cantera/numerics/Integrator.h +++ b/include/cantera/numerics/Integrator.h @@ -12,7 +12,6 @@ #define CT_INTEGRATOR_H #include "FuncEval.h" -#include "cantera/base/ct_defs.h" #include "cantera/base/global.h" namespace Cantera diff --git a/include/cantera/oneD/Domain1D.h b/include/cantera/oneD/Domain1D.h index 506a5a038..7a6761a5a 100644 --- a/include/cantera/oneD/Domain1D.h +++ b/include/cantera/oneD/Domain1D.h @@ -8,7 +8,6 @@ #ifndef CT_DOMAIN1D_H #define CT_DOMAIN1D_H -#include "cantera/base/xml.h" #include "cantera/base/stringUtils.h" #include "cantera/base/ctexceptions.h" #include "refine.h" @@ -29,6 +28,7 @@ const int cPorousType = 109; class MultiJac; class OneDim; +class XML_Node; /** * Base class for one-dimensional domains. diff --git a/include/cantera/oneD/Inlet1D.h b/include/cantera/oneD/Inlet1D.h index 690479c03..b31a31b18 100644 --- a/include/cantera/oneD/Inlet1D.h +++ b/include/cantera/oneD/Inlet1D.h @@ -15,8 +15,6 @@ #include "cantera/thermo/SurfPhase.h" #include "cantera/kinetics/InterfaceKinetics.h" #include "StFlow.h" -#include "OneDim.h" -#include "cantera/base/ctml.h" #include diff --git a/include/cantera/oneD/MultiJac.h b/include/cantera/oneD/MultiJac.h index d0ad579c5..5f485fd27 100644 --- a/include/cantera/oneD/MultiJac.h +++ b/include/cantera/oneD/MultiJac.h @@ -11,7 +11,6 @@ #include "cantera/numerics/BandMatrix.h" #include "OneDim.h" -#include "time.h" namespace Cantera { diff --git a/include/cantera/oneD/Sim1D.h b/include/cantera/oneD/Sim1D.h index 78e47e5ff..05567ea2a 100644 --- a/include/cantera/oneD/Sim1D.h +++ b/include/cantera/oneD/Sim1D.h @@ -6,7 +6,6 @@ #define CT_SIM1D_H #include "OneDim.h" -#include "cantera/numerics/funcs.h" namespace Cantera { diff --git a/include/cantera/oneD/StFlow.h b/include/cantera/oneD/StFlow.h index a4a09d0cc..5ab3f0943 100644 --- a/include/cantera/oneD/StFlow.h +++ b/include/cantera/oneD/StFlow.h @@ -6,12 +6,10 @@ #ifndef CT_STFLOW_H #define CT_STFLOW_H -#include "cantera/transport/TransportBase.h" #include "Domain1D.h" #include "cantera/base/Array.h" #include "cantera/thermo/IdealGasPhase.h" #include "cantera/kinetics/Kinetics.h" -#include "cantera/numerics/funcs.h" namespace Cantera { @@ -31,6 +29,8 @@ const int c_Mixav_Transport = 0; const int c_Multi_Transport = 1; const int c_Soret = 2; +class Transport; + /** * This class represents 1D flow domains that satisfy the one-dimensional * similarity solution for chemically-reacting, axisymmetric, flows. diff --git a/include/cantera/thermo/AdsorbateThermo.h b/include/cantera/thermo/AdsorbateThermo.h index d8c22dddc..5f5402d6f 100644 --- a/include/cantera/thermo/AdsorbateThermo.h +++ b/include/cantera/thermo/AdsorbateThermo.h @@ -12,7 +12,6 @@ #define CT_ADSORBATE_H #include "SpeciesThermoInterpType.h" -#include "cantera/base/global.h" namespace Cantera { diff --git a/include/cantera/thermo/ConstDensityThermo.h b/include/cantera/thermo/ConstDensityThermo.h index e625a5b1d..faf5caf8d 100644 --- a/include/cantera/thermo/ConstDensityThermo.h +++ b/include/cantera/thermo/ConstDensityThermo.h @@ -10,10 +10,7 @@ #ifndef CT_CONSTRHOTHERMO_H #define CT_CONSTRHOTHERMO_H -#include "cantera/base/ct_defs.h" -#include "mix_defs.h" #include "ThermoPhase.h" -#include "SpeciesThermo.h" #include "cantera/base/utilities.h" namespace Cantera diff --git a/include/cantera/thermo/DebyeHuckel.h b/include/cantera/thermo/DebyeHuckel.h index b80e5d010..b14223d41 100644 --- a/include/cantera/thermo/DebyeHuckel.h +++ b/include/cantera/thermo/DebyeHuckel.h @@ -17,7 +17,6 @@ #define CT_DEBYEHUCKEL_H #include "MolalityVPSSTP.h" -#include "electrolytes.h" #include "cantera/base/Array.h" namespace Cantera diff --git a/include/cantera/thermo/EdgePhase.h b/include/cantera/thermo/EdgePhase.h index 6d66044a0..ce612e70d 100644 --- a/include/cantera/thermo/EdgePhase.h +++ b/include/cantera/thermo/EdgePhase.h @@ -9,8 +9,6 @@ #ifndef CT_EDGEPHASE_H #define CT_EDGEPHASE_H -#include "mix_defs.h" -#include "ThermoPhase.h" #include "SurfPhase.h" namespace Cantera diff --git a/include/cantera/thermo/FixedChemPotSSTP.h b/include/cantera/thermo/FixedChemPotSSTP.h index 714e1eb6f..ebbd5e44e 100644 --- a/include/cantera/thermo/FixedChemPotSSTP.h +++ b/include/cantera/thermo/FixedChemPotSSTP.h @@ -14,9 +14,7 @@ #ifndef CT_FIXEDCHEMPOTSSTP_H #define CT_FIXEDCHEMPOTSSTP_H -#include "mix_defs.h" #include "SingleSpeciesTP.h" -#include "SpeciesThermo.h" namespace Cantera { diff --git a/include/cantera/thermo/GeneralSpeciesThermo.h b/include/cantera/thermo/GeneralSpeciesThermo.h index 8c945cfed..ca4ab9d0c 100644 --- a/include/cantera/thermo/GeneralSpeciesThermo.h +++ b/include/cantera/thermo/GeneralSpeciesThermo.h @@ -8,12 +8,9 @@ */ #ifndef CT_GENERALSPECIESTHERMO_H #define CT_GENERALSPECIESTHERMO_H -#include "cantera/base/ct_defs.h" + #include "SpeciesThermoMgr.h" -#include "NasaPoly1.h" -#include "Nasa9Poly1.h" -#include "StatMech.h" -#include "speciesThermoTypes.h" +#include "SpeciesThermoInterpType.h" namespace Cantera { diff --git a/include/cantera/thermo/GibbsExcessVPSSTP.h b/include/cantera/thermo/GibbsExcessVPSSTP.h index 8e6bf1694..baa6424dc 100644 --- a/include/cantera/thermo/GibbsExcessVPSSTP.h +++ b/include/cantera/thermo/GibbsExcessVPSSTP.h @@ -20,6 +20,7 @@ #define CT_GIBBSEXCESSVPSSTP_H #include "VPStandardStateTP.h" +#include "cantera/base/Array.h" namespace Cantera { diff --git a/include/cantera/thermo/HMWSoln.h b/include/cantera/thermo/HMWSoln.h index 40213acee..2a2001d09 100644 --- a/include/cantera/thermo/HMWSoln.h +++ b/include/cantera/thermo/HMWSoln.h @@ -17,7 +17,7 @@ #define CT_HMWSOLN_H #include "MolalityVPSSTP.h" -#include "electrolytes.h" +#include "cantera/base/Array.h" namespace Cantera { diff --git a/include/cantera/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h index d7b15ffca..5f1d51d95 100644 --- a/include/cantera/thermo/IdealGasPhase.h +++ b/include/cantera/thermo/IdealGasPhase.h @@ -11,8 +11,6 @@ #include "mix_defs.h" #include "ThermoPhase.h" -#include "SpeciesThermo.h" -#include "cantera/base/utilities.h" namespace Cantera { diff --git a/include/cantera/thermo/IdealSolidSolnPhase.h b/include/cantera/thermo/IdealSolidSolnPhase.h index c30ef1af6..84477fb8f 100644 --- a/include/cantera/thermo/IdealSolidSolnPhase.h +++ b/include/cantera/thermo/IdealSolidSolnPhase.h @@ -15,10 +15,7 @@ #ifndef CT_IDEALSOLIDSOLNPHASE_H #define CT_IDEALSOLIDSOLNPHASE_H -#include "mix_defs.h" #include "ThermoPhase.h" -#include "ThermoFactory.h" -#include "SpeciesThermo.h" namespace Cantera { diff --git a/include/cantera/thermo/IdealSolnGasVPSS.h b/include/cantera/thermo/IdealSolnGasVPSS.h index 9de9c995f..5ce7d61e7 100644 --- a/include/cantera/thermo/IdealSolnGasVPSS.h +++ b/include/cantera/thermo/IdealSolnGasVPSS.h @@ -15,7 +15,6 @@ #define CT_IDEALSOLNGASVPSS_H #include "VPStandardStateTP.h" -#include "VPSSMgr.h" namespace Cantera { diff --git a/include/cantera/thermo/LatticePhase.h b/include/cantera/thermo/LatticePhase.h index 4ab7ba348..a583f2931 100644 --- a/include/cantera/thermo/LatticePhase.h +++ b/include/cantera/thermo/LatticePhase.h @@ -10,13 +10,8 @@ #ifndef CT_LATTICE_H #define CT_LATTICE_H -#include "cantera/base/config.h" - -#include "cantera/base/ct_defs.h" #include "mix_defs.h" #include "ThermoPhase.h" -#include "SpeciesThermo.h" -#include "cantera/base/utilities.h" namespace Cantera { diff --git a/include/cantera/thermo/LatticeSolidPhase.h b/include/cantera/thermo/LatticeSolidPhase.h index 15404dd10..66fd2b585 100644 --- a/include/cantera/thermo/LatticeSolidPhase.h +++ b/include/cantera/thermo/LatticeSolidPhase.h @@ -11,13 +11,8 @@ #ifndef CT_LATTICESOLID_H #define CT_LATTICESOLID_H -#include "cantera/base/config.h" -#include "cantera/base/ct_defs.h" -#include "mix_defs.h" #include "ThermoPhase.h" -#include "SpeciesThermo.h" #include "LatticePhase.h" -#include "cantera/base/utilities.h" namespace Cantera { diff --git a/include/cantera/thermo/MaskellSolidSolnPhase.h b/include/cantera/thermo/MaskellSolidSolnPhase.h index 1a7bbf38d..bfccad1e7 100644 --- a/include/cantera/thermo/MaskellSolidSolnPhase.h +++ b/include/cantera/thermo/MaskellSolidSolnPhase.h @@ -14,11 +14,7 @@ #ifndef CT_MASKELLSOLIDSOLNPHASE_H #define CT_MASKELLSOLIDSOLNPHASE_H -#include "mix_defs.h" -#include "ThermoPhase.h" #include "VPStandardStateTP.h" -#include "ThermoFactory.h" -#include "SpeciesThermo.h" namespace Cantera { diff --git a/include/cantera/thermo/MetalPhase.h b/include/cantera/thermo/MetalPhase.h index 36a15d549..d743a8e84 100644 --- a/include/cantera/thermo/MetalPhase.h +++ b/include/cantera/thermo/MetalPhase.h @@ -9,7 +9,7 @@ #include "mix_defs.h" #include "ThermoPhase.h" -#include "SpeciesThermo.h" +#include "cantera/base/ctml.h" namespace Cantera { diff --git a/include/cantera/thermo/MetalSHEelectrons.h b/include/cantera/thermo/MetalSHEelectrons.h index 7f528ccc1..d1bd9009e 100644 --- a/include/cantera/thermo/MetalSHEelectrons.h +++ b/include/cantera/thermo/MetalSHEelectrons.h @@ -14,7 +14,6 @@ #ifndef CT_METALSHEELECTRONS_H #define CT_METALSHEELECTRONS_H -#include "mix_defs.h" #include "SingleSpeciesTP.h" namespace Cantera diff --git a/include/cantera/thermo/MineralEQ3.h b/include/cantera/thermo/MineralEQ3.h index 7f60ca2a3..5d099ac03 100644 --- a/include/cantera/thermo/MineralEQ3.h +++ b/include/cantera/thermo/MineralEQ3.h @@ -15,9 +15,6 @@ #ifndef CT_MINERALEQ3_H #define CT_MINERALEQ3_H -#include "mix_defs.h" -#include "SingleSpeciesTP.h" -#include "SpeciesThermo.h" #include "StoichSubstanceSSTP.h" namespace Cantera diff --git a/include/cantera/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h index cb9b8a134..ce93348c5 100644 --- a/include/cantera/thermo/MixtureFugacityTP.h +++ b/include/cantera/thermo/MixtureFugacityTP.h @@ -14,7 +14,6 @@ #define CT_MIXTUREFUGACITYTP_H #include "ThermoPhase.h" -#include "VPSSMgr.h" #include "cantera/numerics/ResidEval.h" namespace Cantera diff --git a/include/cantera/thermo/Nasa9Poly1.h b/include/cantera/thermo/Nasa9Poly1.h index bc81e0bf7..44bdcb630 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 "cantera/base/global.h" + #include "SpeciesThermoInterpType.h" namespace Cantera diff --git a/include/cantera/thermo/NasaPoly1.h b/include/cantera/thermo/NasaPoly1.h index f8e28dfb0..82b7a6d72 100644 --- a/include/cantera/thermo/NasaPoly1.h +++ b/include/cantera/thermo/NasaPoly1.h @@ -13,9 +13,7 @@ #define CT_NASAPOLY1_H // Copyright 2001 California Institute of Technology -#include "cantera/base/global.h" #include "SpeciesThermoInterpType.h" -#include namespace Cantera { diff --git a/include/cantera/thermo/PDSS_Water.h b/include/cantera/thermo/PDSS_Water.h index 70ada958b..920091b81 100644 --- a/include/cantera/thermo/PDSS_Water.h +++ b/include/cantera/thermo/PDSS_Water.h @@ -12,11 +12,9 @@ #ifndef CT_PDSS_WATER_H #define CT_PDSS_WATER_H -#include "cantera/base/ct_defs.h" #include "PDSS.h" -#include "VPStandardStateTP.h" #include "WaterPropsIAPWS.h" - #include "WaterProps.h" +#include "WaterProps.h" namespace Cantera { diff --git a/include/cantera/thermo/Phase.h b/include/cantera/thermo/Phase.h index ac76cf8c4..be997960a 100644 --- a/include/cantera/thermo/Phase.h +++ b/include/cantera/thermo/Phase.h @@ -7,8 +7,7 @@ #ifndef CT_PHASE_H #define CT_PHASE_H -#include "cantera/base/vec_functions.h" -#include "cantera/base/ctml.h" +#include "cantera/base/ctexceptions.h" #include "cantera/thermo/Elements.h" #include "cantera/base/ValueCache.h" diff --git a/include/cantera/thermo/RedlichKisterVPSSTP.h b/include/cantera/thermo/RedlichKisterVPSSTP.h index b965bbb85..5761e5fb5 100644 --- a/include/cantera/thermo/RedlichKisterVPSSTP.h +++ b/include/cantera/thermo/RedlichKisterVPSSTP.h @@ -21,7 +21,6 @@ #define CT_REDLICHKISTERVPSSTP_H #include "cantera/thermo/GibbsExcessVPSSTP.h" -#include "cantera/base/Array.h" namespace Cantera { diff --git a/include/cantera/thermo/RedlichKwongMFTP.h b/include/cantera/thermo/RedlichKwongMFTP.h index a28a2b87c..3f3fb794c 100644 --- a/include/cantera/thermo/RedlichKwongMFTP.h +++ b/include/cantera/thermo/RedlichKwongMFTP.h @@ -16,6 +16,7 @@ #define CT_REDLICHKWONGMFTP_H #include "MixtureFugacityTP.h" +#include "cantera/base/Array.h" namespace Cantera { diff --git a/include/cantera/thermo/SemiconductorPhase.h b/include/cantera/thermo/SemiconductorPhase.h index ce9ebfbf0..1ab4021a0 100644 --- a/include/cantera/thermo/SemiconductorPhase.h +++ b/include/cantera/thermo/SemiconductorPhase.h @@ -9,6 +9,7 @@ #include "mix_defs.h" #include "ThermoPhase.h" +#include "cantera/base/ctml.h" namespace Cantera { diff --git a/include/cantera/thermo/SpeciesThermoInterpType.h b/include/cantera/thermo/SpeciesThermoInterpType.h index 82b3d7691..15aa41a04 100644 --- a/include/cantera/thermo/SpeciesThermoInterpType.h +++ b/include/cantera/thermo/SpeciesThermoInterpType.h @@ -7,12 +7,12 @@ // Copyright 2001 California Institute of Technology -#include "cantera/base/ct_defs.h" -#include "speciesThermoTypes.h" - #ifndef CT_SPECIESTHERMOINTERPTYPE_H #define CT_SPECIESTHERMOINTERPTYPE_H +#include "cantera/base/ct_defs.h" +#include "speciesThermoTypes.h" + namespace Cantera { diff --git a/include/cantera/thermo/SpeciesThermoMgr.h b/include/cantera/thermo/SpeciesThermoMgr.h index db131e2bc..456101e53 100644 --- a/include/cantera/thermo/SpeciesThermoMgr.h +++ b/include/cantera/thermo/SpeciesThermoMgr.h @@ -11,7 +11,6 @@ #ifndef CT_SPECIESTHERMO_MGR_H #define CT_SPECIESTHERMO_MGR_H -#include "cantera/base/ct_defs.h" #include "cantera/base/ctexceptions.h" #include "cantera/base/stringUtils.h" #include "SpeciesThermo.h" diff --git a/include/cantera/thermo/StoichSubstance.h b/include/cantera/thermo/StoichSubstance.h index a1c986308..f549b3821 100644 --- a/include/cantera/thermo/StoichSubstance.h +++ b/include/cantera/thermo/StoichSubstance.h @@ -11,7 +11,6 @@ #include "mix_defs.h" #include "ThermoPhase.h" -#include "SpeciesThermo.h" namespace Cantera { diff --git a/include/cantera/thermo/StoichSubstanceSSTP.h b/include/cantera/thermo/StoichSubstanceSSTP.h index 53f333558..331804ef9 100644 --- a/include/cantera/thermo/StoichSubstanceSSTP.h +++ b/include/cantera/thermo/StoichSubstanceSSTP.h @@ -13,9 +13,7 @@ #ifndef CT_STOICHSUBSTANCESSTP_H #define CT_STOICHSUBSTANCESSTP_H -#include "mix_defs.h" #include "SingleSpeciesTP.h" -#include "SpeciesThermo.h" namespace Cantera { diff --git a/include/cantera/thermo/VPSSMgr.h b/include/cantera/thermo/VPSSMgr.h index 6536e778f..482e89879 100644 --- a/include/cantera/thermo/VPSSMgr.h +++ b/include/cantera/thermo/VPSSMgr.h @@ -15,7 +15,6 @@ #ifndef CT_VPSSMGR_H #define CT_VPSSMGR_H -#include "cantera/base/ct_defs.h" #include "mix_defs.h" #include "cantera/base/global.h" diff --git a/include/cantera/thermo/VPSSMgr_ConstVol.h b/include/cantera/thermo/VPSSMgr_ConstVol.h index ac39cf142..2c7668484 100644 --- a/include/cantera/thermo/VPSSMgr_ConstVol.h +++ b/include/cantera/thermo/VPSSMgr_ConstVol.h @@ -14,7 +14,6 @@ #ifndef CT_VPSSMGR_CONSTVOL_H #define CT_VPSSMGR_CONSTVOL_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 c72f80a39..bc634ebf6 100644 --- a/include/cantera/thermo/VPSSMgr_General.h +++ b/include/cantera/thermo/VPSSMgr_General.h @@ -15,7 +15,6 @@ #ifndef CT_VPSSMGR_GENERAL_H #define CT_VPSSMGR_GENERAL_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 a2363ea15..1a80b100b 100644 --- a/include/cantera/thermo/VPSSMgr_IdealGas.h +++ b/include/cantera/thermo/VPSSMgr_IdealGas.h @@ -15,8 +15,6 @@ #ifndef CT_VPSSMGR_IDEALGAS_H #define CT_VPSSMGR_IDEALGAS_H -#include "cantera/base/ct_defs.h" -#include "PDSS.h" #include "VPSSMgr.h" namespace Cantera diff --git a/include/cantera/thermo/WaterPropsIAPWS.h b/include/cantera/thermo/WaterPropsIAPWS.h index 6ef456ee1..e31e9d881 100644 --- a/include/cantera/thermo/WaterPropsIAPWS.h +++ b/include/cantera/thermo/WaterPropsIAPWS.h @@ -13,7 +13,6 @@ #define WATERPROPSIAPWS_H #include "WaterPropsIAPWSphi.h" -#include "cantera/base/config.h" namespace Cantera { diff --git a/include/cantera/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h index 8441ccfb4..feb6d2ad0 100644 --- a/include/cantera/transport/AqueousTransport.h +++ b/include/cantera/transport/AqueousTransport.h @@ -10,8 +10,6 @@ // Cantera includes #include "TransportBase.h" #include "cantera/numerics/DenseMatrix.h" -#include "TransportParams.h" -#include "LiquidTransportParams.h" namespace Cantera { diff --git a/include/cantera/transport/GasTransport.h b/include/cantera/transport/GasTransport.h index 1add65fa6..bbe6eeafa 100644 --- a/include/cantera/transport/GasTransport.h +++ b/include/cantera/transport/GasTransport.h @@ -6,6 +6,7 @@ #define CT_GAS_TRANSPORT_H #include "TransportBase.h" +#include "cantera/numerics/DenseMatrix.h" namespace Cantera { diff --git a/include/cantera/transport/LTPspecies.h b/include/cantera/transport/LTPspecies.h index 49f0b6103..7559e5e40 100644 --- a/include/cantera/transport/LTPspecies.h +++ b/include/cantera/transport/LTPspecies.h @@ -7,7 +7,6 @@ #define CT_LTPSPECIES_H #include "TransportBase.h" -#include "cantera/base/FactoryBase.h" namespace Cantera { diff --git a/include/cantera/transport/LiquidTranInteraction.h b/include/cantera/transport/LiquidTranInteraction.h index 3c8819e6a..c214887c5 100644 --- a/include/cantera/transport/LiquidTranInteraction.h +++ b/include/cantera/transport/LiquidTranInteraction.h @@ -7,8 +7,6 @@ #ifndef CT_LIQUIDTRANINTERACTION_H #define CT_LIQUIDTRANINTERACTION_H -#include "cantera/base/ct_defs.h" -#include "TransportBase.h" #include "TransportParams.h" #include "LiquidTransportData.h" #include "cantera/base/xml.h" diff --git a/include/cantera/transport/LiquidTransport.h b/include/cantera/transport/LiquidTransport.h index 2343d19bb..9905a4dc8 100644 --- a/include/cantera/transport/LiquidTransport.h +++ b/include/cantera/transport/LiquidTransport.h @@ -7,7 +7,6 @@ #include "TransportBase.h" #include "cantera/numerics/DenseMatrix.h" -#include "TransportParams.h" #include "LiquidTransportParams.h" namespace Cantera diff --git a/include/cantera/transport/LiquidTransportData.h b/include/cantera/transport/LiquidTransportData.h index 1cba50d74..40052028e 100644 --- a/include/cantera/transport/LiquidTransportData.h +++ b/include/cantera/transport/LiquidTransportData.h @@ -6,7 +6,6 @@ #define CT_LIQUIDTRANSPORTDATA_H #include "TransportBase.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 2d163ea13..79d15346c 100644 --- a/include/cantera/transport/LiquidTransportParams.h +++ b/include/cantera/transport/LiquidTransportParams.h @@ -6,11 +6,8 @@ #ifndef CT_LIQUIDTRANSPORTPARAMS_H #define CT_LIQUIDTRANSPORTPARAMS_H -#include "TransportBase.h" #include "TransportParams.h" -#include "LiquidTransportData.h" #include "LiquidTranInteraction.h" -#include "cantera/base/xml.h" namespace Cantera { diff --git a/include/cantera/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h index fb19692be..de782e64e 100644 --- a/include/cantera/transport/SimpleTransport.h +++ b/include/cantera/transport/SimpleTransport.h @@ -7,9 +7,6 @@ #ifndef CT_SIMPLETRAN_H #define CT_SIMPLETRAN_H -#include "TransportBase.h" -#include "cantera/numerics/DenseMatrix.h" -#include "TransportParams.h" #include "LiquidTransportParams.h" namespace Cantera diff --git a/include/cantera/transport/SolidTransport.h b/include/cantera/transport/SolidTransport.h index 1a3ae6fa4..c45e2a64a 100644 --- a/include/cantera/transport/SolidTransport.h +++ b/include/cantera/transport/SolidTransport.h @@ -12,7 +12,6 @@ #include "LTPspecies.h" #include "TransportBase.h" -#include "cantera/numerics/DenseMatrix.h" namespace Cantera { diff --git a/include/cantera/transport/SolidTransportData.h b/include/cantera/transport/SolidTransportData.h index 2bbaa8c33..3023988ce 100644 --- a/include/cantera/transport/SolidTransportData.h +++ b/include/cantera/transport/SolidTransportData.h @@ -6,9 +6,7 @@ #ifndef CT_SOLIDTRANSPORTDATA_H #define CT_SOLIDTRANSPORTDATA_H -#include "cantera/transport/TransportBase.h" #include "cantera/transport/TransportParams.h" -#include "cantera/base/FactoryBase.h" #include "cantera/transport/LTPspecies.h" namespace Cantera diff --git a/include/cantera/transport/TransportBase.h b/include/cantera/transport/TransportBase.h index 29e9830a9..b52ce3b08 100644 --- a/include/cantera/transport/TransportBase.h +++ b/include/cantera/transport/TransportBase.h @@ -22,7 +22,6 @@ #define CT_TRANSPORTBASE_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 c7d8f085f..f095a19e8 100644 --- a/include/cantera/transport/TransportFactory.h +++ b/include/cantera/transport/TransportFactory.h @@ -9,12 +9,10 @@ #define CT_TRANSPORTFACTORY_H // Cantera includes -#include "cantera/base/ct_defs.h" #include "cantera/base/ct_thread.h" #include "TransportBase.h" #include "cantera/base/FactoryBase.h" #include "LiquidTransportParams.h" -#include "SolidTransportData.h" namespace Cantera { diff --git a/include/cantera/transport/WaterTransport.h b/include/cantera/transport/WaterTransport.h index 896498425..b0a099189 100644 --- a/include/cantera/transport/WaterTransport.h +++ b/include/cantera/transport/WaterTransport.h @@ -4,8 +4,6 @@ #ifndef CT_WATERTRAN_H #define CT_WATERTRAN_H -#include "TransportBase.h" -#include "cantera/numerics/DenseMatrix.h" #include "LiquidTransportParams.h" #include "cantera/thermo/WaterPropsIAPWS.h" diff --git a/include/cantera/zeroD/IdealGasReactor.h b/include/cantera/zeroD/IdealGasReactor.h index 5452f517b..b214d77ec 100644 --- a/include/cantera/zeroD/IdealGasReactor.h +++ b/include/cantera/zeroD/IdealGasReactor.h @@ -8,7 +8,6 @@ #define CT_IDEALGASREACTOR_H #include "Reactor.h" -#include "cantera/kinetics/Kinetics.h" namespace Cantera { diff --git a/include/cantera/zeroD/Wall.h b/include/cantera/zeroD/Wall.h index a5a9e48fd..b027e87b1 100644 --- a/include/cantera/zeroD/Wall.h +++ b/include/cantera/zeroD/Wall.h @@ -7,7 +7,6 @@ #ifndef CT_WALL_H #define CT_WALL_H -#include "cantera/base/ct_defs.h" #include "cantera/base/ctexceptions.h" #include "cantera/numerics/Func1.h" diff --git a/src/base/application.cpp b/src/base/application.cpp index 8f158594b..3d426754c 100644 --- a/src/base/application.cpp +++ b/src/base/application.cpp @@ -1,15 +1,12 @@ //! @file application.cpp #include "application.h" -#include "cantera/base/ctexceptions.h" #include "cantera/base/ctml.h" #include "cantera/base/stringUtils.h" -#include "cantera/base/xml.h" #include "units.h" #include #include -#include using std::string; using std::endl; diff --git a/src/base/ct2ctml.cpp b/src/base/ct2ctml.cpp index addd70dd1..e12974225 100644 --- a/src/base/ct2ctml.cpp +++ b/src/base/ct2ctml.cpp @@ -5,16 +5,12 @@ */ // Copyright 2001-2005 California Institute of Technology -#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 "../../ext/libexecstream/exec-stream.h" #include #include -#include #ifdef _WIN32 #include diff --git a/src/base/ctexceptions.cpp b/src/base/ctexceptions.cpp index 7342e7344..27e1184de 100644 --- a/src/base/ctexceptions.cpp +++ b/src/base/ctexceptions.cpp @@ -1,15 +1,11 @@ //! @file ctexceptions.cpp #include "cantera/base/ctexceptions.h" - #include "application.h" -#include "cantera/base/global.h" -#include "cantera/base/stringUtils.h" #ifdef HAVE_FENV_H #include #endif #include -#include namespace Cantera { diff --git a/src/base/ctml.cpp b/src/base/ctml.cpp index 56db97c1b..5eb80ff8d 100644 --- a/src/base/ctml.cpp +++ b/src/base/ctml.cpp @@ -8,8 +8,8 @@ #define CTML_VERSION_1_4_1 -#include "cantera/base/global.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/Array.h" using namespace std; using namespace Cantera; diff --git a/src/base/global.cpp b/src/base/global.cpp index 8a69568cc..7b7645193 100644 --- a/src/base/global.cpp +++ b/src/base/global.cpp @@ -1,7 +1,5 @@ //! @file global.cpp -#include "cantera/base/global.h" -#include "cantera/base/ctexceptions.h" #include "cantera/base/FactoryBase.h" #include "cantera/base/xml.h" #include "application.h" diff --git a/src/base/stringUtils.cpp b/src/base/stringUtils.cpp index c73e333b5..868a58058 100644 --- a/src/base/stringUtils.cpp +++ b/src/base/stringUtils.cpp @@ -17,7 +17,6 @@ #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/xml.cpp b/src/base/xml.cpp index d829dc1c8..791ddd75b 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -6,16 +6,13 @@ */ // Copyright 2001 California Institute of Technology -#include "cantera/base/config.h" +#include "cantera/base/xml.h" +#include "cantera/base/stringUtils.h" + #include -#include using namespace std; -#include "cantera/base/xml.h" -#include "cantera/base/global.h" -#include "cantera/base/stringUtils.h" - namespace Cantera { ////////////////////// exceptions //////////////////////////// diff --git a/src/clib/clib_defs.h b/src/clib/clib_defs.h index c05972dda..b8552f008 100644 --- a/src/clib/clib_defs.h +++ b/src/clib/clib_defs.h @@ -4,7 +4,6 @@ #ifndef CTC_DEFS_H #define CTC_DEFS_H -#include "cantera/base/ct_defs.h" #include "cantera/base/global.h" #include "cantera/base/ctexceptions.h" #include diff --git a/src/clib/ct.cpp b/src/clib/ct.cpp index 476ad56c4..12c4249f1 100644 --- a/src/clib/ct.cpp +++ b/src/clib/ct.cpp @@ -21,7 +21,6 @@ #include "Cabinet.h" #include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/thermo/PureFluidPhase.h" -#include "cantera/thermo/MixtureFugacityTP.h" using namespace std; using namespace Cantera; diff --git a/src/clib/ctonedim.cpp b/src/clib/ctonedim.cpp index ca3c0aadc..7ebba02c9 100644 --- a/src/clib/ctonedim.cpp +++ b/src/clib/ctonedim.cpp @@ -6,11 +6,9 @@ #include "ctonedim.h" // Cantera includes -#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" +#include "cantera/transport/TransportBase.h" #include "Cabinet.h" #include diff --git a/src/clib/ctreactor.cpp b/src/clib/ctreactor.cpp index 360c64be1..c9ccaafba 100644 --- a/src/clib/ctreactor.cpp +++ b/src/clib/ctreactor.cpp @@ -7,9 +7,7 @@ // Cantera includes #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/ReactorFactory.h" #include "cantera/zeroD/Wall.h" #include "cantera/zeroD/flowControllers.h" diff --git a/src/clib/ctsurf.cpp b/src/clib/ctsurf.cpp index 274fb9545..d3d6a82bc 100644 --- a/src/clib/ctsurf.cpp +++ b/src/clib/ctsurf.cpp @@ -7,8 +7,6 @@ // Cantera includes #include "cantera/thermo/SurfPhase.h" -#include "cantera/kinetics/InterfaceKinetics.h" -#include "cantera/kinetics/ImplicitSurfChem.h" #include "Cabinet.h" using namespace std; diff --git a/src/equil/BasisOptimize.cpp b/src/equil/BasisOptimize.cpp index e79eb8ba4..19c44012c 100644 --- a/src/equil/BasisOptimize.cpp +++ b/src/equil/BasisOptimize.cpp @@ -2,7 +2,6 @@ * @file BasisOptimize.cpp Functions which calculation optimized basis of the * stoichiometric coefficient matrix (see /ref equil functions) */ -#include "cantera/thermo/ThermoPhase.h" #include "cantera/equil/MultiPhase.h" #include "cantera/numerics/ctlapack.h" diff --git a/src/equil/ChemEquil.cpp b/src/equil/ChemEquil.cpp index dd9dc66d8..6d6758aeb 100644 --- a/src/equil/ChemEquil.cpp +++ b/src/equil/ChemEquil.cpp @@ -7,15 +7,10 @@ // Copyright 2001 California Institute of Technology #include "cantera/equil/ChemEquil.h" -#include "cantera/numerics/DenseMatrix.h" -#include "cantera/base/ct_defs.h" -#include "cantera/base/global.h" #include "PropertyCalculator.h" -#include "cantera/base/ctexceptions.h" -#include "cantera/base/vec_functions.h" #include "cantera/base/stringUtils.h" -#include "cantera/equil/MultiPhase.h" +#include "cantera/equil/MultiPhaseEquil.h" using namespace std; diff --git a/src/equil/MultiPhase.cpp b/src/equil/MultiPhase.cpp index 7c3a9cb41..0816f6bb2 100644 --- a/src/equil/MultiPhase.cpp +++ b/src/equil/MultiPhase.cpp @@ -5,11 +5,7 @@ */ #include "cantera/equil/MultiPhase.h" #include "cantera/equil/MultiPhaseEquil.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 282250186..c119ff935 100644 --- a/src/equil/MultiPhaseEquil.cpp +++ b/src/equil/MultiPhaseEquil.cpp @@ -2,9 +2,7 @@ * @file MultiPhaseEquil.cpp */ #include "cantera/equil/MultiPhaseEquil.h" -#include "cantera/equil/MultiPhase.h" #include "cantera/thermo/MolalityVPSSTP.h" -#include "cantera/base/global.h" #include "cantera/base/stringUtils.h" #include diff --git a/src/equil/equilibrate.cpp b/src/equil/equilibrate.cpp index 0c86a41ce..da59b091e 100644 --- a/src/equil/equilibrate.cpp +++ b/src/equil/equilibrate.cpp @@ -2,11 +2,8 @@ * @file equilibrate.cpp Driver routines for the chemical equilibrium solvers. */ -#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_Gibbs.cpp b/src/equil/vcs_Gibbs.cpp index 8541f096d..ac35ab0ff 100644 --- a/src/equil/vcs_Gibbs.cpp +++ b/src/equil/vcs_Gibbs.cpp @@ -9,9 +9,7 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_VolPhase.h" -#include "math.h" namespace VCSnonideal { diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp index 2b5dc84fd..af1d22175 100644 --- a/src/equil/vcs_MultiPhaseEquil.cpp +++ b/src/equil/vcs_MultiPhaseEquil.cpp @@ -9,18 +9,14 @@ */ #include "cantera/equil/vcs_MultiPhaseEquil.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_VolPhase.h" #include "cantera/equil/vcs_species_thermo.h" -#include "cantera/thermo/mix_defs.h" #include "cantera/base/clockWC.h" #include "cantera/base/stringUtils.h" #include "cantera/thermo/speciesThermoTypes.h" #include "cantera/thermo/IdealSolidSolnPhase.h" #include "cantera/thermo/IdealMolalSoln.h" -#include "cantera/equil/ChemEquil.h" -#include "cantera/equil/vcs_SpeciesProperties.h" #include diff --git a/src/equil/vcs_SpeciesProperties.cpp b/src/equil/vcs_SpeciesProperties.cpp index aed3e3178..b611a3d98 100644 --- a/src/equil/vcs_SpeciesProperties.cpp +++ b/src/equil/vcs_SpeciesProperties.cpp @@ -1,11 +1,7 @@ /** * @file vcs_SpeciesProperties.cpp */ -#include "cantera/equil/vcs_defs.h" #include "cantera/equil/vcs_SpeciesProperties.h" -#include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_species_thermo.h" -#include "cantera/equil/vcs_internal.h" using namespace std; diff --git a/src/equil/vcs_TP.cpp b/src/equil/vcs_TP.cpp index 7212485cd..dc31821f0 100644 --- a/src/equil/vcs_TP.cpp +++ b/src/equil/vcs_TP.cpp @@ -1,7 +1,5 @@ //! @file vcs_TP.cpp #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" -#include "cantera/equil/vcs_species_thermo.h" #include "cantera/equil/vcs_VolPhase.h" namespace VCSnonideal diff --git a/src/equil/vcs_VolPhase.cpp b/src/equil/vcs_VolPhase.cpp index 6b6cf31ad..1ecab5e68 100644 --- a/src/equil/vcs_VolPhase.cpp +++ b/src/equil/vcs_VolPhase.cpp @@ -7,8 +7,6 @@ * U.S. Government retains certain rights in this software. */ #include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_internal.h" -#include "cantera/equil/vcs_SpeciesProperties.h" #include "cantera/equil/vcs_species_thermo.h" #include "cantera/equil/vcs_solve.h" diff --git a/src/equil/vcs_elem.cpp b/src/equil/vcs_elem.cpp index 73e660f8b..53d8d2f55 100644 --- a/src/equil/vcs_elem.cpp +++ b/src/equil/vcs_elem.cpp @@ -4,12 +4,9 @@ * element abundances constraints and the algorithm for fixing violations * of the element abundances constraints. */ -#include "cantera/base/ct_defs.h" #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/base/ctexceptions.h" #include "cantera/numerics/ctlapack.h" -#include "math.h" using namespace Cantera; diff --git a/src/equil/vcs_elem_rearrange.cpp b/src/equil/vcs_elem_rearrange.cpp index f78716d81..1802b5bda 100644 --- a/src/equil/vcs_elem_rearrange.cpp +++ b/src/equil/vcs_elem_rearrange.cpp @@ -10,9 +10,9 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_VolPhase.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/ctexceptions.h" using namespace Cantera; diff --git a/src/equil/vcs_equilibrate.cpp b/src/equil/vcs_equilibrate.cpp index 60243a886..fd2ef6782 100644 --- a/src/equil/vcs_equilibrate.cpp +++ b/src/equil/vcs_equilibrate.cpp @@ -8,20 +8,9 @@ * U.S. Government retains certain rights in this software. */ #include "cantera/equil/vcs_MultiPhaseEquil.h" -#include "cantera/equil/vcs_prob.h" -#include "cantera/equil/vcs_internal.h" -#include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_species_thermo.h" -#include "cantera/equil/vcs_SpeciesProperties.h" -#include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_solve.h" #include "cantera/equil/equil.h" #include "cantera/base/stringUtils.h" -#include "cantera/thermo/mix_defs.h" -#include "cantera/thermo/speciesThermoTypes.h" -#include "cantera/thermo/IdealSolidSolnPhase.h" -#include "cantera/thermo/IdealMolalSoln.h" #include "cantera/equil/ChemEquil.h" using namespace std; diff --git a/src/equil/vcs_inest.cpp b/src/equil/vcs_inest.cpp index 3fdf3302f..dab5715dd 100644 --- a/src/equil/vcs_inest.cpp +++ b/src/equil/vcs_inest.cpp @@ -9,7 +9,6 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_VolPhase.h" #include "cantera/base/clockWC.h" diff --git a/src/equil/vcs_nondim.cpp b/src/equil/vcs_nondim.cpp index ac8100e87..aab94a033 100644 --- a/src/equil/vcs_nondim.cpp +++ b/src/equil/vcs_nondim.cpp @@ -9,7 +9,6 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_VolPhase.h" #include "cantera/base/stringUtils.h" #include "cantera/base/ctexceptions.h" diff --git a/src/equil/vcs_phaseStability.cpp b/src/equil/vcs_phaseStability.cpp index 38e79fc88..88f858879 100644 --- a/src/equil/vcs_phaseStability.cpp +++ b/src/equil/vcs_phaseStability.cpp @@ -4,13 +4,9 @@ * (see Class \link VCSnonideal::VCS_SOLVE VCS_SOLVE\endlink and \ref equilfunctions ). */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" -#include "cantera/equil/vcs_species_thermo.h" #include "cantera/equil/vcs_VolPhase.h" #include "cantera/base/stringUtils.h" - -#include -#include +#include "cantera/base/ctexceptions.h" using namespace std; using namespace Cantera; diff --git a/src/equil/vcs_prep.cpp b/src/equil/vcs_prep.cpp index 9e2f1fd25..fd49854fd 100644 --- a/src/equil/vcs_prep.cpp +++ b/src/equil/vcs_prep.cpp @@ -10,10 +10,8 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_prob.h" #include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_SpeciesProperties.h" namespace VCSnonideal { diff --git a/src/equil/vcs_prob.cpp b/src/equil/vcs_prob.cpp index 05601e9de..0680ff6cd 100644 --- a/src/equil/vcs_prob.cpp +++ b/src/equil/vcs_prob.cpp @@ -13,10 +13,8 @@ #include "cantera/equil/vcs_VolPhase.h" #include "cantera/equil/vcs_species_thermo.h" #include "cantera/equil/vcs_internal.h" - -#include "cantera/thermo/ThermoPhase.h" +#include "cantera/equil/vcs_defs.h" #include "cantera/thermo/MolalityVPSSTP.h" -#include "cantera/base/global.h" #include diff --git a/src/equil/vcs_rank.cpp b/src/equil/vcs_rank.cpp index cfc2cc88f..87b8be28a 100644 --- a/src/equil/vcs_rank.cpp +++ b/src/equil/vcs_rank.cpp @@ -10,14 +10,6 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" -#include "cantera/equil/vcs_prob.h" - -#include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_SpeciesProperties.h" -#include "cantera/equil/vcs_species_thermo.h" - -#include "cantera/base/clockWC.h" #include "cantera/base/ctexceptions.h" #include diff --git a/src/equil/vcs_rearrange.cpp b/src/equil/vcs_rearrange.cpp index beeeb7080..4d8d8bbf7 100644 --- a/src/equil/vcs_rearrange.cpp +++ b/src/equil/vcs_rearrange.cpp @@ -9,7 +9,6 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" namespace VCSnonideal { diff --git a/src/equil/vcs_report.cpp b/src/equil/vcs_report.cpp index a665a86b9..19aa04a4f 100644 --- a/src/equil/vcs_report.cpp +++ b/src/equil/vcs_report.cpp @@ -6,9 +6,8 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_VolPhase.h" -#include "cantera/base/global.h" +#include "cantera/base/ctexceptions.h" using namespace Cantera; diff --git a/src/equil/vcs_root1d.cpp b/src/equil/vcs_root1d.cpp index 4caeb098a..5890174ce 100644 --- a/src/equil/vcs_root1d.cpp +++ b/src/equil/vcs_root1d.cpp @@ -9,6 +9,7 @@ */ #include "cantera/equil/vcs_internal.h" +#include "cantera/equil/vcs_defs.h" #include "cantera/numerics/ctlapack.h" #include diff --git a/src/equil/vcs_rxnadj.cpp b/src/equil/vcs_rxnadj.cpp index f91c65931..ac1444963 100644 --- a/src/equil/vcs_rxnadj.cpp +++ b/src/equil/vcs_rxnadj.cpp @@ -9,9 +9,8 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_VolPhase.h" -#include "cantera/base/global.h" +#include "cantera/base/ctexceptions.h" #include diff --git a/src/equil/vcs_setMolesLinProg.cpp b/src/equil/vcs_setMolesLinProg.cpp index 79050e348..ed0e29905 100644 --- a/src/equil/vcs_setMolesLinProg.cpp +++ b/src/equil/vcs_setMolesLinProg.cpp @@ -7,9 +7,6 @@ * U.S. Government retains certain rights in this software. */ -#include "cantera/equil/vcs_internal.h" -#include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_species_thermo.h" #include "cantera/equil/vcs_solve.h" using namespace std; diff --git a/src/equil/vcs_solve.cpp b/src/equil/vcs_solve.cpp index 1b5e42794..3fcc2bba2 100644 --- a/src/equil/vcs_solve.cpp +++ b/src/equil/vcs_solve.cpp @@ -11,11 +11,9 @@ #include "cantera/equil/vcs_solve.h" #include "cantera/base/ctexceptions.h" #include "cantera/base/stringUtils.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_prob.h" #include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_SpeciesProperties.h" #include "cantera/equil/vcs_species_thermo.h" #include "cantera/base/clockWC.h" diff --git a/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp index 2b70a379d..4d3548afe 100644 --- a/src/equil/vcs_solve_TP.cpp +++ b/src/equil/vcs_solve_TP.cpp @@ -9,9 +9,7 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_species_thermo.h" #include "cantera/base/ctexceptions.h" #include "cantera/base/clockWC.h" diff --git a/src/equil/vcs_solve_phaseStability.cpp b/src/equil/vcs_solve_phaseStability.cpp index 68f943c0d..135469b53 100644 --- a/src/equil/vcs_solve_phaseStability.cpp +++ b/src/equil/vcs_solve_phaseStability.cpp @@ -7,13 +7,8 @@ */ #include "cantera/equil/vcs_solve.h" -#include "cantera/equil/vcs_internal.h" -#include "cantera/equil/vcs_VolPhase.h" -#include "cantera/equil/vcs_species_thermo.h" #include "cantera/equil/vcs_prob.h" -#include "cantera/base/clockWC.h" - using namespace std; namespace VCSnonideal diff --git a/src/equil/vcs_species_thermo.cpp b/src/equil/vcs_species_thermo.cpp index 67d61b657..737e69f3d 100644 --- a/src/equil/vcs_species_thermo.cpp +++ b/src/equil/vcs_species_thermo.cpp @@ -8,7 +8,6 @@ * U.S. Government retains certain rights in this software. */ -#include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_species_thermo.h" #include "cantera/equil/vcs_defs.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_util.cpp b/src/equil/vcs_util.cpp index 707262292..c1a0f6ba4 100644 --- a/src/equil/vcs_util.cpp +++ b/src/equil/vcs_util.cpp @@ -9,9 +9,11 @@ */ #include "cantera/equil/vcs_internal.h" +#include "cantera/equil/vcs_defs.h" #include "cantera/base/stringUtils.h" #include "cantera/base/ctexceptions.h" #include +#include using namespace std; using namespace Cantera; diff --git a/src/fortran/fct.cpp b/src/fortran/fct.cpp index d0672ace2..d152961d4 100644 --- a/src/fortran/fct.cpp +++ b/src/fortran/fct.cpp @@ -15,7 +15,6 @@ #include "cantera/kinetics/importKinetics.h" #include "clib/Cabinet.h" #include "cantera/kinetics/InterfaceKinetics.h" -#include "cantera/thermo/PureFluidPhase.h" #include "clib/clib_defs.h" diff --git a/src/kinetics/AqueousKinetics.cpp b/src/kinetics/AqueousKinetics.cpp index 144f34ac7..e22acbe43 100644 --- a/src/kinetics/AqueousKinetics.cpp +++ b/src/kinetics/AqueousKinetics.cpp @@ -12,9 +12,7 @@ */ #include "cantera/kinetics/AqueousKinetics.h" -#include "cantera/kinetics/ReactionData.h" -#include "cantera/kinetics/RateCoeffMgr.h" -#include "cantera/base/stringUtils.h" +#include "cantera/base/vec_functions.h" using namespace std; diff --git a/src/kinetics/ElectrodeKinetics.cpp b/src/kinetics/ElectrodeKinetics.cpp index 2a7161118..9a80439f0 100644 --- a/src/kinetics/ElectrodeKinetics.cpp +++ b/src/kinetics/ElectrodeKinetics.cpp @@ -4,6 +4,7 @@ #include "cantera/kinetics/ElectrodeKinetics.h" #include "cantera/thermo/SurfPhase.h" +#include "cantera/base/utilities.h" using namespace std; diff --git a/src/kinetics/FalloffFactory.cpp b/src/kinetics/FalloffFactory.cpp index 227131cd4..1397a9ce0 100644 --- a/src/kinetics/FalloffFactory.cpp +++ b/src/kinetics/FalloffFactory.cpp @@ -6,7 +6,7 @@ #include "cantera/kinetics/FalloffFactory.h" #include "cantera/base/ctexceptions.h" #include "cantera/base/stringUtils.h" -#include "cantera/base/global.h" +#include "cantera/kinetics/reaction_defs.h" namespace Cantera { diff --git a/src/kinetics/GasKinetics.cpp b/src/kinetics/GasKinetics.cpp index 0950f98b8..71438156b 100644 --- a/src/kinetics/GasKinetics.cpp +++ b/src/kinetics/GasKinetics.cpp @@ -8,11 +8,6 @@ #include "cantera/kinetics/GasKinetics.h" -#include "cantera/kinetics/ReactionData.h" -#include "cantera/kinetics/Enhanced3BConc.h" -#include "cantera/kinetics/ThirdBodyMgr.h" -#include "cantera/kinetics/RateCoeffMgr.h" - using namespace std; namespace Cantera diff --git a/src/kinetics/Group.cpp b/src/kinetics/Group.cpp index 61c171724..5e081aadb 100644 --- a/src/kinetics/Group.cpp +++ b/src/kinetics/Group.cpp @@ -9,6 +9,7 @@ // reaction path analysis support #include "cantera/kinetics/Group.h" +#include namespace Cantera { diff --git a/src/kinetics/ImplicitSurfChem.cpp b/src/kinetics/ImplicitSurfChem.cpp index 97b332518..ad2ecc27a 100644 --- a/src/kinetics/ImplicitSurfChem.cpp +++ b/src/kinetics/ImplicitSurfChem.cpp @@ -7,8 +7,8 @@ // Copyright 2001 California Institute of Technology #include "cantera/kinetics/ImplicitSurfChem.h" -#include "cantera/numerics/Integrator.h" #include "cantera/kinetics/solveSP.h" +#include "cantera/thermo/SurfPhase.h" using namespace std; diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index e763e689f..2de81d73a 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -6,10 +6,9 @@ #include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/kinetics/EdgeKinetics.h" -#include "cantera/kinetics/ReactionData.h" -#include "cantera/kinetics/RateCoeffMgr.h" #include "cantera/kinetics/ImplicitSurfChem.h" #include "cantera/thermo/SurfPhase.h" +#include "cantera/base/vec_functions.h" #include diff --git a/src/kinetics/Kinetics.cpp b/src/kinetics/Kinetics.cpp index e70b3fbfb..7d6b6e556 100644 --- a/src/kinetics/Kinetics.cpp +++ b/src/kinetics/Kinetics.cpp @@ -8,15 +8,10 @@ // Copyright 2001-2004 California Institute of Technology #include "cantera/kinetics/Kinetics.h" -#include "cantera/thermo/SurfPhase.h" -#include "cantera/kinetics/StoichManager.h" -#include "cantera/kinetics/RateCoeffMgr.h" - -#include "cantera/kinetics/ImplicitSurfChem.h" +#include "cantera/base/stringUtils.h" using namespace std; - namespace Cantera { Kinetics::Kinetics() : diff --git a/src/kinetics/KineticsFactory.cpp b/src/kinetics/KineticsFactory.cpp index 9686edbf9..44130c1b9 100644 --- a/src/kinetics/KineticsFactory.cpp +++ b/src/kinetics/KineticsFactory.cpp @@ -10,6 +10,7 @@ #include "cantera/kinetics/EdgeKinetics.h" #include "cantera/kinetics/importKinetics.h" #include "cantera/kinetics/AqueousKinetics.h" +#include "cantera/base/xml.h" using namespace std; diff --git a/src/kinetics/ReactionPath.cpp b/src/kinetics/ReactionPath.cpp index 98461a2db..b232d63d2 100644 --- a/src/kinetics/ReactionPath.cpp +++ b/src/kinetics/ReactionPath.cpp @@ -5,9 +5,7 @@ // Copyright 2001 California Institute of Technology #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 695e147b9..32b0b8bb5 100644 --- a/src/kinetics/ReactionStoichMgr.cpp +++ b/src/kinetics/ReactionStoichMgr.cpp @@ -7,7 +7,6 @@ #include "cantera/kinetics/ReactionStoichMgr.h" -#include "cantera/kinetics/StoichManager.h" #include "cantera/base/ctexceptions.h" #include "cantera/kinetics/ReactionData.h" diff --git a/src/kinetics/importKinetics.cpp b/src/kinetics/importKinetics.cpp index 6c91119c4..b1267ec5d 100644 --- a/src/kinetics/importKinetics.cpp +++ b/src/kinetics/importKinetics.cpp @@ -12,25 +12,13 @@ // Copyright 2002 California Institute of Technology #include "cantera/kinetics/importKinetics.h" -#include "cantera/thermo/mix_defs.h" - -// Cantera includes -#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 "cantera/kinetics/ReactionData.h" -#include "cantera/kinetics/importKinetics.h" -#include "cantera/base/global.h" #include "cantera/base/stringUtils.h" - -#include "cantera/base/xml.h" #include "cantera/base/ctml.h" +#include + using namespace ctml; using namespace std; diff --git a/src/kinetics/solveSP.cpp b/src/kinetics/solveSP.cpp index fb828ed97..1e912ccb0 100644 --- a/src/kinetics/solveSP.cpp +++ b/src/kinetics/solveSP.cpp @@ -9,7 +9,8 @@ */ #include "cantera/kinetics/solveSP.h" -#include "cantera/base/clockWC.h" +#include "cantera/thermo/SurfPhase.h" +#include "cantera/kinetics/ImplicitSurfChem.h" #include diff --git a/src/numerics/BEulerInt.cpp b/src/numerics/BEulerInt.cpp index 6108be3d4..c5b56cd84 100644 --- a/src/numerics/BEulerInt.cpp +++ b/src/numerics/BEulerInt.cpp @@ -10,6 +10,7 @@ */ #include "cantera/numerics/BEulerInt.h" +#include "cantera/numerics/SquareMatrix.h" using namespace std; diff --git a/src/numerics/BandMatrix.cpp b/src/numerics/BandMatrix.cpp index 95c2a7d49..a09428d70 100644 --- a/src/numerics/BandMatrix.cpp +++ b/src/numerics/BandMatrix.cpp @@ -9,9 +9,7 @@ #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 #include diff --git a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp index 39338740c..74ff7fc54 100644 --- a/src/numerics/CVodesIntegrator.cpp +++ b/src/numerics/CVodesIntegrator.cpp @@ -3,8 +3,6 @@ */ // Copyright 2001 California Institute of Technology -#include "cantera/base/config.h" - #include "cantera/numerics/CVodesIntegrator.h" #include "cantera/base/stringUtils.h" @@ -30,7 +28,6 @@ using namespace std; #define CV_SV 2 #include -#include namespace Cantera { diff --git a/src/numerics/DenseMatrix.cpp b/src/numerics/DenseMatrix.cpp index 7f5e93d81..21eabffcf 100644 --- a/src/numerics/DenseMatrix.cpp +++ b/src/numerics/DenseMatrix.cpp @@ -4,12 +4,9 @@ // Copyright 2001 California Institute of Technology -#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 73fbe1554..3eacacab3 100644 --- a/src/numerics/Func1.cpp +++ b/src/numerics/Func1.cpp @@ -1,7 +1,6 @@ //! @file Func1.cpp #include "cantera/numerics/Func1.h" #include "cantera/base/stringUtils.h" -#include "cantera/base/global.h" using namespace std; diff --git a/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp index 86f338891..027106dcb 100644 --- a/src/numerics/NonlinearSolver.cpp +++ b/src/numerics/NonlinearSolver.cpp @@ -9,16 +9,11 @@ * See file License.txt for licensing information. */ - -#include "cantera/numerics/SquareMatrix.h" -#include "cantera/numerics/GeneralMatrix.h" #include "cantera/numerics/NonlinearSolver.h" #include "cantera/numerics/ctlapack.h" #include "cantera/base/clockWC.h" -#include "cantera/base/vec_functions.h" #include "cantera/base/stringUtils.h" -#include "cantera/base/global.h" #include diff --git a/src/numerics/RootFind.cpp b/src/numerics/RootFind.cpp index f7dc32d64..4fc279d15 100644 --- a/src/numerics/RootFind.cpp +++ b/src/numerics/RootFind.cpp @@ -18,7 +18,6 @@ #define DEBUG_MODE_ENABLED 1 #endif -#include "cantera/base/global.h" #include "cantera/base/utilities.h" #include "cantera/base/stringUtils.h" diff --git a/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp index d030e4164..67875870a 100644 --- a/src/numerics/SquareMatrix.cpp +++ b/src/numerics/SquareMatrix.cpp @@ -12,7 +12,6 @@ #include "cantera/base/stringUtils.h" #include "cantera/numerics/ctlapack.h" #include "cantera/numerics/SquareMatrix.h" -#include "cantera/base/global.h" using namespace std; diff --git a/src/numerics/funcs.cpp b/src/numerics/funcs.cpp index 357eac7be..34b76efc0 100644 --- a/src/numerics/funcs.cpp +++ b/src/numerics/funcs.cpp @@ -10,9 +10,6 @@ #include "cantera/numerics/funcs.h" #include "cantera/base/ctexceptions.h" #include "cantera/base/stringUtils.h" -#include "cantera/numerics/polyfit.h" - -#include using namespace std; diff --git a/src/oneD/Domain1D.cpp b/src/oneD/Domain1D.cpp index 219d9c76f..95cfb1082 100644 --- a/src/oneD/Domain1D.cpp +++ b/src/oneD/Domain1D.cpp @@ -3,7 +3,6 @@ */ #include "cantera/oneD/Domain1D.h" -#include "cantera/oneD/OneDim.h" #include "cantera/oneD/MultiJac.h" #include "cantera/base/ctml.h" diff --git a/src/oneD/MultiJac.cpp b/src/oneD/MultiJac.cpp index 20cf58403..3df607160 100644 --- a/src/oneD/MultiJac.cpp +++ b/src/oneD/MultiJac.cpp @@ -7,6 +7,8 @@ */ #include "cantera/oneD/MultiJac.h" +#include + using namespace std; namespace Cantera diff --git a/src/oneD/MultiNewton.cpp b/src/oneD/MultiNewton.cpp index 0cd943a09..2da87d4fd 100644 --- a/src/oneD/MultiNewton.cpp +++ b/src/oneD/MultiNewton.cpp @@ -7,12 +7,10 @@ */ #include "cantera/oneD/MultiNewton.h" - -#include "cantera/base/ctexceptions.h" #include "cantera/base/vec_functions.h" -#include "cantera/base/stringUtils.h" #include +#include using namespace std; diff --git a/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp index 5043850d1..92e5ea284 100644 --- a/src/oneD/OneDim.cpp +++ b/src/oneD/OneDim.cpp @@ -1,5 +1,4 @@ //! @file OneDim.cpp -#include "cantera/oneD/MultiJac.h" #include "cantera/oneD/MultiNewton.h" #include "cantera/oneD/OneDim.h" @@ -7,6 +6,7 @@ #include "cantera/base/ctml.h" #include +#include using namespace ctml; using namespace std; diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp index 16ee7f1a4..ef52112a0 100644 --- a/src/oneD/Sim1D.cpp +++ b/src/oneD/Sim1D.cpp @@ -5,6 +5,9 @@ #include "cantera/oneD/Sim1D.h" #include "cantera/oneD/MultiJac.h" #include "cantera/oneD/StFlow.h" +#include "cantera/numerics/funcs.h" +#include "cantera/base/xml.h" + #include using namespace std; diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp index eea955e9d..41d975f6a 100644 --- a/src/oneD/StFlow.cpp +++ b/src/oneD/StFlow.cpp @@ -3,12 +3,10 @@ */ // Copyright 2002 California Institute of Technology -#include -#include - #include "cantera/oneD/StFlow.h" #include "cantera/base/ctml.h" -#include "cantera/oneD/MultiJac.h" +#include "cantera/transport/TransportBase.h" +#include "cantera/numerics/funcs.h" #include diff --git a/src/oneD/boundaries1D.cpp b/src/oneD/boundaries1D.cpp index deda101df..c65558138 100644 --- a/src/oneD/boundaries1D.cpp +++ b/src/oneD/boundaries1D.cpp @@ -4,6 +4,8 @@ // Copyright 2002-3 California Institute of Technology #include "cantera/oneD/Inlet1D.h" +#include "cantera/oneD/OneDim.h" +#include "cantera/base/ctml.h" using namespace std; diff --git a/src/oneD/refine.cpp b/src/oneD/refine.cpp index fccd4984e..311788e56 100644 --- a/src/oneD/refine.cpp +++ b/src/oneD/refine.cpp @@ -1,11 +1,7 @@ //! @file refine.cpp #include "cantera/oneD/refine.h" -#include "cantera/oneD/Domain1D.h" #include "cantera/oneD/StFlow.h" -#include -#include - using namespace std; namespace Cantera diff --git a/src/thermo/ConstDensityThermo.cpp b/src/thermo/ConstDensityThermo.cpp index 247ca7949..19a387fcc 100644 --- a/src/thermo/ConstDensityThermo.cpp +++ b/src/thermo/ConstDensityThermo.cpp @@ -6,10 +6,9 @@ */ // Copyright 2002 California Institute of Technology -#include "cantera/base/ct_defs.h" #include "cantera/thermo/mix_defs.h" #include "cantera/thermo/ConstDensityThermo.h" -#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/base/ctml.h" using namespace ctml; diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp index 7bbe3f682..20f10c54c 100644 --- a/src/thermo/DebyeHuckel.cpp +++ b/src/thermo/DebyeHuckel.cpp @@ -15,10 +15,10 @@ #include "cantera/thermo/DebyeHuckel.h" #include "cantera/thermo/ThermoFactory.h" -#include "cantera/thermo/WaterProps.h" #include "cantera/thermo/PDSS_Water.h" - +#include "cantera/thermo/electrolytes.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/ctml.h" #include diff --git a/src/thermo/Elements.cpp b/src/thermo/Elements.cpp index f925e7bc5..6a4d157ca 100644 --- a/src/thermo/Elements.cpp +++ b/src/thermo/Elements.cpp @@ -6,9 +6,7 @@ // Copyright 2003 California Institute of Technology #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; diff --git a/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp index 3fc4505f1..0f1e961f5 100644 --- a/src/thermo/FixedChemPotSSTP.cpp +++ b/src/thermo/FixedChemPotSSTP.cpp @@ -11,12 +11,12 @@ * U.S. Government retains certain rights in this software. */ -#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 "cantera/thermo/SimpleThermo.h" +#include "cantera/base/ctml.h" + namespace Cantera { /* diff --git a/src/thermo/GeneralSpeciesThermo.cpp b/src/thermo/GeneralSpeciesThermo.cpp index 11a4e5202..e0d9d975d 100644 --- a/src/thermo/GeneralSpeciesThermo.cpp +++ b/src/thermo/GeneralSpeciesThermo.cpp @@ -14,6 +14,7 @@ #include "cantera/thermo/Mu0Poly.h" #include "cantera/thermo/AdsorbateThermo.h" #include "cantera/thermo/SpeciesThermoFactory.h" +#include "cantera/thermo/StatMech.h" #include using namespace std; diff --git a/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp index 045f8a118..b3ffc89ca 100644 --- a/src/thermo/GibbsExcessVPSSTP.cpp +++ b/src/thermo/GibbsExcessVPSSTP.cpp @@ -18,8 +18,6 @@ #include "cantera/thermo/GibbsExcessVPSSTP.h" #include "cantera/base/stringUtils.h" -#include - using namespace std; namespace Cantera diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index 1db86e514..c0ea299ed 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -20,8 +20,8 @@ #include "cantera/thermo/HMWSoln.h" #include "cantera/thermo/ThermoFactory.h" -#include "cantera/thermo/WaterProps.h" #include "cantera/thermo/PDSS_Water.h" +#include "cantera/thermo/electrolytes.h" #include "cantera/base/stringUtils.h" #include diff --git a/src/thermo/HMWSoln_input.cpp b/src/thermo/HMWSoln_input.cpp index 3633ffecf..e1312b922 100644 --- a/src/thermo/HMWSoln_input.cpp +++ b/src/thermo/HMWSoln_input.cpp @@ -14,9 +14,10 @@ */ #include "cantera/thermo/HMWSoln.h" #include "cantera/thermo/ThermoFactory.h" -#include "cantera/thermo/WaterProps.h" #include "cantera/thermo/PDSS_Water.h" +#include "cantera/thermo/electrolytes.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/ctml.h" #include diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index b849f9627..77959b96b 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -5,10 +5,8 @@ * and class \link Cantera::IdealGasPhase IdealGasPhase\endlink). */ -#include "cantera/base/ct_defs.h" -#include "cantera/thermo/mix_defs.h" #include "cantera/thermo/IdealGasPhase.h" -#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/base/vec_functions.h" using namespace std; diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp index 986a84629..0d932b9ee 100644 --- a/src/thermo/IdealMolalSoln.cpp +++ b/src/thermo/IdealMolalSoln.cpp @@ -19,6 +19,8 @@ */ #include "cantera/thermo/IdealMolalSoln.h" #include "cantera/thermo/ThermoFactory.h" +#include "cantera/base/ctml.h" +#include using namespace ctml; diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp index ef01e85fd..d86200e6e 100644 --- a/src/thermo/IdealSolidSolnPhase.cpp +++ b/src/thermo/IdealSolidSolnPhase.cpp @@ -11,7 +11,10 @@ */ #include "cantera/thermo/IdealSolidSolnPhase.h" +#include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/ctml.h" +#include "cantera/base/vec_functions.h" using namespace std; diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index 769031772..52fa50ca7 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -13,11 +13,10 @@ */ #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" #include "cantera/base/stringUtils.h" +#include "cantera/base/vec_functions.h" using namespace std; diff --git a/src/thermo/LatticePhase.cpp b/src/thermo/LatticePhase.cpp index 981b3707a..c92ad0781 100644 --- a/src/thermo/LatticePhase.cpp +++ b/src/thermo/LatticePhase.cpp @@ -7,13 +7,11 @@ * (see \ref thermoprops and class \link Cantera::LatticePhase LatticePhase\endlink). * */ -#include "cantera/base/config.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 "cantera/base/stringUtils.h" +#include "cantera/base/ctml.h" +#include "cantera/base/vec_functions.h" namespace Cantera { diff --git a/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp index 02da763ff..742fc9fc8 100644 --- a/src/thermo/LatticeSolidPhase.cpp +++ b/src/thermo/LatticeSolidPhase.cpp @@ -6,14 +6,12 @@ * (see \ref thermoprops and class \link Cantera::LatticeSolidPhase LatticeSolidPhase\endlink). */ -#include "cantera/base/ct_defs.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 "cantera/base/ctml.h" +#include "cantera/base/utilities.h" using namespace std; diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index 755815f92..8ca8b4323 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -13,9 +13,7 @@ #include "cantera/thermo/MargulesVPSSTP.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" - -#include -#include +#include "cantera/base/ctml.h" using namespace std; diff --git a/src/thermo/MaskellSolidSolnPhase.cpp b/src/thermo/MaskellSolidSolnPhase.cpp index 44e5a3617..b8ad2574d 100644 --- a/src/thermo/MaskellSolidSolnPhase.cpp +++ b/src/thermo/MaskellSolidSolnPhase.cpp @@ -11,11 +11,10 @@ */ #include "cantera/thermo/MaskellSolidSolnPhase.h" - #include "cantera/base/stringUtils.h" +#include "cantera/base/xml.h" #include -#include namespace Cantera { diff --git a/src/thermo/MetalSHEelectrons.cpp b/src/thermo/MetalSHEelectrons.cpp index cdb93e06a..864440ba1 100644 --- a/src/thermo/MetalSHEelectrons.cpp +++ b/src/thermo/MetalSHEelectrons.cpp @@ -12,10 +12,9 @@ * U.S. Government retains certain rights in this software. * */ -#include "cantera/base/ct_defs.h" - +#include "cantera/thermo/mix_defs.h" +#include "cantera/base/ctml.h" #include "cantera/thermo/MetalSHEelectrons.h" -#include "cantera/thermo/SingleSpeciesTP.h" #include "cantera/thermo/ThermoFactory.h" namespace Cantera diff --git a/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp index ea9a4af86..bc7575994 100644 --- a/src/thermo/MineralEQ3.cpp +++ b/src/thermo/MineralEQ3.cpp @@ -12,13 +12,10 @@ * * Copyright 2001 California Institute of Technology */ -#include "cantera/base/ct_defs.h" +#include "cantera/base/ctml.h" #include "cantera/thermo/mix_defs.h" #include "cantera/thermo/MineralEQ3.h" -#include "cantera/thermo/SpeciesThermo.h" - #include "cantera/thermo/ThermoFactory.h" -#include "cantera/thermo/MineralEQ3.h" using namespace std; diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp index 5020b1481..1f95109c4 100644 --- a/src/thermo/MixedSolventElectrolyte.cpp +++ b/src/thermo/MixedSolventElectrolyte.cpp @@ -14,9 +14,7 @@ #include "cantera/thermo/MixedSolventElectrolyte.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" - -#include -#include +#include "cantera/base/ctml.h" using namespace std; diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index 1171056f2..a7e0dcc0b 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -11,10 +11,9 @@ */ #include "cantera/thermo/MixtureFugacityTP.h" -#include "cantera/thermo/VPSSMgr.h" -#include "cantera/thermo/PDSS.h" #include "cantera/base/stringUtils.h" -#include "cantera/base/xml.h" +#include "cantera/base/ctml.h" +#include "cantera/base/vec_functions.h" using namespace std; diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index c7fca1384..c76299649 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -18,9 +18,8 @@ */ #include "cantera/thermo/MolalityVPSSTP.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/ctml.h" -#include -#include #include using namespace std; diff --git a/src/thermo/Mu0Poly.cpp b/src/thermo/Mu0Poly.cpp index cf0ce48bd..b741fda74 100644 --- a/src/thermo/Mu0Poly.cpp +++ b/src/thermo/Mu0Poly.cpp @@ -6,10 +6,7 @@ * (see \ref spthermo and class \link Cantera::Mu0Poly Mu0Poly\endlink). */ #include "cantera/thermo/Mu0Poly.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" #include "cantera/base/stringUtils.h" diff --git a/src/thermo/Nasa9PolyMultiTempRegion.cpp b/src/thermo/Nasa9PolyMultiTempRegion.cpp index 797741d58..19bef3cd8 100644 --- a/src/thermo/Nasa9PolyMultiTempRegion.cpp +++ b/src/thermo/Nasa9PolyMultiTempRegion.cpp @@ -12,7 +12,6 @@ */ // Copyright 2007 Sandia National Laboratories -#include "cantera/base/global.h" #include "cantera/base/ctexceptions.h" #include "Nasa9PolyMultiTempRegion.h" diff --git a/src/thermo/Nasa9PolyMultiTempRegion.h b/src/thermo/Nasa9PolyMultiTempRegion.h index f423a71f5..ee5cda1d6 100644 --- a/src/thermo/Nasa9PolyMultiTempRegion.h +++ b/src/thermo/Nasa9PolyMultiTempRegion.h @@ -14,7 +14,6 @@ #define CT_NASA9POLYMULTITEMPREGION_H // Copyright 2007 Sandia National Laboratories -#include "cantera/base/global.h" #include "cantera/thermo/Nasa9Poly1.h" namespace Cantera diff --git a/src/thermo/NasaThermo.cpp b/src/thermo/NasaThermo.cpp index 1a789bd98..75bfe1492 100644 --- a/src/thermo/NasaThermo.cpp +++ b/src/thermo/NasaThermo.cpp @@ -3,7 +3,6 @@ */ #include "NasaThermo.h" -#include "cantera/base/utilities.h" #include "cantera/numerics/DenseMatrix.h" #include "cantera/numerics/ctlapack.h" diff --git a/src/thermo/NasaThermo.h b/src/thermo/NasaThermo.h index 794703adc..58094ec50 100644 --- a/src/thermo/NasaThermo.h +++ b/src/thermo/NasaThermo.h @@ -12,8 +12,6 @@ #include "cantera/thermo/SpeciesThermoMgr.h" #include "cantera/thermo/NasaPoly1.h" -#include "cantera/thermo/speciesThermoTypes.h" -#include "cantera/base/global.h" namespace Cantera { diff --git a/src/thermo/PDSS.cpp b/src/thermo/PDSS.cpp index cac931976..96c72e4c5 100644 --- a/src/thermo/PDSS.cpp +++ b/src/thermo/PDSS.cpp @@ -9,14 +9,8 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "cantera/base/ct_defs.h" -#include "cantera/base/xml.h" #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS.h" - -#include "cantera/thermo/ThermoFactory.h" -#include "cantera/thermo/SpeciesThermo.h" - #include "cantera/thermo/VPStandardStateTP.h" namespace Cantera diff --git a/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp index a94c5b35d..27f4f8b9f 100644 --- a/src/thermo/PDSS_ConstVol.cpp +++ b/src/thermo/PDSS_ConstVol.cpp @@ -8,12 +8,8 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#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 "cantera/thermo/VPStandardStateTP.h" #include diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp index e652fbd54..a53bbe78e 100644 --- a/src/thermo/PDSS_HKFT.cpp +++ b/src/thermo/PDSS_HKFT.cpp @@ -13,8 +13,8 @@ #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS_HKFT.h" -#include "cantera/thermo/WaterProps.h" #include "cantera/thermo/PDSS_Water.h" +#include "cantera/thermo/VPStandardStateTP.h" #include "cantera/base/stringUtils.h" #include diff --git a/src/thermo/PDSS_IdealGas.cpp b/src/thermo/PDSS_IdealGas.cpp index f602aba4b..a6dec6153 100644 --- a/src/thermo/PDSS_IdealGas.cpp +++ b/src/thermo/PDSS_IdealGas.cpp @@ -8,11 +8,8 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#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 "cantera/thermo/VPStandardStateTP.h" #include diff --git a/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp index 36861f00b..b4a5244cf 100644 --- a/src/thermo/PDSS_IonsFromNeutral.cpp +++ b/src/thermo/PDSS_IonsFromNeutral.cpp @@ -10,12 +10,8 @@ */ #include "cantera/thermo/PDSS_IonsFromNeutral.h" -#include "cantera/thermo/ThermoFactory.h" #include "cantera/thermo/IonsFromNeutralVPSSTP.h" -#include "cantera/thermo/VPStandardStateTP.h" #include "cantera/base/stringUtils.h" -#include "cantera/base/ct_defs.h" -#include "cantera/base/xml.h" #include "cantera/base/ctml.h" #include diff --git a/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp index bae696705..cb77d20b0 100644 --- a/src/thermo/PDSS_SSVol.cpp +++ b/src/thermo/PDSS_SSVol.cpp @@ -8,12 +8,8 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#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 "cantera/thermo/VPStandardStateTP.h" #include diff --git a/src/thermo/PDSS_Water.cpp b/src/thermo/PDSS_Water.cpp index 1e68fec23..6eeff2a8d 100644 --- a/src/thermo/PDSS_Water.cpp +++ b/src/thermo/PDSS_Water.cpp @@ -7,16 +7,9 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#include "cantera/base/ct_defs.h" - -#include "cantera/base/xml.h" #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS_Water.h" - #include "cantera/thermo/WaterPropsIAPWS.h" -#include "cantera/thermo/ThermoFactory.h" -#include "cantera/thermo/WaterProps.h" -#include "cantera/thermo/VPStandardStateTP.h" #include "cantera/base/stringUtils.h" #include diff --git a/src/thermo/Phase.cpp b/src/thermo/Phase.cpp index d4d45c951..992f738d8 100644 --- a/src/thermo/Phase.cpp +++ b/src/thermo/Phase.cpp @@ -7,8 +7,8 @@ #include "cantera/thermo/Phase.h" #include "cantera/base/vec_functions.h" -#include "cantera/base/ctexceptions.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/ctml.h" using namespace std; diff --git a/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp index 6831897a2..69ce1789b 100644 --- a/src/thermo/PhaseCombo_Interaction.cpp +++ b/src/thermo/PhaseCombo_Interaction.cpp @@ -10,9 +10,7 @@ #include "cantera/thermo/PhaseCombo_Interaction.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" - -#include -#include +#include "cantera/base/ctml.h" using namespace std; diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp index e09090c1f..772dc4095 100644 --- a/src/thermo/PureFluidPhase.cpp +++ b/src/thermo/PureFluidPhase.cpp @@ -14,7 +14,6 @@ #include using std::string; -using std::endl; namespace Cantera { diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp index 2ccd22a03..e17e350e7 100644 --- a/src/thermo/RedlichKisterVPSSTP.cpp +++ b/src/thermo/RedlichKisterVPSSTP.cpp @@ -15,9 +15,7 @@ #include "cantera/thermo/RedlichKisterVPSSTP.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" - -#include -#include +#include "cantera/base/ctml.h" using namespace std; diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index 3e55d6024..72549ba7c 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -18,6 +18,7 @@ #include "cantera/thermo/ThermoFactory.h" #include "cantera/numerics/RootFind.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/ctml.h" using namespace std; diff --git a/src/thermo/ShomatePoly.h b/src/thermo/ShomatePoly.h index 37c66b670..ff1aeda37 100644 --- a/src/thermo/ShomatePoly.h +++ b/src/thermo/ShomatePoly.h @@ -13,7 +13,6 @@ #define CT_SHOMATEPOLY1_H #include "cantera/thermo/SpeciesThermoInterpType.h" -#include "cantera/base/global.h" #include "cantera/base/ctexceptions.h" namespace Cantera diff --git a/src/thermo/ShomateThermo.h b/src/thermo/ShomateThermo.h index f029dead2..f1bd317be 100644 --- a/src/thermo/ShomateThermo.h +++ b/src/thermo/ShomateThermo.h @@ -12,7 +12,7 @@ #include "cantera/thermo/SpeciesThermoMgr.h" #include "ShomatePoly.h" -#include "cantera/thermo/speciesThermoTypes.h" +#include "cantera/base/global.h" namespace Cantera { diff --git a/src/thermo/SingleSpeciesTP.cpp b/src/thermo/SingleSpeciesTP.cpp index cbdcef659..fc4aa669b 100644 --- a/src/thermo/SingleSpeciesTP.cpp +++ b/src/thermo/SingleSpeciesTP.cpp @@ -12,6 +12,7 @@ */ #include "cantera/thermo/SingleSpeciesTP.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/global.h" using namespace std; diff --git a/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp index e94c40e77..15a289eba 100644 --- a/src/thermo/SpeciesThermoFactory.cpp +++ b/src/thermo/SpeciesThermoFactory.cpp @@ -7,7 +7,6 @@ // Copyright 2001 California Institute of Technology #include "cantera/thermo/SpeciesThermoFactory.h" -using namespace std; #include "cantera/thermo/SpeciesThermo.h" #include "NasaThermo.h" @@ -25,9 +24,9 @@ using namespace std; #include "cantera/thermo/VPSSMgr.h" #include "cantera/thermo/VPStandardStateTP.h" -#include "cantera/base/xml.h" #include "cantera/base/ctml.h" +using namespace std; using namespace ctml; namespace Cantera diff --git a/src/thermo/SpeciesThermoInterpType.cpp b/src/thermo/SpeciesThermoInterpType.cpp index 193f81f45..ea1a877ba 100644 --- a/src/thermo/SpeciesThermoInterpType.cpp +++ b/src/thermo/SpeciesThermoInterpType.cpp @@ -8,7 +8,6 @@ #include "cantera/thermo/VPSSMgr.h" #include "cantera/thermo/PDSS.h" #include "cantera/base/ctexceptions.h" - #include "cantera/base/global.h" namespace Cantera { diff --git a/src/thermo/StoichSubstance.cpp b/src/thermo/StoichSubstance.cpp index 14e9d002f..aa31864ed 100644 --- a/src/thermo/StoichSubstance.cpp +++ b/src/thermo/StoichSubstance.cpp @@ -6,10 +6,8 @@ // Copyright 2001 California Institute of Technology -#include "cantera/base/ct_defs.h" -#include "cantera/thermo/mix_defs.h" #include "cantera/thermo/StoichSubstance.h" -#include "cantera/thermo/SpeciesThermo.h" +#include "cantera/base/ctml.h" namespace Cantera { diff --git a/src/thermo/StoichSubstanceSSTP.cpp b/src/thermo/StoichSubstanceSSTP.cpp index e30f32bdd..0556a8c43 100644 --- a/src/thermo/StoichSubstanceSSTP.cpp +++ b/src/thermo/StoichSubstanceSSTP.cpp @@ -12,11 +12,10 @@ * * Copyright 2001 California Institute of Technology */ -#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/mix_defs.h" #include "cantera/thermo/ThermoFactory.h" +#include "cantera/base/ctml.h" namespace Cantera { diff --git a/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp index 22763eb95..3fff37002 100644 --- a/src/thermo/SurfPhase.cpp +++ b/src/thermo/SurfPhase.cpp @@ -11,6 +11,8 @@ #include "cantera/thermo/EdgePhase.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/ctml.h" +#include "cantera/base/vec_functions.h" using namespace ctml; using namespace std; diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp index 88bbc97ce..41dbdc477 100644 --- a/src/thermo/ThermoPhase.cpp +++ b/src/thermo/ThermoPhase.cpp @@ -10,6 +10,8 @@ #include "cantera/thermo/ThermoPhase.h" #include "cantera/base/stringUtils.h" #include "cantera/thermo/ThermoFactory.h" +#include "cantera/base/ctml.h" +#include "cantera/base/vec_functions.h" #include #include diff --git a/src/thermo/VPSSMgr.cpp b/src/thermo/VPSSMgr.cpp index 2f0124890..c868253f8 100644 --- a/src/thermo/VPSSMgr.cpp +++ b/src/thermo/VPSSMgr.cpp @@ -17,6 +17,7 @@ #include "cantera/thermo/SpeciesThermoFactory.h" #include "cantera/thermo/PDSS.h" #include "cantera/thermo/GeneralSpeciesThermo.h" +#include "cantera/base/vec_functions.h" using namespace std; diff --git a/src/thermo/VPSSMgrFactory.cpp b/src/thermo/VPSSMgrFactory.cpp index 12b9d4c7f..c71703b8d 100644 --- a/src/thermo/VPSSMgrFactory.cpp +++ b/src/thermo/VPSSMgrFactory.cpp @@ -11,28 +11,16 @@ * U.S. Government retains certain rights in this software. */ -#include "cantera/thermo/SpeciesThermo.h" - -#include "cantera/thermo/VPSSMgr.h" #include "VPSSMgrFactory.h" - #include "cantera/thermo/VPStandardStateTP.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 "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 "cantera/thermo/mix_defs.h" - -#include "cantera/base/xml.h" +#include "cantera/base/stringUtils.h" #include "cantera/base/ctml.h" using namespace ctml; diff --git a/src/thermo/VPSSMgrFactory.h b/src/thermo/VPSSMgrFactory.h index 80ae3414a..e9f8424dc 100644 --- a/src/thermo/VPSSMgrFactory.h +++ b/src/thermo/VPSSMgrFactory.h @@ -13,7 +13,6 @@ #ifndef VPSSSPECIESTHERMO_FACTORY_H #define VPSSSPECIESTHERMO_FACTORY_H -#include "cantera/thermo/SpeciesThermo.h" #include "cantera/base/ctexceptions.h" #include "cantera/base/FactoryBase.h" #include "cantera/base/ct_thread.h" diff --git a/src/thermo/VPSSMgr_ConstVol.cpp b/src/thermo/VPSSMgr_ConstVol.cpp index cc27beef1..18130be33 100644 --- a/src/thermo/VPSSMgr_ConstVol.cpp +++ b/src/thermo/VPSSMgr_ConstVol.cpp @@ -13,10 +13,9 @@ */ #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" +#include "cantera/base/ctml.h" using namespace std; diff --git a/src/thermo/VPSSMgr_General.cpp b/src/thermo/VPSSMgr_General.cpp index 5ca631e34..163cafd5c 100644 --- a/src/thermo/VPSSMgr_General.cpp +++ b/src/thermo/VPSSMgr_General.cpp @@ -13,9 +13,8 @@ */ #include "cantera/thermo/VPSSMgr_General.h" -#include "cantera/thermo/PDSS.h" -#include "cantera/base/xml.h" #include "cantera/base/ctml.h" +#include "cantera/thermo/VPStandardStateTP.h" #include "cantera/thermo/PDSS_IdealGas.h" #include "cantera/thermo/PDSS_Water.h" #include "cantera/thermo/PDSS_ConstVol.h" @@ -23,6 +22,7 @@ #include "cantera/thermo/PDSS_HKFT.h" #include "cantera/thermo/PDSS_IonsFromNeutral.h" #include "cantera/thermo/GeneralSpeciesThermo.h" +#include "cantera/base/vec_functions.h" using namespace std; diff --git a/src/thermo/VPSSMgr_IdealGas.cpp b/src/thermo/VPSSMgr_IdealGas.cpp index 39084c860..d52d33dec 100644 --- a/src/thermo/VPSSMgr_IdealGas.cpp +++ b/src/thermo/VPSSMgr_IdealGas.cpp @@ -13,8 +13,6 @@ */ #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" diff --git a/src/thermo/VPSSMgr_Water_ConstVol.cpp b/src/thermo/VPSSMgr_Water_ConstVol.cpp index 732d87d81..4a1d77522 100644 --- a/src/thermo/VPSSMgr_Water_ConstVol.cpp +++ b/src/thermo/VPSSMgr_Water_ConstVol.cpp @@ -18,6 +18,8 @@ #include "cantera/thermo/PDSS_Water.h" #include "cantera/thermo/PDSS_ConstVol.h" #include "cantera/thermo/GeneralSpeciesThermo.h" +#include "cantera/thermo/VPStandardStateTP.h" +#include "cantera/base/ctml.h" using namespace std; diff --git a/src/thermo/VPSSMgr_Water_HKFT.cpp b/src/thermo/VPSSMgr_Water_HKFT.cpp index 9b3b6a58d..22dbf450a 100644 --- a/src/thermo/VPSSMgr_Water_HKFT.cpp +++ b/src/thermo/VPSSMgr_Water_HKFT.cpp @@ -17,7 +17,9 @@ #include "cantera/thermo/VPSSMgr_Water_HKFT.h" #include "cantera/thermo/PDSS_Water.h" #include "cantera/thermo/PDSS_HKFT.h" +#include "cantera/thermo/VPStandardStateTP.h" #include "cantera/thermo/GeneralSpeciesThermo.h" +#include "cantera/base/xml.h" using namespace std; diff --git a/src/thermo/VPStandardStateTP.cpp b/src/thermo/VPStandardStateTP.cpp index 070dc2aa5..4b478c971 100644 --- a/src/thermo/VPStandardStateTP.cpp +++ b/src/thermo/VPStandardStateTP.cpp @@ -12,9 +12,7 @@ */ #include "cantera/thermo/VPStandardStateTP.h" -#include "cantera/thermo/VPSSMgr.h" #include "cantera/thermo/PDSS.h" -#include "cantera/base/stringUtils.h" using namespace std; diff --git a/src/thermo/WaterProps.cpp b/src/thermo/WaterProps.cpp index d72ae1fe9..75f7fe588 100644 --- a/src/thermo/WaterProps.cpp +++ b/src/thermo/WaterProps.cpp @@ -10,7 +10,6 @@ #include "cantera/thermo/WaterProps.h" #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS_Water.h" -#include "cantera/thermo/WaterPropsIAPWS.h" #include "cantera/base/stringUtils.h" namespace Cantera diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp index 173717d03..4ac25bbee 100644 --- a/src/thermo/WaterSSTP.cpp +++ b/src/thermo/WaterSSTP.cpp @@ -13,7 +13,6 @@ #include "cantera/thermo/WaterPropsIAPWS.h" #include "cantera/thermo/WaterProps.h" #include "cantera/thermo/ThermoFactory.h" -#include "cantera/base/xml.h" #include "cantera/base/stringUtils.h" using namespace std; diff --git a/src/transport/AqueousTransport.cpp b/src/transport/AqueousTransport.cpp index af8b3a107..bcaee8373 100644 --- a/src/transport/AqueousTransport.cpp +++ b/src/transport/AqueousTransport.cpp @@ -3,14 +3,8 @@ * Transport properties for aqueous systems */ -#include "cantera/thermo/ThermoPhase.h" #include "cantera/transport/AqueousTransport.h" - -#include "cantera/base/utilities.h" -#include "cantera/transport/TransportParams.h" #include "cantera/transport/LiquidTransportParams.h" -#include "cantera/transport/TransportFactory.h" - #include "cantera/base/stringUtils.h" #include diff --git a/src/transport/DustyGasTransport.cpp b/src/transport/DustyGasTransport.cpp index 177b6d027..116a84f62 100644 --- a/src/transport/DustyGasTransport.cpp +++ b/src/transport/DustyGasTransport.cpp @@ -8,7 +8,6 @@ * See file License.txt for licensing information */ -#include "cantera/thermo/ThermoPhase.h" #include "cantera/transport/DustyGasTransport.h" #include "cantera/base/stringUtils.h" diff --git a/src/transport/LTPspecies.cpp b/src/transport/LTPspecies.cpp index 9d1ad50f4..e075dc7bd 100644 --- a/src/transport/LTPspecies.cpp +++ b/src/transport/LTPspecies.cpp @@ -6,6 +6,8 @@ */ #include "cantera/transport/LTPspecies.h" +#include "cantera/base/ctml.h" + using namespace std; using namespace ctml; diff --git a/src/transport/LiquidTranInteraction.cpp b/src/transport/LiquidTranInteraction.cpp index 7f6ca445b..07cc2c11a 100644 --- a/src/transport/LiquidTranInteraction.cpp +++ b/src/transport/LiquidTranInteraction.cpp @@ -7,6 +7,7 @@ #include "cantera/thermo/IonsFromNeutralVPSSTP.h" #include "cantera/thermo/MargulesVPSSTP.h" #include "cantera/base/stringUtils.h" +#include "cantera/base/ctml.h" using namespace std; using namespace ctml; diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index 576d0ee22..f3a28d97f 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -2,12 +2,7 @@ * @file LiquidTransport.cpp * Mixture-averaged transport properties for ideal gas mixtures. */ -#include "cantera/thermo/ThermoPhase.h" #include "cantera/transport/LiquidTransport.h" - -#include "cantera/base/utilities.h" -#include "cantera/transport/LiquidTransportParams.h" -#include "cantera/transport/TransportFactory.h" #include "cantera/base/stringUtils.h" #include diff --git a/src/transport/LiquidTransportParams.cpp b/src/transport/LiquidTransportParams.cpp index 24f3528b1..63433898e 100644 --- a/src/transport/LiquidTransportParams.cpp +++ b/src/transport/LiquidTransportParams.cpp @@ -4,8 +4,6 @@ */ #include "cantera/transport/LiquidTransportParams.h" -#include "cantera/thermo/IonsFromNeutralVPSSTP.h" -#include "cantera/thermo/MargulesVPSSTP.h" using namespace std; namespace Cantera diff --git a/src/transport/MMCollisionInt.cpp b/src/transport/MMCollisionInt.cpp index 604c26b4b..4db74d256 100644 --- a/src/transport/MMCollisionInt.cpp +++ b/src/transport/MMCollisionInt.cpp @@ -7,9 +7,6 @@ #include "cantera/base/utilities.h" #include "cantera/numerics/polyfit.h" #include "cantera/base/stringUtils.h" -#include "cantera/base/global.h" - -#include using namespace std; diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index 1692e2f23..57c3e6665 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -4,12 +4,8 @@ */ // copyright 2001 California Institute of Technology -#include "cantera/thermo/ThermoPhase.h" #include "cantera/transport/MixTransport.h" - -#include "cantera/base/utilities.h" #include "cantera/transport/TransportParams.h" -#include "cantera/transport/TransportFactory.h" #include "cantera/base/stringUtils.h" using namespace std; diff --git a/src/transport/MultiTransport.cpp b/src/transport/MultiTransport.cpp index 656732963..88b41d243 100644 --- a/src/transport/MultiTransport.cpp +++ b/src/transport/MultiTransport.cpp @@ -8,10 +8,8 @@ */ #include "cantera/transport/MultiTransport.h" -#include "cantera/base/utilities.h" #include "cantera/transport/TransportParams.h" #include "cantera/thermo/IdealGasPhase.h" -#include "cantera/transport/TransportFactory.h" #include "cantera/base/stringUtils.h" using namespace std; diff --git a/src/transport/PecosTransport.cpp b/src/transport/PecosTransport.cpp index 77915f4fa..c6ba1777e 100755 --- a/src/transport/PecosTransport.cpp +++ b/src/transport/PecosTransport.cpp @@ -3,11 +3,8 @@ * Mixture-averaged transport properties. */ -#include "cantera/thermo/ThermoPhase.h" #include "cantera/transport/PecosTransport.h" -#include "cantera/base/utilities.h" #include "cantera/transport/TransportParams.h" -#include "cantera/transport/TransportFactory.h" #include "cantera/base/stringUtils.h" #include "cantera/thermo/IdealGasPhase.h" diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index e337eba9c..6afcce255 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -2,12 +2,7 @@ * @file SimpleTransport.cpp * Simple mostly constant transport properties */ -#include "cantera/thermo/ThermoPhase.h" #include "cantera/transport/SimpleTransport.h" - -#include "cantera/base/utilities.h" -#include "cantera/transport/LiquidTransportParams.h" -#include "cantera/transport/TransportFactory.h" #include "cantera/base/stringUtils.h" using namespace std; diff --git a/src/transport/SolidTransport.cpp b/src/transport/SolidTransport.cpp index 6a0842138..66147e135 100644 --- a/src/transport/SolidTransport.cpp +++ b/src/transport/SolidTransport.cpp @@ -6,9 +6,8 @@ */ // copyright 2008 California Institute of Technology -#include "cantera/thermo/ThermoPhase.h" -#include "cantera/transport/SolidTransportData.h" #include "cantera/transport/SolidTransport.h" +#include "cantera/transport/SolidTransportData.h" using namespace std; diff --git a/src/transport/TransportBase.cpp b/src/transport/TransportBase.cpp index 7ebbec067..bc03f94ba 100644 --- a/src/transport/TransportBase.cpp +++ b/src/transport/TransportBase.cpp @@ -2,14 +2,7 @@ * @file TransportBase.cpp * Mixture-averaged transport properties for ideal gas mixtures. */ -#include "cantera/thermo/ThermoPhase.h" -#include "cantera/transport/LiquidTransport.h" -#include "cantera/base/ctexceptions.h" - -#include "cantera/base/utilities.h" -#include "cantera/transport/LiquidTransportParams.h" -#include "cantera/transport/TransportFactory.h" -#include "cantera/base/stringUtils.h" +#include "cantera/transport/TransportBase.h" using namespace std; diff --git a/src/transport/TransportFactory.cpp b/src/transport/TransportFactory.cpp index fceb17498..e86437be7 100644 --- a/src/transport/TransportFactory.cpp +++ b/src/transport/TransportFactory.cpp @@ -4,8 +4,6 @@ * Implementation file for class TransportFactory. */ -#include "cantera/thermo/ThermoPhase.h" - // known transport models #include "cantera/transport/MultiTransport.h" #include "cantera/transport/PecosTransport.h" @@ -17,22 +15,14 @@ #include "cantera/transport/AqueousTransport.h" #include "cantera/transport/HighPressureGasTransport.h" #include "cantera/transport/TransportFactory.h" +#include "cantera/transport/SolidTransportData.h" #include "cantera/numerics/polyfit.h" #include "MMCollisionInt.h" -#include "cantera/base/xml.h" -#include "cantera/transport/TransportParams.h" -#include "cantera/transport/LiquidTransportParams.h" -#include "cantera/transport/LiquidTranInteraction.h" -#include "cantera/transport/SolidTransportData.h" -#include "cantera/base/global.h" -#include "cantera/thermo/IdealGasPhase.h" #include "cantera/base/ctml.h" #include "cantera/base/stringUtils.h" -#include - using namespace std; //! polynomial degree used for fitting collision integrals diff --git a/src/transport/WaterTransport.cpp b/src/transport/WaterTransport.cpp index e0eb81813..0afc0eff8 100644 --- a/src/transport/WaterTransport.cpp +++ b/src/transport/WaterTransport.cpp @@ -1,15 +1,9 @@ //! @file WaterTransport.cpp -#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 "cantera/transport/WaterTransport.h" + +#include "cantera/thermo/VPStandardStateTP.h" #include "cantera/thermo/PDSS_Water.h" #include "cantera/thermo/WaterSSTP.h" -#include "cantera/thermo/WaterProps.h" using namespace std; diff --git a/src/zeroD/FlowReactor.cpp b/src/zeroD/FlowReactor.cpp index ab2e47534..4cbfa9e1e 100644 --- a/src/zeroD/FlowReactor.cpp +++ b/src/zeroD/FlowReactor.cpp @@ -5,6 +5,7 @@ // Copyright 2001 California Institute of Technology #include "cantera/zeroD/FlowReactor.h" +#include "cantera/base/global.h" using namespace std; diff --git a/src/zeroD/IdealGasReactor.cpp b/src/zeroD/IdealGasReactor.cpp index 3ba6e821f..14906b06f 100644 --- a/src/zeroD/IdealGasReactor.cpp +++ b/src/zeroD/IdealGasReactor.cpp @@ -5,9 +5,6 @@ #include "cantera/zeroD/IdealGasReactor.h" #include "cantera/zeroD/FlowDevice.h" #include "cantera/zeroD/Wall.h" -#include "cantera/zeroD/ReactorNet.h" - -#include using namespace std; diff --git a/src/zeroD/Reactor.cpp b/src/zeroD/Reactor.cpp index 7d0d84ac2..d8b3223a7 100644 --- a/src/zeroD/Reactor.cpp +++ b/src/zeroD/Reactor.cpp @@ -7,7 +7,6 @@ #include "cantera/zeroD/Reactor.h" #include "cantera/zeroD/FlowDevice.h" #include "cantera/zeroD/Wall.h" -#include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/thermo/SurfPhase.h" #include "cantera/zeroD/ReactorNet.h" diff --git a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp index 22342ac96..31ce87a7b 100644 --- a/src/zeroD/ReactorNet.cpp +++ b/src/zeroD/ReactorNet.cpp @@ -1,6 +1,5 @@ //! @file ReactorNet.cpp #include "cantera/zeroD/ReactorNet.h" -#include "cantera/numerics/Integrator.h" #include "cantera/zeroD/FlowDevice.h" #include "cantera/zeroD/Wall.h" diff --git a/src/zeroD/Wall.cpp b/src/zeroD/Wall.cpp index 7c9f06c0c..651d2cfe5 100644 --- a/src/zeroD/Wall.cpp +++ b/src/zeroD/Wall.cpp @@ -1,10 +1,9 @@ //! @file Wall.cpp #include "cantera/zeroD/Wall.h" -#include "cantera/zeroD/ReactorBase.h" #include "cantera/zeroD/ReactorNet.h" #include "cantera/numerics/Func1.h" -#include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/thermo/SurfPhase.h" +#include "cantera/base/stringUtils.h" namespace Cantera { diff --git a/test_problems/cathermo/VPissp/ISSPTester.cpp b/test_problems/cathermo/VPissp/ISSPTester.cpp index 08b8ca026..ef101a82f 100644 --- a/test_problems/cathermo/VPissp/ISSPTester.cpp +++ b/test_problems/cathermo/VPissp/ISSPTester.cpp @@ -15,9 +15,8 @@ // working correctly // -#include "cantera/thermo/IdealSolidSolnPhase.h" #include "cantera/thermo/IdealSolnGasVPSS.h" - +#include #include using namespace std; diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp index ea5ec61c0..d79f65fc0 100644 --- a/test_problems/cathermo/ims/IMSTester.cpp +++ b/test_problems/cathermo/ims/IMSTester.cpp @@ -16,6 +16,7 @@ #include "cantera/thermo/IdealMolalSoln.h" #include +#include using namespace std; using namespace Cantera; diff --git a/test_problems/cathermo/issp/ISSPTester.cpp b/test_problems/cathermo/issp/ISSPTester.cpp index 392a9af00..893fd53ce 100644 --- a/test_problems/cathermo/issp/ISSPTester.cpp +++ b/test_problems/cathermo/issp/ISSPTester.cpp @@ -16,7 +16,7 @@ // #include "cantera/thermo/IdealSolidSolnPhase.h" - +#include #include using namespace std; diff --git a/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp b/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp index 410ea0991..119a896be 100644 --- a/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp +++ b/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp @@ -1,13 +1,7 @@ -#include "cantera/base/ct_defs.h" +#include "cantera/thermo/PDSS_Water.h" #include "cantera/base/ctexceptions.h" #include "cantera/base/global.h" -#include "cantera/base/xml.h" -#include "cantera/base/ctml.h" -#include "cantera/thermo/PDSS_Water.h" -#include "cantera/thermo/ThermoPhase.h" -#include "cantera/thermo/VPStandardStateTP.h" -#include - +#include #include using namespace std; diff --git a/test_problems/cathermo/wtWater/wtWater.cpp b/test_problems/cathermo/wtWater/wtWater.cpp index 029eb6dcf..da0d94568 100644 --- a/test_problems/cathermo/wtWater/wtWater.cpp +++ b/test_problems/cathermo/wtWater/wtWater.cpp @@ -1,15 +1,6 @@ -#include "cantera/base/ct_defs.h" -#include "cantera/base/ctexceptions.h" -#include "cantera/base/global.h" -#include "cantera/base/xml.h" -#include "cantera/base/ctml.h" -#include "cantera/thermo/ThermoPhase.h" -#include "cantera/thermo/VPStandardStateTP.h" - #include "cantera/thermo/WaterSSTP.h" #include "cantera/transport/WaterTransport.h" -#include #include diff --git a/test_problems/cxx_ex/examples.cpp b/test_problems/cxx_ex/examples.cpp index 85aa33b91..e3b5f7a62 100644 --- a/test_problems/cxx_ex/examples.cpp +++ b/test_problems/cxx_ex/examples.cpp @@ -1,7 +1,7 @@ #include "cantera/base/ctexceptions.h" -#include "cantera/base/global.h" #include +#include using namespace Cantera; using namespace std;