diff --git a/interfaces/matlab/toolbox/@ThermoPhase/meanMolarMass.m b/interfaces/matlab/toolbox/@ThermoPhase/meanMolarMass.m index 6d2af4ffa..c6489fa0a 100644 --- a/interfaces/matlab/toolbox/@ThermoPhase/meanMolarMass.m +++ b/interfaces/matlab/toolbox/@ThermoPhase/meanMolarMass.m @@ -1,8 +1,9 @@ -function wtm = meanMolarMass(tp) +function mmm = meanMolarMass(tp) % MEANMOLARMASS - Mean molar mass [kg/kmol]. % % The mean molar mass is the mole-fraction-weighted sum of the % molar masses of the individual species in the phase. % -wtm = phase_get(tp.tp_id, 4); +warning('Deprecated in favor of meanMolecularWeight.m') +mmm = meanMolecularWeight(tp); diff --git a/interfaces/matlab/toolbox/@ThermoPhase/meanMolecularWeight.m b/interfaces/matlab/toolbox/@ThermoPhase/meanMolecularWeight.m index 3ff709428..c26053ed6 100644 --- a/interfaces/matlab/toolbox/@ThermoPhase/meanMolecularWeight.m +++ b/interfaces/matlab/toolbox/@ThermoPhase/meanMolecularWeight.m @@ -1,4 +1,4 @@ -function wtm = meanMolecularWeight(tp) +function mmw = meanMolecularWeight(tp) % MEANMOLECULARWEIGHT - Mean molecular weight. % % This method is a synonym for method meanMolarMass and is @@ -7,4 +7,4 @@ function wtm = meanMolecularWeight(tp) % See also; meanMolarMass % -wtm = meanMolarMass(tp); +mmw = phase_get(tp.tp_id,4); diff --git a/interfaces/matlab/toolbox/@ThermoPhase/molarMasses.m b/interfaces/matlab/toolbox/@ThermoPhase/molarMasses.m index 8c91603f6..fc051e9a2 100644 --- a/interfaces/matlab/toolbox/@ThermoPhase/molarMasses.m +++ b/interfaces/matlab/toolbox/@ThermoPhase/molarMasses.m @@ -1,5 +1,6 @@ -function x = molarMasses(tp) +function mm = molarMasses(tp) % MOLARMASSES - Array of species molar masses [kg/kmol]. % -x = phase_get(tp.tp_id, 22); +warning('Deprecated in favor of molecularWeights.m') +mm = molecularWeights(tp); diff --git a/interfaces/matlab/toolbox/@ThermoPhase/molecularWeights.m b/interfaces/matlab/toolbox/@ThermoPhase/molecularWeights.m index 58d91f399..96201172b 100644 --- a/interfaces/matlab/toolbox/@ThermoPhase/molecularWeights.m +++ b/interfaces/matlab/toolbox/@ThermoPhase/molecularWeights.m @@ -1,8 +1,9 @@ -function x = molecularWeights(a) +function mw = molecularWeights(tp) % MOLECULARWEIGHTS - Array of species molar masses [kg/kmol]. % % This method is deprecated - use molarMasses instead. % % See also: molarMasses % -x = molarMasses(a); + +mw = phase_get(tp.tp_id, 22);