Support reactions via reagency

gerlero · Sep 13, 2024 · 0ffc920 · 0ffc920
1 parent 2cbcca9
commit 0ffc920
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 723 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,6 +20,8 @@ jobs:
  steps:
  - name: Checkout
  uses: actions/checkout@v4
+ with:
+ path: porousMicroTransport
  - name: Set up OpenFOAM
  uses: gerlero/setup-openfoam@v1
  with:
@@ -30,12 +32,18 @@ jobs:
  python-version: '3.x'
  cache: pip
  cache-dependency-path: tests/requirements.txt
- - name: Build
+ - name: Check out reagency
+ uses: actions/checkout@v4
+ with:
+ repository: gerlero/reagency
+ path: reagency
+ - name: Build reagency
  run: |
- ./Allwmake -j
+ reagency/Allwmake -j
+ - name: Build
+ run: porousMicroTransport/Allwmake -j
  - name: Test
- run: |
- tests/Alltest
+ run: porousMicroTransport/tests/Alltest
 
  lint-tests:
  name: Lint tests

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ARG OPENFOAM_VERSION=2406
 
-FROM microfluidica/openfoam:${OPENFOAM_VERSION} AS dev
+FROM microfluidica/reagency:openfoam${OPENFOAM_VERSION} AS dev
 
 ARG PMT_DIR=/usr/local/src/porousMicroTransport
 
@@ -20,7 +20,7 @@ RUN ${PMT_DIR}/Allwmake -j -prefix=group \
  && moistureDiffusivityTransportFoam -help
 
 
-FROM microfluidica/openfoam:${OPENFOAM_VERSION}-slim AS slim
+FROM microfluidica/reagency:slim-openfoam${OPENFOAM_VERSION} AS slim
 
 ARG OPENFOAM_VERSION
 

diff --git a/libraries/Allwmake b/libraries/Allwmake
@@ -11,5 +11,4 @@ wmake $targetType common
 wmake $targetType unsaturatedFlowModels
 wmake $targetType PicardControl
 wmake $targetType transport
-wmake $targetType reactions
 wmake $targetType boundaryConditions
diff --git a/libraries/reactions/Make/files b/libraries/reactions/Make/files
diff --git a/libraries/reactions/Make/options b/libraries/reactions/Make/options
diff --git a/libraries/reactions/defaultReaction/defaultReaction.C b/libraries/reactions/defaultReaction/defaultReaction.C
diff --git a/libraries/reactions/defaultReaction/defaultReaction.H b/libraries/reactions/defaultReaction/defaultReaction.H