Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support python 3.9 + tutorial and experimental tested in CI #66

Merged
merged 27 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
77b538b
update action version and test for python 3.9
malihass Dec 3, 2024
5faba33
fix test name
malihass Dec 3, 2024
58e7aac
try with python 3.9
malihass Dec 3, 2024
82323d2
revert python 3.9
malihass Dec 3, 2024
d615364
openfoam action
malihass Dec 3, 2024
189bd92
don't define python version with the OF setup
malihass Dec 3, 2024
8cacbdf
support python 3.9
malihass Dec 6, 2024
e315794
fix deprecation warning for jax clip
malihass Dec 6, 2024
688f0a9
np clip and jnp clip differ
malihass Dec 6, 2024
9d85289
Remove rogue print
malihass Dec 6, 2024
2cc6f2d
run bubble column in ci
malihass Dec 6, 2024
6841610
enable all bird models, compile with debug for faster compile and fix…
malihass Dec 6, 2024
aac2ed4
fix stirred tank typo and enable test of bubble column, stirred tank …
malihass Dec 6, 2024
b0c0ab2
make sure species fraction sum to 1 at outlet
malihass Dec 6, 2024
e9e52c9
fix limited drag
malihass Dec 6, 2024
9f4817a
enable higbie and grace for all tutorials
malihass Dec 6, 2024
3cbddfa
Henry limited not available
malihass Dec 6, 2024
c88acf3
reorganize tutorial cases and experimental cases
malihass Dec 6, 2024
b6ea460
bump up version
malihass Dec 6, 2024
02ec6cf
remove level in OFsolver tree
malihass Dec 6, 2024
76bea5a
fix conflict
malihass Dec 6, 2024
47b2256
add missing doc for tutorial cases
malihass Dec 6, 2024
17c40c5
wall default faces and format
malihass Dec 7, 2024
2265815
remove disengagement for basic bubble column
malihass Dec 7, 2024
508424a
remove holdup writing
malihass Dec 7, 2024
c329f6b
add option to force mixing sign
malihass Dec 7, 2024
1369fd6
add force sign option to run
malihass Dec 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/linters/.codespell-ignore-words
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ nd
inh
lastR
inpt
cocurrent
2 changes: 1 addition & 1 deletion .github/linters/.codespellrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[codespell]
skip = None, .git,OFsolvers,build,__pycache__,data_conditional_mean,Figures,assets
skip = None, .git,OFsolvers,tutorial_cases,experimental_cases,build,__pycache__,data_conditional_mean,Figures,assets
ignore-words = .github/linters/.codespell-ignore-words
80 changes: 75 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run:
working-directory: ${{github.workspace}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{matrix.python-version}}
Expand All @@ -43,19 +43,19 @@ jobs:
run: |
source .github/linters/formatting.sh
format . true
Test:
name: Test (${{ matrix.python-version }}, ${{ matrix.os }})
Test-BiRD:
name: Test-BiRD (${{ matrix.python-version }}, ${{ matrix.os }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.9', '3.10', '3.11', '3.12']
os: ['ubuntu-latest', 'macos-latest']
defaults:
run:
working-directory: ${{github.workspace}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{matrix.python-version}}
Expand All @@ -73,3 +73,73 @@ jobs:
- name: Test postprocessing
run: |
pytest tests/postprocess
Test-OF:
name: Test-OF (${{ matrix.python-version }}, ${{ matrix.os }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: ['3.10']
os: ['ubuntu-22.04']
defaults:
run:
working-directory: ${{github.workspace}}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{matrix.python-version}}
- uses: gerlero/setup-openfoam@v1
with:
openfoam-version: 9
- name: Install dependencies
run: |
pip install --upgrade pip
pip install .
- name: Compile solver
run: |
cd OFsolvers/birdmultiphaseEulerFoam
export WM_COMPILE_OPTION=Debug
./Allwmake
cd ../../
- name: Run deckwer17 PBE
run: |
cd experimental_cases/deckwer17
bash run.sh
cd ../../
- name: Run deckwer17 constantD
run: |
cd experimental_cases/deckwer17
cp constant/phaseProperties_constantd constant/phaseProperties
bash run.sh
cd ../../
- name: Run deckwer19 PBE
run: |
cd experimental_cases/deckwer19
bash run.sh
cd ../../
- name: Run side sparger tutorial
run: |
cd tutorial_cases/side_sparger
bash run.sh
cd ../../
- name: Run bubble column tutorial
run: |
cd tutorial_cases/bubble_column_20L
bash run.sh
cd ../../
- name: Run stirred-tank tutorial
run: |
cd tutorial_cases/stirred_tank
bash run.sh
cd ../../
- name: Run reactive loop reactor tutorial
run: |
cd tutorial_cases/loop_reactor_reacting
bash run.sh
cd ../../
- name: Run mixing loop reactor tutorial
run: |
cd tutorial_cases/loop_reactor_mixing
bash run.sh
cd ../../
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,4 @@ dmypy.json
# output
.DS_Store
*.stl

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 20 additions & 0 deletions OFsolvers/birdmultiphaseEulerFoam/1
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory

# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments

numcores=4
wmake -j $numcores $targetType functionObjects
wmake -j $numcores $targetType interfacialCompositionModels
wmake -j $numcores $targetType interfacialModels
wmake -j $numcores $targetType phaseSystems


wmake -j $numcores $targetType multiphaseCompressibleMomentumTransportModels
wmake -j $numcores $targetType multiphaseReactions

multiphaseEulerFoam/Allwmake $targetType $*


#------------------------------------------------------------------------------
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments

numcores=20
numcores=4
wmake -j $numcores $targetType functionObjects
wmake -j $numcores $targetType interfacialCompositionModels
wmake -j $numcores $targetType interfacialModels
Expand Down
Loading
Loading