diff --git a/interfaces/matlab/toolbox/@Mixture/Mixture.m b/interfaces/matlab/toolbox/@Mixture/Mixture.m index 2f81cd8bf2..be1998fef5 100644 --- a/interfaces/matlab/toolbox/@Mixture/Mixture.m +++ b/interfaces/matlab/toolbox/@Mixture/Mixture.m @@ -5,13 +5,13 @@ % To construct a mixture, supply a cell array of phases and % mole numbers:: % -% >> gas = importPhase('gas.cti'); -% >> graphite = importPhase('graphite.cti'); +% >> gas = Solution('gas.cti'); +% >> graphite = Solution('graphite.cti'); % >> mix = Mixture({gas, 1.0; graphite, 0.1}); % % Phases may also be added later using the addPhase method:: % -% >> water = importPhase('water.cti'); +% >> water = Solution('water.cti'); % >> addPhase(mix, water, 3.0); % % Note that the objects representing each phase compute only the diff --git a/samples/matlab/catcomb.m b/samples/matlab/catcomb.m index 77396e5563..9130bcdcee 100644 --- a/samples/matlab/catcomb.m +++ b/samples/matlab/catcomb.m @@ -61,7 +61,7 @@ % The gas phase will be taken from the definition of phase 'gas' in % input file 'ptcombust.cti,' which is a stripped-down version of % GRI-Mech 3.0. -gas = importPhase('ptcombust.cti','gas'); +gas = Solution('ptcombust.cti','gas'); set(gas,'T',tinlet,'P',p,'X',comp1); %%%%%%%%%%%%%%%% create the interface object %%%%%%%%%%%%%%%%%% diff --git a/samples/matlab/surfreactor.m b/samples/matlab/surfreactor.m index 72aff020c9..1110ceba59 100644 --- a/samples/matlab/surfreactor.m +++ b/samples/matlab/surfreactor.m @@ -7,7 +7,7 @@ help surfreactor t = 870.0; -gas = importPhase('ptcombust.cti','gas'); +gas = Solution('ptcombust.cti','gas'); % set the initial conditions set(gas,'T',t,'P',oneatm,'X','CH4:0.01, O2:0.21, N2:0.78'); diff --git a/samples/matlab/tut2.m b/samples/matlab/tut2.m index cf656939fd..f3af17e3d8 100644 --- a/samples/matlab/tut2.m +++ b/samples/matlab/tut2.m @@ -1,7 +1,7 @@ % Tutorial 2: Working with input files % % Topics: -% - using functions 'importPhase' and 'importInterface' +% - using functions 'Solution' and 'importInterface' % - input files distributed with Cantera % - the Cantera search path % - CTML files @@ -16,10 +16,10 @@ % GRI-Mech 3.0. Another way to do this is shown here, with statements % added to measure how long this takes: -gas1 = importPhase('gri30.cti', 'gri30'); +gas1 = Solution('gri30.cti', 'gri30'); msg = sprintf('time to create gas1: %f', cputime - t0) -% Function 'importPhase' constructs an object representing a phase of +% Function 'Solution' constructs an 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 % spcifications; the one we want here is 'gri30', which is specified @@ -40,7 +40,7 @@ % them in again: t0 = cputime; -gas1b = importPhase('gri30.cti', 'gri30'); +gas1b = Solution('gri30.cti', 'gri30'); msg = sprintf('time to create gas1b: %f', cputime - t0) @@ -76,9 +76,9 @@ % import definitions of two bulk phases and the interface between them % from file diamond.cti: -gas2 = importPhase('diamond.cti', 'gas'); % a gas +gas2 = Solution('diamond.cti', 'gas'); % a gas -diamond = importPhase('diamond.cti','diamond'); % bulk diamond +diamond = Solution('diamond.cti','diamond'); % bulk diamond diamonnd_surf = importInterface('diamond.cti','diamond_100',... gas2, diamond); @@ -97,7 +97,7 @@ % you can use it instead of the .cti file, which will result in % somewhat faster startup. -gas4 = importPhase('gri30.xml','gri30'); +gas4 = Solution('gri30.xml','gri30'); % Interfaces can be imported from XML files too. diamonnd_surf2 = importInterface('diamond.xml','diamond_100',...