Skip to content

Commit 4522199

Browse files
malihassmalihass
authored
Merge pull request #66 from NREL/ofaction
Support python 3.9 + tutorial and experimental tested in CI
2 parents cd0a887 + 1369fd6 commit 4522199

1,212 files changed

Lines changed: 5295 additions & 7023 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/linters/.codespell-ignore-words‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ nd
22
inh
33
lastR
44
inpt
5+
cocurrent

‎.github/linters/.codespellrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[codespell]
2-
skip = None, .git,OFsolvers,build,__pycache__,data_conditional_mean,Figures,assets
2+
skip = None, .git,OFsolvers,tutorial_cases,experimental_cases,build,__pycache__,data_conditional_mean,Figures,assets
33
ignore-words = .github/linters/.codespell-ignore-words

‎.github/workflows/ci.yml‎

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run:
3131
working-directory: ${{github.workspace}}
3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434
- uses: actions/setup-python@v4
3535
with:
3636
python-version: ${{matrix.python-version}}
@@ -43,19 +43,19 @@ jobs:
4343
run: |
4444
source .github/linters/formatting.sh
4545
format . true
46-
Test:
47-
name: Test (${{ matrix.python-version }}, ${{ matrix.os }})
46+
Test-BiRD:
47+
name: Test-BiRD (${{ matrix.python-version }}, ${{ matrix.os }})
4848
runs-on: ${{ matrix.os }}
4949
strategy:
5050
fail-fast: false
5151
matrix:
52-
python-version: ['3.10', '3.11', '3.12']
52+
python-version: ['3.9', '3.10', '3.11', '3.12']
5353
os: ['ubuntu-latest', 'macos-latest']
5454
defaults:
5555
run:
5656
working-directory: ${{github.workspace}}
5757
steps:
58-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
5959
- uses: actions/setup-python@v4
6060
with:
6161
python-version: ${{matrix.python-version}}
@@ -73,3 +73,73 @@ jobs:
7373
- name: Test postprocessing
7474
run: |
7575
pytest tests/postprocess
76+
Test-OF:
77+
name: Test-OF (${{ matrix.python-version }}, ${{ matrix.os }})
78+
runs-on: ${{ matrix.os }}
79+
strategy:
80+
fail-fast: false
81+
matrix:
82+
python-version: ['3.10']
83+
os: ['ubuntu-22.04']
84+
defaults:
85+
run:
86+
working-directory: ${{github.workspace}}
87+
steps:
88+
- uses: actions/checkout@v4
89+
- uses: actions/setup-python@v4
90+
with:
91+
python-version: ${{matrix.python-version}}
92+
- uses: gerlero/setup-openfoam@v1
93+
with:
94+
openfoam-version: 9
95+
- name: Install dependencies
96+
run: |
97+
pip install --upgrade pip
98+
pip install .
99+
- name: Compile solver
100+
run: |
101+
cd OFsolvers/birdmultiphaseEulerFoam
102+
export WM_COMPILE_OPTION=Debug
103+
./Allwmake
104+
cd ../../
105+
- name: Run deckwer17 PBE
106+
run: |
107+
cd experimental_cases/deckwer17
108+
bash run.sh
109+
cd ../../
110+
- name: Run deckwer17 constantD
111+
run: |
112+
cd experimental_cases/deckwer17
113+
cp constant/phaseProperties_constantd constant/phaseProperties
114+
bash run.sh
115+
cd ../../
116+
- name: Run deckwer19 PBE
117+
run: |
118+
cd experimental_cases/deckwer19
119+
bash run.sh
120+
cd ../../
121+
- name: Run side sparger tutorial
122+
run: |
123+
cd tutorial_cases/side_sparger
124+
bash run.sh
125+
cd ../../
126+
- name: Run bubble column tutorial
127+
run: |
128+
cd tutorial_cases/bubble_column_20L
129+
bash run.sh
130+
cd ../../
131+
- name: Run stirred-tank tutorial
132+
run: |
133+
cd tutorial_cases/stirred_tank
134+
bash run.sh
135+
cd ../../
136+
- name: Run reactive loop reactor tutorial
137+
run: |
138+
cd tutorial_cases/loop_reactor_reacting
139+
bash run.sh
140+
cd ../../
141+
- name: Run mixing loop reactor tutorial
142+
run: |
143+
cd tutorial_cases/loop_reactor_mixing
144+
bash run.sh
145+
cd ../../

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,4 @@ dmypy.json
134134
# output
135135
.DS_Store
136136
*.stl
137+

OFsolvers/applications/bdoFoam/Allwclean renamed to OFsolvers/bdoFoam/Allwclean

File renamed without changes.

OFsolvers/applications/bdoFoam/Allwmake renamed to OFsolvers/bdoFoam/Allwmake

File renamed without changes.

OFsolvers/applications/bdoFoam/CourantNos.H renamed to OFsolvers/bdoFoam/CourantNos.H

File renamed without changes.

OFsolvers/applications/bdoFoam/EEqns.H renamed to OFsolvers/bdoFoam/EEqns.H

File renamed without changes.

OFsolvers/applications/bdoFoam/Make/files renamed to OFsolvers/bdoFoam/Make/files

File renamed without changes.

OFsolvers/applications/bdoFoam/Make/options renamed to OFsolvers/bdoFoam/Make/options

File renamed without changes.

0 commit comments

Comments
 (0)