Removed includes of Cantera.h from the regression tests

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 <map>
 #include <vector>
 
-//#include "cantera/Cantera.h"
-
-
 namespace ckr
 {
 

src/converters/thermoFunctions.cpp

@@ -11,8 +11,6 @@
 #include <iostream>
 using namespace std;
 
-//#include "cantera/Cantera.h"
-
 namespace ckr
 {
 

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"
 

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"
 

test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp

@@ -1,4 +1,3 @@
-#include "cantera/Cantera.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equilibrium.h"
 

test_problems/ChemEquil_red1/basopt_red1.cpp

@@ -1,4 +1,3 @@
-#include "cantera/Cantera.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equilibrium.h"
 

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"
 

test_problems/NASA9poly_test/NASA9poly_test.cpp

@@ -3,9 +3,6 @@
  *       test problem for NASA 9 coefficient formulation
  */
 
-
-
-
 #include <iostream>
 #include <string>
 #include <vector>
@@ -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;

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"

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"

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"
 

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"
 

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"
 

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"
 

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"
 

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"

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"

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"

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"

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 <cstdio>

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"

test_problems/cathermo/HMW_test_1/HMW_test_1.cpp

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

test_problems/cathermo/HMW_test_3/HMW_test_3.cpp

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

test_problems/cathermo/VPissp/ISSPTester.cpp

@@ -15,15 +15,12 @@
 //  working correctly
 //
 
-#include <iostream>
-#include <string>
-#include <vector>
-
-
-#include "cantera/Cantera.h"
 #include "cantera/thermo/IdealSolidSolnPhase.h"
 #include "cantera/thermo/IdealSolnGasVPSS.h"
 
+#include <iostream>
+#include <string>
+#include <vector>
 #include <cstdio>
 
 using namespace std;

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 <iostream>
 #include <string>
 #include <vector>
-
-#include "cantera/Cantera.h"
-#include "cantera/thermo/IdealMolalSoln.h"
-
 #include <cstdio>
 
 using namespace std;

test_problems/cathermo/issp/ISSPTester.cpp

@@ -19,7 +19,6 @@
 #include <string>
 #include <vector>
 
-#include "cantera/Cantera.h"
 #include "cantera/thermo/IdealSolidSolnPhase.h"
 
 #include <cstdio>

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"
 

test_problems/cathermo/testWaterTP/testWaterSSTP.cpp

@@ -1,11 +1,9 @@
-#include "cantera/Cantera.h"
 #include "cantera/thermo.h"
 #include "cantera/thermo/WaterSSTP.h"
 
 #include <cstdio>
 #include <cmath>
 
-#include <new>
 using namespace std;
 using namespace Cantera;
 

test_problems/cxx_ex/equil_example1.cpp

@@ -5,7 +5,6 @@
 //
 /////////////////////////////////////////////////////////////
 
-#include <cantera/Cantera.h>
 #include "example_utils.h"
 #include <cantera/equilibrium.h>
 

test_problems/cxx_ex/examples.cpp

@@ -1,4 +1,9 @@
-#include <cantera/Cantera.h>
+#include "cantera/base/ctexceptions.h"
+#include "cantera/base/global.h"
+
+#include <iostream>
+#include <stdlib.h>
+
 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]);
         }

test_problems/cxx_ex/kinetics_example1.cpp

@@ -6,7 +6,6 @@
 //
 /////////////////////////////////////////////////////////////
 
-#include <cantera/Cantera.h>
 #include <cantera/zerodim.h>
 #include <cantera/IdealGasMix.h>
 #include "example_utils.h"

test_problems/cxx_ex/kinetics_example2.cpp

@@ -6,7 +6,6 @@
 //
 /////////////////////////////////////////////////////////////
 
-#include <cantera/Cantera.h>
 #include <cantera/GRI30.h>
 #include <cantera/zerodim.h>
 #include "example_utils.h"

test_problems/cxx_ex/kinetics_example3.cpp

@@ -6,7 +6,6 @@
 //
 /////////////////////////////////////////////////////////////
 
-#include <cantera/Cantera.h>
 #include <cantera/zerodim.h>
 #include <cantera/IdealGasMix.h>
 #include "example_utils.h"

test_problems/cxx_ex/rxnpath_example1.cpp

@@ -6,7 +6,6 @@
 //
 /////////////////////////////////////////////////////////////
 
-#include <cantera/Cantera.h>
 #include <cantera/zerodim.h>
 #include "example_utils.h"
 #include <cantera/reactionpaths.h>

test_problems/cxx_ex/transport_example1.cpp

@@ -6,7 +6,6 @@
 //
 /////////////////////////////////////////////////////////////
 
-#include <cantera/Cantera.h>
 #include <cantera/transport.h>
 #include "example_utils.h"
 #include <cantera/IdealGasMix.h>

test_problems/cxx_ex/transport_example2.cpp

@@ -6,7 +6,6 @@
 //
 /////////////////////////////////////////////////////////////
 
-#include <cantera/Cantera.h>
 #include <cantera/transport.h>
 #include "example_utils.h"
 #include <cantera/equilibrium.h>

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 <iostream>
 #include <string>
@@ -18,18 +19,6 @@
 #include <iomanip>
 
 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)

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 <iostream>
 #include <string>
@@ -18,18 +19,6 @@
 #include <iomanip>
 
 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)

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 <iostream>
 #include <string>
@@ -18,18 +18,6 @@
 #include <iomanip>
 
 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)

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 <iostream>
 #include <string>
@@ -18,18 +19,6 @@
 #include <iomanip>
 
 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)

test_problems/min_python/negATest/negATest.cpp

@@ -1,4 +1,3 @@
-#include "cantera/Cantera.h"
 #include "cantera/kinetics.h"
 
 using namespace Cantera;

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 <iostream>
 #include <string>
@@ -25,21 +28,10 @@
 #include <iomanip>
 
 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) {

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 <iostream>
 #include <string>
@@ -25,21 +28,10 @@
 #include <iomanip>
 
 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) {

test_problems/negATest/negATest.cpp

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

test_problems/printUtilUnitTest/pUtest.cpp

@@ -3,7 +3,6 @@
 #include <cmath>
 #include <sstream>
 
-#include "cantera/Cantera.h"
 #include "cantera/base/PrintCtrl.h"
 #include "base/LogPrintCtrl.h"
 

test_problems/rankine_democxx/rankine.cpp

@@ -3,7 +3,6 @@
 #include <string>
 #include <map>
 
-#include <cantera/Cantera.h>
 #include <cantera/PureFluid.h>    // defines class Water
 
 using namespace Cantera;

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"
 

test_problems/spectroscopy/spectratest.cpp

@@ -1,5 +1,3 @@
-
-#include "cantera/Cantera.h"
 #include "cantera/spectra.h"
 #include "spectra/Nuclei.h"
 #include <iostream>

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"

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];

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 <iostream>
 
+#include <iostream>
 #include "cantera/IdealGasMix.h"
 #include "cantera/Interface.h"