From 0b8d2ec22369f7d53e27f1a71e59e521d982c8cd Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 15 Feb 2012 01:00:46 +0000 Subject: [PATCH] Removed includes of Cantera.h from the regression tests --- src/converters/Species.h | 5 ----- src/converters/thermoFunctions.cpp | 2 -- .../ChemEquil_gri_matrix/gri_matrix.cpp | 1 - test_problems/ChemEquil_gri_pairs/gri_pairs.cpp | 1 - .../ChemEquil_ionizedGas/ionizedGasEquil.cpp | 1 - test_problems/ChemEquil_red1/basopt_red1.cpp | 1 - test_problems/CpJump/CpJump.cpp | 1 - test_problems/NASA9poly_test/NASA9poly_test.cpp | 5 ----- .../VCSnonideal/NaCl_equil/nacl_equil.cpp | 1 - test_problems/VPsilane_test/silane_equil.cpp | 1 - test_problems/cathermo/DH_graph_1/DH_graph_1.cpp | 3 +-- .../cathermo/DH_graph_NM/DH_graph_1.cpp | 3 +-- .../cathermo/DH_graph_Pitzer/DH_graph_1.cpp | 3 +-- .../cathermo/DH_graph_acommon/DH_graph_1.cpp | 3 +-- .../cathermo/DH_graph_bdotak/DH_graph_1.cpp | 3 +-- .../cathermo/HMW_dupl_test/HMW_dupl_test.cpp | 2 +- .../cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp | 3 +-- .../cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp | 2 -- .../cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp | 2 +- .../cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp | 5 +++-- .../cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp | 1 - test_problems/cathermo/HMW_test_1/HMW_test_1.cpp | 1 - test_problems/cathermo/HMW_test_3/HMW_test_3.cpp | 1 - test_problems/cathermo/VPissp/ISSPTester.cpp | 9 +++------ test_problems/cathermo/ims/IMSTester.cpp | 6 ++---- test_problems/cathermo/issp/ISSPTester.cpp | 1 - .../cathermo/stoichSubSSTP/stoichSubSSTP.cpp | 3 ++- .../cathermo/testWaterTP/testWaterSSTP.cpp | 2 -- test_problems/cxx_ex/equil_example1.cpp | 1 - test_problems/cxx_ex/examples.cpp | 9 +++++++-- test_problems/cxx_ex/kinetics_example1.cpp | 1 - test_problems/cxx_ex/kinetics_example2.cpp | 1 - test_problems/cxx_ex/kinetics_example3.cpp | 1 - test_problems/cxx_ex/rxnpath_example1.cpp | 1 - test_problems/cxx_ex/transport_example1.cpp | 1 - test_problems/cxx_ex/transport_example2.cpp | 1 - test_problems/diamondSurf/runDiamond.cpp | 13 +------------ .../diamondSurf_dupl/runDiamondDupl.cpp | 13 +------------ test_problems/fracCoeff/fracCoeff.cpp | 14 +------------- .../min_python/minDiamond/runDiamond.cpp | 13 +------------ test_problems/min_python/negATest/negATest.cpp | 1 - .../mixGasTransport/mixGasTransport.cpp | 16 ++++------------ .../multiGasTransport/multiGasTransport.cpp | 16 ++++------------ test_problems/negATest/negATest.cpp | 1 - test_problems/printUtilUnitTest/pUtest.cpp | 1 - test_problems/rankine_democxx/rankine.cpp | 1 - test_problems/silane_equil/silane_equil.cpp | 1 - test_problems/spectroscopy/spectratest.cpp | 2 -- test_problems/surfSolverTest/surfaceSolver.cpp | 2 -- test_problems/surfSolverTest/surfaceSolver2.cpp | 5 ----- test_problems/surfkin/surfdemo.cpp | 3 +-- 51 files changed, 38 insertions(+), 152 deletions(-) diff --git a/src/converters/Species.h b/src/converters/Species.h index 0091fbc76..d9f01b2a2 100644 --- a/src/converters/Species.h +++ b/src/converters/Species.h @@ -1,10 +1,8 @@ /** * @file Species.h - * */ // Copyright 2001 California Institute of Technology - #ifndef CKR_SPECIES_H #define CKR_SPECIES_H @@ -13,9 +11,6 @@ #include #include -//#include "cantera/Cantera.h" - - namespace ckr { diff --git a/src/converters/thermoFunctions.cpp b/src/converters/thermoFunctions.cpp index 5f851ff62..034b94c0a 100644 --- a/src/converters/thermoFunctions.cpp +++ b/src/converters/thermoFunctions.cpp @@ -11,8 +11,6 @@ #include using namespace std; -//#include "cantera/Cantera.h" - namespace ckr { diff --git a/test_problems/ChemEquil_gri_matrix/gri_matrix.cpp b/test_problems/ChemEquil_gri_matrix/gri_matrix.cpp index 40ea390cf..2b2e43aba 100644 --- a/test_problems/ChemEquil_gri_matrix/gri_matrix.cpp +++ b/test_problems/ChemEquil_gri_matrix/gri_matrix.cpp @@ -2,7 +2,6 @@ * Copyright 2002 California Institute of Technology */ -#include "cantera/Cantera.h" #include "cantera/IdealGasMix.h" #include "cantera/equilibrium.h" diff --git a/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp b/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp index d0fbb40bf..2c393be9c 100644 --- a/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp +++ b/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp @@ -2,7 +2,6 @@ * Copyright 2002 California Institute of Technology */ -#include "cantera/Cantera.h" #include "cantera/IdealGasMix.h" #include "cantera/equilibrium.h" diff --git a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp index 5b88a6aa0..f5d814f59 100644 --- a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp +++ b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp @@ -1,4 +1,3 @@ -#include "cantera/Cantera.h" #include "cantera/IdealGasMix.h" #include "cantera/equilibrium.h" diff --git a/test_problems/ChemEquil_red1/basopt_red1.cpp b/test_problems/ChemEquil_red1/basopt_red1.cpp index e3bf8856d..a0eda6b9b 100644 --- a/test_problems/ChemEquil_red1/basopt_red1.cpp +++ b/test_problems/ChemEquil_red1/basopt_red1.cpp @@ -1,4 +1,3 @@ -#include "cantera/Cantera.h" #include "cantera/IdealGasMix.h" #include "cantera/equilibrium.h" diff --git a/test_problems/CpJump/CpJump.cpp b/test_problems/CpJump/CpJump.cpp index 28a661dc4..6c1258fea 100644 --- a/test_problems/CpJump/CpJump.cpp +++ b/test_problems/CpJump/CpJump.cpp @@ -2,7 +2,6 @@ * Copyright 2002 California Institute of Technology */ -#include "cantera/Cantera.h" #include "cantera/IdealGasMix.h" #include "cantera/equilibrium.h" diff --git a/test_problems/NASA9poly_test/NASA9poly_test.cpp b/test_problems/NASA9poly_test/NASA9poly_test.cpp index 79c91e862..d69ec4b57 100644 --- a/test_problems/NASA9poly_test/NASA9poly_test.cpp +++ b/test_problems/NASA9poly_test/NASA9poly_test.cpp @@ -3,9 +3,6 @@ * test problem for NASA 9 coefficient formulation */ - - - #include #include #include @@ -20,10 +17,8 @@ using namespace std; /*****************************************************************/ /*****************************************************************/ -#include "cantera/Cantera.h" #include "cantera/transport.h" #include "cantera/IdealGasMix.h" - #include "cantera/transport/TransportFactory.h" using namespace Cantera; diff --git a/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp b/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp index ca4bce4ca..3b0e6aa77 100644 --- a/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp +++ b/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp @@ -2,7 +2,6 @@ * Copyright 2002 California Institute of Technology */ -#include "cantera/Cantera.h" #include "cantera/equilibrium.h" #include "cantera/equil/vcs_MultiPhaseEquil.h" #include "equil/vcs_internal.h" diff --git a/test_problems/VPsilane_test/silane_equil.cpp b/test_problems/VPsilane_test/silane_equil.cpp index 02e80cf96..a0b37acd9 100644 --- a/test_problems/VPsilane_test/silane_equil.cpp +++ b/test_problems/VPsilane_test/silane_equil.cpp @@ -2,7 +2,6 @@ * Copyright 2002 California Institute of Technology */ -#include "cantera/Cantera.h" #include "cantera/IdealGasMix.h" #include "cantera/equilibrium.h" #include "cantera/thermo/IdealSolnGasVPSS.h" diff --git a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp index 3f23bb783..79b398f6e 100644 --- a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp @@ -1,8 +1,7 @@ /** - * * @file DH_graph_1 */ -#include "cantera/Cantera.h" + #include "cantera/base/logger.h" #include "cantera/thermo/DebyeHuckel.h" diff --git a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp index 398fc5192..6caac3b1b 100644 --- a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp @@ -1,8 +1,7 @@ /** - * * @file DH_graph_1 */ -#include "cantera/Cantera.h" + #include "cantera/base/logger.h" #include "cantera/thermo/DebyeHuckel.h" diff --git a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp index 398fc5192..6caac3b1b 100644 --- a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp @@ -1,8 +1,7 @@ /** - * * @file DH_graph_1 */ -#include "cantera/Cantera.h" + #include "cantera/base/logger.h" #include "cantera/thermo/DebyeHuckel.h" diff --git a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp index 398fc5192..6caac3b1b 100644 --- a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp @@ -1,8 +1,7 @@ /** - * * @file DH_graph_1 */ -#include "cantera/Cantera.h" + #include "cantera/base/logger.h" #include "cantera/thermo/DebyeHuckel.h" diff --git a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp index 398fc5192..6caac3b1b 100644 --- a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp @@ -1,8 +1,7 @@ /** - * * @file DH_graph_1 */ -#include "cantera/Cantera.h" + #include "cantera/base/logger.h" #include "cantera/thermo/DebyeHuckel.h" diff --git a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp index dd031be16..6853f6dd9 100644 --- a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp +++ b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp @@ -2,7 +2,7 @@ * * @file HMW_graph_1.cpp */ -#include "cantera/Cantera.h" + #include "cantera/base/logger.h" #include "cantera/thermo.h" #include "TemperatureTable.h" diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp index 160bd71c3..5aa5d13a2 100644 --- a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp +++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp @@ -1,8 +1,7 @@ /** - * * @file HMW_graph_1.cpp */ -#include "cantera/Cantera.h" + #include "cantera/base/logger.h" #include "cantera/thermo.h" #include "TemperatureTable.h" diff --git a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp index 8c20aec91..05a8cbe7d 100644 --- a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp +++ b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp @@ -1,8 +1,6 @@ /** - * * @file HMW_graph_1.cpp */ -#include "cantera/Cantera.h" #include "cantera/base/logger.h" #include "cantera/thermo/HMWSoln.h" diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp index 27aea566e..0bd8c71b2 100644 --- a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp +++ b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp @@ -2,7 +2,7 @@ * * @file HMW_graph_1.cpp */ -#include "cantera/Cantera.h" + #include "cantera/thermo/ThermoPhase.h" #include "cantera/base/logger.h" #include "cantera/thermo.h" diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp index 7cea978b3..48a7c5c91 100644 --- a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp +++ b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp @@ -1,10 +1,11 @@ /** - * * @file HMW_graph_1.cpp */ -#include "cantera/Cantera.h" + #include "cantera/thermo.h" #include "cantera/thermo/HMWSoln.h" +#include "cantera/base/logger.h" + #include "TemperatureTable.h" #include diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp index cd75bad28..3cd24cc8f 100644 --- a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp +++ b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp @@ -2,7 +2,6 @@ * @file HMW_graph_VvT */ -#include "cantera/Cantera.h" #include "cantera/base/logger.h" #include "cantera/thermo.h" #include "TemperatureTable.h" diff --git a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp index 5ff24f443..db9011124 100644 --- a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp +++ b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp @@ -1,4 +1,3 @@ -#include "cantera/Cantera.h" #include "cantera/thermo/HMWSoln.h" #include diff --git a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp index 797fe2acd..c6f62af63 100644 --- a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp +++ b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp @@ -1,4 +1,3 @@ -#include "cantera/Cantera.h" #include "cantera/thermo/HMWSoln.h" #include diff --git a/test_problems/cathermo/VPissp/ISSPTester.cpp b/test_problems/cathermo/VPissp/ISSPTester.cpp index 7f5730009..d1a3d7bc8 100644 --- a/test_problems/cathermo/VPissp/ISSPTester.cpp +++ b/test_problems/cathermo/VPissp/ISSPTester.cpp @@ -15,15 +15,12 @@ // working correctly // -#include -#include -#include - - -#include "cantera/Cantera.h" #include "cantera/thermo/IdealSolidSolnPhase.h" #include "cantera/thermo/IdealSolnGasVPSS.h" +#include +#include +#include #include using namespace std; diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp index f98daea2c..e63b32751 100644 --- a/test_problems/cathermo/ims/IMSTester.cpp +++ b/test_problems/cathermo/ims/IMSTester.cpp @@ -14,13 +14,11 @@ // class IdealMolalSoln in order to test that it's // working correctly +#include "cantera/thermo/IdealMolalSoln.h" + #include #include #include - -#include "cantera/Cantera.h" -#include "cantera/thermo/IdealMolalSoln.h" - #include using namespace std; diff --git a/test_problems/cathermo/issp/ISSPTester.cpp b/test_problems/cathermo/issp/ISSPTester.cpp index 7b79ae330..e09fd0a14 100644 --- a/test_problems/cathermo/issp/ISSPTester.cpp +++ b/test_problems/cathermo/issp/ISSPTester.cpp @@ -19,7 +19,6 @@ #include #include -#include "cantera/Cantera.h" #include "cantera/thermo/IdealSolidSolnPhase.h" #include diff --git a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp index 8575e6443..b25f5cf73 100644 --- a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp +++ b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp @@ -2,9 +2,10 @@ * * @file HMW_graph_1.cpp */ -#include "cantera/Cantera.h" + #include "cantera/thermo.h" #include "cantera/thermo/StoichSubstanceSSTP.h" +#include "cantera/base/logger.h" #include "TemperatureTable.h" diff --git a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp index c3e4768ce..54af996b0 100644 --- a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp +++ b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp @@ -1,11 +1,9 @@ -#include "cantera/Cantera.h" #include "cantera/thermo.h" #include "cantera/thermo/WaterSSTP.h" #include #include -#include using namespace std; using namespace Cantera; diff --git a/test_problems/cxx_ex/equil_example1.cpp b/test_problems/cxx_ex/equil_example1.cpp index c88becb55..4b51dd9d5 100644 --- a/test_problems/cxx_ex/equil_example1.cpp +++ b/test_problems/cxx_ex/equil_example1.cpp @@ -5,7 +5,6 @@ // ///////////////////////////////////////////////////////////// -#include #include "example_utils.h" #include diff --git a/test_problems/cxx_ex/examples.cpp b/test_problems/cxx_ex/examples.cpp index 0a6575882..8cca3de3c 100644 --- a/test_problems/cxx_ex/examples.cpp +++ b/test_problems/cxx_ex/examples.cpp @@ -1,4 +1,9 @@ -#include +#include "cantera/base/ctexceptions.h" +#include "cantera/base/global.h" + +#include +#include + using namespace Cantera; using namespace std; @@ -53,7 +58,7 @@ int main(int argc, char** argv) fex[i](0); cout << endl; } - exit(0); + return 0; } else { example_num = atoi(argv[1]); } diff --git a/test_problems/cxx_ex/kinetics_example1.cpp b/test_problems/cxx_ex/kinetics_example1.cpp index 33cbc9790..4e5cfdcd2 100644 --- a/test_problems/cxx_ex/kinetics_example1.cpp +++ b/test_problems/cxx_ex/kinetics_example1.cpp @@ -6,7 +6,6 @@ // ///////////////////////////////////////////////////////////// -#include #include #include #include "example_utils.h" diff --git a/test_problems/cxx_ex/kinetics_example2.cpp b/test_problems/cxx_ex/kinetics_example2.cpp index 5b6ed4644..9cc38fc37 100644 --- a/test_problems/cxx_ex/kinetics_example2.cpp +++ b/test_problems/cxx_ex/kinetics_example2.cpp @@ -6,7 +6,6 @@ // ///////////////////////////////////////////////////////////// -#include #include #include #include "example_utils.h" diff --git a/test_problems/cxx_ex/kinetics_example3.cpp b/test_problems/cxx_ex/kinetics_example3.cpp index 2c9ae20a3..c8d874017 100644 --- a/test_problems/cxx_ex/kinetics_example3.cpp +++ b/test_problems/cxx_ex/kinetics_example3.cpp @@ -6,7 +6,6 @@ // ///////////////////////////////////////////////////////////// -#include #include #include #include "example_utils.h" diff --git a/test_problems/cxx_ex/rxnpath_example1.cpp b/test_problems/cxx_ex/rxnpath_example1.cpp index 37541d92c..dc4bdf340 100644 --- a/test_problems/cxx_ex/rxnpath_example1.cpp +++ b/test_problems/cxx_ex/rxnpath_example1.cpp @@ -6,7 +6,6 @@ // ///////////////////////////////////////////////////////////// -#include #include #include "example_utils.h" #include diff --git a/test_problems/cxx_ex/transport_example1.cpp b/test_problems/cxx_ex/transport_example1.cpp index 9862f4d56..51fccb72e 100644 --- a/test_problems/cxx_ex/transport_example1.cpp +++ b/test_problems/cxx_ex/transport_example1.cpp @@ -6,7 +6,6 @@ // ///////////////////////////////////////////////////////////// -#include #include #include "example_utils.h" #include diff --git a/test_problems/cxx_ex/transport_example2.cpp b/test_problems/cxx_ex/transport_example2.cpp index 762cf342e..cb16798e7 100644 --- a/test_problems/cxx_ex/transport_example2.cpp +++ b/test_problems/cxx_ex/transport_example2.cpp @@ -6,7 +6,6 @@ // ///////////////////////////////////////////////////////////// -#include #include #include "example_utils.h" #include diff --git a/test_problems/diamondSurf/runDiamond.cpp b/test_problems/diamondSurf/runDiamond.cpp index 80be9819e..bc57e180a 100644 --- a/test_problems/diamondSurf/runDiamond.cpp +++ b/test_problems/diamondSurf/runDiamond.cpp @@ -10,6 +10,7 @@ // user-friendly. This could be rewritten using class Interface to // make things simpler. +#include "cantera/kinetics.h" #include #include @@ -18,18 +19,6 @@ #include using namespace std; - -#ifdef DEBUG_HKM -int iDebug_HKM = 0; -#endif - -/*****************************************************************/ -/*****************************************************************/ - -#include "cantera/Cantera.h" -#include "cantera/kinetics.h" - - using namespace Cantera; void printDbl(double val) diff --git a/test_problems/diamondSurf_dupl/runDiamondDupl.cpp b/test_problems/diamondSurf_dupl/runDiamondDupl.cpp index f734dd0ba..15f736c4c 100644 --- a/test_problems/diamondSurf_dupl/runDiamondDupl.cpp +++ b/test_problems/diamondSurf_dupl/runDiamondDupl.cpp @@ -10,6 +10,7 @@ // user-friendly. This could be rewritten using class Interface to // make things simpler. +#include "cantera/kinetics.h" #include #include @@ -18,18 +19,6 @@ #include using namespace std; - -#ifdef DEBUG_HKM -int iDebug_HKM = 0; -#endif - -/*****************************************************************/ -/*****************************************************************/ - -#include "cantera/Cantera.h" -#include "cantera/kinetics.h" - - using namespace Cantera; void printDbl(double val) diff --git a/test_problems/fracCoeff/fracCoeff.cpp b/test_problems/fracCoeff/fracCoeff.cpp index 1e18c18da..68fb2e23e 100644 --- a/test_problems/fracCoeff/fracCoeff.cpp +++ b/test_problems/fracCoeff/fracCoeff.cpp @@ -1,6 +1,5 @@ /** * @file runDiamond.cpp - * */ // Example @@ -10,6 +9,7 @@ // user-friendly. This could be rewritten using class Interface to // make things simpler. +#include "cantera/kinetics.h" #include #include @@ -18,18 +18,6 @@ #include using namespace std; - -#ifdef DEBUG_HKM -int iDebug_HKM = 0; -#endif - -/*****************************************************************/ -/*****************************************************************/ -/*****************************************************************/ - -#include "cantera/Cantera.h" -#include "cantera/kinetics.h" - using namespace Cantera; void printDbl(double val) diff --git a/test_problems/min_python/minDiamond/runDiamond.cpp b/test_problems/min_python/minDiamond/runDiamond.cpp index e1ecde5ce..d22b8b16a 100644 --- a/test_problems/min_python/minDiamond/runDiamond.cpp +++ b/test_problems/min_python/minDiamond/runDiamond.cpp @@ -10,6 +10,7 @@ // user-friendly. This could be rewritten using class Interface to // make things simpler. +#include "cantera/kinetics.h" #include #include @@ -18,18 +19,6 @@ #include using namespace std; - -#ifdef DEBUG_HKM -int iDebug_HKM = 0; -#endif - -/*****************************************************************/ -/*****************************************************************/ -/*****************************************************************/ - -#include "cantera/Cantera.h" -#include "cantera/kinetics.h" - using namespace Cantera; void printDbl(double val) diff --git a/test_problems/min_python/negATest/negATest.cpp b/test_problems/min_python/negATest/negATest.cpp index 60f63f0c2..449cd55d1 100644 --- a/test_problems/min_python/negATest/negATest.cpp +++ b/test_problems/min_python/negATest/negATest.cpp @@ -1,4 +1,3 @@ -#include "cantera/Cantera.h" #include "cantera/kinetics.h" using namespace Cantera; diff --git a/test_problems/mixGasTransport/mixGasTransport.cpp b/test_problems/mixGasTransport/mixGasTransport.cpp index ce02ada50..5b64b45c0 100644 --- a/test_problems/mixGasTransport/mixGasTransport.cpp +++ b/test_problems/mixGasTransport/mixGasTransport.cpp @@ -17,6 +17,9 @@ // perhaps, later, an analytical solution could be added +#include "cantera/transport.h" +#include "cantera/IdealGasMix.h" +#include "cantera/transport/TransportFactory.h" #include #include @@ -25,21 +28,10 @@ #include using namespace std; - +using namespace Cantera; #define MAX(x,y) (( (x) > (y) ) ? (x) : (y)) -/*****************************************************************/ -/*****************************************************************/ - -#include "cantera/Cantera.h" -#include "cantera/transport.h" -#include "cantera/IdealGasMix.h" - -#include "cantera/transport/TransportFactory.h" - -using namespace Cantera; - void printDbl(double val) { if (fabs(val) < 5.0E-17) { diff --git a/test_problems/multiGasTransport/multiGasTransport.cpp b/test_problems/multiGasTransport/multiGasTransport.cpp index ceac0e7ca..3454b46c1 100644 --- a/test_problems/multiGasTransport/multiGasTransport.cpp +++ b/test_problems/multiGasTransport/multiGasTransport.cpp @@ -17,6 +17,9 @@ // perhaps, later, an analytical solution could be added +#include "cantera/transport.h" +#include "cantera/IdealGasMix.h" +#include "cantera/transport/TransportFactory.h" #include #include @@ -25,21 +28,10 @@ #include using namespace std; - +using namespace Cantera; #define MAX(x,y) (( (x) > (y) ) ? (x) : (y)) -/*****************************************************************/ -/*****************************************************************/ - -#include "cantera/Cantera.h" -#include "cantera/transport.h" -#include "cantera/IdealGasMix.h" - -#include "cantera/transport/TransportFactory.h" - -using namespace Cantera; - void printDbl(double val) { if (fabs(val) < 1.0E-17) { diff --git a/test_problems/negATest/negATest.cpp b/test_problems/negATest/negATest.cpp index 7dd7a9fed..a8e3631da 100644 --- a/test_problems/negATest/negATest.cpp +++ b/test_problems/negATest/negATest.cpp @@ -1,4 +1,3 @@ -#include "cantera/Cantera.h" #include "cantera/kinetics.h" #include diff --git a/test_problems/printUtilUnitTest/pUtest.cpp b/test_problems/printUtilUnitTest/pUtest.cpp index cc243c6df..858282f0d 100644 --- a/test_problems/printUtilUnitTest/pUtest.cpp +++ b/test_problems/printUtilUnitTest/pUtest.cpp @@ -3,7 +3,6 @@ #include #include -#include "cantera/Cantera.h" #include "cantera/base/PrintCtrl.h" #include "base/LogPrintCtrl.h" diff --git a/test_problems/rankine_democxx/rankine.cpp b/test_problems/rankine_democxx/rankine.cpp index 115d00825..793780d0a 100644 --- a/test_problems/rankine_democxx/rankine.cpp +++ b/test_problems/rankine_democxx/rankine.cpp @@ -3,7 +3,6 @@ #include #include -#include #include // defines class Water using namespace Cantera; diff --git a/test_problems/silane_equil/silane_equil.cpp b/test_problems/silane_equil/silane_equil.cpp index 4f6d46b6b..de7aa490b 100644 --- a/test_problems/silane_equil/silane_equil.cpp +++ b/test_problems/silane_equil/silane_equil.cpp @@ -2,7 +2,6 @@ * Copyright 2002 California Institute of Technology */ -#include "cantera/Cantera.h" #include "cantera/IdealGasMix.h" #include "cantera/equilibrium.h" diff --git a/test_problems/spectroscopy/spectratest.cpp b/test_problems/spectroscopy/spectratest.cpp index e394c6a8b..e105b4545 100644 --- a/test_problems/spectroscopy/spectratest.cpp +++ b/test_problems/spectroscopy/spectratest.cpp @@ -1,5 +1,3 @@ - -#include "cantera/Cantera.h" #include "cantera/spectra.h" #include "spectra/Nuclei.h" #include diff --git a/test_problems/surfSolverTest/surfaceSolver.cpp b/test_problems/surfSolverTest/surfaceSolver.cpp index 64eb89332..43c5fb617 100644 --- a/test_problems/surfSolverTest/surfaceSolver.cpp +++ b/test_problems/surfSolverTest/surfaceSolver.cpp @@ -34,9 +34,7 @@ static void printUsage() } -#include "cantera/Cantera.h" #include "cantera/Interface.h" - #include "cantera/kinetics.h" #include "kinetics/ImplicitSurfChem.h" #include "kinetics/solveSP.h" diff --git a/test_problems/surfSolverTest/surfaceSolver2.cpp b/test_problems/surfSolverTest/surfaceSolver2.cpp index 54232ac47..d65ce5933 100644 --- a/test_problems/surfSolverTest/surfaceSolver2.cpp +++ b/test_problems/surfSolverTest/surfaceSolver2.cpp @@ -33,18 +33,13 @@ static void printUsage() } -#include "cantera/Cantera.h" #include "cantera/Interface.h" - #include "cantera/kinetics.h" #include "kinetics/ImplicitSurfChem.h" #include "kinetics/solveSP.h" using namespace Cantera; - - - void printGas(ostream& oooo, ThermoPhase* gasTP, InterfaceKinetics* iKin_ptr, double* src) { double x[MSSIZE]; diff --git a/test_problems/surfkin/surfdemo.cpp b/test_problems/surfkin/surfdemo.cpp index 452c7e069..c40a01dda 100644 --- a/test_problems/surfkin/surfdemo.cpp +++ b/test_problems/surfkin/surfdemo.cpp @@ -2,9 +2,8 @@ * Sample program that solves an implicit problem for surface * site fractions. */ -#include "cantera/Cantera.h" -#include +#include #include "cantera/IdealGasMix.h" #include "cantera/Interface.h"