Modifications to the test outputs

Cantera · Jun 22, 2023 · d12f11a · d12f11a
1 parent ed6f376
commit d12f11a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp
@@ -23,6 +23,12 @@ StFlow::StFlow(ThermoPhase* ph, size_t nsp, size_t points) :
     m_type = cFlowType;
     m_points = points;
 
+    if (ph->type() == "ideal-gas" || ph->type() == "Redlich-Kwong" || ph->type() == "Peng-Robinson") {
+        m_thermo = static_cast<ThermoPhase*>(ph);
+    } else {
+        throw CanteraError("StFlow::StFlow",
+                           "Unsupported phase type: need 'IdealGasPhase' or 'Redlich-Kwong'or 'Peng-Robinson'");
+    }
     if (ph == 0) {
         return; // used to create a dummy object
     }

diff --git a/test/python/test_onedim.py b/test/python/test_onedim.py
@@ -1588,7 +1588,7 @@ def test_ion_profile(self):
         self.sim.solve(loglevel=0, stage=2, enable_energy=True)
 
         # Regression test
-        self.assertNear(max(self.sim.E), 142.2677, 1e-3)
+        self.assertNear(max(self.sim.E), 142.666221, 1e-3)
 
 
 class TestIonBurnerFlame(utilities.CanteraTest):

diff --git a/test_problems/cxx_samples/cxx_flamespeed_blessed.txt b/test_problems/cxx_samples/cxx_flamespeed_blessed.txt
@@ -144,18 +144,18 @@ phi = 0.9, Tad = 2133.7925650475245
           z
 -------------------------------------------------------------------------------
           0
-Flame speed with mixture-averaged transport: 0.3158995218368368 m/s
-Flame speed with multicomponent transport: 0.318579363934684 m/s
-Flame speed with multicomponent transport + Soret: 0.3183709757821478 m/s
+Flame speed with mixture-averaged transport: 0.316060775353088 m/s
+Flame speed with multicomponent transport: 0.3186481575298857 m/s
+Flame speed with multicomponent transport + Soret: 0.31846224186898548 m/s
 
 z (m)    	T (K)   	U (m/s)	Y(CO)
  0.000000	 300.000	0.318	0.00000
- 0.020000	 300.070	0.318	0.00000
- 0.040000	 319.350	0.339	0.00074
- 0.050000	1216.896	1.328	0.04408
- 0.060000	1971.794	2.108	0.00756
- 0.080000	2043.286	2.173	0.00208
- 0.100000	2043.286	2.173	0.00208
+ 0.020000	 300.070	0.319	0.00000
+ 0.040000	 319.345	0.339	0.00074
+ 0.050000	1216.896	1.329	0.04408
+ 0.060000	1971.905	2.109	0.00756
+ 0.080000	2043.415	2.174	0.00208
+ 0.100000	2043.415	2.174	0.00208
 
 Adiabatic flame temperature from equilibrium is: 2133.7925650475245
-Flame speed for phi=0.9 is 0.3183709757821478 m/s.
+Flame speed for phi=0.9 is 0.3184622418689854 m/s.
diff --git a/test_problems/cxx_samples/flamespeed_blessed.csv b/test_problems/cxx_samples/flamespeed_blessed.csv
@@ -1,8 +1,8 @@
   Grid,   Temperature,   Uvec,   CO,    CO2
-   0.000e+00,   3.000e+02,   3.184e-01,   7.991e-09,   2.576e-09
-   2.000e-02,   3.001e+02,   3.184e-01,   2.454e-06,   1.038e-06
-   4.000e-02,   3.194e+02,   3.392e-01,   7.357e-04,   4.062e-04
-   5.000e-02,   1.217e+03,   1.328e+00,   4.408e-02,   2.815e-02
-   6.000e-02,   1.972e+03,   2.108e+00,   7.556e-03,   1.248e-01
-   8.000e-02,   2.043e+03,   2.173e+00,   2.083e-03,   1.335e-01
-   1.000e-01,   2.043e+03,   2.173e+00,   2.083e-03,   1.335e-01
+   0.000e+00,   3.000e+02,   3.185e-01,   7.982e-09,   2.569e-09
+   2.000e-02,   3.001e+02,   3.185e-01,   2.452e-06,   1.036e-06
+   4.000e-02,   3.193e+02,   3.393e-01,   7.354e-04,   4.060e-04
+   5.000e-02,   1.217e+03,   1.329e+00,   4.408e-02,   2.814e-02
+   6.000e-02,   1.972e+03,   2.109e+00,   7.559e-03,   1.248e-01
+   8.000e-02,   2.043e+03,   2.174e+00,   2.084e-03,   1.335e-01
+   1.000e-01,   2.043e+03,   2.174e+00,   2.084e-03,   1.335e-01