From 9267a8984180e65a992e35e69359198c677adebd Mon Sep 17 00:00:00 2001 From: Raymond Speth Date: Fri, 19 Feb 2021 17:15:22 -0500 Subject: [PATCH 1/2] [Reactor] Fix using reactor surface chemistry with YAML input --- src/zeroD/Reactor.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/zeroD/Reactor.cpp b/src/zeroD/Reactor.cpp index da3f985312b..61c64988bfb 100644 --- a/src/zeroD/Reactor.cpp +++ b/src/zeroD/Reactor.cpp @@ -94,10 +94,6 @@ void Reactor::initialize(doublereal t0) m_nv += S->thermo()->nSpecies(); size_t nt = S->kinetics()->nTotalSpecies(); maxnt = std::max(maxnt, nt); - if (m_chem && &m_kin->thermo(0) != &S->kinetics()->thermo(0)) { - throw CanteraError("Reactor::initialize", - "First phase of all kinetics managers must be the gas."); - } } m_work.resize(maxnt); } From 8c661a74e04b762b4651ea1c862a113a138fc680 Mon Sep 17 00:00:00 2001 From: Raymond Speth Date: Fri, 19 Feb 2021 17:35:15 -0500 Subject: [PATCH 2/2] [Test] Use YAML input for reactor surface test --- interfaces/cython/cantera/test/test_reactor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/cython/cantera/test/test_reactor.py b/interfaces/cython/cantera/test/test_reactor.py index 638dbddef22..7669554cfee 100644 --- a/interfaces/cython/cantera/test/test_reactor.py +++ b/interfaces/cython/cantera/test/test_reactor.py @@ -1048,9 +1048,9 @@ class TestSurfaceKinetics(utilities.CanteraTest): def make_reactors(self): self.net = ct.ReactorNet() - self.gas = ct.Solution('diamond.xml', 'gas') - self.solid = ct.Solution('diamond.xml', 'diamond') - self.interface = ct.Interface('diamond.xml', 'diamond_100', + self.gas = ct.Solution('diamond.yaml', 'gas') + self.solid = ct.Solution('diamond.yaml', 'diamond') + self.interface = ct.Interface('diamond.yaml', 'diamond_100', (self.gas, self.solid)) self.gas.TPX = None, 1.0e3, 'H:0.002, H2:1, CH4:0.01, CH3:0.0002' self.r1 = ct.IdealGasReactor(self.gas)