research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup include statements

Browse source 
Move includes from header to implementation files where possible, and remove
unnecessary includes.
This commit is contained in:
Ray Speth 2014-08-28 16:54:13 +00:00
parent 5505b791b7
commit 002c158761
241 changed files with 132 additions and 556 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cantera/base/Array.h
View file

@ -7,8 +7,6 @@
#ifndef CT_ARRAY_H #ifndef CT_ARRAY_H
#define CT_ARRAY_H #define CT_ARRAY_H
#include "ct_defs.h"
#include "ctexceptions.h"
#include "utilities.h" #include "utilities.h"
#include <iostream> #include <iostream>

6
include/cantera/base/ctml.h
View file

@ -11,7 +11,11 @@
#include "ct_defs.h" #include "ct_defs.h"
#include "xml.h" #include "xml.h"
#include "Array.h"
namespace Cantera
{
class Array2D;
}
//! The ctml namespace adds functionality to the XML object, by providing //! The ctml namespace adds functionality to the XML object, by providing
//! standard functions that read, write, and interpret XML files and //! standard functions that read, write, and interpret XML files and

1
include/cantera/base/utilities.h
View file

@ -20,7 +20,6 @@
#include "global.h" #include "global.h"
#include <numeric> #include <numeric>
#include <algorithm>
namespace Cantera namespace Cantera
{ {

2
include/cantera/base/vec_functions.h
View file

@ -11,9 +11,7 @@
#include "ct_defs.h" #include "ct_defs.h"
#include "utilities.h" #include "utilities.h"
#include <numeric>
#include <functional> #include <functional>
#include <algorithm>
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>

5
include/cantera/equil/ChemEquil.h
View file

@ -10,18 +10,15 @@
// Cantera includes // Cantera includes
#include "cantera/base/ct_defs.h" #include "cantera/base/ct_defs.h"
#include "cantera/base/vec_functions.h"
#include "cantera/base/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "cantera/thermo/ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "cantera/numerics/DenseMatrix.h"
#include "MultiPhaseEquil.h"
#include <memory> #include <memory>
namespace Cantera namespace Cantera
{ {
class DenseMatrix;
/// map property strings to integers /// map property strings to integers
int _equilflag(const char* xy); int _equilflag(const char* xy);

1
include/cantera/equil/MultiPhase.h
View file

@ -8,7 +8,6 @@
#ifndef CT_MULTIPHASE_H #ifndef CT_MULTIPHASE_H
#define CT_MULTIPHASE_H #define CT_MULTIPHASE_H
#include "cantera/base/ct_defs.h"
#include "cantera/numerics/DenseMatrix.h" #include "cantera/numerics/DenseMatrix.h"
#include "cantera/thermo/ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"

1
include/cantera/equil/MultiPhaseEquil.h
View file

@ -2,7 +2,6 @@
#ifndef CT_MULTIPHASE_EQUIL #ifndef CT_MULTIPHASE_EQUIL
#define CT_MULTIPHASE_EQUIL #define CT_MULTIPHASE_EQUIL
#include "cantera/base/ct_defs.h"
#include "MultiPhase.h" #include "MultiPhase.h"
namespace Cantera namespace Cantera

2
include/cantera/equil/vcs_MultiPhaseEquil.h
View file

@ -5,9 +5,7 @@
#ifndef VCS_MULTIPHASEEQUIL_H #ifndef VCS_MULTIPHASEEQUIL_H
#define VCS_MULTIPHASEEQUIL_H #define VCS_MULTIPHASEEQUIL_H
#include "cantera/base/ct_defs.h"
#include "MultiPhase.h" #include "MultiPhase.h"
#include "vcs_defs.h"
#include "vcs_solve.h" #include "vcs_solve.h"
#include "vcs_prob.h" #include "vcs_prob.h"

3
include/cantera/equil/vcs_internal.h
View file

@ -11,9 +11,6 @@
#ifndef _VCS_INTERNAL_H #ifndef _VCS_INTERNAL_H
#define _VCS_INTERNAL_H #define _VCS_INTERNAL_H
#include <cstring>
#include "cantera/equil/vcs_defs.h"
#include "cantera/base/global.h" #include "cantera/base/global.h"
namespace VCSnonideal namespace VCSnonideal

2
include/cantera/equil/vcs_prob.h
View file

@ -12,8 +12,6 @@
#define _VCS_PROB_H #define _VCS_PROB_H
#include "cantera/base/Array.h" #include "cantera/base/Array.h"
#include "cantera/equil/vcs_defs.h"
#include <string>
namespace VCSnonideal namespace VCSnonideal
{ {

6
include/cantera/kinetics/AqueousKinetics.h
View file

@ -9,14 +9,8 @@
#ifndef CT_AQUEOUSKINETICS_H #ifndef CT_AQUEOUSKINETICS_H
#define CT_AQUEOUSKINETICS_H #define CT_AQUEOUSKINETICS_H
#include "cantera/thermo/mix_defs.h"
#include "Kinetics.h" #include "Kinetics.h"
#include "cantera/base/utilities.h"
#include "ReactionStoichMgr.h" #include "ReactionStoichMgr.h"
#include "ThirdBodyMgr.h"
#include "FalloffMgr.h"
#include "RateCoeffMgr.h" #include "RateCoeffMgr.h"
namespace Cantera namespace Cantera

1
include/cantera/kinetics/FalloffFactory.h
View file

@ -10,7 +10,6 @@
#define CT_NEWFALLOFF_H #define CT_NEWFALLOFF_H
#include "cantera/base/ct_defs.h" #include "cantera/base/ct_defs.h"
#include "reaction_defs.h"
#include "cantera/base/FactoryBase.h" #include "cantera/base/FactoryBase.h"
#include "cantera/base/ct_thread.h" #include "cantera/base/ct_thread.h"

4
include/cantera/kinetics/GasKinetics.h
View file

@ -9,11 +9,7 @@
#ifndef CT_GASKINETICS_H #ifndef CT_GASKINETICS_H
#define CT_GASKINETICS_H #define CT_GASKINETICS_H
#include "cantera/thermo/mix_defs.h"
#include "Kinetics.h" #include "Kinetics.h"
#include "cantera/base/utilities.h"
#include "ReactionStoichMgr.h" #include "ReactionStoichMgr.h"
#include "ThirdBodyMgr.h" #include "ThirdBodyMgr.h"
#include "FalloffMgr.h" #include "FalloffMgr.h"

2
include/cantera/kinetics/Group.h
View file

@ -9,8 +9,6 @@
#include "cantera/base/ct_defs.h" #include "cantera/base/ct_defs.h"
#include <iostream>
namespace Cantera namespace Cantera
{ {

3
include/cantera/kinetics/ImplicitSurfChem.h
View file

@ -9,11 +9,8 @@
#ifndef CT_IMPSURFCHEM_H #ifndef CT_IMPSURFCHEM_H
#define CT_IMPSURFCHEM_H #define CT_IMPSURFCHEM_H
#include "cantera/numerics/FuncEval.h"
#include "cantera/numerics/Integrator.h" #include "cantera/numerics/Integrator.h"
#include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/kinetics/InterfaceKinetics.h"
#include "cantera/thermo/SurfPhase.h"
#include "solveSP.h"
namespace Cantera namespace Cantera
{ {

3
include/cantera/kinetics/InterfaceKinetics.h
View file

@ -8,11 +8,8 @@
#ifndef CT_IFACEKINETICS_H #ifndef CT_IFACEKINETICS_H
#define CT_IFACEKINETICS_H #define CT_IFACEKINETICS_H
#include "cantera/thermo/mix_defs.h"
#include "Kinetics.h" #include "Kinetics.h"
#include "cantera/kinetics/RxnMolChange.h" #include "cantera/kinetics/RxnMolChange.h"
#include "cantera/base/utilities.h"
#include "RateCoeffMgr.h" #include "RateCoeffMgr.h"
#include "ReactionStoichMgr.h" #include "ReactionStoichMgr.h"

1
include/cantera/kinetics/Kinetics.h
View file

@ -10,7 +10,6 @@
#ifndef CT_KINETICS_H #ifndef CT_KINETICS_H
#define CT_KINETICS_H #define CT_KINETICS_H
#include "cantera/base/ctexceptions.h"
#include "cantera/thermo/ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "cantera/thermo/mix_defs.h" #include "cantera/thermo/mix_defs.h"

1
include/cantera/kinetics/KineticsFactory.h
View file

@ -8,7 +8,6 @@
#define KINETICS_FACTORY_H #define KINETICS_FACTORY_H
#include "Kinetics.h" #include "Kinetics.h"
#include "cantera/base/xml.h"
#include "cantera/base/FactoryBase.h" #include "cantera/base/FactoryBase.h"
#include "cantera/base/ct_thread.h" #include "cantera/base/ct_thread.h"

5
include/cantera/kinetics/RateCoeffMgr.h
View file

@ -7,13 +7,8 @@
#ifndef CT_RATECOEFF_MGR_H #ifndef CT_RATECOEFF_MGR_H
#define CT_RATECOEFF_MGR_H #define CT_RATECOEFF_MGR_H
#include "cantera/base/utilities.h"
#include "RxnRates.h" #include "RxnRates.h"
#include "cantera/base/ct_defs.h"
#include "cantera/base/ctexceptions.h"
#include "cantera/base/stringUtils.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/kinetics/ReactionPath.h
View file

@ -9,8 +9,6 @@
#ifndef CT_RXNPATH_H #ifndef CT_RXNPATH_H
#define CT_RXNPATH_H #define CT_RXNPATH_H
// Cantera includes
#include "cantera/base/ct_defs.h"
#include "cantera/numerics/DenseMatrix.h" #include "cantera/numerics/DenseMatrix.h"
#include "Group.h" #include "Group.h"
#include "Kinetics.h" #include "Kinetics.h"

2
include/cantera/kinetics/ReactionStoichMgr.h
View file

@ -6,8 +6,8 @@
#ifndef CT_RXN_STOICH #ifndef CT_RXN_STOICH
#define CT_RXN_STOICH #define CT_RXN_STOICH
#include "cantera/base/ct_defs.h"
#include "cantera/kinetics/StoichManager.h" #include "cantera/kinetics/StoichManager.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/kinetics/RxnRates.h
View file

@ -8,9 +8,7 @@
#ifndef CT_RXNRATES_H #ifndef CT_RXNRATES_H
#define CT_RXNRATES_H #define CT_RXNRATES_H
#include "reaction_defs.h"
#include "ReactionData.h" #include "ReactionData.h"
#include "cantera/base/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"

3
include/cantera/kinetics/ThirdBodyMgr.h
View file

@ -8,9 +8,6 @@
#ifndef CT_THIRDBODY_MGR_H #ifndef CT_THIRDBODY_MGR_H
#define CT_THIRDBODY_MGR_H #define CT_THIRDBODY_MGR_H
#include <algorithm>
#include "cantera/base/ct_defs.h"
#include "cantera/base/utilities.h" #include "cantera/base/utilities.h"
#include "Enhanced3BConc.h" #include "Enhanced3BConc.h"

1
include/cantera/kinetics/importKinetics.h
View file

@ -15,7 +15,6 @@
#ifndef CT_IMPORTKINETICS_H #ifndef CT_IMPORTKINETICS_H
#define CT_IMPORTKINETICS_H #define CT_IMPORTKINETICS_H
#include "cantera/thermo/ThermoPhase.h"
#include "Kinetics.h" #include "Kinetics.h"
namespace Cantera namespace Cantera

1
include/cantera/kinetics/solveSP.h
View file

@ -12,7 +12,6 @@
#ifndef SOLVESP_H #ifndef SOLVESP_H
#define SOLVESP_H #define SOLVESP_H
#include "ImplicitSurfChem.h"
#include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/kinetics/InterfaceKinetics.h"
#include "cantera/numerics/SquareMatrix.h" #include "cantera/numerics/SquareMatrix.h"

6
include/cantera/numerics/BEulerInt.h
View file

@ -11,15 +11,9 @@
#ifndef CT_BEULERINT_H #ifndef CT_BEULERINT_H
#define 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/Integrator.h"
#include "cantera/numerics/ResidJacEval.h" #include "cantera/numerics/ResidJacEval.h"
#include "cantera/numerics/GeneralMatrix.h" #include "cantera/numerics/GeneralMatrix.h"
#include "cantera/numerics/NonlinearSolver.h"
#define OPT_SIZE 10 #define OPT_SIZE 10

3
include/cantera/numerics/BandMatrix.h
View file

@ -10,9 +10,6 @@
#ifndef CT_BANDMATRIX_H #ifndef CT_BANDMATRIX_H
#define 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" #include "GeneralMatrix.h"
namespace Cantera namespace Cantera

2
include/cantera/numerics/CVodesIntegrator.h
View file

@ -7,9 +7,7 @@
#define CT_CVODESWRAPPER_H #define CT_CVODESWRAPPER_H
#include "cantera/numerics/Integrator.h" #include "cantera/numerics/Integrator.h"
#include "cantera/numerics/FuncEval.h"
#include "cantera/base/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "cantera/base/ct_defs.h"
#ifdef HAS_SUNDIALS #ifdef HAS_SUNDIALS

1
include/cantera/numerics/DenseMatrix.h
View file

@ -12,6 +12,7 @@
#define CT_DENSEMATRIX_H #define CT_DENSEMATRIX_H
#include "cantera/base/ct_defs.h" #include "cantera/base/ct_defs.h"
#include "cantera/base/ctexceptions.h"
#include "cantera/base/Array.h" #include "cantera/base/Array.h"
namespace Cantera namespace Cantera

1
include/cantera/numerics/IDA_Solver.h
View file

@ -9,7 +9,6 @@
#define CT_IDA_SOLVER_H #define CT_IDA_SOLVER_H
#include "DAE_Solver.h" #include "DAE_Solver.h"
#include "cantera/base/ctexceptions.h"
#if HAS_SUNDIALS #if HAS_SUNDIALS

1
include/cantera/numerics/Integrator.h
View file

@ -12,7 +12,6 @@
#define CT_INTEGRATOR_H #define CT_INTEGRATOR_H
#include "FuncEval.h" #include "FuncEval.h"
#include "cantera/base/ct_defs.h"
#include "cantera/base/global.h" #include "cantera/base/global.h"
namespace Cantera namespace Cantera

2
include/cantera/oneD/Domain1D.h
View file

@ -8,7 +8,6 @@
#ifndef CT_DOMAIN1D_H #ifndef CT_DOMAIN1D_H
#define CT_DOMAIN1D_H #define CT_DOMAIN1D_H
#include "cantera/base/xml.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include "cantera/base/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "refine.h" #include "refine.h"
@ -29,6 +28,7 @@ const int cPorousType = 109;
class MultiJac; class MultiJac;
class OneDim; class OneDim;
class XML_Node;
/** /**
* Base class for one-dimensional domains. * Base class for one-dimensional domains.

2
include/cantera/oneD/Inlet1D.h
View file

@ -15,8 +15,6 @@
#include "cantera/thermo/SurfPhase.h" #include "cantera/thermo/SurfPhase.h"
#include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/kinetics/InterfaceKinetics.h"
#include "StFlow.h" #include "StFlow.h"
#include "OneDim.h"
#include "cantera/base/ctml.h"
#include <cstdio> #include <cstdio>

1
include/cantera/oneD/MultiJac.h
View file

@ -11,7 +11,6 @@
#include "cantera/numerics/BandMatrix.h" #include "cantera/numerics/BandMatrix.h"
#include "OneDim.h" #include "OneDim.h"
#include "time.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/oneD/Sim1D.h
View file

@ -6,7 +6,6 @@
#define CT_SIM1D_H #define CT_SIM1D_H
#include "OneDim.h" #include "OneDim.h"
#include "cantera/numerics/funcs.h"
namespace Cantera namespace Cantera
{ {

4
include/cantera/oneD/StFlow.h
View file

@ -6,12 +6,10 @@
#ifndef CT_STFLOW_H #ifndef CT_STFLOW_H
#define CT_STFLOW_H #define CT_STFLOW_H
#include "cantera/transport/TransportBase.h"
#include "Domain1D.h" #include "Domain1D.h"
#include "cantera/base/Array.h" #include "cantera/base/Array.h"
#include "cantera/thermo/IdealGasPhase.h" #include "cantera/thermo/IdealGasPhase.h"
#include "cantera/kinetics/Kinetics.h" #include "cantera/kinetics/Kinetics.h"
#include "cantera/numerics/funcs.h"
namespace Cantera namespace Cantera
{ {
@ -31,6 +29,8 @@ const int c_Mixav_Transport = 0;
const int c_Multi_Transport = 1; const int c_Multi_Transport = 1;
const int c_Soret = 2; const int c_Soret = 2;
class Transport;
/** /**
* This class represents 1D flow domains that satisfy the one-dimensional * This class represents 1D flow domains that satisfy the one-dimensional
* similarity solution for chemically-reacting, axisymmetric, flows. * similarity solution for chemically-reacting, axisymmetric, flows.

1
include/cantera/thermo/AdsorbateThermo.h
View file

@ -12,7 +12,6 @@
#define CT_ADSORBATE_H #define CT_ADSORBATE_H
#include "SpeciesThermoInterpType.h" #include "SpeciesThermoInterpType.h"
#include "cantera/base/global.h"
namespace Cantera namespace Cantera
{ {

3
include/cantera/thermo/ConstDensityThermo.h
View file

@ -10,10 +10,7 @@
#ifndef CT_CONSTRHOTHERMO_H #ifndef CT_CONSTRHOTHERMO_H
#define CT_CONSTRHOTHERMO_H #define CT_CONSTRHOTHERMO_H
#include "cantera/base/ct_defs.h"
#include "mix_defs.h"
#include "ThermoPhase.h" #include "ThermoPhase.h"
#include "SpeciesThermo.h"
#include "cantera/base/utilities.h" #include "cantera/base/utilities.h"
namespace Cantera namespace Cantera

1
include/cantera/thermo/DebyeHuckel.h
View file

@ -17,7 +17,6 @@
#define CT_DEBYEHUCKEL_H #define CT_DEBYEHUCKEL_H
#include "MolalityVPSSTP.h" #include "MolalityVPSSTP.h"
#include "electrolytes.h"
#include "cantera/base/Array.h" #include "cantera/base/Array.h"
namespace Cantera namespace Cantera

2
include/cantera/thermo/EdgePhase.h
View file

@ -9,8 +9,6 @@
#ifndef CT_EDGEPHASE_H #ifndef CT_EDGEPHASE_H
#define CT_EDGEPHASE_H #define CT_EDGEPHASE_H
#include "mix_defs.h"
#include "ThermoPhase.h"
#include "SurfPhase.h" #include "SurfPhase.h"
namespace Cantera namespace Cantera

2
include/cantera/thermo/FixedChemPotSSTP.h
View file

@ -14,9 +14,7 @@
#ifndef CT_FIXEDCHEMPOTSSTP_H #ifndef CT_FIXEDCHEMPOTSSTP_H
#define CT_FIXEDCHEMPOTSSTP_H #define CT_FIXEDCHEMPOTSSTP_H
#include "mix_defs.h"
#include "SingleSpeciesTP.h" #include "SingleSpeciesTP.h"
#include "SpeciesThermo.h"
namespace Cantera namespace Cantera
{ {

7
include/cantera/thermo/GeneralSpeciesThermo.h
View file

@ -8,12 +8,9 @@
*/ */
#ifndef CT_GENERALSPECIESTHERMO_H #ifndef CT_GENERALSPECIESTHERMO_H
#define CT_GENERALSPECIESTHERMO_H #define CT_GENERALSPECIESTHERMO_H
#include "cantera/base/ct_defs.h"
#include "SpeciesThermoMgr.h" #include "SpeciesThermoMgr.h"
#include "NasaPoly1.h" #include "SpeciesThermoInterpType.h"
#include "Nasa9Poly1.h"
#include "StatMech.h"
#include "speciesThermoTypes.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/thermo/GibbsExcessVPSSTP.h
View file

@ -20,6 +20,7 @@
#define CT_GIBBSEXCESSVPSSTP_H #define CT_GIBBSEXCESSVPSSTP_H
#include "VPStandardStateTP.h" #include "VPStandardStateTP.h"
#include "cantera/base/Array.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/thermo/HMWSoln.h
View file

@ -17,7 +17,7 @@
#define CT_HMWSOLN_H #define CT_HMWSOLN_H
#include "MolalityVPSSTP.h" #include "MolalityVPSSTP.h"
#include "electrolytes.h" #include "cantera/base/Array.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/thermo/IdealGasPhase.h
View file

@ -11,8 +11,6 @@
#include "mix_defs.h" #include "mix_defs.h"
#include "ThermoPhase.h" #include "ThermoPhase.h"
#include "SpeciesThermo.h"
#include "cantera/base/utilities.h"
namespace Cantera namespace Cantera
{ {

3
include/cantera/thermo/IdealSolidSolnPhase.h
View file

@ -15,10 +15,7 @@
#ifndef CT_IDEALSOLIDSOLNPHASE_H #ifndef CT_IDEALSOLIDSOLNPHASE_H
#define CT_IDEALSOLIDSOLNPHASE_H #define CT_IDEALSOLIDSOLNPHASE_H
#include "mix_defs.h"
#include "ThermoPhase.h" #include "ThermoPhase.h"
#include "ThermoFactory.h"
#include "SpeciesThermo.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/thermo/IdealSolnGasVPSS.h
View file

@ -15,7 +15,6 @@
#define CT_IDEALSOLNGASVPSS_H #define CT_IDEALSOLNGASVPSS_H
#include "VPStandardStateTP.h" #include "VPStandardStateTP.h"
#include "VPSSMgr.h"
namespace Cantera namespace Cantera
{ {

5
include/cantera/thermo/LatticePhase.h
View file

@ -10,13 +10,8 @@
#ifndef CT_LATTICE_H #ifndef CT_LATTICE_H
#define CT_LATTICE_H #define CT_LATTICE_H
#include "cantera/base/config.h"
#include "cantera/base/ct_defs.h"
#include "mix_defs.h" #include "mix_defs.h"
#include "ThermoPhase.h" #include "ThermoPhase.h"
#include "SpeciesThermo.h"
#include "cantera/base/utilities.h"
namespace Cantera namespace Cantera
{ {

5
include/cantera/thermo/LatticeSolidPhase.h
View file

@ -11,13 +11,8 @@
#ifndef CT_LATTICESOLID_H #ifndef CT_LATTICESOLID_H
#define 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 "ThermoPhase.h"
#include "SpeciesThermo.h"
#include "LatticePhase.h" #include "LatticePhase.h"
#include "cantera/base/utilities.h"
namespace Cantera namespace Cantera
{ {

4
include/cantera/thermo/MaskellSolidSolnPhase.h
View file

@ -14,11 +14,7 @@
#ifndef CT_MASKELLSOLIDSOLNPHASE_H #ifndef CT_MASKELLSOLIDSOLNPHASE_H
#define CT_MASKELLSOLIDSOLNPHASE_H #define CT_MASKELLSOLIDSOLNPHASE_H
#include "mix_defs.h"
#include "ThermoPhase.h"
#include "VPStandardStateTP.h" #include "VPStandardStateTP.h"
#include "ThermoFactory.h"
#include "SpeciesThermo.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/thermo/MetalPhase.h
View file

@ -9,7 +9,7 @@
#include "mix_defs.h" #include "mix_defs.h"
#include "ThermoPhase.h" #include "ThermoPhase.h"
#include "SpeciesThermo.h" #include "cantera/base/ctml.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/thermo/MetalSHEelectrons.h
View file

@ -14,7 +14,6 @@
#ifndef CT_METALSHEELECTRONS_H #ifndef CT_METALSHEELECTRONS_H
#define CT_METALSHEELECTRONS_H #define CT_METALSHEELECTRONS_H
#include "mix_defs.h"
#include "SingleSpeciesTP.h" #include "SingleSpeciesTP.h"
namespace Cantera namespace Cantera

3
include/cantera/thermo/MineralEQ3.h
View file

@ -15,9 +15,6 @@
#ifndef CT_MINERALEQ3_H #ifndef CT_MINERALEQ3_H
#define CT_MINERALEQ3_H #define CT_MINERALEQ3_H
#include "mix_defs.h"
#include "SingleSpeciesTP.h"
#include "SpeciesThermo.h"
#include "StoichSubstanceSSTP.h" #include "StoichSubstanceSSTP.h"
namespace Cantera namespace Cantera

1
include/cantera/thermo/MixtureFugacityTP.h
View file

@ -14,7 +14,6 @@
#define CT_MIXTUREFUGACITYTP_H #define CT_MIXTUREFUGACITYTP_H
#include "ThermoPhase.h" #include "ThermoPhase.h"
#include "VPSSMgr.h"
#include "cantera/numerics/ResidEval.h" #include "cantera/numerics/ResidEval.h"
namespace Cantera namespace Cantera

2
include/cantera/thermo/Nasa9Poly1.h
View file

@ -17,7 +17,7 @@
#ifndef CT_NASA9POLY1_H #ifndef CT_NASA9POLY1_H
#define CT_NASA9POLY1_H #define CT_NASA9POLY1_H
#include "cantera/base/global.h"
#include "SpeciesThermoInterpType.h" #include "SpeciesThermoInterpType.h"
namespace Cantera namespace Cantera

2
include/cantera/thermo/NasaPoly1.h
View file

@ -13,9 +13,7 @@
#define CT_NASAPOLY1_H #define CT_NASAPOLY1_H
// Copyright 2001 California Institute of Technology // Copyright 2001 California Institute of Technology
#include "cantera/base/global.h"
#include "SpeciesThermoInterpType.h" #include "SpeciesThermoInterpType.h"
#include <iostream>
namespace Cantera namespace Cantera
{ {

4
include/cantera/thermo/PDSS_Water.h
View file

@ -12,11 +12,9 @@
#ifndef CT_PDSS_WATER_H #ifndef CT_PDSS_WATER_H
#define CT_PDSS_WATER_H #define CT_PDSS_WATER_H
#include "cantera/base/ct_defs.h"
#include "PDSS.h" #include "PDSS.h"
#include "VPStandardStateTP.h"
#include "WaterPropsIAPWS.h" #include "WaterPropsIAPWS.h"
#include "WaterProps.h" #include "WaterProps.h"
namespace Cantera namespace Cantera
{ {

3
include/cantera/thermo/Phase.h
View file

@ -7,8 +7,7 @@
#ifndef CT_PHASE_H #ifndef CT_PHASE_H
#define CT_PHASE_H #define CT_PHASE_H
#include "cantera/base/vec_functions.h" #include "cantera/base/ctexceptions.h"
#include "cantera/base/ctml.h"
#include "cantera/thermo/Elements.h" #include "cantera/thermo/Elements.h"
#include "cantera/base/ValueCache.h" #include "cantera/base/ValueCache.h"

1
include/cantera/thermo/RedlichKisterVPSSTP.h
View file

@ -21,7 +21,6 @@
#define CT_REDLICHKISTERVPSSTP_H #define CT_REDLICHKISTERVPSSTP_H
#include "cantera/thermo/GibbsExcessVPSSTP.h" #include "cantera/thermo/GibbsExcessVPSSTP.h"
#include "cantera/base/Array.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/thermo/RedlichKwongMFTP.h
View file

@ -16,6 +16,7 @@
#define CT_REDLICHKWONGMFTP_H #define CT_REDLICHKWONGMFTP_H
#include "MixtureFugacityTP.h" #include "MixtureFugacityTP.h"
#include "cantera/base/Array.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/thermo/SemiconductorPhase.h
View file

@ -9,6 +9,7 @@
#include "mix_defs.h" #include "mix_defs.h"
#include "ThermoPhase.h" #include "ThermoPhase.h"
#include "cantera/base/ctml.h"
namespace Cantera namespace Cantera
{ {

6
include/cantera/thermo/SpeciesThermoInterpType.h
View file

@ -7,12 +7,12 @@
// Copyright 2001 California Institute of Technology // Copyright 2001 California Institute of Technology
#include "cantera/base/ct_defs.h"
#include "speciesThermoTypes.h"
#ifndef CT_SPECIESTHERMOINTERPTYPE_H #ifndef CT_SPECIESTHERMOINTERPTYPE_H
#define CT_SPECIESTHERMOINTERPTYPE_H #define CT_SPECIESTHERMOINTERPTYPE_H
#include "cantera/base/ct_defs.h"
#include "speciesThermoTypes.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/thermo/SpeciesThermoMgr.h
View file

@ -11,7 +11,6 @@
#ifndef CT_SPECIESTHERMO_MGR_H #ifndef CT_SPECIESTHERMO_MGR_H
#define CT_SPECIESTHERMO_MGR_H #define CT_SPECIESTHERMO_MGR_H
#include "cantera/base/ct_defs.h"
#include "cantera/base/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include "SpeciesThermo.h" #include "SpeciesThermo.h"

1
include/cantera/thermo/StoichSubstance.h
View file

@ -11,7 +11,6 @@
#include "mix_defs.h" #include "mix_defs.h"
#include "ThermoPhase.h" #include "ThermoPhase.h"
#include "SpeciesThermo.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/thermo/StoichSubstanceSSTP.h
View file

@ -13,9 +13,7 @@
#ifndef CT_STOICHSUBSTANCESSTP_H #ifndef CT_STOICHSUBSTANCESSTP_H
#define CT_STOICHSUBSTANCESSTP_H #define CT_STOICHSUBSTANCESSTP_H
#include "mix_defs.h"
#include "SingleSpeciesTP.h" #include "SingleSpeciesTP.h"
#include "SpeciesThermo.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/thermo/VPSSMgr.h
View file

@ -15,7 +15,6 @@
#ifndef CT_VPSSMGR_H #ifndef CT_VPSSMGR_H
#define CT_VPSSMGR_H #define CT_VPSSMGR_H
#include "cantera/base/ct_defs.h"
#include "mix_defs.h" #include "mix_defs.h"
#include "cantera/base/global.h" #include "cantera/base/global.h"

1
include/cantera/thermo/VPSSMgr_ConstVol.h
View file

@ -14,7 +14,6 @@
#ifndef CT_VPSSMGR_CONSTVOL_H #ifndef CT_VPSSMGR_CONSTVOL_H
#define CT_VPSSMGR_CONSTVOL_H #define CT_VPSSMGR_CONSTVOL_H
#include "cantera/base/ct_defs.h"
#include "VPSSMgr.h" #include "VPSSMgr.h"
namespace Cantera namespace Cantera

1
include/cantera/thermo/VPSSMgr_General.h
View file

@ -15,7 +15,6 @@
#ifndef CT_VPSSMGR_GENERAL_H #ifndef CT_VPSSMGR_GENERAL_H
#define CT_VPSSMGR_GENERAL_H #define CT_VPSSMGR_GENERAL_H
#include "cantera/base/ct_defs.h"
#include "VPSSMgr.h" #include "VPSSMgr.h"
namespace Cantera namespace Cantera

2
include/cantera/thermo/VPSSMgr_IdealGas.h
View file

@ -15,8 +15,6 @@
#ifndef CT_VPSSMGR_IDEALGAS_H #ifndef CT_VPSSMGR_IDEALGAS_H
#define CT_VPSSMGR_IDEALGAS_H #define CT_VPSSMGR_IDEALGAS_H
#include "cantera/base/ct_defs.h"
#include "PDSS.h"
#include "VPSSMgr.h" #include "VPSSMgr.h"
namespace Cantera namespace Cantera

1
include/cantera/thermo/WaterPropsIAPWS.h
View file

@ -13,7 +13,6 @@
#define WATERPROPSIAPWS_H #define WATERPROPSIAPWS_H
#include "WaterPropsIAPWSphi.h" #include "WaterPropsIAPWSphi.h"
#include "cantera/base/config.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/transport/AqueousTransport.h
View file

@ -10,8 +10,6 @@
// Cantera includes // Cantera includes
#include "TransportBase.h" #include "TransportBase.h"
#include "cantera/numerics/DenseMatrix.h" #include "cantera/numerics/DenseMatrix.h"
#include "TransportParams.h"
#include "LiquidTransportParams.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/transport/GasTransport.h
View file

@ -6,6 +6,7 @@
#define CT_GAS_TRANSPORT_H #define CT_GAS_TRANSPORT_H
#include "TransportBase.h" #include "TransportBase.h"
#include "cantera/numerics/DenseMatrix.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/transport/LTPspecies.h
View file

@ -7,7 +7,6 @@
#define CT_LTPSPECIES_H #define CT_LTPSPECIES_H
#include "TransportBase.h" #include "TransportBase.h"
#include "cantera/base/FactoryBase.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/transport/LiquidTranInteraction.h
View file

@ -7,8 +7,6 @@
#ifndef CT_LIQUIDTRANINTERACTION_H #ifndef CT_LIQUIDTRANINTERACTION_H
#define CT_LIQUIDTRANINTERACTION_H #define CT_LIQUIDTRANINTERACTION_H
#include "cantera/base/ct_defs.h"
#include "TransportBase.h"
#include "TransportParams.h" #include "TransportParams.h"
#include "LiquidTransportData.h" #include "LiquidTransportData.h"
#include "cantera/base/xml.h" #include "cantera/base/xml.h"

1
include/cantera/transport/LiquidTransport.h
View file

@ -7,7 +7,6 @@
#include "TransportBase.h" #include "TransportBase.h"
#include "cantera/numerics/DenseMatrix.h" #include "cantera/numerics/DenseMatrix.h"
#include "TransportParams.h"
#include "LiquidTransportParams.h" #include "LiquidTransportParams.h"
namespace Cantera namespace Cantera

1
include/cantera/transport/LiquidTransportData.h
View file

@ -6,7 +6,6 @@
#define CT_LIQUIDTRANSPORTDATA_H #define CT_LIQUIDTRANSPORTDATA_H
#include "TransportBase.h" #include "TransportBase.h"
#include "cantera/base/FactoryBase.h"
#include "LTPspecies.h" #include "LTPspecies.h"
namespace Cantera namespace Cantera

3
include/cantera/transport/LiquidTransportParams.h
View file

@ -6,11 +6,8 @@
#ifndef CT_LIQUIDTRANSPORTPARAMS_H #ifndef CT_LIQUIDTRANSPORTPARAMS_H
#define CT_LIQUIDTRANSPORTPARAMS_H #define CT_LIQUIDTRANSPORTPARAMS_H
#include "TransportBase.h"
#include "TransportParams.h" #include "TransportParams.h"
#include "LiquidTransportData.h"
#include "LiquidTranInteraction.h" #include "LiquidTranInteraction.h"
#include "cantera/base/xml.h"
namespace Cantera namespace Cantera
{ {

3
include/cantera/transport/SimpleTransport.h
View file

@ -7,9 +7,6 @@
#ifndef CT_SIMPLETRAN_H #ifndef CT_SIMPLETRAN_H
#define CT_SIMPLETRAN_H #define CT_SIMPLETRAN_H
#include "TransportBase.h"
#include "cantera/numerics/DenseMatrix.h"
#include "TransportParams.h"
#include "LiquidTransportParams.h" #include "LiquidTransportParams.h"
namespace Cantera namespace Cantera

1
include/cantera/transport/SolidTransport.h
View file

@ -12,7 +12,6 @@
#include "LTPspecies.h" #include "LTPspecies.h"
#include "TransportBase.h" #include "TransportBase.h"
#include "cantera/numerics/DenseMatrix.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/transport/SolidTransportData.h
View file

@ -6,9 +6,7 @@
#ifndef CT_SOLIDTRANSPORTDATA_H #ifndef CT_SOLIDTRANSPORTDATA_H
#define CT_SOLIDTRANSPORTDATA_H #define CT_SOLIDTRANSPORTDATA_H
#include "cantera/transport/TransportBase.h"
#include "cantera/transport/TransportParams.h" #include "cantera/transport/TransportParams.h"
#include "cantera/base/FactoryBase.h"
#include "cantera/transport/LTPspecies.h" #include "cantera/transport/LTPspecies.h"
namespace Cantera namespace Cantera

1
include/cantera/transport/TransportBase.h
View file

@ -22,7 +22,6 @@
#define CT_TRANSPORTBASE_H #define CT_TRANSPORTBASE_H
#include "cantera/thermo/ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "cantera/numerics/DenseMatrix.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/transport/TransportFactory.h
View file

@ -9,12 +9,10 @@
#define CT_TRANSPORTFACTORY_H #define CT_TRANSPORTFACTORY_H
// Cantera includes // Cantera includes
#include "cantera/base/ct_defs.h"
#include "cantera/base/ct_thread.h" #include "cantera/base/ct_thread.h"
#include "TransportBase.h" #include "TransportBase.h"
#include "cantera/base/FactoryBase.h" #include "cantera/base/FactoryBase.h"
#include "LiquidTransportParams.h" #include "LiquidTransportParams.h"
#include "SolidTransportData.h"
namespace Cantera namespace Cantera
{ {

2
include/cantera/transport/WaterTransport.h
View file

@ -4,8 +4,6 @@
#ifndef CT_WATERTRAN_H #ifndef CT_WATERTRAN_H
#define CT_WATERTRAN_H #define CT_WATERTRAN_H
#include "TransportBase.h"
#include "cantera/numerics/DenseMatrix.h"
#include "LiquidTransportParams.h" #include "LiquidTransportParams.h"
#include "cantera/thermo/WaterPropsIAPWS.h" #include "cantera/thermo/WaterPropsIAPWS.h"

1
include/cantera/zeroD/IdealGasReactor.h
View file

@ -8,7 +8,6 @@
#define CT_IDEALGASREACTOR_H #define CT_IDEALGASREACTOR_H
#include "Reactor.h" #include "Reactor.h"
#include "cantera/kinetics/Kinetics.h"
namespace Cantera namespace Cantera
{ {

1
include/cantera/zeroD/Wall.h
View file

@ -7,7 +7,6 @@
#ifndef CT_WALL_H #ifndef CT_WALL_H
#define CT_WALL_H #define CT_WALL_H
#include "cantera/base/ct_defs.h"
#include "cantera/base/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "cantera/numerics/Func1.h" #include "cantera/numerics/Func1.h"

3
src/base/application.cpp
View file

@ -1,15 +1,12 @@
//! @file application.cpp //! @file application.cpp
#include "application.h" #include "application.h"
#include "cantera/base/ctexceptions.h"
#include "cantera/base/ctml.h" #include "cantera/base/ctml.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include "cantera/base/xml.h"
#include "units.h" #include "units.h"
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <functional>
using std::string; using std::string;
using std::endl; using std::endl;

4
src/base/ct2ctml.cpp
View file

@ -5,16 +5,12 @@
*/ */
// Copyright 2001-2005 California Institute of Technology // 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/ctml.h"
#include "cantera/base/global.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include "../../ext/libexecstream/exec-stream.h" #include "../../ext/libexecstream/exec-stream.h"
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <functional>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>

4
src/base/ctexceptions.cpp
View file

@ -1,15 +1,11 @@
//! @file ctexceptions.cpp //! @file ctexceptions.cpp
#include "cantera/base/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "application.h" #include "application.h"
#include "cantera/base/global.h"
#include "cantera/base/stringUtils.h"
#ifdef HAVE_FENV_H #ifdef HAVE_FENV_H
#include <fenv.h> #include <fenv.h>
#endif #endif
#include <sstream> #include <sstream>
#include <typeinfo>
namespace Cantera namespace Cantera
{ {

2
src/base/ctml.cpp
View file

@ -8,8 +8,8 @@
#define CTML_VERSION_1_4_1 #define CTML_VERSION_1_4_1
#include "cantera/base/global.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include "cantera/base/Array.h"
using namespace std; using namespace std;
using namespace Cantera; using namespace Cantera;

2
src/base/global.cpp
View file

@ -1,7 +1,5 @@
//! @file global.cpp //! @file global.cpp
#include "cantera/base/global.h"
#include "cantera/base/ctexceptions.h"
#include "cantera/base/FactoryBase.h" #include "cantera/base/FactoryBase.h"
#include "cantera/base/xml.h" #include "cantera/base/xml.h"
#include "application.h" #include "application.h"

1
src/base/stringUtils.cpp
View file

@ -17,7 +17,6 @@
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include "cantera/base/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "cantera/base/global.h"
#include "cantera/base/ctml.h" #include "cantera/base/ctml.h"
#include <sstream> #include <sstream>

9
src/base/xml.cpp
View file

@ -6,16 +6,13 @@
*/ */
// Copyright 2001 California Institute of Technology // Copyright 2001 California Institute of Technology
#include "cantera/base/config.h" #include "cantera/base/xml.h"
#include "cantera/base/stringUtils.h"
#include <sstream> #include <sstream>
#include <algorithm>
using namespace std; using namespace std;
#include "cantera/base/xml.h"
#include "cantera/base/global.h"
#include "cantera/base/stringUtils.h"
namespace Cantera namespace Cantera
{ {
////////////////////// exceptions //////////////////////////// ////////////////////// exceptions ////////////////////////////

1
src/clib/clib_defs.h
View file

@ -4,7 +4,6 @@
#ifndef CTC_DEFS_H #ifndef CTC_DEFS_H
#define CTC_DEFS_H #define CTC_DEFS_H
#include "cantera/base/ct_defs.h"
#include "cantera/base/global.h" #include "cantera/base/global.h"
#include "cantera/base/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include <iostream> #include <iostream>

1
src/clib/ct.cpp
View file

@ -21,7 +21,6 @@
#include "Cabinet.h" #include "Cabinet.h"
#include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/kinetics/InterfaceKinetics.h"
#include "cantera/thermo/PureFluidPhase.h" #include "cantera/thermo/PureFluidPhase.h"
#include "cantera/thermo/MixtureFugacityTP.h"
using namespace std; using namespace std;
using namespace Cantera; using namespace Cantera;

4
src/clib/ctonedim.cpp
View file

@ -6,11 +6,9 @@
#include "ctonedim.h" #include "ctonedim.h"
// Cantera includes // Cantera includes
#include "cantera/base/config.h"
#include "cantera/oneD/Sim1D.h" #include "cantera/oneD/Sim1D.h"
#include "cantera/oneD/StFlow.h"
#include "cantera/oneD/Inlet1D.h" #include "cantera/oneD/Inlet1D.h"
#include "cantera/numerics/DenseMatrix.h" #include "cantera/transport/TransportBase.h"
#include "Cabinet.h" #include "Cabinet.h"
#include <fstream> #include <fstream>

2
src/clib/ctreactor.cpp
View file

@ -7,9 +7,7 @@
// Cantera includes // Cantera includes
#include "cantera/zeroD/Reactor.h" #include "cantera/zeroD/Reactor.h"
#include "cantera/zeroD/FlowReactor.h" #include "cantera/zeroD/FlowReactor.h"
#include "cantera/zeroD/ConstPressureReactor.h"
#include "cantera/zeroD/ReactorNet.h" #include "cantera/zeroD/ReactorNet.h"
#include "cantera/zeroD/Reservoir.h"
#include "cantera/zeroD/ReactorFactory.h" #include "cantera/zeroD/ReactorFactory.h"
#include "cantera/zeroD/Wall.h" #include "cantera/zeroD/Wall.h"
#include "cantera/zeroD/flowControllers.h" #include "cantera/zeroD/flowControllers.h"

2
src/clib/ctsurf.cpp
View file

@ -7,8 +7,6 @@
// Cantera includes // Cantera includes
#include "cantera/thermo/SurfPhase.h" #include "cantera/thermo/SurfPhase.h"
#include "cantera/kinetics/InterfaceKinetics.h"
#include "cantera/kinetics/ImplicitSurfChem.h"
#include "Cabinet.h" #include "Cabinet.h"
using namespace std; using namespace std;

1
src/equil/BasisOptimize.cpp
View file

@ -2,7 +2,6 @@
* @file BasisOptimize.cpp Functions which calculation optimized basis of the * @file BasisOptimize.cpp Functions which calculation optimized basis of the
* stoichiometric coefficient matrix (see /ref equil functions) * stoichiometric coefficient matrix (see /ref equil functions)
*/ */
#include "cantera/thermo/ThermoPhase.h"
#include "cantera/equil/MultiPhase.h" #include "cantera/equil/MultiPhase.h"
#include "cantera/numerics/ctlapack.h" #include "cantera/numerics/ctlapack.h"

7
src/equil/ChemEquil.cpp
View file

@ -7,15 +7,10 @@
// Copyright 2001 California Institute of Technology // Copyright 2001 California Institute of Technology
#include "cantera/equil/ChemEquil.h" #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 "PropertyCalculator.h"
#include "cantera/base/ctexceptions.h"
#include "cantera/base/vec_functions.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include "cantera/equil/MultiPhase.h" #include "cantera/equil/MultiPhaseEquil.h"
using namespace std; using namespace std;

4
src/equil/MultiPhase.cpp
View file

@ -5,11 +5,7 @@
*/ */
#include "cantera/equil/MultiPhase.h" #include "cantera/equil/MultiPhase.h"
#include "cantera/equil/MultiPhaseEquil.h" #include "cantera/equil/MultiPhaseEquil.h"
#include "cantera/thermo/ThermoPhase.h"
#include "cantera/numerics/DenseMatrix.h"
#include "cantera/base/stringUtils.h" #include "cantera/base/stringUtils.h"
#include "cantera/base/global.h"
using namespace std; using namespace std;

Some files were not shown because too many files have changed in this diff Show more