Add Nedelec on prism (#96)

* remove core/ folder. Start adding prism nedelec

* higher order prism nedelec

* pydocstyle

* fix tests and docs

* don't update pip and apt

* add -x to stop failing tests running forever

* ++version

Author: mscroggs

.github/workflows/coveralls.yml

@@ -15,10 +15,6 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.8
-      - run: |
-            sudo apt-get update
-            pip install --upgrade pip
-        name: Update apt and pip
       - run: |
             sudo apt-get install -y libeigen3-dev libopenblas-dev liblapack-dev ninja-build
             pip install pybind11

.github/workflows/run-tests.yml

@@ -22,10 +22,6 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - run: |
-            sudo apt-get update
-            pip install --upgrade pip
-        name: Update apt and pip
       - run: |
             pip install pytest numpy scipy coverage coveralls pytest-cov pytest-xdist
         name: Install test dependencies
@@ -36,7 +32,7 @@ jobs:
             python3 setup.py install
             rm -rf symfem
         name: Install symfem
-      - run: python3 -m pytest -n=auto --durations=50 test/
+      - run: python3 -m pytest -n=auto --durations=50 test/ -x
         name: Run unit tests
       - run: python3 -m pytest demo/test_demos.py
         name: Run demos
@@ -52,10 +48,6 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - run: |
-            sudo apt-get update
-            pip install --upgrade pip
-        name: Update apt and pip
       - run: |
             sudo apt-get install -y libeigen3-dev libopenblas-dev liblapack-dev ninja-build
             pip install pybind11
@@ -83,5 +75,5 @@ jobs:
             sudo cmake --install build-dir
             pip install ./python/
         name: Install basix
-      - run: python3 -m pytest -n=auto --durations=50 test/test_against_basix.py --has-basix 1
+      - run: python3 -m pytest -n=auto --durations=50 test/test_against_basix.py --has-basix 1 -x
         name: Run unit tests

VERSION

@@ -1 +1 @@
-2021.6.1
+2021.6.2

codemeta.json

@@ -1 +1 @@
-{"@context": "https://raw.githubusercontent.com/codemeta/codemeta/master/codemeta.jsonld", "@type": "Code", "author": [{"@id": "0000-0002-4658-2443", "@type": "Person", "email": "[email protected]", "name": "Matthew Scroggs", "affiliation": "Department of Engineering, University of Cambridge"}], "identifier": "", "codeRepository": "https://github.com/mscroggs/symfem", "datePublished": "2021-01-23", "dateModified": "2021-06-13", "dateCreated": "2021-01-23", "description": "A symbolic finite element definition library", "keywords": "Python, finite element method, numerical analysis", "license": "MIT", "title": "Symfem", "version": "2021.6.1"}
+{"@context": "https://raw.githubusercontent.com/codemeta/codemeta/master/codemeta.jsonld", "@type": "Code", "author": [{"@id": "0000-0002-4658-2443", "@type": "Person", "email": "[email protected]", "name": "Matthew Scroggs", "affiliation": "Department of Engineering, University of Cambridge"}], "identifier": "", "codeRepository": "https://github.com/mscroggs/symfem", "datePublished": "2021-01-23", "dateModified": "2021-06-17", "dateCreated": "2021-01-23", "description": "A symbolic finite element definition library", "keywords": "Python, finite element method, numerical analysis", "license": "MIT", "title": "Symfem", "version": "2021.6.2"}

demo/custom_element.py

@@ -1,8 +1,8 @@
 import symfem
 import sympy
-from symfem.core.finite_element import CiarletElement
-from symfem.core.symbolic import x
-from symfem.core.functionals import PointEvaluation
+from symfem.finite_element import CiarletElement
+from symfem.symbolic import x
+from symfem.functionals import PointEvaluation
 
 
 class CustomElement(CiarletElement):

demo/stiffness_matrix.py

@@ -1,6 +1,6 @@
 import symfem
-from symfem.core.vectors import vdot
-from symfem.core.calculus import grad
+from symfem.vectors import vdot
+from symfem.calculus import grad
 
 matrix = [[0 for i in range(4)] for j in range(4)]
 

docs/index.rst

@@ -39,7 +39,7 @@ For example, some elements are created in the following snippet:
     nedelec = symfem.create_element("triangle", "N2curl", 1)
     qcurl = symfem.create_element("quadrilateral", "Qcurl", 2)
 
-`create_element` will create a :class:`symfem.core.finite_element.FiniteElement` object.
+`create_element` will create a :class:`symfem.finite_element.FiniteElement` object.
 From this object, the polynomial basis of the element can be obtained:
 
 .. code-block:: python
@@ -67,9 +67,9 @@ snippet.
 
 ::
 
-    [<symfem.core.functionals.PointEvaluation object at 0x{ADDRESS}>, <symfem.core.functionals.PointEvaluation object at 0x{ADDRESS}>, <symfem.core.functionals.PointEvaluation object at 0x{ADDRESS}>]
+    [<symfem.functionals.PointEvaluation object at 0x{ADDRESS}>, <symfem.functionals.PointEvaluation object at 0x{ADDRESS}>, <symfem.functionals.PointEvaluation object at 0x{ADDRESS}>]
 
-Each functional will be a functional defined in :mod:`symfem.core.functionals`.
+Each functional will be a functional defined in :mod:`symfem.functionals`.
 
 The basis functions spanning the finite element space can be obtained, or tabulated
 at a set of points:
@@ -91,7 +91,7 @@ at a set of points:
 
 Reference elements
 ------------------
-Reference elements can be obtained from a :class:`symfem.core.finite_element.FiniteElement`:
+Reference elements can be obtained from a :class:`symfem.finite_element.FiniteElement`:
 
 .. code-block:: python
 

setup.py

@@ -35,7 +35,7 @@
         author_email="[email protected]",
         maintainer_email="[email protected]",
         url="https://github.com/mscroggs/symfem",
-        packages=["symfem", "symfem.core", "symfem.elements"],
+        packages=["symfem", "symfem.elements"],
         data_files=data_files,
         include_package_data=True,
         install_requires=requirements

symfem/core/basis_function.py renamed to symfem/basis_function.py

@@ -18,13 +18,17 @@ def __getattr__(self, attr):
         """Forward all other function calls to symbolic function."""
         return getattr(self.get_function(), attr)
 
-    def __rmul__(self, other):
+    def __getitem__(self, key):
+        """Forward all other function calls to symbolic function."""
+        return self.get_function()[key]
+
+    def __mul__(self, other):
         """Multiply."""
         return self.get_function() * other
 
-    def __lmul__(self, other):
+    def __rmul__(self, other):
         """Multiply."""
-        return self.__rmul__(other)
+        return self.__mul__(other)
 
     def __truediv__(self, other):
         """Divide."""