Skip to content

Commit

Permalink
Merge pull request #66 from NREL/ofaction
Browse files Browse the repository at this point in the history
Support python 3.9 + tutorial and experimental tested in CI
  • Loading branch information
malihass authored Dec 9, 2024
2 parents cd0a887 + 1369fd6 commit 4522199
Show file tree
Hide file tree
Showing 1,212 changed files with 5,295 additions and 7,023 deletions.
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.
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.
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 $*


#------------------------------------------------------------------------------
File renamed without changes.
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
File renamed without changes.
Loading

0 comments on commit 4522199

Please sign in to comment.