allow chemicals with spaces

BioSTEAMDevelopmentGroup · Feb 6, 2025 · 8cd825d · 8cd825d
1 parent 1187dde
commit 8cd825d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/thermosteam/_chemical.py b/thermosteam/_chemical.py
@@ -716,7 +716,6 @@ def blank(cls, ID, CAS=None, phase_ref=None, phase=None,
         for i in _names: setfield(self, i, None)
         for i in _data: setfield(self, i, None)
         for i in _energy_handles: setfield(self, i, None)
-        check_valid_ID(ID)
         self._phase_ref = phase_ref or phase
         self._CAS = CAS or ID
         if formula: self.formula = formula

diff --git a/thermosteam/_stream.py b/thermosteam/_stream.py
@@ -330,7 +330,7 @@ class Stream(AbstractStream):
     _flow_cache = {}
 
     def __init__(self, ID: Optional[str]='', 
-                 flow: Sequence[float]=(),
+                 flow: Sequence[float]|Sequence[tuple[str, float]]=(),
                  phase: Optional[str]='l',
                  T: Optional[float]=298.15,
                  P: Optional[float]=101325.,
@@ -809,7 +809,16 @@ def _init_indexer(self, flow, phase, chemicals, chemical_flows):
             else:
                 parent = indexer.parent_indexer(chemicals)
                 imol = parent.to_chemical_indexer(phase)
-                imol.data[:] = flow
+                if isinstance(flow[0], str):
+                    ID, flow = flow
+                    imol[ID] = flow
+                else:
+                    try:
+                        IDs, flow = zip(*flow)
+                    except:
+                        imol.data[:] = flow
+                    else:
+                        imol[IDs] = flow
         self._imol = imol
 
     def reset_cache(self):

diff --git a/thermosteam/reaction/_parse.py b/thermosteam/reaction/_parse.py
@@ -60,7 +60,7 @@ def split_coefficient(nID, sign):
                 break
             else:
                 if next_letter.isalpha(): break
-        elif letter.isalpha() or letter in '()[]{}':
+        elif letter.isalpha() or letter in '`()[]{}':
             break
     if i: 
         ID = nID[i:]