Skip to content

Commit

Permalink
Merge branch 'main' into jhale/try-llvm-on-windows
Browse files Browse the repository at this point in the history
  • Loading branch information
garth-wells authored Nov 16, 2024
2 parents c03f886 + fc9ec6a commit 79e6d1f
Show file tree
Hide file tree
Showing 5 changed files with 343 additions and 118 deletions.
93 changes: 47 additions & 46 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

[![Basix CI](https://github.com/FEniCS/basix/actions/workflows/pythonapp.yml/badge.svg)](https://github.com/FEniCS/basix/actions/workflows/pythonapp.yml)
[![Spack install](https://github.com/FEniCS/basix/actions/workflows/spack.yml/badge.svg)](https://github.com/FEniCS/basix/actions/workflows/spack.yml)
[![DefElement verification](https://defelement.org/badges/basix.ufl.svg)](https://defelement.org/verification.html)

Basix is a finite element definition and tabulation runtime library.
Basix allows users to:
Expand Down Expand Up @@ -68,11 +69,11 @@ follows:

The following elements are supported on an interval:

- [Lagrange](https://defelement.com/elements/lagrange.html)
- [Bubble](https://defelement.com/elements/bubble.html)
- [Serendipity](https://defelement.com/elements/serendipity.html)
- [Hermite](https://defelement.com/elements/hermite.html)
- [iso](https://defelement.com/elements/p1-iso-p2.html)
- [Lagrange](https://defelement.org/elements/lagrange.html)
- [Bubble](https://defelement.org/elements/bubble.html)
- [Serendipity](https://defelement.org/elements/serendipity.html)
- [Hermite](https://defelement.org/elements/hermite.html)
- [iso](https://defelement.org/elements/p1-iso-p2.html)


### Triangle
Expand All @@ -84,17 +85,17 @@ follows:

The following elements are supported on a triangle:

- [Lagrange](https://defelement.com/elements/lagrange.html)
- [Nédélec first kind](https://defelement.com/elements/nedelec1.html)
- [Raviart-Thomas](https://defelement.com/elements/raviart-thomas.html)
- [Nédélec second kind](https://defelement.com/elements/nedelec2.html)
- [Brezzi-Douglas-Marini](https://defelement.com/elements/brezzi-douglas-marini.html)
- [Regge](https://defelement.com/elements/regge.html)
- [Hellan-Herrmann-Johnson](https://defelement.com/elements/hellan-hermann-johnson.html)
- [Crouzeix-Raviart](https://defelement.com/elements/crouzeix-raviart.html)
- [Bubble](https://defelement.com/elements/bubble.html)
- [Hermite](https://defelement.com/elements/hermite.html)
- [iso](https://defelement.com/elements/p1-iso-p2.html)
- [Lagrange](https://defelement.org/elements/lagrange.html)
- [Nédélec first kind](https://defelement.org/elements/nedelec1.html)
- [Raviart-Thomas](https://defelement.org/elements/raviart-thomas.html)
- [Nédélec second kind](https://defelement.org/elements/nedelec2.html)
- [Brezzi-Douglas-Marini](https://defelement.org/elements/brezzi-douglas-marini.html)
- [Regge](https://defelement.org/elements/regge.html)
- [Hellan-Herrmann-Johnson](https://defelement.org/elements/hellan-hermann-johnson.html)
- [Crouzeix-Raviart](https://defelement.org/elements/crouzeix-raviart.html)
- [Bubble](https://defelement.org/elements/bubble.html)
- [Hermite](https://defelement.org/elements/hermite.html)
- [iso](https://defelement.org/elements/p1-iso-p2.html)


### Quadrilateral
Expand All @@ -106,15 +107,15 @@ as follows:

The following elements are supported on a quadrilateral:

- [Lagrange](https://defelement.com/elements/lagrange.html)
- [Nédélec first kind](https://defelement.com/elements/nedelec1.html)
- [Raviart-Thomas](https://defelement.com/elements/qdiv.html)
- [Nédélec second kind](https://defelement.com/elements/scurl.html)
- [Brezzi-Douglas-Marini](https://defelement.com/elements/sdiv.html)
- [Bubble](https://defelement.com/elements/bubble.html)
- [DPC](https://defelement.com/elements/dpc.html)
- [Serendipity](https://defelement.com/elements/serendipity.html)
- [iso](https://defelement.com/elements/p1-iso-p2.html)
- [Lagrange](https://defelement.org/elements/lagrange.html)
- [Nédélec first kind](https://defelement.org/elements/nedelec1.html)
- [Raviart-Thomas](https://defelement.org/elements/qdiv.html)
- [Nédélec second kind](https://defelement.org/elements/scurl.html)
- [Brezzi-Douglas-Marini](https://defelement.org/elements/sdiv.html)
- [Bubble](https://defelement.org/elements/bubble.html)
- [DPC](https://defelement.org/elements/dpc.html)
- [Serendipity](https://defelement.org/elements/serendipity.html)
- [iso](https://defelement.org/elements/p1-iso-p2.html)


### Tetrahedron
Expand All @@ -126,16 +127,16 @@ follows:

The following elements are supported on a tetrahedron:

- [Lagrange](https://defelement.com/elements/lagrange.html)
- [Nédélec first kind](https://defelement.com/elements/nedelec1.html)
- [Raviart-Thomas](https://defelement.com/elements/raviart-thomas.html)
- [Nédélec second kind](https://defelement.com/elements/nedelec2.html)
- [Brezzi-Douglas-Marini](https://defelement.com/elements/brezzi-douglas-marini.html)
- [Regge](https://defelement.com/elements/regge.html)
- [Crouzeix-Raviart](https://defelement.com/elements/crouzeix-raviart.html)
- [Bubble](https://defelement.com/elements/bubble.html)
- [Hermite](https://defelement.com/elements/hermite.html)
- [iso](https://defelement.com/elements/p1-iso-p2.html)
- [Lagrange](https://defelement.org/elements/lagrange.html)
- [Nédélec first kind](https://defelement.org/elements/nedelec1.html)
- [Raviart-Thomas](https://defelement.org/elements/raviart-thomas.html)
- [Nédélec second kind](https://defelement.org/elements/nedelec2.html)
- [Brezzi-Douglas-Marini](https://defelement.org/elements/brezzi-douglas-marini.html)
- [Regge](https://defelement.org/elements/regge.html)
- [Crouzeix-Raviart](https://defelement.org/elements/crouzeix-raviart.html)
- [Bubble](https://defelement.org/elements/bubble.html)
- [Hermite](https://defelement.org/elements/hermite.html)
- [iso](https://defelement.org/elements/p1-iso-p2.html)


### Hexahedron
Expand All @@ -147,15 +148,15 @@ follows:

The following elements are supported on a hexahedron:

- [Lagrange](https://defelement.com/elements/lagrange.html)
- [Nédélec first kind](https://defelement.com/elements/nedelec1.html)
- [Raviart-Thomas](https://defelement.com/elements/qdiv.html)
- [Nédélec second kind](https://defelement.com/elements/scurl.html)
- [Brezzi-Douglas-Marini](https://defelement.com/elements/sdiv.html)
- [Bubble](https://defelement.com/elements/bubble.html)
- [DPC](https://defelement.com/elements/dpc.html)
- [Serendipity](https://defelement.com/elements/serendipity.html)
- [iso](https://defelement.com/elements/p1-iso-p2.html)
- [Lagrange](https://defelement.org/elements/lagrange.html)
- [Nédélec first kind](https://defelement.org/elements/nedelec1.html)
- [Raviart-Thomas](https://defelement.org/elements/qdiv.html)
- [Nédélec second kind](https://defelement.org/elements/scurl.html)
- [Brezzi-Douglas-Marini](https://defelement.org/elements/sdiv.html)
- [Bubble](https://defelement.org/elements/bubble.html)
- [DPC](https://defelement.org/elements/dpc.html)
- [Serendipity](https://defelement.org/elements/serendipity.html)
- [iso](https://defelement.org/elements/p1-iso-p2.html)


### Prism
Expand All @@ -167,7 +168,7 @@ follows:

The following elements are supported on a prism:

- [Lagrange](https://defelement.com/elements/lagrange.html)
- [Lagrange](https://defelement.org/elements/lagrange.html)


### Pyramid
Expand All @@ -179,4 +180,4 @@ follows:

The following elements are supported on a pyramid:

- [Lagrange](https://defelement.com/elements/lagrange.html)
- [Lagrange](https://defelement.org/elements/lagrange.html)
3 changes: 3 additions & 0 deletions cpp/basix/finite-element.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ class FiniteElement
T, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, d>>;

public:
/// Scalar type.
using scalar_type = F;

/// @brief Construct a finite element.
///
/// Initialising a finite element calculates the basis functions of
Expand Down
Loading

0 comments on commit 79e6d1f

Please sign in to comment.