Combined CanteraZeroD and CanteraSpectra namespaces with Cantera

Cantera/clib/src/clib_defs.h

@@ -40,8 +40,5 @@
 #endif
 
 namespace Cantera {}
-//using namespace Cantera;
-namespace std {}
-//using namespace std;
 
 #endif

Cantera/clib/src/ctreactor.cpp

@@ -16,7 +16,7 @@
 #include "Cabinet.h"
 #include "Storage.h"
 
-using namespace CanteraZeroD;
+using namespace Cantera;
 
 typedef ReactorBase reactor_t;
 typedef ReactorNet  reactornet_t;

Cantera/cxx/demos/combustor/combustor.cpp

@@ -11,7 +11,7 @@
 #include <cantera/zerodim.h>
 #include <cantera/IdealGasMix.h>
 
-using namespace CanteraZeroD;
+using namespace Cantera;
 
 void runexample() {
 

Cantera/cxx/demos/kinetics1/example_utils.h

@@ -4,12 +4,8 @@
 #include <cantera/kernel/Array.h>
 #include <cantera/kernel/plots.h>
 
-namespace Cantera{}
 using namespace Cantera;
-namespace std{}
 using namespace std;
-namespace CanteraZeroD{}
-using namespace CanteraZeroD;
 
 // Save the temperature, density, pressure, and mole fractions at one
 // time

Cantera/fortran/src/flib_defs.h

@@ -20,7 +20,5 @@ typedef integer status_t;
 
 namespace Cantera {}
 using namespace Cantera;
-namespace std{}
-using namespace std;
 
 #endif

Cantera/src/equil/vcs_equilibrate.cpp

@@ -31,7 +31,6 @@
 #include <string>
 #include <vector>
 
-using namespace Cantera;
 using namespace std;
 
 namespace Cantera {

Cantera/src/spectra/DiatomicMolecule.h

@@ -3,7 +3,7 @@
 
 #include "Nuclei.h"
 
-namespace CanteraSpectra {
+namespace Cantera {
 
     class DiatomicMolecule {
     public:

Cantera/src/spectra/LineBroadener.cpp

@@ -10,7 +10,7 @@ using boost::math::erf;
 
 using namespace std;
 
-namespace CanteraSpectra {
+namespace Cantera {
 
     Lorentzian::Lorentzian(doublereal gamma) {
         m_hwhm = gamma;

Cantera/src/spectra/LineBroadener.h

@@ -7,8 +7,7 @@
 #include "ct_defs.h"
 #include "ctexceptions.h"
 
-using namespace Cantera;
-namespace CanteraSpectra {
+namespace Cantera {
 
     /**
      * Base class for classes implementing line shapes of

Cantera/src/spectra/Nuclei.h

@@ -7,7 +7,7 @@
 
 #include "ct_defs.h"
  
-namespace CanteraSpectra {
+namespace Cantera {
 
     /**
      * Represents atomic nuclei. These classes only provide minimal
@@ -90,6 +90,6 @@ namespace CanteraSpectra {
     }
 
 
-} // CanteraSpectra
+} // Cantera
 
 #endif

Cantera/src/spectra/rotor.cpp

@@ -7,7 +7,7 @@
 
 using namespace std;
 
-namespace CanteraSpectra {
+namespace Cantera {
 
     /**
      * Constructor.

Cantera/src/spectra/rotor.h

@@ -14,12 +14,11 @@
  */
 
 #include "ct_defs.h"
-using namespace Cantera;
 
 /**
  * Namespace for spectroscopic functions and classes. 
  */
-namespace CanteraSpectra {
+namespace Cantera {
 
     /**
      * Class Rotor represents a non-rigid quantum-mechanical rotor.

Cantera/src/spectra/spectralUtilities.cpp

@@ -1,7 +1,7 @@
 #include "spectralUtilities.h"
 #include "Nuclei.h"
 
-namespace CanteraSpectra {
+namespace Cantera {
     
     //Nucleus_syms = {"H":1, "D":2, "T":3, "He3":4, "He4":5,
     //                                     "C12":6, "C13":7, "N14":8, "N15":9, 

Cantera/src/spectra/spectralUtilities.h

@@ -3,9 +3,4 @@
 
 #include "Nuclei.h"
 
-namespace CanteraSpectra {
-    
-}
-
-
 #endif

Cantera/src/zeroD/ConstPressureReactor.cpp

@@ -12,10 +12,9 @@
 #include "InterfaceKinetics.h"
 #include "SurfPhase.h"
 
-using namespace Cantera;
 using namespace std;
 
-namespace CanteraZeroD {
+namespace Cantera {
 
     ConstPressureReactor::ConstPressureReactor() : Reactor() {}
 

Cantera/src/zeroD/ConstPressureReactor.h

@@ -9,7 +9,7 @@
 
 #include "Reactor.h"
 
-namespace CanteraZeroD {
+namespace Cantera {
 
     /**
      * Class ConstPressureReactor is a class for constant-pressure 

Cantera/src/zeroD/FlowDevice.cpp

@@ -5,7 +5,7 @@
 
 using namespace std;
 
-namespace CanteraZeroD {
+namespace Cantera {
 
     bool FlowDevice::install(ReactorBase& in, ReactorBase& out) {
         if (m_in || m_out) return false;

Cantera/src/zeroD/FlowDevice.h

@@ -13,14 +13,8 @@
 
 namespace Cantera {
     class Func1;
-}
-using namespace Cantera;
-
-namespace CanteraZeroD {
-
     class ReactorBase;  // forward reference
 
-
     const int MFC_Type = 1;
     const int PressureController_Type = 2;
     const int Valve_Type = 3;

Cantera/src/zeroD/FlowReactor.cpp

@@ -8,10 +8,9 @@
 
 #include "FlowReactor.h"
 
-using namespace Cantera;
 using namespace std;
 
-namespace CanteraZeroD {
+namespace Cantera {
 
     FlowReactor::FlowReactor() : Reactor(), m_fctr(1.0e10), 
                                  m_speed0(0.0) {}

Cantera/src/zeroD/FlowReactor.h

@@ -9,7 +9,7 @@
 
 #include "Reactor.h"
 
-namespace CanteraZeroD {
+namespace Cantera {
 
     /**
      * Adiabatic, reversible flow in a constant-area duct.

Cantera/src/zeroD/PID_Controller.h

@@ -7,7 +7,7 @@
 #ifndef CT_PID_H
 #define CT_PID_H
 
-namespace CanteraZeroD {
+namespace Cantera {
 
     class PID_Controller {
 

Cantera/src/zeroD/Reactor.cpp

@@ -13,10 +13,9 @@
 #include "InterfaceKinetics.h"
 #include "SurfPhase.h"
 
-using namespace Cantera;
 using namespace std;
 
-namespace CanteraZeroD {
+namespace Cantera {
 
     doublereal quadInterp(doublereal x0, doublereal* x, doublereal* y);
 

Cantera/src/zeroD/Reactor.h

@@ -10,7 +10,7 @@
 #include "ReactorBase.h"
 #include "Kinetics.h"
 
-namespace CanteraZeroD {
+namespace Cantera {
 
     /**
      * Class Reactor is a general-purpose class for stirred

Cantera/src/zeroD/ReactorBase.cpp

@@ -9,7 +9,7 @@
 #include "Wall.h"
 
 using namespace std;
-namespace CanteraZeroD {
+namespace Cantera {
 
     ReactorBase::ReactorBase(string name) : m_nsp(0), 
                                  m_thermo(0), 

Cantera/src/zeroD/ReactorBase.h

@@ -8,10 +8,8 @@
 
 #include "ThermoPhase.h"
 
-using namespace Cantera;
-
 /// Namespace for classes implementing zero-dimensional reactor networks. 
-namespace CanteraZeroD {
+namespace Cantera {
 
 //    typedef Thermo   thermo_t;
 

Cantera/src/zeroD/ReactorFactory.cpp

@@ -11,7 +11,7 @@
 #include "ConstPressureReactor.h"
 
 using namespace std;
-namespace CanteraZeroD {
+namespace Cantera {
 
     ReactorFactory* ReactorFactory::s_factory = 0;
    #ifdef THREAD_SAFE_CANTERA

Cantera/src/zeroD/ReactorFactory.h

@@ -14,8 +14,7 @@
 #include <boost/thread/mutex.hpp>
 #endif
 
-namespace CanteraZeroD {
-
+namespace Cantera {
 
     class ReactorFactory : FactoryBase {
 

Cantera/src/zeroD/ReactorNet.cpp

@@ -5,7 +5,7 @@
 
 using namespace std;
 
-namespace CanteraZeroD {
+namespace Cantera {
 
   ReactorNet::ReactorNet() : Cantera::FuncEval(), m_nr(0), m_nreactors(0),
 			     m_integ(0), m_time(0.0), m_init(false), 

Cantera/src/zeroD/ReactorNet.h

@@ -11,7 +11,7 @@
 #include "Integrator.h"
 #include "Array.h"
 
-namespace CanteraZeroD {
+namespace Cantera {
 
   class ReactorNet : public Cantera::FuncEval {
 

Cantera/src/zeroD/Reservoir.h

@@ -9,7 +9,7 @@
 #include <iostream>
 #include "ReactorBase.h"
 
-namespace CanteraZeroD {
+namespace Cantera {
 
     class Reservoir : public ReactorBase {
 

Cantera/src/zeroD/Wall.cpp

@@ -5,14 +5,10 @@
 #include "InterfaceKinetics.h"
 #include "SurfPhase.h"
 
-using Cantera::Func1;
-using Cantera::Kinetics;
-
 using namespace std;
 
-namespace CanteraZeroD {
+namespace Cantera {
 
-        
     Wall::Wall() : m_left(0), m_right(0),  
                    m_area(0.0), m_k(0.0), m_rrth(0.0), m_emiss(0.0), 
                    m_vf(0), m_qf(0) {

Cantera/src/zeroD/Wall.h

@@ -12,16 +12,12 @@
 #include "Func1.h"
 
 namespace Cantera {
-    class Kinetics;
-    class Func1;
-    class SurfPhase;
-}
-//using namespace Cantera;
-
-namespace CanteraZeroD {
 
     // forward references
     class ReactorBase;
+    class Kinetics;
+    class Func1;
+    class SurfPhase;
 
     class Wall {
 

Cantera/src/zeroD/flowControllers.h

@@ -14,7 +14,7 @@
 //#include "PID_Controller.h"
 #include "Func1.h"
 
-namespace CanteraZeroD {
+namespace Cantera {
     /**
      * A class for mass flow controllers. The mass flow rate is constant,
      * independent of any other parameters.

test_problems/cxx_ex/example_utils.h

@@ -6,8 +6,6 @@
 
 using namespace Cantera;
 using namespace std;
-namespace CanteraZeroD{}
-using namespace CanteraZeroD;
 
 // Save the temperature, density, pressure, and mole fractions at one
 // time

test_problems/cxx_ex/kinetics_example1.cpp

@@ -11,7 +11,6 @@
 #include <cantera/IdealGasMix.h>
 #include "example_utils.h"
 using namespace Cantera;
-using namespace CanteraZeroD;
 using namespace std;
 
 // Kinetics example. This is written as a function so that one 
@@ -73,7 +72,7 @@ int kinetics_example1(int job) {
 
         // create a container object to run the simulation
         // and add the reactor to it
-		CanteraZeroD::ReactorNet *sim_ptr = new CanteraZeroD::ReactorNet();
+        ReactorNet* sim_ptr = new ReactorNet();
         sim_ptr->addReactor(&r);
 
         double tm;

test_problems/cxx_ex/kinetics_example2.cpp

@@ -62,8 +62,8 @@ int kinetics_example2(int job) {
 
         // create a container object to run the simulation
         // and add the reactor to it
-		CanteraZeroD::ReactorNet * sim_ptr = new ReactorNet ();
-         CanteraZeroD::ReactorNet &sim = *sim_ptr;
+        ReactorNet* sim_ptr = new ReactorNet();
+        ReactorNet& sim = *sim_ptr;
         sim.addReactor(&r);
 
         double tm;

test_problems/cxx_ex/kinetics_example3.cpp

@@ -68,7 +68,7 @@ int kinetics_example3(int job) {
 
         // create a container object to run the simulation
         // and add the reactor to it
-		CanteraZeroD::ReactorNet& sim = *(new ReactorNet());
+        ReactorNet& sim = *(new ReactorNet());
         sim.addReactor(&r);
 
         double tm;

test_problems/cxx_ex/rxnpath_example1.cpp

@@ -117,7 +117,7 @@ int rxnpath_example1(int job) {
 
         // create a container object to run the simulation
         // and add the reactor to it
-        CanteraZeroD::ReactorNet& sim = *(new ReactorNet ());
+        ReactorNet& sim = *(new ReactorNet());
         sim.addReactor(&r);
 
         // create a reaction path diagram builder

test_problems/spectroscopy/spectratest.cpp

@@ -4,11 +4,11 @@
 #include "kernel/Nuclei.h"
 #include <iostream>
 using namespace std;
-using namespace CanteraSpectra;
+using namespace Cantera;
 
 int main() {
 
-    Nucleus* a = CanteraSpectra::HydrogenNucleus();
+    Nucleus* a = HydrogenNucleus();
     Nucleus* b = HydrogenNucleus();
     if (*a == *b) {
         cout << "a and b and indistinguishable" << endl;