From 245c32a8fa76bed4dbe19bf137e7f79f8d804dba Mon Sep 17 00:00:00 2001
From: Markus Holzer <markus.holzer@fau.de>
Date: Tue, 8 Oct 2024 09:24:20 +0200
Subject: [PATCH] Increase lbmpy Version
---
.gitlab-ci.yml | 142 +++++++++---------
CMakeLists.txt | 2 +-
.../TurbulentChannel/TurbulentChannel.cpp | 12 +-
.../TurbulentChannel/TurbulentChannel.py | 4 +-
extern/pybind11 | 2 +-
5 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c46b9090f..1db3ecadc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -277,7 +277,7 @@ gcc_10_serial:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -306,7 +306,7 @@ gcc_10_mpionly:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -333,7 +333,7 @@ gcc_10_hybrid:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -359,7 +359,7 @@ gcc_10_serial_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -389,7 +389,7 @@ gcc_10_mpionly_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -417,7 +417,7 @@ gcc_10_hybrid_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -441,7 +441,7 @@ gcc_10_hybrid_dbg_sp:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -471,7 +471,7 @@ gcc_11_serial:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -500,7 +500,7 @@ gcc_11_mpionly:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -527,7 +527,7 @@ gcc_11_hybrid:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -553,7 +553,7 @@ gcc_11_serial_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -583,7 +583,7 @@ gcc_11_mpionly_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -611,7 +611,7 @@ gcc_11_hybrid_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -638,7 +638,7 @@ gcc_11_hybrid_dbg_sp:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -668,7 +668,7 @@ gcc_12_serial:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -697,7 +697,7 @@ gcc_12_mpionly:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -724,7 +724,7 @@ gcc_12_hybrid:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -750,7 +750,7 @@ gcc_12_serial_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -780,7 +780,7 @@ gcc_12_mpionly_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -808,7 +808,7 @@ gcc_12_hybrid_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -835,7 +835,7 @@ gcc_12_hybrid_dbg_sp:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -865,7 +865,7 @@ gcc_13_serial:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -895,7 +895,7 @@ gcc_13_mpionly:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -924,7 +924,7 @@ gcc_13_hybrid:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -948,7 +948,7 @@ gcc_13_serial_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -976,7 +976,7 @@ gcc_13_mpionly_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1002,7 +1002,7 @@ gcc_13_hybrid_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1027,7 +1027,7 @@ gcc_13_hybrid_dbg_sp:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1055,7 +1055,7 @@ clang_14_serial:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1084,7 +1084,7 @@ clang_14_mpionly:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1111,7 +1111,7 @@ clang_14_hybrid:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1137,7 +1137,7 @@ clang_14_serial_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1167,7 +1167,7 @@ clang_14_mpionly_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1195,7 +1195,7 @@ clang_14_hybrid_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1219,7 +1219,7 @@ clang_14_hybrid_dbg_sp:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1249,7 +1249,7 @@ clang_15_serial:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1278,7 +1278,7 @@ clang_15_mpionly:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1305,7 +1305,7 @@ clang_15_hybrid:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1331,7 +1331,7 @@ clang_15_serial_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1361,7 +1361,7 @@ clang_15_mpionly_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1389,7 +1389,7 @@ clang_15_hybrid_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1416,7 +1416,7 @@ clang_15_hybrid_dbg_sp:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1446,7 +1446,7 @@ clang_16_serial:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1475,7 +1475,7 @@ clang_16_mpionly:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1502,7 +1502,7 @@ clang_16_hybrid:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1528,7 +1528,7 @@ clang_16_serial_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1558,7 +1558,7 @@ clang_16_mpionly_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1586,7 +1586,7 @@ clang_16_hybrid_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1613,7 +1613,7 @@ clang_16_hybrid_dbg_sp:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1643,7 +1643,7 @@ clang_17_serial:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1672,7 +1672,7 @@ clang_17_mpionly:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1699,7 +1699,7 @@ clang_17_hybrid:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1722,7 +1722,7 @@ clang_17_serial_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1749,7 +1749,7 @@ clang_17_mpionly_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1774,7 +1774,7 @@ clang_17_hybrid_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1799,7 +1799,7 @@ clang_17_hybrid_dbg_sp:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1826,7 +1826,7 @@ aocc_4_serial:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1855,7 +1855,7 @@ aocc_4_mpionly:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1882,7 +1882,7 @@ aocc_4_hybrid:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1905,7 +1905,7 @@ aocc_4_serial_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1932,7 +1932,7 @@ aocc_4_mpionly_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1957,7 +1957,7 @@ aocc_4_hybrid_dbg:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -1981,7 +1981,7 @@ aocc_4_hybrid_dbg_sp:
before_script:
- python3 -m venv ci-venv
- source ci-venv/bin/activate
- - python3 -m pip install lbmpy==1.3.5 jinja2 pytest
+ - python3 -m pip install lbmpy==1.3.6 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- python3 -m pip list
@@ -2142,8 +2142,8 @@ coverage:
mac_Serial_Dbg:
extends: .mac_build_template
before_script:
- - pip3 install pystencils==1.3.4
- - pip3 install lbmpy==1.3.4
+ - pip3 install pystencils==1.3.6
+ - pip3 install lbmpy==1.3.6
variables:
CMAKE_BUILD_TYPE: "DebugOptimized"
CTEST_EXCLUDE_LABELS: "longrun"
@@ -2155,8 +2155,8 @@ mac_Serial_Dbg:
mac_Serial:
extends: .mac_build_template
before_script:
- - pip3 install pystencils==1.3.4
- - pip3 install lbmpy==1.3.4
+ - pip3 install pystencils==1.3.6
+ - pip3 install lbmpy==1.3.6
variables:
CMAKE_BUILD_TYPE: "Release"
CTEST_EXCLUDE_LABELS: "longrun"
@@ -2168,8 +2168,8 @@ mac_Serial:
mac_MpiOnly_Dbg:
extends: .mac_build_template
before_script:
- - pip3 install pystencils==1.3.4
- - pip3 install lbmpy==1.3.4
+ - pip3 install pystencils==1.3.6
+ - pip3 install lbmpy==1.3.6
variables:
CMAKE_BUILD_TYPE: "DebugOptimized"
CTEST_EXCLUDE_LABELS: "longrun"
@@ -2182,8 +2182,8 @@ mac_MpiOnly_Dbg:
mac_MpiOnly:
extends: .mac_build_template
before_script:
- - pip3 install pystencils==1.3.4
- - pip3 install lbmpy==1.3.4
+ - pip3 install pystencils==1.3.6
+ - pip3 install lbmpy==1.3.6
variables:
CMAKE_BUILD_TYPE: "Release"
CTEST_EXCLUDE_LABELS: "longrun"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f157d599e..10eef1bc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -619,7 +619,7 @@ endif ()
##
#############################################################################################################################
if ( WALBERLA_BUILD_WITH_CODEGEN )
- set(LBMPY_MIN_VERSION 1.3.3)
+ set(LBMPY_MIN_VERSION 1.3.6)
execute_process(COMMAND ${Python_EXECUTABLE} -c "import lbmpy; print(lbmpy.__version__)"
RESULT_VARIABLE LBMPY_FOUND OUTPUT_VARIABLE LBMPY_VERSION)
if(NOT LBMPY_FOUND EQUAL 0)
diff --git a/apps/benchmarks/TurbulentChannel/TurbulentChannel.cpp b/apps/benchmarks/TurbulentChannel/TurbulentChannel.cpp
index bd31d1263..f0f568de5 100644
--- a/apps/benchmarks/TurbulentChannel/TurbulentChannel.cpp
+++ b/apps/benchmarks/TurbulentChannel/TurbulentChannel.cpp
@@ -526,8 +526,8 @@ namespace walberla {
const auto * const tkeSGS = block->template getData<ScalarField_T>(meanTkeSGSFieldId_);
WALBERLA_CHECK_NOT_NULLPTR(tkeSGS)
- const auto * const sop = block->template getData<TensorField_T>(velocityWelford_->sum_of_productsID);
- WALBERLA_CHECK_NOT_NULLPTR(sop)
+ const auto * const sos = block->template getData<TensorField_T>(velocityWelford_->sum_of_squares_fieldID);
+ WALBERLA_CHECK_NOT_NULLPTR(sos)
for(uint_t idx = 0; idx < parameters_->channelHalfWidth; ++idx) {
@@ -541,7 +541,7 @@ namespace walberla {
meanVelocityVector[idx] = meanVelocity->get(localCell, flowAxis);
tkeSGSVector[idx] = tkeSGS->get(localCell);
for(uint_t i = 0; i < TensorField_T::F_SIZE; ++i) {
- reynoldsStressVector[idx*TensorField_T::F_SIZE+i] = sop->get(localCell,i) / velocityWelford_->counter_;
+ reynoldsStressVector[idx*TensorField_T::F_SIZE+i] = sos->get(localCell,i) / velocityWelford_->counter_;
}
tkeResolvedVector[idx] = real_c(0.5) * (
reynoldsStressVector[idx*TensorField_T::F_SIZE+0] +
@@ -706,7 +706,7 @@ namespace walberla {
// Common Fields
const BlockDataID velocityFieldId = field::addToStorage< VectorField_T >(blocks, "velocity", real_c(0.0), codegen::layout);
const BlockDataID meanVelocityFieldId = field::addToStorage< VectorField_T >(blocks, "mean velocity", real_c(0.0), codegen::layout);
- const BlockDataID sopFieldId = field::addToStorage< TensorField_T >(blocks, "sum of products", real_c(0.0), codegen::layout);
+ const BlockDataID sosFieldId = field::addToStorage< TensorField_T >(blocks, "sum of squares", real_c(0.0), codegen::layout);
const BlockDataID tkeSgsFieldId = field::addToStorage< ScalarField_T >(blocks, "tke_SGS", real_c(0.0), codegen::layout);
const BlockDataID meanTkeSgsFieldId = field::addToStorage< ScalarField_T >(blocks, "mean_tke_SGS", real_c(0.0), codegen::layout);
@@ -755,7 +755,7 @@ namespace walberla {
const auto omega = lbm::collision_model::omegaFromViscosity(simulationParameters.viscosity);
StreamCollideSweep_T streamCollideSweep(omegaFieldId, pdfFieldId, velocityFieldId, initialForce, omega);
- WelfordSweep_T welfordSweep(meanVelocityFieldId, sopFieldId, velocityFieldId, 0_r);
+ WelfordSweep_T welfordSweep(meanVelocityFieldId, sosFieldId, velocityFieldId, 0_r);
TKEWelfordSweep_T welfordTKESweep(meanTkeSgsFieldId, tkeSgsFieldId, 0_r);
TkeSgsWriter_T tkeSgsWriter(omegaFieldId, pdfFieldId, tkeSgsFieldId, initialForce, omega);
@@ -876,7 +876,7 @@ namespace walberla {
welfordSweep.counter_ = real_t(0);
welfordTKESweep.counter_ = real_t(0);
for(auto & block : *blocks) {
- auto * sopField = block.template getData<TensorField_T >(sopFieldId);
+ auto * sopField = block.template getData<TensorField_T >(sosFieldId);
sopField->setWithGhostLayer(0.0);
auto * tkeField = block.template getData<ScalarField_T>(tkeSgsFieldId);
diff --git a/apps/benchmarks/TurbulentChannel/TurbulentChannel.py b/apps/benchmarks/TurbulentChannel/TurbulentChannel.py
index 72df02190..8ef300d83 100644
--- a/apps/benchmarks/TurbulentChannel/TurbulentChannel.py
+++ b/apps/benchmarks/TurbulentChannel/TurbulentChannel.py
@@ -97,7 +97,7 @@ with CodeGeneration() as ctx:
mean_sgs_tke = ps.fields(f"mean_sgs_tke: {data_type}[{stencil.D}D]", layout=layout)
velocity = ps.fields(f"velocity({stencil.D}): {data_type}[{stencil.D}D]", layout=layout)
mean_velocity = ps.fields(f"mean_velocity({stencil.D}): {data_type}[{stencil.D}D]", layout=layout)
- sum_of_products = ps.fields(f"sum_of_products({stencil.D**2}): {data_type}[{stencil.D}D]", layout=layout)
+ sum_of_squares_field = ps.fields(f"sum_of_squares_field({stencil.D**2}): {data_type}[{stencil.D}D]", layout=layout)
# LBM Optimisation
lbm_opt = LBMOptimisation(cse_global=True,
@@ -146,7 +146,7 @@ with CodeGeneration() as ctx:
# Welford update
# welford_update = welford_assignments(vector_field=velocity, mean_vector_field=mean_velocity)
welford_update = welford_assignments(field=velocity, mean_field=mean_velocity,
- sum_of_products_field=sum_of_products)
+ sum_of_squares_field=sum_of_squares_field)
generate_sweep(ctx, "TurbulentChannel_Welford", welford_update, target=target)
tke_welford_update = welford_assignments(field=sgs_tke, mean_field=mean_sgs_tke)
diff --git a/extern/pybind11 b/extern/pybind11
index 7c33cdc2d..f7b499615 160000
--- a/extern/pybind11
+++ b/extern/pybind11
@@ -1 +1 @@
-Subproject commit 7c33cdc2d39c7b99a122579f53bc94c8eb3332ff
+Subproject commit f7b499615e14d70ab098a20deb0cdb3889998a1a
--
GitLab