From 3bf09fbd7f69f8839bc8a7d1e33bee8ad409ad7b Mon Sep 17 00:00:00 2001
From: Ingmar Schoegl <ischoegl@lgmail.com>
Date: Sun, 29 Sep 2019 08:43:54 -0500
Subject: [PATCH] [Base] rename Base.h/.cpp to SolutionBase.h/.cpp

---
 .../cantera/base/{Base.h => SolutionBase.h}   | 21 ++++++++++++++++---
 include/cantera/thermo/ThermoPhase.h          |  2 +-
 interfaces/cython/cantera/_cantera.pxd        |  2 +-
 src/base/{Base.cpp => SolutionBase.cpp}       |  4 ++--
 src/thermo/Phase.cpp                          |  2 +-
 5 files changed, 23 insertions(+), 8 deletions(-)
 rename include/cantera/base/{Base.h => SolutionBase.h} (87%)
 rename src/base/{Base.cpp => SolutionBase.cpp} (97%)

diff --git a/include/cantera/base/Base.h b/include/cantera/base/SolutionBase.h
similarity index 87%
rename from include/cantera/base/Base.h
rename to include/cantera/base/SolutionBase.h
index a22e1580e..ea5ee8bb2 100644
--- a/include/cantera/base/Base.h
+++ b/include/cantera/base/SolutionBase.h
@@ -1,10 +1,10 @@
-//! @file Base.h
+//! @file SolutionBase.h
 
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
-#ifndef CT_BASE_H
-#define CT_BASE_H
+#ifndef CT_SOLUTIONBASE_H
+#define CT_SOLUTIONBASE_H
 
 #include "cantera/base/ctexceptions.h"
 
@@ -77,6 +77,21 @@ public:
     //! Set the Transport object
     void setTransport(shared_ptr<Transport> transport);
 
+    //! Accessor for the ThermoPhase object
+    shared_ptr<ThermoPhase> thermo() {
+        return m_thermo;
+    }
+
+    //! Accessor for the Kinetics object
+    shared_ptr<Kinetics> kinetics() {
+        return m_kinetics;
+    }
+
+    //! Accessor for the Transport object
+    shared_ptr<Transport> transport() {
+        return m_transport;
+    }
+
 protected:
     shared_ptr<ThermoPhase> m_thermo;  //! ThermoPhase manager
     shared_ptr<Kinetics> m_kinetics;  //! Kinetics manager
diff --git a/include/cantera/thermo/ThermoPhase.h b/include/cantera/thermo/ThermoPhase.h
index a1b6da7a6..fdac8cf29 100644
--- a/include/cantera/thermo/ThermoPhase.h
+++ b/include/cantera/thermo/ThermoPhase.h
@@ -6,7 +6,7 @@
  */
 
 // This file is part of Cantera. See License.txt in the top-level directory or
-// at http://www.cantera.org/license.txt for license and copyright information.
+// at https://cantera.org/license.txt for license and copyright information.
 
 #ifndef CT_THERMOPHASE_H
 #define CT_THERMOPHASE_H
diff --git a/interfaces/cython/cantera/_cantera.pxd b/interfaces/cython/cantera/_cantera.pxd
index 94f232b83..7c4a4c253 100644
--- a/interfaces/cython/cantera/_cantera.pxd
+++ b/interfaces/cython/cantera/_cantera.pxd
@@ -121,7 +121,7 @@ cdef extern from "cantera/thermo/Species.h" namespace "Cantera":
     cdef vector[shared_ptr[CxxSpecies]] CxxGetSpecies "getSpecies" (CxxAnyValue&) except +translate_exception
 
 
-cdef extern from "cantera/base/Base.h" namespace "Cantera":
+cdef extern from "cantera/base/SolutionBase.h" namespace "Cantera":
     cdef cppclass CxxSolutionBase "Cantera::SolutionBase":
         CxxSolutionBase()
         string type()
diff --git a/src/base/Base.cpp b/src/base/SolutionBase.cpp
similarity index 97%
rename from src/base/Base.cpp
rename to src/base/SolutionBase.cpp
index 258ee953e..dd9e8db6c 100644
--- a/src/base/Base.cpp
+++ b/src/base/SolutionBase.cpp
@@ -1,9 +1,9 @@
-//! @file Base.cpp
+//! @file SolutionBase.cpp
 
 // This file is part of Cantera. See License.txt in the top-level directory or
 // at https://cantera.org/license.txt for license and copyright information.
 
-#include "cantera/base/Base.h"
+#include "cantera/base/SolutionBase.h"
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/kinetics/Kinetics.h"
 #include "cantera/transport/TransportBase.h"
diff --git a/src/thermo/Phase.cpp b/src/thermo/Phase.cpp
index c82b3e756..85798d5ec 100644
--- a/src/thermo/Phase.cpp
+++ b/src/thermo/Phase.cpp
@@ -4,7 +4,7 @@
  */
 
 // This file is part of Cantera. See License.txt in the top-level directory or
-// at http://www.cantera.org/license.txt for license and copyright information.
+// at https://cantera.org/license.txt for license and copyright information.
 
 #include "cantera/thermo/Phase.h"
 #include "cantera/base/utilities.h"