[Transport] Remove 'NoTransport' class

Cantera · Nov 27, 2021 · 1f23494 · 1f23494
1 parent 5a917b5
commit 1f23494
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/include/cantera/transport/TransportBase.h b/include/cantera/transport/TransportBase.h
@@ -158,7 +158,7 @@ class Transport
     //! Identifies the Transport object type. Each derived class should override
     //! this method to return a meaningful identifier.
     virtual std::string transportType() const {
-        return "Transport";
+        return "None";
     }
 
     /*!
@@ -788,15 +788,6 @@ class Transport
     std::weak_ptr<Solution> m_root;
 };
 
-
-//! Empty transport object used for exception handling
-class NoTransport : public Transport
-{
-    virtual std::string transportType() const {
-        return "None";
-    }
-};
-
 }
 
 #endif
diff --git a/src/transport/TransportFactory.cpp b/src/transport/TransportFactory.cpp
@@ -31,9 +31,8 @@ TransportFactory::TransportFactory()
 {
     reg("", []() { return new Transport(); });
     addAlias("", "Transport");
-    reg("None", []() { return new NoTransport(); });
-    addAlias("None", "none");
-    addAlias("None", "NoTransport");
+    addAlias("", "None");
+    addAlias("", "none");
     reg("unity-Lewis-number", []() { return new UnityLewisTransport(); });
     addAlias("unity-Lewis-number", "UnityLewis");
     reg("mixture-averaged", []() { return new MixTransport(); });
@@ -64,7 +63,7 @@ void TransportFactory::deleteFactory()
 Transport* TransportFactory::newTransport(const std::string& transportModel,
         ThermoPhase* phase, int log_level)
 {
-    if (transportModel != "DustyGas" && canonicalize(transportModel) == "None") {
+    if (transportModel != "DustyGas" && canonicalize(transportModel) == "") {
         return create(transportModel);
     }
     if (!phase) {