Syncup static mix

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
         os: ['ubuntu-latest']
     defaults:
       run:
-        shell: bash -l {0}
+        shell: bash -leo pipefail {0}
         working-directory: ${{github.workspace}}
     steps:
       - uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
         os: ['ubuntu-latest', 'macos-latest']
     defaults:
       run:
-        shell: bash -l {0}
+        shell: bash -leo pipefail {0}
         working-directory: ${{github.workspace}}
 
     steps:
@@ -106,7 +106,7 @@ jobs:
         os: ['ubuntu-latest', 'macos-latest']
     defaults:
       run:
-        shell: bash -l {0}
+        shell: bash -leo pipefail {0}
         working-directory: ${{github.workspace}}
 
     steps:
@@ -119,7 +119,7 @@ jobs:
           cache: true
           cache-write: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
 
-      - name: Formatting and sorting import
+      - name: Test
         run: |
           pixi run test
 
@@ -133,7 +133,7 @@ jobs:
         os: ['ubuntu-latest']
     defaults:
       run:
-        shell: bash -l {0}
+        shell: bash -leo pipefail {0}
         working-directory: ${{github.workspace}}
     steps:
       - uses: actions/checkout@v4
@@ -162,8 +162,8 @@ jobs:
       - name: Test
         run: nox -s tests -- no-reports
 
-  Regression-Test-OF:
-    name: Regression-Test-OF (${{ matrix.python-version }}, ${{ matrix.os }})
+  Regression-Test-OF9:
+    name: Regression-Test-OF9 (${{ matrix.python-version }}, ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -172,7 +172,7 @@ jobs:
         os: ['ubuntu-22.04']
     defaults:
       run:
-        shell: bash -l {0}
+        shell: bash -leo pipefail {0}
         working-directory: ${{github.workspace}}
     steps:
       - uses: actions/checkout@v4
@@ -202,72 +202,117 @@ jobs:
 
       - name: Compile solver
         run: |
-          cd OFsolvers/birdmultiphaseEulerFoam
+          cd OFsolvers/OF9/birdmultiphaseEulerFoam
           export WM_COMPILE_OPTION=Debug
           ./Allwmake
-          cd ../../
       - name: Run deckwer17 PBE
         run: |
-          cd experimental_cases/deckwer17
+          cd experimental_cases/OF9/deckwer17
           bash run.sh 
-          cd ../../
       - name: Run deckwer17 constantD
         run: |
-          cd experimental_cases/deckwer17
+          cd experimental_cases/OF9/deckwer17
           cp constant/phaseProperties_constantd constant/phaseProperties
           bash run.sh 
-          cd ../../
       - name: Run deckwer19 PBE
         run: |
-          cd experimental_cases/deckwer19
+          cd experimental_cases/OF9/deckwer19
           bash run.sh 
-          cd ../../
       - name: Run side sparger tutorial
         run: |
-          cd tutorial_cases/side_sparger
+          cd tutorial_cases/OF9/side_sparger
           bash run.sh 
-          cd ../../
       - name: Run bubble column tutorial
         run: |
-          cd tutorial_cases/bubble_column_20L
+          cd tutorial_cases/OF9/bubble_column_20L
           bash run.sh 
-          cd ../../
       - name: Run stirred-tank tutorial
         run: |
-          cd tutorial_cases/stirred_tank
+          cd tutorial_cases/OF9/stirred_tank
           bash run.sh 
-          cd ../../
       - name: Run reactive loop reactor tutorial
         run: |
-          cd tutorial_cases/loop_reactor_reacting
+          cd tutorial_cases/OF9/loop_reactor_reacting
           bash run.sh 
-          cd ../../
       - name: Run mixing loop reactor tutorial
         run: |
-          cd tutorial_cases/loop_reactor_mixing
+          cd tutorial_cases/OF9/loop_reactor_mixing
           bash run.sh 
-          cd ../../
       - name: Run airlift reactor tutorial
         run: |
-          cd tutorial_cases/airlift_40m
+          cd tutorial_cases/OF9/airlift_40m
           bash run.sh
-          cd ../../
       - name: Run flat panel reactor tutorial
         run: |
-          cd tutorial_cases/FlatPanel_250L_ASU
+          cd tutorial_cases/OF9/FlatPanel_250L_ASU
           bash run.sh
-          cd ../../
+
+  Regression-Test-OF13:
+    name: Regression-Test-OF13 (${{ matrix.python-version }}, ${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.14']
+        os: ['ubuntu-22.04']
+    defaults:
+      run:
+        shell: bash -leo pipefail {0}
+        working-directory: ${{github.workspace}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{matrix.python-version}}
+      - uses: gerlero/setup-openfoam@v1
+        with:
+          openfoam-version: 13
+
+      - name: Set up micromamba
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-name: test-env
+          create-args: >-
+            python=${{ matrix.python-version }}
+          channels: conda-forge
+          channel-priority: strict
+          cache-downloads: true
+          cache-env: true
+
+      - name: Install dependencies
+        run: |
+          micromamba install --yes -n test-env -c conda-forge paraview
+          pip install --upgrade pip
+          pip install .
+
+      - name: Compile solver
+        run: |
+          cd OFsolvers/OF13/birdmultiphaseEuler
+          export WM_COMPILE_OPTION=Debug
+          ./Allwmake
+      - name: Run bubble column
+        run: |
+          cd tutorial_cases/OF13/bubble_column
+          ./Allrun --test 
+      - name: STR MRF
+        run: |
+          cd tutorial_cases/OF13/STR_MRF
+          ./Allrun --test 
+      - name: STR rotating mesh
+        run: |
+          cd tutorial_cases/OF13/STR_rotatingMesh
+          ./Allrun --test 
 
-  Regression-Test-OF-pixi:
-    name: Regression-Test-OF-pixi (${{ matrix.os }})
+  Regression-Test-OF9-pixi:
+    name: Regression-Test-OF9-pixi (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: ['ubuntu-22.04']
     defaults:
       run:
-        shell: bash -l {0}
+        shell: bash -leo pipefail {0}
         working-directory: ${{github.workspace}}
     steps:
       - uses: actions/checkout@v4
@@ -282,13 +327,11 @@ jobs:
           cache-write: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
       - name: Compile solver
         run: |
-          cd OFsolvers/birdmultiphaseEulerFoam
+          cd OFsolvers/OF9/birdmultiphaseEulerFoam
           export WM_COMPILE_OPTION=Debug
           ./Allwmake
-          cd ../../
       - name: Run bubble column tutorial
         run: |
-          cd tutorial_cases/bubble_column_20L
+          cd tutorial_cases/OF9/bubble_column_20L
           bash run_pixi.sh 
-          cd ../../
 

OFsolvers/OF13/birdmultiphaseEuler/Allwclean

@@ -0,0 +1,14 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+wclean libso phaseSystem
+wclean libso populationBalance
+wclean libso thermophysicalTransportModels
+wclean libso reactions
+wclean libso momentumTransportModels
+wclean
+
+wclean libso fvModels
+wclean libso functionObjects
+
+#------------------------------------------------------------------------------

OFsolvers/OF13/birdmultiphaseEuler/Allwmake

@@ -0,0 +1,17 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
+wmake -j 20 $targetType phaseSystem
+wmake -j 20 $targetType populationBalance
+wmake -j 20 $targetType thermophysicalTransportModels
+wmake -j 20 $targetType reactions
+wmake -j 20 $targetType momentumTransportModels
+wmake $targetType
+
+wmake -j 20 $targetType fvModels
+wmake -j 20 $targetType functionObjects
+
+#------------------------------------------------------------------------------

OFsolvers/OF13/birdmultiphaseEuler/Make/files

@@ -0,0 +1,11 @@
+setRDeltaT.C
+moveMesh.C
+momentumPredictor.C
+thermophysicalPredictor.C
+compressibilityEqns.C
+facePressureCorrector.C
+cellPressureCorrector.C
+pressureCorrector.C
+birdmultiphaseEuler.C
+
+LIB = $(FOAM_USER_LIBBIN)/libbirdmultiphaseEuler

OFsolvers/OF13/birdmultiphaseEuler/Make/options

@@ -0,0 +1,24 @@
+EXE_INC = \
+    -I$(FOAM_MODULES)/fluidSolver/lnInclude \
+    -IphaseSystem/lnInclude \
+    -IpopulationBalance/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/physicalProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
+    -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude
+
+LIB_LIBS = \
+    -L$(FOAM_USER_LIBBIN) \
+    -lfluidSolver \
+    -lbirdpopulationBalance \
+    -lbirdmultiphaseEulerThermophysicalTransportModels \
+    -lbirdmultiphaseEulerMomentumTransportModels \
+    -lbirdmultiphaseEulerReactions \
+    -lfvModels \
+    -lfvConstraints