[Transport] Update signature of new newTransport function

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

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/include/cantera/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h
@@ -98,14 +98,14 @@ Transport* newTransportMgr(const std::string& transportModel = "",
 
 //!  Create a new Transport instance.
 /*!
+ *  @param thermo   the ThermoPhase object associated with the phase
  *  @param model    name of transport model; if "default", the default
  *                  transport model for the ThermoPhase object is created
- *  @param thermo   the ThermoPhase object associated with the phase
  *  @returns a Transport object for the phase
  * @ingroup tranprops
  */
-inline shared_ptr<Transport> newTransport(const std::string& model = "",
-                                          ThermoPhase* thermo = 0) {
+inline shared_ptr<Transport> newTransport(ThermoPhase* thermo,
+                                          const std::string& model = "default") {
     Transport* tr;
     if (model == "default") {
         tr = TransportFactory::factory()->newTransport(thermo, 0);

diff --git a/interfaces/cython/cantera/_cantera.pxd b/interfaces/cython/cantera/_cantera.pxd
@@ -890,8 +890,7 @@ cdef extern from "cantera/transport/TransportFactory.h" namespace "Cantera":
     cdef CxxTransport* newDefaultTransportMgr(CxxThermoPhase*) except +translate_exception
     cdef CxxTransport* newTransportMgr(string, CxxThermoPhase*) except +translate_exception
     cdef CxxTransport* newTransportMgr(string) except +translate_exception
-    cdef shared_ptr[CxxTransport] newTransport(string) except +translate_exception
-    cdef shared_ptr[CxxTransport] newTransport(string, CxxThermoPhase*) except +translate_exception
+    cdef shared_ptr[CxxTransport] newTransport(CxxThermoPhase*, string) except +translate_exception
 
 cdef extern from "cantera/oneD/Domain1D.h":
     cdef cppclass CxxDomain1D "Cantera::Domain1D":

diff --git a/interfaces/cython/cantera/transport.pyx b/interfaces/cython/cantera/transport.pyx
@@ -169,12 +169,12 @@ cdef class Transport(_SolutionBase):
     def __init__(self, *args, **kwargs):
         if self.transport == NULL:
             if 'transport_model' not in kwargs:
-                self.base.setTransport(newTransport(stringify("default"), self.thermo))
+                self.base.setTransport(newTransport(self.thermo, stringify("default")))
             else:
                 model = kwargs['transport_model']
                 if not model:
                     model = 'None'
-                self.base.setTransport(newTransport(stringify(model), self.thermo))
+                self.base.setTransport(newTransport(self.thermo, stringify(model)))
             self.transport = self.base.transport().get()
 
         super().__init__(*args, **kwargs)
@@ -190,7 +190,7 @@ cdef class Transport(_SolutionBase):
             return pystr(self.transport.transportType())
 
         def __set__(self, model):
-            self.base.setTransport(newTransport(stringify(model), self.thermo))
+            self.base.setTransport(newTransport(self.thermo, stringify(model)))
             self.transport = self.base.transport().get()
 
     property CK_mode:
@@ -375,7 +375,7 @@ cdef class DustyGasTransport(Transport):
     """
     # The signature of this function causes warnings for Sphinx documentation
     def __init__(self, *args, **kwargs):
-        self.base.setTransport(newTransport(stringify("DustyGas"), self.thermo))
+        self.base.setTransport(newTransport(self.thermo, stringify("DustyGas")))
         self.transport = self.base.transport().get()
         super().__init__(*args, **kwargs)