From d8e4f263cd2eeb05ffdb5e23bddc0bf12c897421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20He=C3=9F?= <rene.hess@iwr.uni-heidelberg.de> Date: Wed, 6 Feb 2019 15:56:57 +0100 Subject: [PATCH] Add geometry mixins to applications --- applications/knl/poisson_dg/knl_poisson_dg.mini | 1 + applications/knl/poisson_dg/verify.mini | 1 + applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini | 1 + applications/knl/poisson_dg_tensor/verify.mini | 1 + applications/poisson_dg/poisson_dg.mini | 1 + applications/poisson_dg/verify.mini | 1 + applications/poisson_dg_tensor/poisson_dg_tensor.mini | 1 + applications/poisson_dg_tensor/verify.mini | 1 + applications/stokes_dg/stokes_dg.mini | 1 + python/dune/codegen/sumfact/basis.py | 2 +- 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/applications/knl/poisson_dg/knl_poisson_dg.mini b/applications/knl/poisson_dg/knl_poisson_dg.mini index 41755b7e..9f93bbb9 100644 --- a/applications/knl/poisson_dg/knl_poisson_dg.mini +++ b/applications/knl/poisson_dg/knl_poisson_dg.mini @@ -52,6 +52,7 @@ vectorization_vertical = 2 matrix_free = 1 generate_jacobians = 0 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval +geometry_mixins = sumfact_equidistant [formcompiler.ufl_variants] cell = hexahedron diff --git a/applications/knl/poisson_dg/verify.mini b/applications/knl/poisson_dg/verify.mini index b82dce69..a8a10bc9 100644 --- a/applications/knl/poisson_dg/verify.mini +++ b/applications/knl/poisson_dg/verify.mini @@ -19,6 +19,7 @@ vectorization_strategy = explicit vectorization_horizontal = 4 vectorization_vertical = 2 quadrature_order = 6 +geometry_mixins = sumfact_equidistant [formcompiler.ufl_variants] cell = hexahedron diff --git a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini b/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini index 9d87f7ee..176a9c7c 100644 --- a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini +++ b/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini @@ -52,6 +52,7 @@ vectorization_vertical = 2 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval matrix_free = 1 generate_jacobians = 0 +geometry_mixins = sumfact_equidistant [formcompiler.ufl_variants] cell = hexahedron diff --git a/applications/knl/poisson_dg_tensor/verify.mini b/applications/knl/poisson_dg_tensor/verify.mini index cedf2fb3..125f4d42 100644 --- a/applications/knl/poisson_dg_tensor/verify.mini +++ b/applications/knl/poisson_dg_tensor/verify.mini @@ -19,6 +19,7 @@ vectorization_strategy = explicit vectorization_horizontal = 4 vectorization_vertical = 2 quadrature_order = 6 +geometry_mixins = sumfact_equidistant [formcompiler.ufl_variants] cell = hexahedron diff --git a/applications/poisson_dg/poisson_dg.mini b/applications/poisson_dg/poisson_dg.mini index d031d823..6fbe2e6a 100644 --- a/applications/poisson_dg/poisson_dg.mini +++ b/applications/poisson_dg/poisson_dg.mini @@ -49,6 +49,7 @@ vectorization_strategy = explicit quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval matrix_free = 1 generate_jacobians = 0 +geometry_mixins = sumfact_equidistant [formcompiler.ufl_variants] cell = hexahedron diff --git a/applications/poisson_dg/verify.mini b/applications/poisson_dg/verify.mini index 475cb4db..ab518951 100644 --- a/applications/poisson_dg/verify.mini +++ b/applications/poisson_dg/verify.mini @@ -17,6 +17,7 @@ fastdg = 1 sumfact = 1 vectorization_quadloop = 1 vectorization_strategy = explicit +geometry_mixins = sumfact_equidistant [formcompiler.ufl_variants] cell = hexahedron diff --git a/applications/poisson_dg_tensor/poisson_dg_tensor.mini b/applications/poisson_dg_tensor/poisson_dg_tensor.mini index a5738a46..d0f6d5dd 100644 --- a/applications/poisson_dg_tensor/poisson_dg_tensor.mini +++ b/applications/poisson_dg_tensor/poisson_dg_tensor.mini @@ -49,6 +49,7 @@ vectorization_strategy = explicit quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval matrix_free = 1 generate_jacobians = 0 +geometry_mixins = sumfact_equidistant [formcompiler.ufl_variants] cell = hexahedron diff --git a/applications/poisson_dg_tensor/verify.mini b/applications/poisson_dg_tensor/verify.mini index 537c202e..b7906781 100644 --- a/applications/poisson_dg_tensor/verify.mini +++ b/applications/poisson_dg_tensor/verify.mini @@ -17,6 +17,7 @@ sumfact = 1 vectorization_quadloop = 1 vectorization_strategy = model vectorization_jacobians = 0 +geometry_mixins = sumfact_equidistant [formcompiler.ufl_variants] cell = hexahedron diff --git a/applications/stokes_dg/stokes_dg.mini b/applications/stokes_dg/stokes_dg.mini index 6160ced2..5f14da6d 100644 --- a/applications/stokes_dg/stokes_dg.mini +++ b/applications/stokes_dg/stokes_dg.mini @@ -51,6 +51,7 @@ vectorization_allow_quadrature_changes = 1 quadrature_order = {formcompiler.ufl_variants.v_degree} * 2 | eval matrix_free = 1 generate_jacobians = 0 +geometry_mixins = sumfact_equidistant [formcompiler.ufl_variants] cell = hexahedron diff --git a/python/dune/codegen/sumfact/basis.py b/python/dune/codegen/sumfact/basis.py index d8194af7..9fac3942 100644 --- a/python/dune/codegen/sumfact/basis.py +++ b/python/dune/codegen/sumfact/basis.py @@ -34,7 +34,7 @@ from dune.codegen.sumfact.permutation import (permute_backward, from dune.codegen.sumfact.switch import (get_facedir, get_facemod, ) -from dune.codegen.pdelab.argument import name_coefficientcontainer +from dune.codegen.pdelab.argument import name_coefficientcontainer, name_applycontainer from dune.codegen.pdelab.basis import GenericBasisMixin from dune.codegen.pdelab.geometry import (local_dimension, world_dimension, -- GitLab