Merge branch 'main' of github.com:FEniCS/ffcx into igor/cross_element…

…_vec
FEniCS · Jul 12, 2022 · c5743fd · c5743fd
2 parents a2d0cea + ba7d12c
commit c5743fd
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 741 deletions.
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Upgrade pip and setuptools
         run: python -m pip install setuptools pip build --upgrade
-      
+
       - name: Build sdist and wheel
         run: python -m build .
 
@@ -63,15 +63,15 @@ jobs:
         with:
           name: artifact
           path: dist
-      
+
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@v1.5.0
         if: ${{ github.event.inputs.pypi_publish == 'true' }}
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
           repository_url: https://upload.pypi.org/legacy/
-      
+
       - name: Publish to Test PyPI
         uses: pypa/gh-action-pypi-publish@v1.5.0
         if: ${{ github.event.inputs.test_pypi_publish == 'true' }}

diff --git a/demo/test_demos.py b/demo/test_demos.py
@@ -13,17 +13,14 @@
 @pytest.mark.parametrize("file", ufl_files)
 def test_demo(file):
     if file in [
-        "MixedPoissonDual",  # Discontinuous Raviart-Thomas
-        "BiharmonicHHJ",  # Hellan-Herrmann-Johnson
         "NodalMini",  # NodalEnrichedElement
         "Mini",  # EnrichedElement
         "MixedGradient", "TraceElement",  # HDiv Trace
-        "MassHdiv_2D_1", "MassHdiv_2D_3", "MixedPoisson", "MassHdiv_2D_2",  # Brezzi-Douglas-Marini
         "MixedElasticity",  # VectorElement of BDM
         "RestrictedElement",
         "_TensorProductElement"
     ]:
-        # Skip demos that use elements not yet implemented in basix
+        # Skip demos that use elements not yet implemented in Basix
         pytest.skip()
 
     extra_flags = "-Wunused-variable -Werror -fPIC "

diff --git a/ffcx/codegeneration/finite_element.py b/ffcx/codegeneration/finite_element.py
@@ -73,7 +73,7 @@ def generator(ir, parameters):
         d["value_shape"] = "NULL"
         d["value_shape_init"] = ""
 
-    if len(ir.value_shape) > 0:
+    if len(ir.reference_value_shape) > 0:
         d["reference_value_shape"] = f"reference_value_shape_{ir.name}"
         d["reference_value_shape_init"] = L.ArrayDecl(
             "int", f"reference_value_shape_{ir.name}",