Revision: 3421
Author:
yar...@gmail.com
Date: Tue Mar 10 22:41:23 2015 UTC
Log: [Doc] Update phase report examples to show compact species output
https://code.google.com/p/cantera/source/detail?r=3421
Modified:
/cantera/trunk/doc/sphinx/cti/phases.rst
/cantera/trunk/doc/sphinx/cython/tutorial.rst
/cantera/trunk/samples/matlab/tut1.m
=======================================
--- /cantera/trunk/doc/sphinx/cti/phases.rst Tue Aug 26 22:04:59 2014 UTC
+++ /cantera/trunk/doc/sphinx/cti/phases.rst Tue Mar 10 22:41:23 2015 UTC
@@ -309,13 +309,7 @@
X Y Chem. Pot. / RT
------------- ------------ ------------
H2 1 1 -917934
- H 0 0
- O 0 0
- O2 0 0
- OH 0 0
- H2O 0 0
- HO2 0 0
- H2O2 0 0
+ [ +7 minor] 0 0
>> eqs = reactionEqn(gas)
=======================================
--- /cantera/trunk/doc/sphinx/cython/tutorial.rst Tue Mar 10 22:41:19 2015
UTC
+++ /cantera/trunk/doc/sphinx/cython/tutorial.rst Tue Mar 10 22:41:23 2015
UTC
@@ -42,58 +42,7 @@
X Y Chem. Pot. / RT
------------- ------------ ------------
H2 1 1 -15.7173
- H 0 0
- O 0 0
- O2 0 0
- OH 0 0
- H2O 0 0
- HO2 0 0
- H2O2 0 0
- C 0 0
- CH 0 0
- CH2 0 0
- CH2(S) 0 0
- CH3 0 0
- CH4 0 0
- CO 0 0
- CO2 0 0
- HCO 0 0
- CH2O 0 0
- CH2OH 0 0
- CH3O 0 0
- CH3OH 0 0
- C2H 0 0
- C2H2 0 0
- C2H3 0 0
- C2H4 0 0
- C2H5 0 0
- C2H6 0 0
- HCCO 0 0
- CH2CO 0 0
- HCCOH 0 0
- N 0 0
- NH 0 0
- NH2 0 0
- NH3 0 0
- NNH 0 0
- NO 0 0
- NO2 0 0
- N2O 0 0
- HNO 0 0
- CN 0 0
- HCN 0 0
- H2CN 0 0
- HCNN 0 0
- HCNO 0 0
- HOCN 0 0
- HNCO 0 0
- NCO 0 0
- N2 0 0
- AR 0 0
- C3H7 0 0
- C3H8 0 0
- CH2CHO 0 0
- CH3CHO 0 0
+ [ +52 minor] 0 0
What you have just done is to create an object, `gas1` that implements GRI-
Mech 3.0, the 53-species, 325-reaction natural gas combustion mechanism
@@ -143,7 +92,7 @@
X Y Chem. Pot. / RT
------------- ------------ ------------
H2 1 1 -17.9775
- (other species not shown)
+ [ +52 minor] 0 0
Notice that the temperature has been changed as requested, but the pressure
has changed too. The density and composition have not.
@@ -205,59 +154,10 @@
X Y Chem. Pot. / RT
------------- ------------ ------------
- H2 0 0
- H 0 0
- O 0 0
O2 0.190114 0.220149 -28.7472
- OH 0 0
- H2O 0 0
- HO2 0 0
- H2O2 0 0
- C 0 0
- CH 0 0
- CH2 0 0
- CH2(S) 0 0
- CH3 0 0
CH4 0.095057 0.0551863 -35.961
- CO 0 0
- CO2 0 0
- HCO 0 0
- CH2O 0 0
- CH2OH 0 0
- CH3O 0 0
- CH3OH 0 0
- C2H 0 0
- C2H2 0 0
- C2H3 0 0
- C2H4 0 0
- C2H5 0 0
- C2H6 0 0
- HCCO 0 0
- CH2CO 0 0
- HCCOH 0 0
- N 0 0
- NH 0 0
- NH2 0 0
- NH3 0 0
- NNH 0 0
- NO 0 0
- NO2 0 0
- N2O 0 0
- HNO 0 0
- CN 0 0
- HCN 0 0
- H2CN 0 0
- HCNN 0 0
- HCNO 0 0
- HOCN 0 0
- HNCO 0 0
- NCO 0 0
N2 0.714829 0.724665 -25.6789
- AR 0 0
- C3H7 0 0
- C3H8 0 0
- CH2CHO 0 0
- CH3CHO 0 0
+ [ +50 minor] 0 0
The composition above was specified using a string. The format is a comma-
separated list of ``<species name>:<relative mole numbers>`` pairs. The
mole
=======================================
--- /cantera/trunk/samples/matlab/tut1.m Thu Jan 30 00:47:24 2014 UTC
+++ /cantera/trunk/samples/matlab/tut1.m Tue Mar 10 22:41:23 2015 UTC
@@ -30,58 +30,7 @@
% X Y Chem. Pot. / RT
% ------------- ------------ ------------
% H2 1 1 -15.7173
-% H 0 0
-% O 0 0
-% O2 0 0
-% OH 0 0
-% H2O 0 0
-% HO2 0 0
-% H2O2 0 0
-% C 0 0
-% CH 0 0
-% CH2 0 0
-% CH2(S) 0 0
-% CH3 0 0
-% CH4 0 0
-% CO 0 0
-% CO2 0 0
-% HCO 0 0
-% CH2O 0 0
-% CH2OH 0 0
-% CH3O 0 0
-% CH3OH 0 0
-% C2H 0 0
-% C2H2 0 0
-% C2H3 0 0
-% C2H4 0 0
-% C2H5 0 0
-% C2H6 0 0
-% HCCO 0 0
-% CH2CO 0 0
-% HCCOH 0 0
-% N 0 0
-% NH 0 0
-% NH2 0 0
-% NH3 0 0
-% NNH 0 0
-% NO 0 0
-% NO2 0 0
-% N2O 0 0
-% HNO 0 0
-% CN 0 0
-% HCN 0 0
-% H2CN 0 0
-% HCNN 0 0
-% HCNO 0 0
-% HOCN 0 0
-% HNCO 0 0
-% NCO 0 0
-% N2 0 0
-% AR 0 0
-% C3H7 0 0
-% C3H8 0 0
-% CH2CHO 0 0
-% CH3CHO 0 0
+% [ +52 minor] 0 0
%
% What you have just done is to create an object ("gas1") that
% implements GRI-Mech 3.0, the 53-species, 325-reaction natural gas
@@ -179,59 +128,10 @@
%
% X Y Chem. Pot. / RT
% ------------- ------------ ------------
-% H2 0 0
-% H 0 0
-% O 0 0
% O2 0.190114 0.220149 -27.9596
-% OH 0 0
-% H2O 0 0
-% HO2 0 0
-% H2O2 0 0
-% C 0 0
-% CH 0 0
-% CH2 0 0
-% CH2(S) 0 0
-% CH3 0 0
% CH4 0.095057 0.0551863 -37.0813
-% CO 0 0
-% CO2 0 0
-% HCO 0 0
-% CH2O 0 0
-% CH2OH 0 0
-% CH3O 0 0
-% CH3OH 0 0
-% C2H 0 0
-% C2H2 0 0
-% C2H3 0 0
-% C2H4 0 0
-% C2H5 0 0
-% C2H6 0 0
-% HCCO 0 0
-% CH2CO 0 0
-% HCCOH 0 0
-% N 0 0
-% NH 0 0
-% NH2 0 0
-% NH3 0 0
-% NNH 0 0
-% NO 0 0
-% NO2 0 0
-% N2O 0 0
-% HNO 0 0
-% CN 0 0
-% HCN 0 0
-% H2CN 0 0
-% HCNN 0 0
-% HCNO 0 0
-% HOCN 0 0
-% HNCO 0 0
-% NCO 0 0
% N2 0.714829 0.724665 -24.935
-% AR 0 0
-% C3H7 0 0
-% C3H8 0 0
-% CH2CHO 0 0
-% CH3CHO 0 0
+% [ +50 minor] 0 0
% Other properties may also be set using 'set', including some that
% can't be set individually. The following property pairs may be