[1D] Use StFlow::fixed_mdot when applicable

Cantera · Mar 18, 2023 · 2884a08 · 2884a08
1 parent bf4ab52
commit 2884a08
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/include/cantera/oneD/StFlow.h b/include/cantera/oneD/StFlow.h
@@ -188,12 +188,6 @@ class StFlow : public Domain1D
         m_isFree = false;
     }
 
-    //! Return flag indicating whether flow is free
-    //! @see setFreeFlow setAxisymmetricFlow
-    bool isFree() {
-        return m_isFree;
-    }
-
     //! Return the type of flow domain being represented, either "Free Flame" or
     //! "Axisymmetric Stagnation".
     //! @see setFreeFlow setAxisymmetricFlow

diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp
@@ -625,7 +625,7 @@ int Sim1D::setFixedTemperature(double t)
         StFlow* d_free = dynamic_cast<StFlow*>(&domain(n));
         size_t npnow = d.nPoints();
         size_t nstart = znew.size();
-        if (d_free && d_free->isFree()) {
+        if (d_free && !d_free->fixed_mdot()) {
             for (size_t m = 0; m < npnow - 1; m++) {
                 bool fixedpt = false;
                 double t1 = value(n, 2, m);
@@ -703,7 +703,7 @@ double Sim1D::fixedTemperature()
     double t_fixed = std::numeric_limits<double>::quiet_NaN();
     for (size_t n = 0; n < nDomains(); n++) {
         StFlow* d = dynamic_cast<StFlow*>(&domain(n));
-        if (d && d->isFree() && d->m_tfixed > 0) {
+        if (d && !d->fixed_mdot() && d->m_tfixed > 0) {
             t_fixed = d->m_tfixed;
             break;
         }
@@ -716,7 +716,7 @@ double Sim1D::fixedTemperatureLocation()
     double z_fixed = std::numeric_limits<double>::quiet_NaN();
     for (size_t n = 0; n < nDomains(); n++) {
         StFlow* d = dynamic_cast<StFlow*>(&domain(n));
-        if (d && d->isFree() && d->m_tfixed > 0) {
+        if (d && !d->fixed_mdot() && d->m_tfixed > 0) {
             z_fixed = d->m_zfixed;
             break;
         }

diff --git a/src/oneD/refine.cpp b/src/oneD/refine.cpp
@@ -183,7 +183,7 @@ int Refiner::analyze(size_t n, const doublereal* z,
         }
 
         // Keep the point where the temperature is fixed
-        if (fflame && fflame->isFree() && z[j] == fflame->m_zfixed) {
+        if (fflame && !fflame->fixed_mdot() && z[j] == fflame->m_zfixed) {
             m_keep[j] = 1;
         }
     }