From 1a4768643d3ac6b11c6be69afc6d70abe965c158 Mon Sep 17 00:00:00 2001 From: Marcel Koch <marcel.koch@uni-muenster.de> Date: Tue, 22 Jan 2019 11:50:52 +0100 Subject: [PATCH] use `self.measure` --- python/dune/codegen/blockstructured/geometry.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/python/dune/codegen/blockstructured/geometry.py b/python/dune/codegen/blockstructured/geometry.py index 3bf5acc4..d11bd8d2 100644 --- a/python/dune/codegen/blockstructured/geometry.py +++ b/python/dune/codegen/blockstructured/geometry.py @@ -31,12 +31,10 @@ class BlockStructuredGeometryMixin(GenericPDELabGeometryMixin): assert isinstance(local, prim.Expression) name = get_pymbolic_basename(local) + "_global" - it = get_global_context_value("integral_type") - - if it == 'cell': + if self.measure == 'cell': compute_multilinear_to_global_transformation(name, local, self) return prim.Variable(name) - elif it == 'exterior_facet' or it == 'interior_facet': + elif self.measure == 'exterior_facet' or self.measure == 'interior_facet': return GenericPDELabGeometryMixin.to_global(self, local) else: raise NotImplementedError @@ -89,12 +87,10 @@ class AxiparallelBlockStructuredGeometryMixin(AxiparallelGeometryMixin, BlockStr assert isinstance(local, prim.Expression) name = get_pymbolic_basename(local) + "_global" - it = get_global_context_value("integral_type") - - if it == 'cell': + if self.measure == 'cell': compute_axiparallel_to_global_transformation(name, local, self) return prim.Variable(name) - elif it == 'exterior_facet' or it == 'interior_facet': + elif self.measure == 'exterior_facet' or self.measure == 'interior_facet': return AxiparallelGeometryMixin.to_global(self, local) else: raise NotImplementedError -- GitLab