From 7bd9ce7ad3a3ecbf06213d3b927ed8cbb3acfc94 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Sun, 5 Nov 2017 13:55:20 +0100
Subject: [PATCH] Caching workaround not necessary any more
---
creationfunctions.py | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/creationfunctions.py b/creationfunctions.py
index dbfa5aca..3c000b08 100644
--- a/creationfunctions.py
+++ b/creationfunctions.py
@@ -333,25 +333,9 @@ def createLatticeBoltzmannAst(updateRule=None, optimizationParams={}, **kwargs):
return res
+@diskcache
def createLatticeBoltzmannUpdateRule(lbMethod=None, optimizationParams={}, **kwargs):
params, optParams = updateWithDefaultParameters(kwargs, optimizationParams)
- forceModel = params["forceModel"]
- force = params['force']
- del params['force']
- del params["forceModel"]
- parameters = json.dumps({
- 'params': params,
- 'optParams': optParams,
- }, cls=SympyJSONEncoder, sort_keys=True)
- return _createLatticeBoltzmannUpdateRuleCached(parameters, forceModel, force, lbMethod)
-
-
-@diskcache
-def _createLatticeBoltzmannUpdateRuleCached(stringParameters, forceModel, force, lbMethod=None):
- parsedParams = json.loads(stringParameters, cls=SympyJSONDecoder)
- params, optParams = parsedParams['params'], parsedParams['optParams']
- params['forceModel'] = forceModel
- params['force'] = force
stencil = getStencil(params['stencil'])
--
GitLab