diff --git a/Cantera/python/ctml_writer.py b/Cantera/python/ctml_writer.py index af6c2fa1f..413366a36 100644 --- a/Cantera/python/ctml_writer.py +++ b/Cantera/python/ctml_writer.py @@ -1654,139 +1654,139 @@ class edge(phase): return (1, -1) -class binary_salt_parameters: - def __init__(self, - cation = "", - anion = "", - beta0 = None, - beta1 = None, - beta2 = None, - Cphi = None, - Alpha1 = -1.0): - self._cation = cation - self._anion = anion - self._beta0 = beta0 - self._beta1 = beta1 - self._Cphi = Cphi - self._Alpha1 = Alpha1 +## class binary_salt_parameters: +## def __init__(self, +## cation = "", +## anion = "", +## beta0 = None, +## beta1 = None, +## beta2 = None, +## Cphi = None, +## Alpha1 = -1.0): +## self._cation = cation +## self._anion = anion +## self._beta0 = beta0 +## self._beta1 = beta1 +## self._Cphi = Cphi +## self._Alpha1 = Alpha1 - def build(self, a): - s = a.addChild("binarySaltParameters") - s["cation"] = self._cation - s["anion"] = self._anion - s.addChild("beta0", self._beta0) - s.addChild("beta1", self._beta1) - s.addChild("beta2", self._beta2) - s.addChild("Cphi", self._Cphi) - s.addChild("Alpha1", self._Alpha1) +## def build(self, a): +## s = a.addChild("binarySaltParameters") +## s["cation"] = self._cation +## s["anion"] = self._anion +## s.addChild("beta0", self._beta0) +## s.addChild("beta1", self._beta1) +## s.addChild("beta2", self._beta2) +## s.addChild("Cphi", self._Cphi) +## s.addChild("Alpha1", self._Alpha1) -class theta_anion: - def __init__(self, - anions = None, - theta = 0.0): - self._anions = anions - self._theta = theta +## class theta_anion: +## def __init__(self, +## anions = None, +## theta = 0.0): +## self._anions = anions +## self._theta = theta - def build(self, a): - s = a.addChild("thetaAnion") - s["anion1"] = self._anions[0] - s["anion2"] = self._anions[1] - s.addChild("Theta", self._theta) +## def build(self, a): +## s = a.addChild("thetaAnion") +## s["anion1"] = self._anions[0] +## s["anion2"] = self._anions[1] +## s.addChild("Theta", self._theta) -class psi_common_cation: - def __init__(self, - anions = None, - cation = '', - theta = 0.0, - psi = 0.0): - self._anions = anions - self._cation = cation - self._theta = theta - self._psi = psi +## class psi_common_cation: +## def __init__(self, +## anions = None, +## cation = '', +## theta = 0.0, +## psi = 0.0): +## self._anions = anions +## self._cation = cation +## self._theta = theta +## self._psi = psi - def build(self, a): - s = a.addChild("psiCommonCation") - s["anion1"] = self._anions[0] - s["anion2"] = self._anions[1] - s["cation"] = self._cation - s.addChild("Theta", self._theta) - s.addChild("Psi", self._psi) +## def build(self, a): +## s = a.addChild("psiCommonCation") +## s["anion1"] = self._anions[0] +## s["anion2"] = self._anions[1] +## s["cation"] = self._cation +## s.addChild("Theta", self._theta) +## s.addChild("Psi", self._psi) -class psi_common_anion: - def __init__(self, - anion = '', - cations = None, - theta = 0.0, - psi = 0.0): - self._anion = anion - self._cations = cations - self._theta = theta - self._psi = psi +## class psi_common_anion: +## def __init__(self, +## anion = '', +## cations = None, +## theta = 0.0, +## psi = 0.0): +## self._anion = anion +## self._cations = cations +## self._theta = theta +## self._psi = psi - def build(self, a): - s = a.addChild("psiCommonAnion") - s["anion1"] = self._cations[0] - s["anion2"] = self._cations[1] - s["cation"] = self._anion - s.addChild("Theta", self._theta) - s.addChild("Psi", self._psi) +## def build(self, a): +## s = a.addChild("psiCommonAnion") +## s["anion1"] = self._cations[0] +## s["anion2"] = self._cations[1] +## s["cation"] = self._anion +## s.addChild("Theta", self._theta) +## s.addChild("Psi", self._psi) -class theta_cation: - def __init__(self, - cations = None, - theta = 0.0): - self._cations = cations - self._theta = theta +## class theta_cation: +## def __init__(self, +## cations = None, +## theta = 0.0): +## self._cations = cations +## self._theta = theta - def build(self, a): - s = a.addChild("thetaCation") - s["cation1"] = self._anions[0] - s["cation2"] = self._anions[1] - s.addChild("Theta", self._theta) +## def build(self, a): +## s = a.addChild("thetaCation") +## s["cation1"] = self._anions[0] +## s["cation2"] = self._anions[1] +## s.addChild("Theta", self._theta) -class pitzer: - def __init__(self, - temp_model = "", - A_Debye = "", - default_ionic_radius = -1.0, +## class pitzer: +## def __init__(self, +## temp_model = "", +## A_Debye = "", +## default_ionic_radius = -1.0, -class electrolyte(phase): - """An electrolye solution obeying the HMW model.""" - def __init__(self, - name = '', - elements = '', - species = '', - transport = 'None', - initial_state = None, - solvent = '', - standard_concentration = '', - activity_coefficients = None, - options = []): +## class electrolyte(phase): +## """An electrolye solution obeying the HMW model.""" +## def __init__(self, +## name = '', +## elements = '', +## species = '', +## transport = 'None', +## initial_state = None, +## solvent = '', +## standard_concentration = '', +## activity_coefficients = None, +## options = []): - phase.__init__(self, name, 3, elements, species, 'none', - initial_state, options) - self._pure = 0 - self._solvent = solvent - self._stdconc = standard_concentration +## phase.__init__(self, name, 3, elements, species, 'none', +## initial_state, options) +## self._pure = 0 +## self._solvent = solvent +## self._stdconc = standard_concentration - def conc_dim(self): - return (1,-3) +## def conc_dim(self): +## return (1,-3) - def build(self, p): - ph = phase.build(self, p) - e = ph.addChild("thermo") - sc = e.addChild("standardConc") - sc['model'] = self._stdconc - e['model'] = 'HMW' - e.addChild("activity_coefficients") +## def build(self, p): +## ph = phase.build(self, p) +## e = ph.addChild("thermo") +## sc = e.addChild("standardConc") +## sc['model'] = self._stdconc +## e['model'] = 'HMW' +## e.addChild("activity_coefficients") - addFloat(e, 'density', self._dens, defunits = _umass+'/'+_ulen+'3') - if self._tr: - t = ph.addChild('transport') - t['model'] = self._tr - k = ph.addChild("kinetics") - k['model'] = 'none' +## addFloat(e, 'density', self._dens, defunits = _umass+'/'+_ulen+'3') +## if self._tr: +## t = ph.addChild('transport') +## t['model'] = self._tr +## k = ph.addChild("kinetics") +## k['model'] = 'none' #-------------------------------------------------------------------