research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deprecate class GRI_30_Kinetics

Browse source
This commit is contained in:
Ray Speth 2013-06-13 22:50:14 +00:00
parent d4be0e605b
commit 9740980c5d
9 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/inputs/gri30.cti
View file

@ -16,7 +16,6 @@ ideal_gas(name = "gri30",
HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7 HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7
C3H8 CH2CHO CH3CHO """, C3H8 CH2CHO CH3CHO """,
reactions = "all", reactions = "all",
kinetics = "GRI30",
initial_state = state(temperature = 300.0, initial_state = state(temperature = 300.0,
pressure = OneAtm) ) pressure = OneAtm) )
@ -29,7 +28,6 @@ ideal_gas(name = "gri30_mix",
HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7 HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7
C3H8 CH2CHO CH3CHO """, C3H8 CH2CHO CH3CHO """,
reactions = "all", reactions = "all",
kinetics = "GRI30",
transport = "Mix", transport = "Mix",
initial_state = state(temperature = 300.0, initial_state = state(temperature = 300.0,
pressure = OneAtm) ) pressure = OneAtm) )
@ -44,7 +42,6 @@ ideal_gas(name = "gri30_multi",
HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7 HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7
C3H8 CH2CHO CH3CHO """, C3H8 CH2CHO CH3CHO """,
reactions = "all", reactions = "all",
kinetics = "GRI30",
transport = "Multi", transport = "Multi",
initial_state = state(temperature = 300.0, initial_state = state(temperature = 300.0,
pressure = OneAtm) ) pressure = OneAtm) )

6
data/inputs/gri30.xml
View file

@ -18,7 +18,7 @@
<pressure units="Pa">101325.0</pressure> <pressure units="Pa">101325.0</pressure>
</state> </state>
<thermo model="IdealGas"/> <thermo model="IdealGas"/>
<kinetics model="GRI30"/> <kinetics model="GasKinetics"/>
<transport model="None"/> <transport model="None"/>
</phase> </phase>
@ -38,7 +38,7 @@
<pressure units="Pa">101325.0</pressure> <pressure units="Pa">101325.0</pressure>
</state> </state>
<thermo model="IdealGas"/> <thermo model="IdealGas"/>
<kinetics model="GRI30"/> <kinetics model="GasKinetics"/>
<transport model="Mix"/> <transport model="Mix"/>
</phase> </phase>
@ -58,7 +58,7 @@
<pressure units="Pa">101325.0</pressure> <pressure units="Pa">101325.0</pressure>
</state> </state>
<thermo model="IdealGas"/> <thermo model="IdealGas"/>
<kinetics model="GRI30"/> <kinetics model="GasKinetics"/>
<transport model="Multi"/> <transport model="Multi"/>
</phase> </phase>

6
data/inputs/gri30_highT.cti
View file

@ -16,7 +16,7 @@ ideal_gas(name = "gri30",
HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7 HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7
C3H8 CH2CHO CH3CHO """, C3H8 CH2CHO CH3CHO """,
reactions = "all", reactions = "all",
kinetics = "GRI30", # kinetics = "GRI30",
initial_state = state(temperature = 300.0, initial_state = state(temperature = 300.0,
pressure = OneAtm) ) pressure = OneAtm) )
@ -29,7 +29,7 @@ ideal_gas(name = "gri30_mix",
HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7 HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7
C3H8 CH2CHO CH3CHO """, C3H8 CH2CHO CH3CHO """,
reactions = "all", reactions = "all",
kinetics = "GRI30", # kinetics = "GRI30",
transport = "Mix", transport = "Mix",
initial_state = state(temperature = 300.0, initial_state = state(temperature = 300.0,
pressure = OneAtm) ) pressure = OneAtm) )
@ -44,7 +44,7 @@ ideal_gas(name = "gri30_multi",
HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7 HCN H2CN HCNN HCNO HOCN HNCO NCO N2 AR C3H7
C3H8 CH2CHO CH3CHO """, C3H8 CH2CHO CH3CHO """,
reactions = "all", reactions = "all",
kinetics = "GRI30", # kinetics = "GRI30",
transport = "Multi", transport = "Multi",
initial_state = state(temperature = 300.0, initial_state = state(temperature = 300.0,
pressure = OneAtm) ) pressure = OneAtm) )

1
include/cantera/GRI30.h
View file

@ -18,6 +18,7 @@ namespace Cantera
* class GRI_30_Kinetics, which is the kinetics manager with * class GRI_30_Kinetics, which is the kinetics manager with
* hard-wired replacements for some of the generic kinetics * hard-wired replacements for some of the generic kinetics
* methods like "getNetReactionRates." * methods like "getNetReactionRates."
* @deprecated
*/ */
class GRI30 : class GRI30 :
public IdealGasPhase, public IdealGasPhase,

1
include/cantera/kinetics/GRI_30_Kinetics.h
View file

@ -17,6 +17,7 @@ const int cGRI_30_Kinetics = cGasKinetics + 1;
/** /**
* Kinetics manager implementing reaction mechanism GRI-Mech 3.0 * Kinetics manager implementing reaction mechanism GRI-Mech 3.0
* @deprecated
*/ */
class GRI_30_Kinetics : public GasKinetics class GRI_30_Kinetics : public GasKinetics
{ {

4
interfaces/cython/cantera/test/test_reactor.py
View file

@ -540,7 +540,7 @@ class TestWellStirredReactorIgnition(utilities.CanteraTest):
break break
# regression test; no external basis for this result # regression test; no external basis for this result
self.assertNear(tIg, 2.2284, 1e-3) self.assertNear(tIg, 2.2249, 1e-3)
def test_ignition2(self): def test_ignition2(self):
self.setup(900.0, 10*ct.one_atm, 1.0, 20.0) self.setup(900.0, 10*ct.one_atm, 1.0, 20.0)
@ -553,7 +553,7 @@ class TestWellStirredReactorIgnition(utilities.CanteraTest):
break break
# regression test; no external basis for this result # regression test; no external basis for this result
self.assertNear(tIg, 1.4900, 1e-3) self.assertNear(tIg, 1.4856, 1e-3)
def test_ignition3(self): def test_ignition3(self):
self.setup(900.0, 10*ct.one_atm, 1.0, 80.0) self.setup(900.0, 10*ct.one_atm, 1.0, 80.0)

5
src/kinetics/GRI_30_Kinetics.cpp
View file

@ -21,7 +21,10 @@ namespace Cantera
{ {
GRI_30_Kinetics:: GRI_30_Kinetics::
GRI_30_Kinetics(thermo_t* th) : GasKinetics(th) {} GRI_30_Kinetics(thermo_t* th) : GasKinetics(th) {
warn_deprecated("class GRI_30_Kinetics",
"To be removed in Cantera 2.2.");
}
void GRI_30_Kinetics:: void GRI_30_Kinetics::
gri30_update_rates_T() gri30_update_rates_T()

2
test_problems/NASA9poly_test/gasNASA9.xml
View file

@ -19,7 +19,7 @@
<pressure units="Pa">101325.0</pressure> <pressure units="Pa">101325.0</pressure>
</state> </state>
<thermo model="IdealGas"/> <thermo model="IdealGas"/>
<kinetics model="GRI30"/> <kinetics model="GasKinetics"/>
<transport model="Mix"/> <transport model="Mix"/>
</phase> </phase>

1
test_problems/cxx_ex/kinetics_example2.cpp
View file

@ -21,6 +21,7 @@ using namespace Cantera;
int kinetics_example2(int job) int kinetics_example2(int job)
{ {
suppress_deprecation_warnings();
try { try {
std::cout << "Ignition simulation using class GRI30." << std::endl; std::cout << "Ignition simulation using class GRI30." << std::endl;