Removed some commented-out includes

2012-10-12 20:34:48 +00:00 · 2012-10-12 20:34:48 +00:00 · 3f17786c01
commit 3f17786c01
parent c404c31879
20 changed files with 1 additions and 29 deletions
--- a/ext/f2c_math/gmres.h
+++ b/ext/f2c_math/gmres.h
@ -29,8 +29,6 @@ gmres( int m, int N, const Matrix &A, const doublereal *b, doublereal *x, double

 // ============================================================================

-// #include "../../Cantera/src/blas.h"
-
 #include "cblas.h"
 #include "../../Cantera/src/ctlapack.h"

--- a/include/cantera/equil/equil.h
+++ b/include/cantera/equil/equil.h
@ -11,7 +11,6 @@
 #ifndef CT_KERNEL_EQUIL_H
 #define CT_KERNEL_EQUIL_H

-//#include "ChemEquil.h"
 #include "MultiPhase.h"
 #include "vcs_defs.h"

--- a/include/cantera/oneD/StFlow.h
+++ b/include/cantera/oneD/StFlow.h
@ -13,8 +13,6 @@
 #include "cantera/thermo/IdealGasPhase.h"
 #include "cantera/kinetics/Kinetics.h"
 #include "cantera/numerics/funcs.h"
-//#include "../flowBoundaries.h"
-

 namespace Cantera
 {
--- a/include/cantera/radiation.h
+++ b/include/cantera/radiation.h
@ -3,6 +3,5 @@

 #include "spectra/rotor.h"
 #include "spectra/LineBroadener.h"
-//#include "kernel/AbsorptionLine.h"

 #endif
--- a/include/cantera/spectra.h
+++ b/include/cantera/spectra.h
@ -3,6 +3,5 @@

 #include "spectra/LineBroadener.h"
 #include "spectra/rotor.h"
-//#include "kernel/AbsorptionLine.h"

 #endif
--- a/include/cantera/thermo/IdealGasPhase.h
+++ b/include/cantera/thermo/IdealGasPhase.h
@ -10,7 +10,6 @@
 #ifndef CT_IDEALGASPHASE_H
 #define CT_IDEALGASPHASE_H

-//#include "cantera/base/ct_defs.h"
 #include "mix_defs.h"
 #include "ThermoPhase.h"
 #include "SpeciesThermo.h"
--- a/include/cantera/thermo/MetalSHEelectrons.h
+++ b/include/cantera/thermo/MetalSHEelectrons.h
@ -16,7 +16,6 @@

 #include "mix_defs.h"
 #include "SingleSpeciesTP.h"
-//#include "SpeciesThermo.h"

 namespace Cantera
 {
--- a/include/cantera/thermo/SemiconductorPhase.h
+++ b/include/cantera/thermo/SemiconductorPhase.h
@ -9,7 +9,6 @@

 #include "mix_defs.h"
 #include "ThermoPhase.h"
-//#include "SpeciesThermo.h"

 namespace Cantera
 {
--- a/include/cantera/transport/TransportFactory.h
+++ b/include/cantera/transport/TransportFactory.h
@ -9,8 +9,6 @@
 #define CT_TRANSPORTFACTORY_H

 // STL includes
-#include <vector>
-#include <string>
 #include <iostream>
 #include <new>

@ -19,7 +17,6 @@
 #include "cantera/base/ct_thread.h"
 #include "TransportBase.h"
 #include "cantera/base/FactoryBase.h"
-//#include "LiquidTransportData.h"
 #include "LiquidTransportParams.h"

 //======================================================================================================================
--- a/include/cantera/zeroD/flowControllers.h
+++ b/include/cantera/zeroD/flowControllers.h
@ -11,7 +11,6 @@

 #include "FlowDevice.h"
 #include "ReactorBase.h"
-//#include "PID_Controller.h"
 #include "cantera/numerics/Func1.h"

 namespace Cantera
--- a/src/equil/vcs_species_thermo.h
+++ b/src/equil/vcs_species_thermo.h
@ -8,7 +8,6 @@
 #ifndef VCS_SPECIES_THERMO_H
 #define VCS_SPECIES_THERMO_H

-//#include <vector>
 #include <cstdlib>

 namespace VCSnonideal
--- a/src/python/pycantera.cpp
+++ b/src/python/pycantera.cpp
@ -62,7 +62,7 @@ pyct_appdelete(PyObject* self, PyObject* args)

 #include "methods.h"
 #include "pylogger.h"
-//#include "cantera/base/global.h"
+
 extern "C" {

    /* Initialization function for the module */
--- a/src/thermo/NasaThermo.h
+++ b/src/thermo/NasaThermo.h
@ -14,7 +14,6 @@
 #include "cantera/thermo/SpeciesThermoMgr.h"
 #include "cantera/thermo/NasaPoly1.h"
 #include "cantera/thermo/speciesThermoTypes.h"
-//#include "cantera/numerics/polyfit.h"
 #include "cantera/base/global.h"

 namespace Cantera
--- a/src/tpx/subs.h
+++ b/src/tpx/subs.h
@ -10,7 +10,6 @@
 #include "Oxygen.h"
 #include "Water.h"
 #include "RedlichKwong.h"
-// #include "lk.h"

 #endif

--- a/test_problems/PecosTransport/PecosTransport.cpp
+++ b/test_problems/PecosTransport/PecosTransport.cpp
@ -36,11 +36,6 @@ using namespace std;
 #include "cantera/IdealGasMix.h"
 #include "cantera/transport/TransportFactory.h"

-//#include "transport.h"
-//#include "IdealGasMix.h"
-
-//#include "TransportFactory.h"
-
 using namespace Cantera;

 void printDbl(double val) {
--- a/test_problems/cxx_ex/rxnpath_example1.cpp
+++ b/test_problems/cxx_ex/rxnpath_example1.cpp
@ -11,8 +11,6 @@
 #include "cantera/reactionpaths.h"
 #include "cantera/IdealGasMix.h"

-// #include <iostream>
-
 using namespace Cantera;
 using std::cout;
 using std::endl;
--- a/test_problems/statmech/statmech_test.cpp
+++ b/test_problems/statmech/statmech_test.cpp
@ -17,7 +17,6 @@
 /*****************************************************************/
 /*****************************************************************/

-//#include "cantera/Cantera.h"
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
--- a/test_problems/statmech/statmech_test_Fe.cpp
+++ b/test_problems/statmech/statmech_test_Fe.cpp
@ -19,7 +19,6 @@ using namespace std;
 /*****************************************************************/
 /*****************************************************************/

-//#include "cantera/Cantera.h"
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
--- a/test_problems/statmech/statmech_test_poly.cpp
+++ b/test_problems/statmech/statmech_test_poly.cpp
@ -19,7 +19,6 @@ using namespace std;
 /*****************************************************************/
 /*****************************************************************/

-//#include "cantera/Cantera.h"
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
--- a/test_problems/statmech/statmech_transport.cpp
+++ b/test_problems/statmech/statmech_transport.cpp
@ -17,7 +17,6 @@
 /*****************************************************************/
 /*****************************************************************/

-//#include "cantera/Cantera.h"
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"