Skip to content

Commit c466f6f

Browse files
committed
fix Cp dep bug and add H_dep_dzs
1 parent 8ff0135 commit c466f6f

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

thermosteam/mixture/mixture.py

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,26 @@ def Hvap(self, mol, T, P):
617617
eos, eos_mol = self.eos_args(phase, mol, T, P)
618618
return (eos.Hvap(T) * eos_mol).sum()
619619

620+
def dh_dep_dzs(self, phase, mol, T, P):
621+
if phase == 's': return 0 * mol
622+
if phase in self.active_eos:
623+
eos, eos_mol = self.active_eos[phase]
624+
else:
625+
eos, eos_mol = self.eos_args(
626+
phase, mol, T, P
627+
)
628+
dH_dep_dzs = np.zeros(len(self.chemicals))
629+
index, = np.nonzero(mol)
630+
if phase == 'l':
631+
try: dH_dep_dzs[index] = eos.dH_dep_dzs(eos.Z_l)
632+
except:
633+
try: dH_dep_dzs[index] = eos.dH_dep_dzs(eos.Z_g)
634+
except: pass
635+
else:
636+
try: dH_dep_dzs[index] = eos.dH_dep_dzs(eos.Z_g)
637+
except: pass
638+
return dH_dep_dzs
639+
620640
def Cn(self, phase, mol, T, P):
621641
Cn = self.Cn_ideal(phase, mol, T, P)
622642
if phase != 's':
@@ -627,12 +647,12 @@ def Cn(self, phase, mol, T, P):
627647
phase, mol, T, P
628648
)
629649
if phase == 'l':
630-
try: Cn += eos.Cn_dep_l * eos_mol
650+
try: Cn += eos.Cp_dep_l * eos_mol
631651
except:
632-
try: Cn += eos.Cn_dep_g * eos_mol
652+
try: Cn += eos.Cp_dep_g * eos_mol
633653
except: pass
634654
else:
635-
try: Cn += eos.Cn_dep_g * eos_mol
655+
try: Cn += eos.Cp_dep_g * eos_mol
636656
except: pass
637657
return Cn
638658

0 commit comments

Comments
 (0)