Commit e0566616 authored by Markus Holzer's avatar Markus Holzer
Browse files

Merge branch 'mr_cumulant_lbm' into 'master'

Cumulant LBM

See merge request pycodegen/lbmpy!48
parents d6bde7f7 9b77d485
...@@ -4,6 +4,7 @@ __pycache__ ...@@ -4,6 +4,7 @@ __pycache__
*.pyc *.pyc
*.vti *.vti
/build /build
/html_doc
/dist /dist
/*.egg-info /*.egg-info
.cache .cache
...@@ -13,5 +14,4 @@ _local_tmp ...@@ -13,5 +14,4 @@ _local_tmp
**/.vscode **/.vscode
/lbmpy_tests/db /lbmpy_tests/db
doc/bibtex.json doc/bibtex.json
/html_doc
RELEASE-VERSION RELEASE-VERSION
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
"name": "python", "name": "python",
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.6.4" "version": "3.8.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
"name": "python", "name": "python",
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.6.9" "version": "3.8.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
"name": "python", "name": "python",
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.6.8" "version": "3.8.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
"name": "python", "name": "python",
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.6.8" "version": "3.8.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment