diff --git a/dune/perftool/sumfact/transposereg.hh b/dune/perftool/sumfact/transposereg.hh index 81cdbbc862d23b8bfc958671610924964a26086a..af50b29ccdc6cf263eb0317a903b692a9f77da81 100644 --- a/dune/perftool/sumfact/transposereg.hh +++ b/dune/perftool/sumfact/transposereg.hh @@ -1,7 +1,7 @@ #ifndef DUNE_PERFTOOL_SUMFACT_TRANSPOSEREG_HH #define DUNE_PERFTOOL_SUMFACT_TRANSPOSEREG_HH -#include<dune/perftool/vectorclass/vectorclass.h> +#include<dune/perftool/common/vectorclass.hh> /** * Transpose a 4x4 matrix given by 4 vector registers (efficiently) diff --git a/python/dune/perftool/loopy/mangler.py b/python/dune/perftool/loopy/mangler.py index c0172170f8ea3dbeeda9871a209795cd38eed7d4..80a3d69a0ca92aaa4266410f24c1ebaf4306012d 100644 --- a/python/dune/perftool/loopy/mangler.py +++ b/python/dune/perftool/loopy/mangler.py @@ -10,7 +10,7 @@ from loopy import CallMangleInfo @function_mangler def dune_math_manglers(kernel, name, arg_dtypes): if name == "exp": - include_file("dune/perftool/vectorclass/vectormath_exp.h", filetag="operatorfile") + include_file("dune/perftool/common/vectorclass.hh", filetag="operatorfile") return CallMangleInfo("exp", arg_dtypes, arg_dtypes, diff --git a/python/dune/perftool/loopy/target.py b/python/dune/perftool/loopy/target.py index 952d6e6429d230fed00c295e133d4ca4a083cda1..9427a401e8b0a51f8b43ddf52abfd2cc3b9bc753 100644 --- a/python/dune/perftool/loopy/target.py +++ b/python/dune/perftool/loopy/target.py @@ -75,7 +75,7 @@ class DuneExpressionToCExpressionMapper(ExpressionToCExpressionMapper): ret = ExpressionToCExpressionMapper.map_constant(self, expr, type_context) if get_option('opcounter'): if type_context == "f": - _type = _type_to_op_counter_type('float') + _type = _type_to_op_counter_type('double') ret = Literal("{}({})".format(_type, ret.s)) if type_context == "d": _type = _type_to_op_counter_type('double') @@ -182,7 +182,7 @@ class DuneTarget(TargetBase): def dtype_to_typename(self, dtype): if dtype.dtype.kind == "V": - include_file("dune/perftool/vectorclass/vectorclass.h", filetag="operatorfile") + include_file("dune/perftool/common/vectorclass.hh", filetag="operatorfile") return VCLTypeRegistry.names[dtype.dtype] else: return numpy_to_cpp_dtype(dtype.dtype.name) diff --git a/test/sumfact/poisson/CMakeLists.txt b/test/sumfact/poisson/CMakeLists.txt index 889b29853ba92c628f91cfbc6a19523189d69fad..aab2e764b019fe0281c20075a819a29b52f26640 100644 --- a/test/sumfact/poisson/CMakeLists.txt +++ b/test/sumfact/poisson/CMakeLists.txt @@ -16,6 +16,11 @@ dune_add_formcompiler_system_test(UFLFILE opcount_poisson_2d_order2.ufl INIFILE opcount_poisson_2d_order2.mini ) +dune_add_formcompiler_system_test(UFLFILE poisson_dg_2d.ufl + BASENAME opcount_sumfact_poisson_dg_2d_vec + INIFILE opcount_sumfact_poisson_dg_2d_vec.mini + ) + # 3. Poisson Test Case: DG in 2D dune_add_formcompiler_system_test(UFLFILE poisson_dg_2d.ufl BASENAME sumfact_poisson_dg_2d diff --git a/test/sumfact/poisson/opcount_sumfact_poisson_dg_2d_vec.mini b/test/sumfact/poisson/opcount_sumfact_poisson_dg_2d_vec.mini new file mode 100644 index 0000000000000000000000000000000000000000..9ae884ddef753819c3ea40a72548fe5fa8a9987d --- /dev/null +++ b/test/sumfact/poisson/opcount_sumfact_poisson_dg_2d_vec.mini @@ -0,0 +1,20 @@ +__name = opcount_sumfact_poisson_dg_2d_vec + + +cells = 8 8 +extension = 1. 1. + +[wrapper.vtkcompare] +name = {__name} +reference = poisson_ref +extension = vtu + +[formcompiler] +numerical_jacobian = 0 +exact_solution_expression = g +compare_l2errorsquared = 1e-8 +sumfact = 1 +opcounter = 1 + +[formcompiler.ufl_variants] +degree = 1