Merge branch 'main' into dev

qsdsan/sanunits/_heat_exchanging.py

@@ -20,11 +20,9 @@
 for license details.
 '''
 
-import biosteam as bst
 from warnings import warn
 from math import ceil, pi
-from biosteam.units import HXprocess as HXP, HXutility as HXU
-from biosteam.units.facilities import HeatExchangerNetwork as HXN
+from biosteam import HeatExchangerNetwork as HXN, HXprocess as HXP, HXutility as HXU
 from biosteam.units.design_tools.specification_factors import material_densities_lb_per_ft3
 from biosteam.exceptions import bounds_warning, DesignWarning
 from biosteam.units.design_tools import flash_vessel_design

qsdsan/sanunits/_hydroprocessing.py

@@ -172,8 +172,8 @@ def _run(self):
         hc_out.P = heavy_oil.P
         hc_out.T = self.HCrxn_T
 
-        hc_out.vle(T=hc_out.T, P=hc_out.P)
-        
+        # hc_out.vle(T=hc_out.T, P=hc_out.P)
+
         cmps = self.components
         C_in = 0
         total_num = len(list(cmps))
@@ -430,7 +430,7 @@ def _run(self):
 
         ht_out.T = self.HTrxn_T
 
-        ht_out.vle(T=ht_out.T, P=ht_out.P)
+        # ht_out.vle(T=ht_out.T, P=ht_out.P)
 
         if self.HTaqueous_C < -0.1*self.HTL.WWTP.sludge_C:
             raise Exception('carbon mass balance is out of +/- 10% for the whole system')

qsdsan/sanunits/_hydrothermal.py

@@ -165,7 +165,9 @@ def _run(self):
         catalyst_out.copy_like(catalyst_in)
         # catalysts amount is quite low compared to the main stream, therefore do not consider
         # heating/cooling of catalysts
-
+
+        chg_out.phase='g'
+
         cmps = self.components
         gas_C_ratio = 0
         for name, ratio in self.gas_composition.items():
@@ -181,7 +183,9 @@ def _run(self):
 
         chg_out.T = self.cool_temp
         chg_out.P = self.pump_pressure
-
+
+        # chg_out.vle(T=chg_out.T, P=chg_out.P)
+
     @property
     def CHGout_C(self):
         # not include carbon in gas phase

setup.py

@@ -5,6 +5,7 @@
 QSDsan: Quantitative Sustainable Design for sanitation and resource recovery systems
 
 This module is developed by:
+
     Yalin Li <mailto.yalin.li@gmail.com>
 
 This module is under the University of Illinois/NCSA Open Source License.
@@ -40,8 +41,8 @@
         'seaborn',
         'sympy>=1.8',
     ],
-    package_data=
-        {'qsdsan': [
+    package_data={
+        'qsdsan': [
             'data/*',
             'data/process_data/*',
             'data/sanunit_data/*',
@@ -52,7 +53,7 @@
             'processes/*',
             'sanunits/*',
             'utils/*',
-        ]},
+    ]},
     classifiers=[
         'License :: OSI Approved :: University of Illinois/NCSA Open Source License',
         'Environment :: Console',