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

Fix include paths for tests and samples

Browse source
This commit is contained in:
Ray Speth 2012-02-12 02:47:21 +00:00
parent c31e48cfb3
commit 1bffc6e150
58 changed files with 230 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/base/plots.h → include/cantera/base/plots.h
View file

6
samples/cxx/bvp/stagnation.cpp
View file

@ -8,9 +8,9 @@
#include <time.h> #include <time.h>
#include "AxiStagnBVP.h" #include "AxiStagnBVP.h"
#include "ArrayViewer.h" #include "cantera/numerics/ArrayViewer.h"
#include "ctml.h" #include "cantera/base/ctml.h"
#include "MultiJac.h" #include "cantera/oneD/MultiJac.h"
using namespace ctml; using namespace ctml;
using namespace Cantera; using namespace Cantera;

4
samples/cxx/kinetics1/example_utils.h
View file

@ -1,8 +1,8 @@
#ifndef CT_EXAMPLE_UTILS_H #ifndef CT_EXAMPLE_UTILS_H
#define CT_EXAMPLE_UTILS_H #define CT_EXAMPLE_UTILS_H
#include <cantera/kernel/Array.h> #include <cantera/base/Array.h>
#include <cantera/kernel/plots.h> #include <cantera/base/plots.h>
// Save the temperature, density, pressure, and mole fractions at one // Save the temperature, density, pressure, and mole fractions at one
// time // time

2
test/thermo/nasapoly.cpp
View file

@ -1,5 +1,5 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "cantera/kernel/NasaPoly1.h" #include "cantera/thermo/NasaPoly1.h"
namespace Cantera namespace Cantera
{ {

6
test_problems/ChemEquil_gri_matrix/gri_matrix.cpp
View file

@ -2,9 +2,9 @@
* Copyright 2002 California Institute of Technology * Copyright 2002 California Institute of Technology
*/ */
#include "Cantera.h" #include "cantera/Cantera.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equilibrium.h" #include "cantera/equilibrium.h"
using namespace std; using namespace std;
using namespace Cantera; using namespace Cantera;

14
test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
View file

@ -3,14 +3,14 @@
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equil.h" #include "cantera/equil/equil.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equilibrium.h" #include "cantera/equilibrium.h"
#endif #endif
using namespace std; using namespace std;

14
test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
View file

@ -1,12 +1,12 @@
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equil.h" #include "cantera/equil/equil.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equilibrium.h" #include "cantera/equilibrium.h"
#endif #endif

14
test_problems/CpJump/CpJump.cpp
View file

@ -3,14 +3,14 @@
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equil.h" #include "cantera/equil/equil.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equilibrium.h" #include "cantera/equilibrium.h"
#endif #endif
using namespace std; using namespace std;

8
test_problems/NASA9poly_test/NASA9poly_test.cpp
View file

@ -20,11 +20,11 @@ using namespace std;
/*****************************************************************/ /*****************************************************************/
/*****************************************************************/ /*****************************************************************/
#include "Cantera.h" #include "cantera/Cantera.h"
#include "transport.h" #include "cantera/transport.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "kernel/TransportFactory.h" #include "cantera/transport/TransportFactory.h"
using namespace Cantera; using namespace Cantera;

1
test_problems/SConscript
View file

@ -2,6 +2,7 @@ from buildutils import *
Import('env','buildTargets','installTargets') Import('env','buildTargets','installTargets')
localenv = env.Clone() localenv = env.Clone()
localenv.Append(CPPPATH=['#include', '#src'])
os.environ['PYTHONPATH'] = pjoin(os.getcwd(), '..', 'Cantera', 'python') os.environ['PYTHONPATH'] = pjoin(os.getcwd(), '..', 'Cantera', 'python')
os.environ['CANTERA_DATA'] = pjoin(os.getcwd(), '..', 'data', 'inputs') os.environ['CANTERA_DATA'] = pjoin(os.getcwd(), '..', 'data', 'inputs')

16
test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp
View file

@ -2,15 +2,15 @@
* Copyright 2002 California Institute of Technology * Copyright 2002 California Institute of Technology
*/ */
#include "Cantera.h" #include "cantera/Cantera.h"
#include "equilibrium.h" #include "cantera/equilibrium.h"
#include "kernel/vcs_MultiPhaseEquil.h" #include "cantera/equil/vcs_MultiPhaseEquil.h"
#include "kernel/vcs_internal.h" #include "equil/vcs_internal.h"
#include "kernel/ThermoFactory.h" #include "cantera/thermo/ThermoFactory.h"
#include "kernel/IdealGasPhase.h" #include "cantera/thermo/IdealGasPhase.h"
#include "kernel/HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#include "kernel/StoichSubstanceSSTP.h" #include "cantera/thermo/StoichSubstanceSSTP.h"
using namespace Cantera; using namespace Cantera;
using namespace std; using namespace std;

12
test_problems/VPsilane_test/silane_equil.cpp
View file

@ -2,12 +2,12 @@
* Copyright 2002 California Institute of Technology * Copyright 2002 California Institute of Technology
*/ */
#include "Cantera.h" #include "cantera/Cantera.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equilibrium.h" #include "cantera/equilibrium.h"
#include "kernel/IdealSolnGasVPSS.h" #include "cantera/thermo/IdealSolnGasVPSS.h"
#include "kernel/ThermoFactory.h" #include "cantera/thermo/ThermoFactory.h"
#include "kernel/PrintCtrl.h" #include "cantera/base/PrintCtrl.h"
using namespace std; using namespace std;
using namespace Cantera; using namespace Cantera;

12
test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
View file

@ -3,13 +3,13 @@
* @file DH_graph_1 * @file DH_graph_1
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "kernel/DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#endif #endif
#include <cstdio> #include <cstdio>

12
test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
View file

@ -3,13 +3,13 @@
* @file DH_graph_1 * @file DH_graph_1
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "kernel/DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#endif #endif
#include <cstdio> #include <cstdio>

12
test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
View file

@ -3,13 +3,13 @@
* @file DH_graph_1 * @file DH_graph_1
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "kernel/DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#endif #endif
#include <cstdio> #include <cstdio>

12
test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
View file

@ -3,13 +3,13 @@
* @file DH_graph_1 * @file DH_graph_1
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "kernel/DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#endif #endif
#include <cstdio> #include <cstdio>

12
test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
View file

@ -3,13 +3,13 @@
* @file DH_graph_1 * @file DH_graph_1
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "kernel/DebyeHuckel.h" #include "cantera/thermo/DebyeHuckel.h"
#endif #endif
#include <cstdio> #include <cstdio>

16
test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
View file

@ -3,18 +3,18 @@
* @file HMW_graph_1.cpp * @file HMW_graph_1.cpp
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "TemperatureTable.h" #include "TemperatureTable.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#include "importCTML.h" #include "importCTML.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "thermo.h" #include "cantera/thermo.h"
#include "TemperatureTable.h" #include "TemperatureTable.h"
#include "kernel/HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#endif #endif
#include <cstdio> #include <cstdio>

2
test_problems/cathermo/HMW_dupl_test/TemperatureTable.h
View file

@ -7,7 +7,7 @@
#ifndef TEMPERATURE_TABLE_H #ifndef TEMPERATURE_TABLE_H
#define TEMPERATURE_TABLE_H #define TEMPERATURE_TABLE_H
//#include "mdp_allo.h" //#include "cantera/base/mdp_allo.h"
#include <vector> #include <vector>
using std::vector; using std::vector;

16
test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
View file

@ -3,18 +3,18 @@
* @file HMW_graph_1.cpp * @file HMW_graph_1.cpp
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "TemperatureTable.h" #include "TemperatureTable.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#include "importCTML.h" #include "importCTML.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "thermo.h" #include "cantera/thermo.h"
#include "TemperatureTable.h" #include "TemperatureTable.h"
#include "kernel/HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#endif #endif
#include <cstdio> #include <cstdio>

2
test_problems/cathermo/HMW_graph_CpvT/TemperatureTable.h
View file

@ -7,7 +7,7 @@
#ifndef TEMPERATURE_TABLE_H #ifndef TEMPERATURE_TABLE_H
#define TEMPERATURE_TABLE_H #define TEMPERATURE_TABLE_H
//#include "mdp_allo.h" //#include "cantera/base/mdp_allo.h"
#include <vector> #include <vector>
using std::vector; using std::vector;

6
test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
View file

@ -2,10 +2,10 @@
* *
* @file HMW_graph_1.cpp * @file HMW_graph_1.cpp
*/ */
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "kernel/HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#include <cstdio> #include <cstdio>

2
test_problems/cathermo/HMW_graph_GvI/TemperatureTable.h
View file

@ -7,7 +7,7 @@
#ifndef TEMPERATURE_TABLE_H #ifndef TEMPERATURE_TABLE_H
#define TEMPERATURE_TABLE_H #define TEMPERATURE_TABLE_H
//#include "mdp_allo.h" //#include "cantera/base/mdp_allo.h"
#include <vector> #include <vector>
using std::vector; using std::vector;

18
test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
View file

@ -3,17 +3,17 @@
* @file HMW_graph_1.cpp * @file HMW_graph_1.cpp
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#include "importCTML.h" #include "importCTML.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "thermo.h" #include "cantera/thermo.h"
#include "kernel/HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#endif #endif
#include "TemperatureTable.h" #include "TemperatureTable.h"

2
test_problems/cathermo/HMW_graph_GvT/TemperatureTable.h
View file

@ -7,7 +7,7 @@
#ifndef TEMPERATURE_TABLE_H #ifndef TEMPERATURE_TABLE_H
#define TEMPERATURE_TABLE_H #define TEMPERATURE_TABLE_H
//#include "mdp_allo.h" //#include "cantera/base/mdp_allo.h"
#include <vector> #include <vector>
using std::vector; using std::vector;

6
test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
View file

@ -2,9 +2,9 @@
* *
* @file HMW_graph_1.cpp * @file HMW_graph_1.cpp
*/ */
#include "Cantera.h" #include "cantera/Cantera.h"
#include "thermo.h" #include "cantera/thermo.h"
#include "kernel/HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#include "TemperatureTable.h" #include "TemperatureTable.h"
#include <cstdio> #include <cstdio>

2
test_problems/cathermo/HMW_graph_HvT/TemperatureTable.h
View file

@ -7,7 +7,7 @@
#ifndef TEMPERATURE_TABLE_H #ifndef TEMPERATURE_TABLE_H
#define TEMPERATURE_TABLE_H #define TEMPERATURE_TABLE_H
//#include "mdp_allo.h" //#include "cantera/base/mdp_allo.h"
#include <vector> #include <vector>
using std::vector; using std::vector;

14
test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
View file

@ -2,20 +2,20 @@
* @file HMW_graph_VvT * @file HMW_graph_VvT
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "TemperatureTable.h" #include "TemperatureTable.h"
#include "HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#include "importCTML.h" #include "importCTML.h"
#else #else
//#include "vcsc.h" //#include "vcsc.h"
#include "Cantera.h" #include "cantera/Cantera.h"
//#include "vcs_Cantera_input.h" //#include "vcs_Cantera_input.h"
//#include "vcs_Cantera_convert.h" //#include "vcs_Cantera_convert.h"
#include "kernel/logger.h" #include "cantera/base/logger.h"
#include "thermo.h" #include "cantera/thermo.h"
#include "TemperatureTable.h" #include "TemperatureTable.h"
#include "kernel/HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#endif #endif

2
test_problems/cathermo/HMW_graph_VvT/TemperatureTable.h
View file

@ -7,7 +7,7 @@
#ifndef TEMPERATURE_TABLE_H #ifndef TEMPERATURE_TABLE_H
#define TEMPERATURE_TABLE_H #define TEMPERATURE_TABLE_H
//#include "mdp_allo.h" //#include "cantera/base/mdp_allo.h"
#include <vector> #include <vector>
using std::vector; using std::vector;

4
test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
View file

@ -1,5 +1,5 @@
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#include <cstdio> #include <cstdio>

8
test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
View file

@ -1,9 +1,9 @@
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/HMWSoln.h" #include "cantera/thermo/HMWSoln.h"
#endif #endif
#include <cstdio> #include <cstdio>

6
test_problems/cathermo/VPissp/ISSPTester.cpp
View file

@ -20,9 +20,9 @@
#include <vector> #include <vector>
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/IdealSolidSolnPhase.h" #include "cantera/thermo/IdealSolidSolnPhase.h"
#include "kernel/IdealSolnGasVPSS.h" #include "cantera/thermo/IdealSolnGasVPSS.h"
#include <cstdio> #include <cstdio>

8
test_problems/cathermo/ims/IMSTester.cpp
View file

@ -19,11 +19,11 @@
#include <vector> #include <vector>
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "IdealMolalSoln.h" #include "cantera/thermo/IdealMolalSoln.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/IdealMolalSoln.h" #include "cantera/thermo/IdealMolalSoln.h"
#endif #endif
#include <cstdio> #include <cstdio>

8
test_problems/cathermo/issp/ISSPTester.cpp
View file

@ -20,11 +20,11 @@
#include <vector> #include <vector>
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "IdealSolidSolnPhase.h" #include "cantera/thermo/IdealSolidSolnPhase.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/IdealSolidSolnPhase.h" #include "cantera/thermo/IdealSolidSolnPhase.h"
#endif #endif
#include <cstdio> #include <cstdio>

2
test_problems/cathermo/stoichSubSSTP/TemperatureTable.h
View file

@ -7,7 +7,7 @@
#ifndef TEMPERATURE_TABLE_H #ifndef TEMPERATURE_TABLE_H
#define TEMPERATURE_TABLE_H #define TEMPERATURE_TABLE_H
//#include "mdp_allo.h" //#include "cantera/base/mdp_allo.h"
#include <vector> #include <vector>
using std::vector; using std::vector;

14
test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
View file

@ -3,15 +3,15 @@
* @file HMW_graph_1.cpp * @file HMW_graph_1.cpp
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "logger.h" #include "cantera/base/logger.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "StoichSubstanceSSTP.h" #include "cantera/thermo/StoichSubstanceSSTP.h"
#include "importCTML.h" #include "importCTML.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "thermo.h" #include "cantera/thermo.h"
#include "kernel/StoichSubstanceSSTP.h" #include "cantera/thermo/StoichSubstanceSSTP.h"
#endif #endif
#include "TemperatureTable.h" #include "TemperatureTable.h"

2
test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
View file

@ -1,4 +1,4 @@
#include "kernel/WaterPropsIAPWSphi.h" #include "cantera/thermo/WaterPropsIAPWSphi.h"
#include <new> #include <new>
#include <cstdio> #include <cstdio>

2
test_problems/cathermo/testIAPWSPres/testPress.cpp
View file

@ -1,5 +1,5 @@
#include "kernel/WaterPropsIAPWS.h" #include "cantera/thermo/WaterPropsIAPWS.h"
#include <new> #include <new>
#include <cstdio> #include <cstdio>

2
test_problems/cathermo/testIAPWSTripP/testTripleP.cpp
View file

@ -1,5 +1,5 @@
#include "kernel/WaterPropsIAPWS.h" #include "cantera/thermo/WaterPropsIAPWS.h"
#include <new> #include <new>
#include <cstdio> #include <cstdio>

16
test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
View file

@ -1,11 +1,11 @@
#include "kernel/ct_defs.h" #include "cantera/base/ct_defs.h"
#include "kernel/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "kernel/global.h" #include "cantera/base/global.h"
#include "kernel/xml.h" #include "cantera/base/xml.h"
#include "kernel/ctml.h" #include "cantera/base/ctml.h"
#include "kernel/PDSS_Water.h" #include "cantera/thermo/PDSS_Water.h"
#include "kernel/ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "kernel/VPStandardStateTP.h" #include "cantera/thermo/VPStandardStateTP.h"
#include <new> #include <new>
#include <cstdio> #include <cstdio>

6
test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
View file

@ -1,6 +1,6 @@
#include "Cantera.h" #include "cantera/Cantera.h"
#include "thermo.h" #include "cantera/thermo.h"
#include "kernel/WaterSSTP.h" #include "cantera/thermo/WaterSSTP.h"
#include <cstdio> #include <cstdio>
#include <cmath> #include <cmath>

18
test_problems/cathermo/wtWater/wtWater.cpp
View file

@ -1,14 +1,14 @@
#include "kernel/ct_defs.h" #include "cantera/base/ct_defs.h"
#include "kernel/ctexceptions.h" #include "cantera/base/ctexceptions.h"
#include "kernel/global.h" #include "cantera/base/global.h"
#include "kernel/xml.h" #include "cantera/base/xml.h"
#include "kernel/ctml.h" #include "cantera/base/ctml.h"
#include "kernel/ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "kernel/VPStandardStateTP.h" #include "cantera/thermo/VPStandardStateTP.h"
#include "kernel/WaterSSTP.h" #include "cantera/thermo/WaterSSTP.h"
#include "kernel/WaterTransport.h" #include "cantera/transport/WaterTransport.h"
#include <new> #include <new>
#include <cstdio> #include <cstdio>

4
test_problems/cxx_ex/example_utils.h
View file

@ -1,8 +1,8 @@
#ifndef CT_EXAMPLE_UTILS_H #ifndef CT_EXAMPLE_UTILS_H
#define CT_EXAMPLE_UTILS_H #define CT_EXAMPLE_UTILS_H
#include <cantera/kernel/Array.h> #include <cantera/base/Array.h>
#include <cantera/kernel/plots.h> #include <cantera/base/plots.h>
// Save the temperature, density, pressure, and mole fractions at one // Save the temperature, density, pressure, and mole fractions at one
// time // time

4
test_problems/diamondSurf/runDiamond.cpp
View file

@ -26,8 +26,8 @@ int iDebug_HKM = 0;
/*****************************************************************/ /*****************************************************************/
/*****************************************************************/ /*****************************************************************/
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kinetics.h" #include "cantera/kinetics.h"
using namespace Cantera; using namespace Cantera;

4
test_problems/diamondSurf_dupl/runDiamondDupl.cpp
View file

@ -26,8 +26,8 @@ int iDebug_HKM = 0;
/*****************************************************************/ /*****************************************************************/
/*****************************************************************/ /*****************************************************************/
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kinetics.h" #include "cantera/kinetics.h"
using namespace Cantera; using namespace Cantera;

14
test_problems/fracCoeff/fracCoeff.cpp
View file

@ -28,15 +28,15 @@ int iDebug_HKM = 0;
/*****************************************************************/ /*****************************************************************/
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "ctml.h" #include "cantera/base/ctml.h"
#include "GasKinetics.h" #include "cantera/kinetics/GasKinetics.h"
#include "importCTML.h" #include "importCTML.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "InterfaceKinetics.h" #include "cantera/kinetics/InterfaceKinetics.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kinetics.h" #include "cantera/kinetics.h"
#endif #endif
using namespace Cantera; using namespace Cantera;

4
test_problems/min_python/minDiamond/runDiamond.cpp
View file

@ -27,8 +27,8 @@ int iDebug_HKM = 0;
/*****************************************************************/ /*****************************************************************/
/*****************************************************************/ /*****************************************************************/
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kinetics.h" #include "cantera/kinetics.h"
using namespace Cantera; using namespace Cantera;

14
test_problems/min_python/negATest/negATest.cpp
View file

@ -1,14 +1,14 @@
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "ctml.h" #include "cantera/base/ctml.h"
#include "GasKinetics.h" #include "cantera/kinetics/GasKinetics.h"
#include "importCTML.h" #include "importCTML.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "InterfaceKinetics.h" #include "cantera/kinetics/InterfaceKinetics.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kinetics.h" #include "cantera/kinetics.h"
#endif #endif
using namespace Cantera; using namespace Cantera;

8
test_problems/mixGasTransport/mixGasTransport.cpp
View file

@ -32,11 +32,11 @@ using namespace std;
/*****************************************************************/ /*****************************************************************/
/*****************************************************************/ /*****************************************************************/
#include "Cantera.h" #include "cantera/Cantera.h"
#include "transport.h" #include "cantera/transport.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "kernel/TransportFactory.h" #include "cantera/transport/TransportFactory.h"
using namespace Cantera; using namespace Cantera;

8
test_problems/multiGasTransport/multiGasTransport.cpp
View file

@ -32,11 +32,11 @@ using namespace std;
/*****************************************************************/ /*****************************************************************/
/*****************************************************************/ /*****************************************************************/
#include "Cantera.h" #include "cantera/Cantera.h"
#include "transport.h" #include "cantera/transport.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "kernel/TransportFactory.h" #include "cantera/transport/TransportFactory.h"
using namespace Cantera; using namespace Cantera;

4
test_problems/negATest/negATest.cpp
View file

@ -1,5 +1,5 @@
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kinetics.h" #include "cantera/kinetics.h"
#include <string> #include <string>

6
test_problems/printUtilUnitTest/pUtest.cpp
View file

@ -3,9 +3,9 @@
#include <cmath> #include <cmath>
#include <sstream> #include <sstream>
#include "Cantera.h" #include "cantera/Cantera.h"
#include "kernel/PrintCtrl.h" #include "cantera/base/PrintCtrl.h"
#include "kernel/LogPrintCtrl.h" #include "base/LogPrintCtrl.h"
using namespace Cantera; using namespace Cantera;
using namespace std; using namespace std;

2
test_problems/pureFluidTest/testPureWater.cpp
View file

@ -1,4 +1,4 @@
#include "PureFluid.h" #include "cantera/PureFluid.h"
#include <new> #include <new>
#include <cstdio> #include <cstdio>
#include <cmath> #include <cmath>

14
test_problems/silane_equil/silane_equil.cpp
View file

@ -3,14 +3,14 @@
*/ */
#ifdef SRCDIRTREE #ifdef SRCDIRTREE
#include "ct_defs.h" #include "cantera/base/ct_defs.h"
#include "ThermoPhase.h" #include "cantera/thermo/ThermoPhase.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equil.h" #include "cantera/equil/equil.h"
#else #else
#include "Cantera.h" #include "cantera/Cantera.h"
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "equilibrium.h" #include "cantera/equilibrium.h"
#endif #endif
using namespace std; using namespace std;

6
test_problems/spectroscopy/spectratest.cpp
View file

@ -1,7 +1,7 @@
#include "Cantera.h" #include "cantera/Cantera.h"
#include "spectra.h" #include "cantera/spectra.h"
#include "kernel/Nuclei.h" #include "spectra/Nuclei.h"
#include <iostream> #include <iostream>
using namespace std; using namespace std;
using namespace Cantera; using namespace Cantera;

10
test_problems/surfSolverTest/surfaceSolver.cpp
View file

@ -34,12 +34,12 @@ static void printUsage()
} }
#include "Cantera.h" #include "cantera/Cantera.h"
#include "Interface.h" #include "cantera/Interface.h"
#include "kinetics.h" #include "cantera/kinetics.h"
#include "kernel/ImplicitSurfChem.h" #include "kinetics/ImplicitSurfChem.h"
#include "kernel/solveSP.h" #include "kinetics/solveSP.h"
using namespace Cantera; using namespace Cantera;

10
test_problems/surfSolverTest/surfaceSolver2.cpp
View file

@ -33,12 +33,12 @@ static void printUsage()
} }
#include "Cantera.h" #include "cantera/Cantera.h"
#include "Interface.h" #include "cantera/Interface.h"
#include "kinetics.h" #include "cantera/kinetics.h"
#include "kernel/ImplicitSurfChem.h" #include "kinetics/ImplicitSurfChem.h"
#include "kernel/solveSP.h" #include "kinetics/solveSP.h"
using namespace Cantera; using namespace Cantera;

6
test_problems/surfkin/surfdemo.cpp
View file

@ -2,11 +2,11 @@
* Sample program that solves an implicit problem for surface * Sample program that solves an implicit problem for surface
* site fractions. * site fractions.
*/ */
#include "Cantera.h" #include "cantera/Cantera.h"
#include <iostream> #include <iostream>
#include "IdealGasMix.h" #include "cantera/IdealGasMix.h"
#include "Interface.h" #include "cantera/Interface.h"
using namespace Cantera; using namespace Cantera;
using namespace std; using namespace std;