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

Removed obsolete header selection logic from regression tests

Browse source
This commit is contained in:
Ray Speth 2012-02-13 23:44:20 +00:00
parent 76c54f4546
commit a942657698
19 changed files with 2 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
View file

@ -2,16 +2,9 @@
* Copyright 2002 California Institute of Technology
*/
#ifdef SRCDIRTREE
#include "cantera/base/ct_defs.h"
#include "cantera/thermo/ThermoPhase.h"
#include "cantera/IdealGasMix.h"
#include "cantera/equil/equil.h"
#else
#include "cantera/Cantera.h"
#include "cantera/IdealGasMix.h"
#include "cantera/equilibrium.h"
#endif
using namespace std;
using namespace Cantera;

8
test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
View file

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

7
test_problems/CpJump/CpJump.cpp
View file

@ -2,16 +2,9 @@
* Copyright 2002 California Institute of Technology
*/
#ifdef SRCDIRTREE
#include "cantera/base/ct_defs.h"
#include "cantera/thermo/ThermoPhase.h"
#include "cantera/IdealGasMix.h"
#include "cantera/equil/equil.h"
#else
#include "cantera/Cantera.h"
#include "cantera/IdealGasMix.h"
#include "cantera/equilibrium.h"
#endif
using namespace std;
using namespace Cantera;

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

@ -2,15 +2,10 @@
*
* @file DH_graph_1
*/
#ifdef SRCDIRTREE
#include "cantera/base/ct_defs.h"
#include "cantera/base/logger.h"
#include "cantera/thermo/DebyeHuckel.h"
#else
#include "cantera/Cantera.h"
#include "cantera/base/logger.h"
#include "cantera/thermo/DebyeHuckel.h"
#endif
#include <cstdio>
using namespace std;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,24 +1,13 @@
/**
* @file HMW_graph_VvT
*/
#ifdef SRCDIRTREE
#include "cantera/base/ct_defs.h"
#include "cantera/base/logger.h"
#include "TemperatureTable.h"
#include "cantera/thermo/HMWSoln.h"
#include "importCTML.h"
#else
//#include "vcsc.h"
#include "cantera/Cantera.h"
//#include "vcs_Cantera_input.h"
//#include "vcs_Cantera_convert.h"
#include "cantera/base/logger.h"
#include "cantera/thermo.h"
#include "TemperatureTable.h"
#include "cantera/thermo/HMWSoln.h"
#endif
#include <cstdio>
using namespace std;

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

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

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

@ -18,13 +18,8 @@
#include <string>
#include <vector>
#ifdef SRCDIRTREE
#include "cantera/base/ct_defs.h"
#include "cantera/thermo/IdealMolalSoln.h"
#else
#include "cantera/Cantera.h"
#include "cantera/thermo/IdealMolalSoln.h"
#endif
#include <cstdio>

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

@ -19,13 +19,8 @@
#include <string>
#include <vector>
#ifdef SRCDIRTREE
#include "cantera/base/ct_defs.h"
#include "cantera/thermo/IdealSolidSolnPhase.h"
#else
#include "cantera/Cantera.h"
#include "cantera/thermo/IdealSolidSolnPhase.h"
#endif
#include <cstdio>

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

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

9
test_problems/fracCoeff/fracCoeff.cpp
View file

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

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

@ -1,20 +1,9 @@
#ifdef SRCDIRTREE
#include "cantera/base/ct_defs.h"
#include "cantera/base/ctml.h"
#include "cantera/kinetics/GasKinetics.h"
#include "importCTML.h"
#include "cantera/thermo/ThermoPhase.h"
#include "cantera/kinetics/InterfaceKinetics.h"
#else
#include "cantera/Cantera.h"
#include "cantera/kinetics.h"
#endif
using namespace Cantera;
using namespace std;
#
int main(int argc, char** argv)
{
#ifdef _MSC_VER

7
test_problems/silane_equil/silane_equil.cpp
View file

@ -2,16 +2,9 @@
* Copyright 2002 California Institute of Technology
*/
#ifdef SRCDIRTREE
#include "cantera/base/ct_defs.h"
#include "cantera/thermo/ThermoPhase.h"
#include "cantera/IdealGasMix.h"
#include "cantera/equil/equil.h"
#else
#include "cantera/Cantera.h"
#include "cantera/IdealGasMix.h"
#include "cantera/equilibrium.h"
#endif
using namespace std;
using namespace Cantera;