From 10363b80050c493c687c318668616ffb9bf8200d Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Sun, 3 Dec 2017 18:23:38 +0100
Subject: [PATCH] Bugfixes
---
boundaries/boundaryconditions.py | 6 ------
creationfunctions.py | 6 +++++-
methods/momentbasedsimplifications.py | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/boundaries/boundaryconditions.py b/boundaries/boundaryconditions.py
index e7146e3f..c49e6139 100644
--- a/boundaries/boundaryconditions.py
+++ b/boundaries/boundaryconditions.py
@@ -232,9 +232,3 @@ class NeumannByCopy(Boundary):
def __eq__(self, other):
return type(other) == NeumannByCopy
-
-if __name__ == '__main__':
- from lbmpy.scenarios import *
- sc = createForceDrivenChannel(domainSize=[60, 30])
- sc.boundaryHandling.setBoundary(FixedDensity(1.01), makeSlice[0.2:0.25, :])
- sc.boundaryHandling.prepare()
diff --git a/creationfunctions.py b/creationfunctions.py
index 280d39d4..aacbe746 100644
--- a/creationfunctions.py
+++ b/creationfunctions.py
@@ -385,7 +385,11 @@ def createLatticeBoltzmannUpdateRule(lbMethod=None, optimizationParams={}, **kwa
else:
collisionRule = addEntropyCondition(collisionRule, omegaOutputField=params['omegaOutputField'])
- fieldDtype = 'float64' if optimizationParams['doublePrecision'] else 'float32'
+ if 'doublePrecision' in optimizationParams:
+ fieldDtype = 'float64' if optimizationParams['doublePrecision'] else 'float32'
+ else:
+ fieldDtype = 'float64'
+
if optParams['fieldSize']:
fieldSize = [s + 2 for s in optParams['fieldSize']] + [len(stencil)]
srcField = Field.createFixedSize(params['fieldName'], fieldSize, indexDimensions=1,
diff --git a/methods/momentbasedsimplifications.py b/methods/momentbasedsimplifications.py
index 07558fc1..fcf3ee14 100644
--- a/methods/momentbasedsimplifications.py
+++ b/methods/momentbasedsimplifications.py
@@ -35,7 +35,7 @@ def factorRelaxationRates(lbmCollisionEqs):
"""
sh = lbmCollisionEqs.simplificationHints
assert 'relaxationRates' in sh, "Needs simplification hint 'relaxationRates': Sequence of relaxation rates"
- if len(sh['relaxationRates']) > 12: # heuristics - for too many relaxation rates this simplification makes no sense
+ if len(sh['relaxationRates']) > 19: # heuristics - for too many relaxation rates this simplification makes no sense
return lbmCollisionEqs
relaxationRates = sp.Matrix(sh['relaxationRates']).atoms(sp.Symbol)
--
GitLab