BSM2 systems

.github/workflows/build-dev.yml

@@ -0,0 +1,37 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: build-dev
+
+on:
+  push:
+    branches: [ bsm2 ]
+  pull_request:
+    branches: [ bsm2 ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10"]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install pytest
+        pip install --no-cache-dir git+https://github.com/BioSTEAMDevelopmentGroup/thermosteam.git@qsdsan
+        pip install --no-cache-dir git+https://github.com/BioSTEAMDevelopmentGroup/biosteam.git@qsdsan
+        pip install --no-cache-dir git+https://github.com/QSD-Group/QSDsan.git@dev
+        pip install --no-cache-dir -r requirements.txt
+    - name: Test with pytest
+      run: |
+        pytest

exposan/bsm1/__init__.py

@@ -25,26 +25,31 @@
 from .system import *
 
 _system_loaded = False
-def load(reload=False, inf_kwargs={}, asm_kwargs={}, init_conds={}, aeration_processes=()):
+def load(reload=False, suspended_growth_model='ASM1', reactor_model='CSTR', 
+         inf_kwargs={}, asm_kwargs={}, settler_kwargs={}, 
+         init_conds={}, aeration_processes=()):
     global _system_loaded
     if not _system_loaded: reload = True
     if reload:
         global cmps, components, asm, sys
         sys = create_system(
+            suspended_growth_model=suspended_growth_model,
+            reactor_model=reactor_model,
             inf_kwargs=inf_kwargs,
             asm_kwargs=asm_kwargs,
+            settler_kwargs=settler_kwargs,
             init_conds=init_conds,
             aeration_processes=aeration_processes,
             )
-        O1 = sys.flowsheet.unit.O1
-        cmps = components = O1.components
-        asm = O1.suspended_growth_model
+        # O1 = sys.flowsheet.unit.O1
+        # cmps = components = O1.components
+        # asm = O1.suspended_growth_model
         # Legacy names
-        global PE, SE, RE
+        global PE, SE#, RE
         stream = sys.flowsheet.stream
         PE = stream.wastewater
         SE = stream.effluent
-        RE = stream.RWW
+        # RE = stream.RWW
     dct = globals()
     dct.update(sys.flowsheet.to_dict())
     _system_loaded = True