From 0ad1a2dce117aaa0ea6fd672a935d81c34d31388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20He=C3=9F?= <rene.hess@iwr.uni-heidelberg.de> Date: Thu, 13 Sep 2018 15:06:03 +0200 Subject: [PATCH] Bugfix: PEP8 --- python/dune/perftool/pdelab/driver/solve.py | 8 +++++--- python/dune/perftool/sumfact/geometry.py | 6 +----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/python/dune/perftool/pdelab/driver/solve.py b/python/dune/perftool/pdelab/driver/solve.py index 4603905e..cdf41b82 100644 --- a/python/dune/perftool/pdelab/driver/solve.py +++ b/python/dune/perftool/pdelab/driver/solve.py @@ -22,6 +22,7 @@ from dune.perftool.pdelab.driver.gridoperator import (name_gridoperator, from dune.perftool.pdelab.driver.interpolate import interpolate_dirichlet_data from dune.perftool.pdelab.geometry import world_dimension + @preamble(section="solver") def dune_solve(): form_ident = get_form_ident() @@ -215,7 +216,7 @@ def random_input(v): def interpolate_input(v): - dim = world_dimension(); + dim = world_dimension() gv = name_leafview() gfs = name_trial_gfs() expr = [] @@ -230,6 +231,7 @@ def interpolate_input(v): " Dune::PDELab::interpolate(interpolate,{},{});".format(gfs, v), ] + @preamble(section="printing") def print_residual(): ini = name_initree() @@ -246,7 +248,7 @@ def print_residual(): return ["if ({}.get<bool>(\"printresidual\", false)) {{".format(ini), " using Dune::PDELab::Backend::native;", " {} r({});".format(t_v, v)] + input + \ - [" r=0.0;", + [" r=0.0;", " {}.residual({}, r);".format(n_go, v), " Dune::printvector(std::cout, native(r), \"residual vector\", \"row\");", "}"] @@ -268,7 +270,7 @@ def print_matrix(): return ["if ({}.get<bool>(\"printmatrix\", false)) {{".format(ini), " using Dune::PDELab::Backend::native;", " {} r({});".format(t_v, v)] + input + \ - [" using M = typename {}::Traits::Jacobian;".format(t_go), + [" using M = typename {}::Traits::Jacobian;".format(t_go), " M m({});".format(n_go), " {}.jacobian({},m);".format(n_go, v), " using Dune::PDELab::Backend::native;", diff --git a/python/dune/perftool/sumfact/geometry.py b/python/dune/perftool/sumfact/geometry.py index ee0fbaae..875ae31e 100644 --- a/python/dune/perftool/sumfact/geometry.py +++ b/python/dune/perftool/sumfact/geometry.py @@ -78,11 +78,7 @@ class GeoCornersInput(SumfactKernelInterfaceBase, ImmutableRecord): def __repr__(self): return ImmutableRecord.__repr__(self) - def realize(self, sf, insn_dep): - # TODO: When we use vectorization this should be the offset - assert(get_form_option('vectorization_strategy') == 'none') - index = 0 - + def realize(self, sf, insn_dep, index=0): # Note: world_dimension, since we only do evaluation of cell geometry mappings name = "input_{}".format(sf.buffer) temporary_variable(name, -- GitLab