diff --git a/creationfunctions.py b/creationfunctions.py index dbfa5aca3f6f08ea070d1c30ebd9759f1bb5103e..3c000b087e470af029aeec30c1f62b408fad48bb 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'])