diff --git a/doc/sphinx/cti/input-files.rst b/doc/sphinx/cti/input-files.rst index 225cf8dc6..ce47de31d 100644 --- a/doc/sphinx/cti/input-files.rst +++ b/doc/sphinx/cti/input-files.rst @@ -280,7 +280,7 @@ From the point of view of the user, it appears that a Cantera application that imports a phase definition reads the input file, and uses the information there to construct the object representing the phase or interface in the application. While this is the net effect, it is actually a two-step -process. When a function like importPhase is called to import a phase definition +process. When a constructor like ``Solution`` is called to import a phase definition from a file, a preprocessor runs automatically to read the input file and create a string that contains the same information but in an XML-based format called CTML. After the preprocessor finishes, Cantera imports the phase definition from @@ -709,4 +709,3 @@ in the report for Chemkin referenced above. These errors include: .. [SAND98] See R. J. Kee, G. Dixon-Lewis, J. Warnatz, M. E. Coltrin, J. A. Miller, H. K. Moffat, Sandia National Laboratories Report SAND86-8246B (1998). - \ No newline at end of file diff --git a/doc/sphinx/cti/phases.rst b/doc/sphinx/cti/phases.rst index 03c3370f0..b2009db79 100644 --- a/doc/sphinx/cti/phases.rst +++ b/doc/sphinx/cti/phases.rst @@ -96,7 +96,8 @@ example, if a phase definition specifies the elements as:: then when this definition is imported by an application, element-specific properties will be ordered in the same way:: - >>> gas = importPhase('example.cti', 'gasmix') + >>> import cantera as ct + >>> gas = ct.Solution('example.cti', 'gasmix') >>> for n in range(gas.nElements()): ... print n, gas.elementSymbol(n) 0 H @@ -286,7 +287,7 @@ If we import this into Matlab, for example, we get a gas mixture containing the .. code-block:: matlabsession - >> gas = importPhase('gas.cti', 'hydrogen_mech') + >> gas = Solution('gas.cti', 'hydrogen_mech') hydrogen_mech: diff --git a/doc/sphinx/install.rst b/doc/sphinx/install.rst index bb6cbd8a5..7e4039f1f 100644 --- a/doc/sphinx/install.rst +++ b/doc/sphinx/install.rst @@ -230,7 +230,7 @@ directions :ref:`above `. - Matlab:: gas = IdealGasMix('gri30.cti') - h2o = importPhase('liquidvapor.cti','water') + h2o = Solution('liquidvapor.cti','water') .. _sec-install-osx: diff --git a/doc/sphinx/matlab/input-tutorial.rst b/doc/sphinx/matlab/input-tutorial.rst index e14083ee7..fd9bb2e5f 100644 --- a/doc/sphinx/matlab/input-tutorial.rst +++ b/doc/sphinx/matlab/input-tutorial.rst @@ -12,7 +12,7 @@ This is the typical way to create a Cantera "phase" object in Matlab:: gas1 = Solution('gri30.cti', 'gri30'); -Function ``Solution`` constructs an object representing a phase of matter by +This statement constructs a ``Solution`` object representing a phase of matter by reading in attributes of the phase from a file, which in this case is ``gri30.cti``. This file contains several phase specifications; the one we want here is ``gri30``, which is specified by the second argument. This file contains