diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/Elasticity3D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/Elasticity3D.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/Elasticity3D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/Elasticity3D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (dx, VectorElement, +from ufl_legacy import (dx, VectorElement, Identity, inner, grad, tr, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/NSEMomentum3D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/NSEMomentum3D.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/NSEMomentum3D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/NSEMomentum3D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, div, dot, inner, grad, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/Poisson2DP1.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/Poisson2DP1.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/Poisson2DP1.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/Poisson2DP1.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (dx, FiniteElement, +from ufl_legacy import (dx, FiniteElement, dot, grad, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/Poisson2DP2.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/Poisson2DP2.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/Poisson2DP2.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/Poisson2DP2.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (dx, FiniteElement, +from ufl_legacy import (dx, FiniteElement, dot, grad, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/Poisson2DP3.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/Poisson2DP3.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/Poisson2DP3.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/Poisson2DP3.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (dx, FiniteElement, +from ufl_legacy import (dx, FiniteElement, dot, grad, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/StabStokes2D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/StabStokes2D.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/StabStokes2D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/StabStokes2D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, div, grad, inner, triangle, TestFunctions, TrialFunctions) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/THStokes2D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/THStokes2D.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/assembly/cpp/forms/THStokes2D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/assembly/cpp/forms/THStokes2D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (dx, FiniteElement, VectorElement, +from ufl_legacy import (dx, FiniteElement, VectorElement, div, grad, inner, triangle, TestFunctions, TrialFunctions) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_1.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_1.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_1.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_1.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Poisson's equation in 2D for q = 1 -from ufl import (Coefficient, dx, FiniteElement, i, +from ufl_legacy import (Coefficient, dx, FiniteElement, i, triangle, TestFunction, TrialFunction) element = FiniteElement("Lagrange", triangle, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_2.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_2.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_2.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_2.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Poisson's equation in 2D for q = 2 -from ufl import (Coefficient, dx, FiniteElement, i, +from ufl_legacy import (Coefficient, dx, FiniteElement, i, triangle, TestFunction, TrialFunction) element = FiniteElement("Lagrange", triangle, 2) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_3.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_3.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_3.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_3.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Poisson's equation in 2D for q = 3 -from ufl import (Coefficient, dx, FiniteElement, i, +from ufl_legacy import (Coefficient, dx, FiniteElement, i, triangle, TestFunction, TrialFunction) element = FiniteElement("Lagrange", triangle, 3) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_4.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_4.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_4.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_4.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Poisson's equation in 2D for q = 4 -from ufl import (Coefficient, dx, FiniteElement, i, +from ufl_legacy import (Coefficient, dx, FiniteElement, i, triangle, TestFunction, TrialFunction) element = FiniteElement("Lagrange", triangle, 4) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_5.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_5.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson2D_5.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson2D_5.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Poisson's equation in 2D for q = 5 -from ufl import (Coefficient, dx, FiniteElement, i, +from ufl_legacy import (Coefficient, dx, FiniteElement, i, triangle, TestFunction, TrialFunction) element = FiniteElement("Lagrange", triangle, 5) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson3D_1.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson3D_1.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson3D_1.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson3D_1.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Poisson's equation in 3D for q = 1 -from ufl import (Coefficient, dx, FiniteElement, i, +from ufl_legacy import (Coefficient, dx, FiniteElement, i, tetrahedron, TestFunction, TrialFunction) element = FiniteElement("Lagrange", tetrahedron, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson3D_2.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson3D_2.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson3D_2.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson3D_2.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Poisson's equation in 3D for q = 2 -from ufl import (Coefficient, dx, FiniteElement, i, +from ufl_legacy import (Coefficient, dx, FiniteElement, i, tetrahedron, TestFunction, TrialFunction) element = FiniteElement("Lagrange", tetrahedron, 2) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson3D_3.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson3D_3.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson3D_3.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson3D_3.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Poisson's equation in 3D for q = 3 -from ufl import (Coefficient, dx, FiniteElement, i, +from ufl_legacy import (Coefficient, dx, FiniteElement, i, tetrahedron, TestFunction, TrialFunction) element = FiniteElement("Lagrange", tetrahedron, 3) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson3D_4.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson3D_4.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/convergence/cpp/Poisson3D_4.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/convergence/cpp/Poisson3D_4.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Poisson's equation in 3D for q = 4 -from ufl import (Coefficient, dx, FiniteElement, i, +from ufl_legacy import (Coefficient, dx, FiniteElement, i, tetrahedron, TestFunction, TrialFunction) element = FiniteElement("Lagrange", tetrahedron, 4) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/fem/speedup/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/speedup/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/fem/speedup/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/fem/speedup/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -21,7 +21,7 @@ # The bilinear form a(v, u) and linear form L(v) for # Poisson's equation. -from ufl import (Coefficient, dx, FiniteElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, inner, grad, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/bench/function/evaluation/cpp/P1.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/function/evaluation/cpp/P1.ufl --- dolfin-2019.2.0~git20230116.bd54183/bench/function/evaluation/cpp/P1.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/bench/function/evaluation/cpp/P1.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin P1.ufl -from ufl import (FiniteElement, tetrahedron) +from ufl_legacy import (FiniteElement, tetrahedron) element = FiniteElement("Lagrange", tetrahedron, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/changelog dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/changelog --- dolfin-2019.2.0~git20230116.bd54183/debian/changelog 2023-02-26 10:33:10.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/changelog 2023-08-09 15:17:45.000000000 +0000 @@ -1,3 +1,50 @@ +dolfin (2019.2.0~legacy20230609.8b85e9d.ar-4) unstable; urgency=medium + + * source-only upload to migrate to testing + + -- Drew Parsons Wed, 09 Aug 2023 17:17:45 +0200 + +dolfin (2019.2.0~legacy20230609.8b85e9d.ar-3) unstable; urgency=medium + + * gcc-13 patches alter the ABI, so add gcc13 suffix to sonames. + Closes: #1041705. + + -- Drew Parsons Mon, 24 Jul 2023 20:41:21 +0200 + +dolfin (2019.2.0~legacy20230609.8b85e9d.ar-2) unstable; urgency=medium + + * debian patch gcc13.patch enables build with gcc-13 + - apply dolfinx PR#2646 to use int instead of std::int32_t + in timing.h + - elsewhere #include to define std::int32_t + - Closes: #1037622 + + -- Drew Parsons Thu, 20 Jul 2023 19:58:06 +0200 + +dolfin (2019.2.0~legacy20230609.8b85e9d.ar-1) unstable; urgency=medium + + * snapshot of upstream ufl_legacy branch + - source tarball generated with git archive to catch git-lfs files + - applies debian ufl_legacy renaming patches + * document use of ufl_legacy in debian/NEWS and in README.Debian. + Install README.Debian in libdolfin-dev, python3-dolfin, dolfin-doc. + * debian patch docstring_not_byte.patch fixes docstring. The byte + string broke pytest 7.3 (PYTEST_DONT_REWRITE). Thanks Timo Röhling. + Closes: #1038883. + + -- Drew Parsons Sun, 25 Jun 2023 13:24:37 +0200 + +dolfin (2019.2.0~git20230116.bd54183-3) experimental; urgency=medium + + * UFL 2023.1 has diverged and breaks dolfin. + debian patches rename_ufl_legacy.patch, test_ufl_legacy.patch + and demo_ufl_legacy.patch rename ufl as ufl_legacy providing the + last compatible UFL 2022.2. Depends: python3-ufl-legacy. + Build-Depends: python3-ffc (>= 2019.2.0~git20210714.a20cbe7-4~), + python3-ufl-legacy (>= 1:2022.2.0-3~) + + -- Drew Parsons Wed, 26 Apr 2023 18:21:52 +0200 + dolfin (2019.2.0~git20230116.bd54183-2) unstable; urgency=medium * debian/tests: armhf debci started running out of disk space diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/control dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/control --- dolfin-2019.2.0~git20230116.bd54183/debian/control 2023-02-26 10:33:10.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/control 2023-08-09 15:17:45.000000000 +0000 @@ -42,8 +42,9 @@ pkg-config, python3-pkgconfig, python3-all-dev, python3-pkg-resources, - python3-ffc (>= 2019.2), python3-ffc (<< 2019.3), + python3-ffc (>= 2019.2.0~git20210714.a20cbe7-4~), python3-ffc (<< 2019.3), python3-dijitso (>= 2019.2), python3-dijitso (<< 2019.3), + python3-ufl-legacy (>= 1:2022.2.0-3~), python3-numpy, python3-ply, python3-sphinx @@ -76,7 +77,7 @@ libboost-serialization-dev, libboost-thread-dev, libboost-timer-dev, - libdolfin2019.2 (= ${binary:Version}), + libdolfin2019.2gcc13 (= ${binary:Version}), libeigen3-dev, libhdf5-mpi-dev, libsuitesparse-dev, @@ -151,7 +152,7 @@ This is the legacy version of DOLFIN, you may want to install the next-generation libdolfinx-dev (DOLFIN-X) instead. -Package: libdolfin2019.2 +Package: libdolfin2019.2gcc13 Section: libs Architecture: any Multi-Arch: same @@ -173,8 +174,8 @@ Architecture: any Depends: python3-dolfin-real | python3-dolfin64-real, python3-dijitso (>= ${fenics:Upstream-Version}), python3-dijitso (<< ${fenics:Next-Upstream-Version}), - python3-ffc (>= ${fenics:Upstream-Version}), python3-ffc (<< ${fenics:Next-Upstream-Version}), - python3-ufl (>= ${fenics:Upstream-Version}), + python3-ffc (>= 2019.2.0~git20210714.a20cbe7-4~), + python3-ufl-legacy (>= 1:2022.2.0-3~), python3-numpy, ${python3-petsc4py:Depends}, python3-ply, @@ -208,7 +209,7 @@ Architecture: any Depends: libdolfin-dev (= ${binary:Version}), - libdolfin2019.2 (= ${binary:Version}), + libdolfin2019.2gcc13 (= ${binary:Version}), ${python3-petsc4py-real:Depends}, ${misc:Depends}, ${python3:Depends}, @@ -247,7 +248,7 @@ libboost-serialization-dev, libboost-thread-dev, libboost-timer-dev, - libdolfin64-2019.2 (= ${binary:Version}), + libdolfin64-2019.2gcc13 (= ${binary:Version}), libeigen3-dev, libhdf5-mpi-dev, libsuitesparse-dev, @@ -272,7 +273,7 @@ This is the legacy version of DOLFIN, you may want to install the next-generation libdolfinx-dev (DOLFIN-X) instead. -Package: libdolfin64-2019.2 +Package: libdolfin64-2019.2gcc13 Section: libs Architecture: any Multi-Arch: same @@ -295,7 +296,7 @@ Architecture: any Depends: libdolfin64-dev (= ${binary:Version}), - libdolfin64-2019.2 (= ${binary:Version}), + libdolfin64-2019.2gcc13 (= ${binary:Version}), ${python3-petsc4py-64-real:Depends}, ${misc:Depends}, ${python3:Depends}, diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/dolfin-doc.docs dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/dolfin-doc.docs --- dolfin-2019.2.0~git20230116.bd54183/debian/dolfin-doc.docs 2023-02-26 10:33:10.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/dolfin-doc.docs 2023-08-09 15:17:45.000000000 +0000 @@ -1 +1,2 @@ debian/index.html +debian/README.Debian diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin2019.2gcc13.install dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin2019.2gcc13.install --- dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin2019.2gcc13.install 1970-01-01 00:00:00.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin2019.2gcc13.install 2023-08-09 15:17:45.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/**/lib*.so.* diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin2019.2.install dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin2019.2.install --- dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin2019.2.install 2023-02-26 10:33:10.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin2019.2.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/**/lib*.so.* diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin64-2019.2gcc13.install dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin64-2019.2gcc13.install --- dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin64-2019.2gcc13.install 1970-01-01 00:00:00.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin64-2019.2gcc13.install 2023-08-09 15:17:45.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +echo "debian/tmp64/usr/lib/**/libdolfin64*.so.* usr/lib/${DEB_HOST_MULTIARCH}" diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin64-2019.2.install dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin64-2019.2.install --- dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin64-2019.2.install 2023-02-26 10:33:10.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin64-2019.2.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#!/bin/sh -echo "debian/tmp64/usr/lib/**/libdolfin64*.so.* usr/lib/${DEB_HOST_MULTIARCH}" diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin-dev.docs dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin-dev.docs --- dolfin-2019.2.0~git20230116.bd54183/debian/libdolfin-dev.docs 1970-01-01 00:00:00.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/libdolfin-dev.docs 2023-08-09 15:17:45.000000000 +0000 @@ -0,0 +1 @@ +debian/README.Debian diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/NEWS dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/NEWS --- dolfin-2019.2.0~git20230116.bd54183/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/NEWS 2023-08-09 15:17:45.000000000 +0000 @@ -0,0 +1,20 @@ +dolfin (2019.2.0~legacy20230609.8b85e9d.ar-1) unstable; urgency=medium + + * UFL 2023 is no longer compatible with legacy dolfin. The last + compatible UFL version 2022 is now provided separately as + ufl_legacy (python3-ufl-legacy). dolfin now uses ufl_legacy. + Depending on how you use dolfin and ufl, you may need to update + scripts, e.g. replace + import ufl + with + import ufl_legacy as ufl + or replace + from ufl import FunctionSpace + with + from ufl_legacy import FunctionSpace + If you use ufl classes from the dolfin namespace rather than the ufl + namespace, for instance `from dolfin import *; V=FunctionSpace(mesh,el)` + rather than `import ufl; V=ufl.FunctionSpace(mesh,el)`, then no code + changes should be needed. + + -- Drew Parsons Sun, 25 Jun 2023 10:37:03 +0200 diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/patches/docstring_not_byte.patch dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/patches/docstring_not_byte.patch --- dolfin-2019.2.0~git20230116.bd54183/debian/patches/docstring_not_byte.patch 1970-01-01 00:00:00.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/patches/docstring_not_byte.patch 2023-08-09 15:17:45.000000000 +0000 @@ -0,0 +1,10 @@ +Index: dolfin/python/test/unit/function/test_function_space.py +=================================================================== +--- dolfin.orig/python/test/unit/function/test_function_space.py 2023-06-24 14:34:39.459760096 +0200 ++++ dolfin/python/test/unit/function/test_function_space.py 2023-06-25 13:20:27.971252518 +0200 +@@ -1,4 +1,4 @@ +-b"""Unit tests for the FunctionSpace class""" ++"""Unit tests for the FunctionSpace class""" + + # Copyright (C) 2011 Johan Hake + # diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/patches/gcc13.patch dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/patches/gcc13.patch --- dolfin-2019.2.0~git20230116.bd54183/debian/patches/gcc13.patch 1970-01-01 00:00:00.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/patches/gcc13.patch 2023-08-09 15:17:45.000000000 +0000 @@ -0,0 +1,62 @@ +Index: dolfin/dolfin/common/timing.h +=================================================================== +--- dolfin.orig/dolfin/common/timing.h 2023-07-24 18:52:32.731340305 +0200 ++++ dolfin/dolfin/common/timing.h 2023-07-24 18:52:32.727340278 +0200 +@@ -39,7 +39,7 @@ + /// + /// Precision of wall is around 1 microsecond, user and system are around + /// 10 millisecond (on Linux). +- enum class TimingType : int32_t { wall = 0, user = 1, system = 2 }; ++ enum class TimingType : int { wall = 0, user = 1, system = 2 }; + + /// Start timing (should not be used internally in DOLFIN!) + void tic(); +Index: dolfin/dolfin/mesh/MeshConnectivity.h +=================================================================== +--- dolfin.orig/dolfin/mesh/MeshConnectivity.h 2023-07-24 18:52:32.731340305 +0200 ++++ dolfin/dolfin/mesh/MeshConnectivity.h 2023-07-24 18:52:32.727340278 +0200 +@@ -24,6 +24,8 @@ + #include + #include + ++#include ++ + namespace dolfin + { + +Index: dolfin/CMakeLists.txt +=================================================================== +--- dolfin.orig/CMakeLists.txt 2023-07-24 18:52:32.699340096 +0200 ++++ dolfin/CMakeLists.txt 2023-07-24 18:55:25.924528433 +0200 +@@ -11,7 +11,8 @@ + set(DOLFIN_VERSION_MAJOR "2019") + set(DOLFIN_VERSION_MINOR "2") + set(DOLFIN_VERSION_MICRO "0") +-set(DOLFIN_VERSION "${DOLFIN_VERSION_MAJOR}.${DOLFIN_VERSION_MINOR}.${DOLFIN_VERSION_MICRO}") ++set(DOLFIN_VERSION_TWEAK "13") ++set(DOLFIN_VERSION "${DOLFIN_VERSION_MAJOR}.${DOLFIN_VERSION_MINOR}.${DOLFIN_VERSION_MICRO}.${DOLFIN_VERSION_TWEAK}") + if (NOT DOLFIN_VERSION_RELEASE) + set(DOLFIN_VERSION "${DOLFIN_VERSION}.dev0") + endif() +@@ -501,7 +502,7 @@ + # will increment either the minor or major version number. + set(DOLFIN_LIBRARY_PROPERTIES ${DOLFIN_LIBRARY_PROPERTIES} + VERSION ${DOLFIN_LIBRARY_VERSION} +- SOVERSION ${DOLFIN_VERSION_MAJOR}.${DOLFIN_VERSION_MINOR} ++ SOVERSION ${DOLFIN_VERSION_MAJOR}.${DOLFIN_VERSION_MINOR}gcc${DOLFIN_VERSION_TWEAK} + OUTPUT_NAME "dolfin${LIB_NAME_EXT}" + ) + endif() +Index: dolfin/python/setup.py +=================================================================== +--- dolfin.orig/python/setup.py 2023-06-24 14:32:45.530664202 +0200 ++++ dolfin/python/setup.py 2023-07-24 18:56:12.608868065 +0200 +@@ -13,7 +13,7 @@ + print("Python 3.5 or higher required, please upgrade.") + sys.exit(1) + +-VERSION = "2019.2.0.dev0" ++VERSION = "2019.2.0.13.dev0" + RESTRICT_REQUIREMENTS = ">=2019.2.0.dev0,<2019.3" + UFL_RESTRICT_REQUIREMENTS = ">=2021.1.0" # UFL 2019.2.0.dev0 does not exist + diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/patches/series dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/patches/series --- dolfin-2019.2.0~git20230116.bd54183/debian/patches/series 2023-02-26 10:33:10.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/patches/series 2023-08-09 15:17:45.000000000 +0000 @@ -12,3 +12,5 @@ docs_local_mathjax.patch matplotlib3.6.patch debian_version_id.patch +docstring_not_byte.patch +gcc13.patch diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/python3-dolfin.docs dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/python3-dolfin.docs --- dolfin-2019.2.0~git20230116.bd54183/debian/python3-dolfin.docs 1970-01-01 00:00:00.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/python3-dolfin.docs 2023-08-09 15:17:45.000000000 +0000 @@ -0,0 +1 @@ +debian/README.Debian diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/README.Debian dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/README.Debian --- dolfin-2019.2.0~git20230116.bd54183/debian/README.Debian 2023-02-26 10:33:10.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/README.Debian 2023-08-09 15:17:45.000000000 +0000 @@ -1,3 +1,26 @@ +ufl_legacy and Dolfin +--------------------- + +UFL 2023 is no longer compatible with legacy dolfin. The last +compatible UFL version 2022 is now provided separately as ufl_legacy +(python3-ufl-legacy). dolfin now uses ufl_legacy. + +Depending on how you use dolfin and ufl, you may need to update +scripts, e.g. replace + import ufl +with + import ufl_legacy as ufl + +or replace + from ufl import FunctionSpace +with + from ufl_legacy import FunctionSpace + +If you use ufl classes from the dolfin namespace rather than the ufl +namespace, for instance `from dolfin import *; V=FunctionSpace(mesh,el)` +rather than `import ufl; V=ufl.FunctionSpace(mesh,el)`, then no code +changes should be needed + 64-bit Dolfin ------------- diff -Nru dolfin-2019.2.0~git20230116.bd54183/debian/rules dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/rules --- dolfin-2019.2.0~git20230116.bd54183/debian/rules 2023-02-26 10:33:10.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/debian/rules 2023-08-09 15:17:45.000000000 +0000 @@ -352,9 +352,9 @@ # dbgsym-migration was introduced for dolfin 2017.2 (don't update the version to a later version) override_dh_strip: - dh_strip --package=libdolfin$(FENICS_VERSION) -Xpython + dh_strip --package=libdolfin$(FENICS_VERSION)gcc13 -Xpython dh_strip --package=python3-dolfin-real -Xpython2 - dh_strip --package=libdolfin64-$(FENICS_VERSION) -Xpython + dh_strip --package=libdolfin64-$(FENICS_VERSION)gcc13 -Xpython dh_strip --package=python3-dolfin64-real # python module so files are already stripped by setup.py (setuptools) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/auto-adaptive-poisson/cpp/AdaptivePoisson.ufl.rst dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/auto-adaptive-poisson/cpp/AdaptivePoisson.ufl.rst --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/auto-adaptive-poisson/cpp/AdaptivePoisson.ufl.rst 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/auto-adaptive-poisson/cpp/AdaptivePoisson.ufl.rst 2023-06-09 16:54:25.000000000 +0000 @@ -3,7 +3,7 @@ UFL code:: - from ufl import (Coefficient, dot, ds, dx, FiniteElement, grad, + from ufl_legacy import (Coefficient, dot, ds, dx, FiniteElement, grad, TestFunction, TrialFunction, triangle) element = FiniteElement("CG", triangle, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/bcs/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/bcs/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/bcs/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/bcs/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile these forms with FFC: ffc -l dolfin Poisson.ufl -from ufl import (Coefficient, dot, dx, FiniteElement, grad, +from ufl_legacy import (Coefficient, dot, dx, FiniteElement, grad, TestFunction, TrialFunction, tetrahedron) element = FiniteElement("Lagrange", tetrahedron, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/biharmonic/cpp/Biharmonic.ufl.rst dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/biharmonic/cpp/Biharmonic.ufl.rst --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/biharmonic/cpp/Biharmonic.ufl.rst 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/biharmonic/cpp/Biharmonic.ufl.rst 2023-06-09 16:54:25.000000000 +0000 @@ -3,7 +3,7 @@ Import required classes:: - from ufl import (avg, CellDiameter, Coefficient, + from ufl_legacy import (avg, CellDiameter, Coefficient, div, dot, dS, dx, FacetNormal, FiniteElement, grad, inner, jump, diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/cahn-hilliard/cpp/CahnHilliard2D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/cahn-hilliard/cpp/CahnHilliard2D.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/cahn-hilliard/cpp/CahnHilliard2D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/cahn-hilliard/cpp/CahnHilliard2D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ # # Compile this form with FFC: ffc -l dolfin -O -f split CahnHilliard2D.ufl -from ufl import (Coefficient, derivative, diff, dot, dx, +from ufl_legacy import (Coefficient, derivative, diff, dot, dx, FiniteElement, grad, quadrilateral, split, TestFunctions, TrialFunction, variable) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/cahn-hilliard/cpp/CahnHilliard3D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/cahn-hilliard/cpp/CahnHilliard3D.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/cahn-hilliard/cpp/CahnHilliard3D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/cahn-hilliard/cpp/CahnHilliard3D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ # # Compile this form with FFC: ffc -l dolfin -O -f split CahnHilliard3D.ufl -from ufl import (Coefficient, derivative, diff, dot, dx, +from ufl_legacy import (Coefficient, derivative, diff, dot, dx, FiniteElement, grad, split, tetrahedron, TestFunctions, TrialFunction, variable) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/eigenvalue/cpp/StiffnessMatrix.ufl.rst dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/eigenvalue/cpp/StiffnessMatrix.ufl.rst --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/eigenvalue/cpp/StiffnessMatrix.ufl.rst 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/eigenvalue/cpp/StiffnessMatrix.ufl.rst 2023-06-09 16:54:25.000000000 +0000 @@ -3,7 +3,7 @@ The bilinear form for a stiffness matrix (Poisson):: - from ufl import (dot, dx, FiniteElement, grad, + from ufl_legacy import (dot, dx, FiniteElement, grad, TestFunction, TrialFunction, tetrahedron) element = FiniteElement("Lagrange", tetrahedron, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/hyperelasticity/cpp/HyperElasticity.ufl.rst dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/hyperelasticity/cpp/HyperElasticity.ufl.rst --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/hyperelasticity/cpp/HyperElasticity.ufl.rst 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/hyperelasticity/cpp/HyperElasticity.ufl.rst 2023-06-09 16:54:25.000000000 +0000 @@ -9,7 +9,7 @@ dimensions, so first we need the appropriate finite element space and trial and test functions on this space:: - from ufl import (Coefficient, derivative, det, ds, dx, + from ufl_legacy import (Coefficient, derivative, det, ds, dx, FiniteElement, grad, Identity, inner, ln, TestFunction, TrialFunction, tr, tetrahedron, VectorElement) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/mixed-poisson/cpp/MixedPoisson.ufl.rst dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/mixed-poisson/cpp/MixedPoisson.ufl.rst --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/mixed-poisson/cpp/MixedPoisson.ufl.rst 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/mixed-poisson/cpp/MixedPoisson.ufl.rst 2023-06-09 16:54:25.000000000 +0000 @@ -8,7 +8,7 @@ element spaces :math:`\Sigma_h = BDM` and :math:`V_h = DG` separately, before combining these into a mixed finite element space: :: - from ufl import (Coefficient, div, dot, dx, FiniteElement, + from ufl_legacy import (Coefficient, div, dot, dx, FiniteElement, TestFunctions, TrialFunctions, triangle) BDM = FiniteElement("BDM", triangle, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/navier-stokes/cpp/PressureUpdate.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/navier-stokes/cpp/PressureUpdate.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/navier-stokes/cpp/PressureUpdate.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/navier-stokes/cpp/PressureUpdate.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ # # Compile this form with FFC: ffc -l dolfin PressureUpdate.ufl. -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, div, grad, inner, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/navier-stokes/cpp/TentativeVelocity.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/navier-stokes/cpp/TentativeVelocity.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/navier-stokes/cpp/TentativeVelocity.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/navier-stokes/cpp/TentativeVelocity.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ # # Compile this form with FFC: ffc -l dolfin TentativeVelocity.ufl. -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, grad, inner, lhs, rhs, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/navier-stokes/cpp/VelocityUpdate.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/navier-stokes/cpp/VelocityUpdate.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/navier-stokes/cpp/VelocityUpdate.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/navier-stokes/cpp/VelocityUpdate.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ # # Compile this form with FFC: ffc -l dolfin TentativeVelocity.ufl. -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, grad, inner, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/neumann-poisson/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/neumann-poisson/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/neumann-poisson/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/neumann-poisson/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin Poisson.ufl. -from ufl import (Coefficient, ds, dx, FiniteElement, +from ufl_legacy import (Coefficient, ds, dx, FiniteElement, grad, inner, quadrilateral, TestFunctions, TrialFunctions) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/nonlinear-poisson/cpp/NonlinearPoisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/nonlinear-poisson/cpp/NonlinearPoisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/nonlinear-poisson/cpp/NonlinearPoisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/nonlinear-poisson/cpp/NonlinearPoisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin NonlinearPoisson.ufl -from ufl import (Coefficient, dx, FiniteElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, derivative, grad, inner, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/nonmatching-interpolation/cpp/P1.ufl.rst dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/nonmatching-interpolation/cpp/P1.ufl.rst --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/nonmatching-interpolation/cpp/P1.ufl.rst 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/nonmatching-interpolation/cpp/P1.ufl.rst 2023-06-09 16:54:25.000000000 +0000 @@ -4,7 +4,7 @@ We define the finite element in UFL in a separate form file :download:`P1.ufl`. We define the linear finite element:: - from ufl import (FiniteElement, triangle) + from ufl_legacy import (FiniteElement, triangle) element = FiniteElement("Lagrange", triangle, 1) Before the form file can be used in the C++ program, it must be diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/nonmatching-interpolation/cpp/P3.ufl.rst dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/nonmatching-interpolation/cpp/P3.ufl.rst --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/nonmatching-interpolation/cpp/P3.ufl.rst 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/nonmatching-interpolation/cpp/P3.ufl.rst 2023-06-09 16:54:25.000000000 +0000 @@ -4,7 +4,7 @@ We define the finite element in UFL in a separate form file :download:`P3.ufl`. We define the linear finite element:: - from ufl import (FiniteElement, triangle) + from ufl_legacy import (FiniteElement, triangle) element = FiniteElement("Lagrange", triangle, 3) Before the form file can be used in the C++ program, it must be diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/periodic/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/periodic/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/periodic/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/periodic/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin Poisson.ufl -from ufl import (Coefficient, dx, FiniteElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, dot, grad, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/poisson/cpp/Poisson.ufl.rst dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/poisson/cpp/Poisson.ufl.rst --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/poisson/cpp/Poisson.ufl.rst 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/poisson/cpp/Poisson.ufl.rst 2023-06-09 16:54:25.000000000 +0000 @@ -5,7 +5,7 @@ the variational problem in UFL terms in a separate form file :download:`Poisson.ufl`. We begin by defining the finite element:: - from ufl import (Coefficient, ds, dx, FiniteElement, + from ufl_legacy import (Coefficient, ds, dx, FiniteElement, grad, inner, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/singular-poisson/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/singular-poisson/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/singular-poisson/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/singular-poisson/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -21,7 +21,7 @@ # # Compile this form with FFC: ffc -l dolfin Poisson.ufl. -from ufl import (Coefficient, ds, dx, FiniteElement, +from ufl_legacy import (Coefficient, ds, dx, FiniteElement, grad, inner, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/stokes-iterative/cpp/StokesPreconditioner.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/stokes-iterative/cpp/StokesPreconditioner.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/stokes-iterative/cpp/StokesPreconditioner.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/stokes-iterative/cpp/StokesPreconditioner.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin StokesPreconditioner.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, grad, inner, hexahedron, TestFunctions, TrialFunctions) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/stokes-iterative/cpp/Stokes.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/stokes-iterative/cpp/Stokes.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/stokes-iterative/cpp/Stokes.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/stokes-iterative/cpp/Stokes.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ # # Compile this form with FFC: ffc -l dolfin Stokes.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, div, dot, grad, inner, hexahedron, TestFunctions, TrialFunctions) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/documented/stokes-taylor-hood/cpp/Stokes.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/stokes-taylor-hood/cpp/Stokes.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/documented/stokes-taylor-hood/cpp/Stokes.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/documented/stokes-taylor-hood/cpp/Stokes.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin Stokes.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, div, dot, grad, inner, triangle, TestFunctions, TrialFunctions) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/advection-diffusion/cpp/AdvectionDiffusion.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/advection-diffusion/cpp/AdvectionDiffusion.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/advection-diffusion/cpp/AdvectionDiffusion.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/advection-diffusion/cpp/AdvectionDiffusion.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin AdvectionDiffusion.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, dot, grad, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/advection-diffusion/cpp/Velocity.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/advection-diffusion/cpp/Velocity.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/advection-diffusion/cpp/Velocity.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/advection-diffusion/cpp/Velocity.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -22,6 +22,6 @@ # # Compile this form with FFC: ffc -l dolfin Velocity.form -from ufl import (VectorElement, triangle) +from ufl_legacy import (VectorElement, triangle) element = VectorElement("Lagrange", triangle, 2) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/auto-adaptive-navier-stokes/cpp/AdaptiveNavierStokes.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/auto-adaptive-navier-stokes/cpp/AdaptiveNavierStokes.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/auto-adaptive-navier-stokes/cpp/AdaptiveNavierStokes.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/auto-adaptive-navier-stokes/cpp/AdaptiveNavierStokes.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Compile with ffc -e -l dolfin AdaptiveNavierStokes.ufl -from ufl import (Coefficient, ds, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, ds, dx, FiniteElement, VectorElement, as_vector, FacetNormal, div, dot, grad, inner, triangle, TestFunctions) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/block-matrix/cpp/StiffnessMatrix.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/block-matrix/cpp/StiffnessMatrix.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/block-matrix/cpp/StiffnessMatrix.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/block-matrix/cpp/StiffnessMatrix.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # The bilinear form for a stiffness matrix (Poisson). -from ufl import (Coefficient, dx, FiniteElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, dot, grad, sin, SpatialCoordinate, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/conditional/cpp/Conditional.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/conditional/cpp/Conditional.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/conditional/cpp/Conditional.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/conditional/cpp/Conditional.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -22,7 +22,7 @@ # # Compile this form with FFC: ffc -l dolfin Conditional.ufl -from ufl import (dx, FiniteElement, +from ufl_legacy import (dx, FiniteElement, conditional, ge, le, SpatialCoordinate, grad, inner, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/contact-vi-snes/cpp/HyperElasticity.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/contact-vi-snes/cpp/HyperElasticity.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/contact-vi-snes/cpp/HyperElasticity.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/contact-vi-snes/cpp/HyperElasticity.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -25,7 +25,7 @@ # # Compile this form with FFC: ffc -l dolfin -feliminate_zeros -fprecompute_basis_const -fprecompute_ip_const HyperElasticity.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, derivative, det, grad, inner, Identity, ln, tr, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/contact-vi-tao/cpp/Elasticity.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/contact-vi-tao/cpp/Elasticity.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/contact-vi-tao/cpp/Elasticity.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/contact-vi-tao/cpp/Elasticity.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ # The bilinear form for classical linear elasticity (Navier). # Compile this form with FFC: ffc -l dolfin Elasticity.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, grad, inner, Identity, tr, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/curl-curl/cpp/CurrentDensity.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/curl-curl/cpp/CurrentDensity.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/curl-curl/cpp/CurrentDensity.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/curl-curl/cpp/CurrentDensity.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin CurrentDensity.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, curl, dot, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/curl-curl/cpp/EddyCurrents.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/curl-curl/cpp/EddyCurrents.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/curl-curl/cpp/EddyCurrents.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/curl-curl/cpp/EddyCurrents.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin EddyCurrents.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, curl, inner, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/curl-curl/cpp/P1Space.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/curl-curl/cpp/P1Space.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/curl-curl/cpp/P1Space.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/curl-curl/cpp/P1Space.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -17,6 +17,6 @@ # # Compile this form with FFC: ffc -l dolfin P1Space.ufl -from ufl import (FiniteElement, tetrahedron) +from ufl_legacy import (FiniteElement, tetrahedron) element = FiniteElement("Lagrange", tetrahedron, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/dg-advection-diffusion/cpp/AdvectionDiffusion.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/dg-advection-diffusion/cpp/AdvectionDiffusion.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/dg-advection-diffusion/cpp/AdvectionDiffusion.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/dg-advection-diffusion/cpp/AdvectionDiffusion.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -21,7 +21,7 @@ # The bilinear form a(phi, v) and linear form L(v) for # advection-diffusion. Discontinuous formulation with upwinding. -from ufl import (Coefficient, dS, ds, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dS, ds, dx, FiniteElement, VectorElement, avg, CellDiameter, dot, FacetNormal, grad, jump, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/dg-advection-diffusion/cpp/Projection.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/dg-advection-diffusion/cpp/Projection.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/dg-advection-diffusion/cpp/Projection.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/dg-advection-diffusion/cpp/Projection.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -18,7 +18,7 @@ # First added: 2008-05-05 # Last changed: 2008-05-05 -from ufl import (Coefficient, dot, dx, FiniteElement, +from ufl_legacy import (Coefficient, dot, dx, FiniteElement, triangle, TestFunction, TrialFunction) DG = FiniteElement("Discontinuous Lagrange", triangle, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/dg-advection-diffusion/cpp/Velocity.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/dg-advection-diffusion/cpp/Velocity.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/dg-advection-diffusion/cpp/Velocity.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/dg-advection-diffusion/cpp/Velocity.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -22,7 +22,7 @@ # # Compile this form with FFC: ffc -l dolfin Velocity.form -from ufl import (VectorElement, triangle) +from ufl_legacy import (VectorElement, triangle) element = VectorElement("Lagrange", triangle, 2) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/dg-poisson/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/dg-poisson/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/dg-poisson/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/dg-poisson/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -21,7 +21,7 @@ # # Compile this form with FFC: ffc -l dolfin Poisson.ufl -from ufl import (CellDiameter, Coefficient, dS, ds, dx, FiniteElement, +from ufl_legacy import (CellDiameter, Coefficient, dS, ds, dx, FiniteElement, avg, dot, FacetNormal, grad, jump, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/elasticity/cpp/Elasticity.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/elasticity/cpp/Elasticity.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/elasticity/cpp/Elasticity.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/elasticity/cpp/Elasticity.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ # The bilinear form for classical linear elasticity (Navier). # Compile this form with FFC: ffc -l dolfin Elasticity.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, TensorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, TensorElement, dot, FacetNormal, inner, grad, Identity, tr, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/elastodynamics/cpp/DG0_eps_xx.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/elastodynamics/cpp/DG0_eps_xx.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/elastodynamics/cpp/DG0_eps_xx.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/elastodynamics/cpp/DG0_eps_xx.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -22,7 +22,7 @@ # # Compile this form with FFC: ffc -l dolfin DG0_eps-xx.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, triangle, TestFunction, TrialFunction) vector = VectorElement("Lagrange", triangle, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/elastodynamics/cpp/ElastoDynamics.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/elastodynamics/cpp/ElastoDynamics.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/elastodynamics/cpp/ElastoDynamics.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/elastodynamics/cpp/ElastoDynamics.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin ElastoDynamics.ufl. -from ufl import (Coefficient, ds, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, ds, dx, FiniteElement, VectorElement, Identity, inner, grad, tr, sym, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/eval/cpp/Projection.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/eval/cpp/Projection.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/eval/cpp/Projection.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/eval/cpp/Projection.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin Projection.ufl -from ufl import (Coefficient, dx, FiniteElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, tetrahedron, TestFunction, TrialFunction) element = FiniteElement("Lagrange", tetrahedron, 2) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/extrapolation/cpp/P1.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/extrapolation/cpp/P1.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/extrapolation/cpp/P1.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/extrapolation/cpp/P1.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,3 +1,3 @@ -from ufl import (FiniteElement, triangle) +from ufl_legacy import (FiniteElement, triangle) element = FiniteElement("Lagrange", triangle, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/extrapolation/cpp/P2.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/extrapolation/cpp/P2.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/extrapolation/cpp/P2.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/extrapolation/cpp/P2.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,3 +1,3 @@ -from ufl import (FiniteElement, triangle) +from ufl_legacy import (FiniteElement, triangle) element = FiniteElement("Lagrange", triangle, 2) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/functional/cpp/EnergyNorm.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/functional/cpp/EnergyNorm.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/functional/cpp/EnergyNorm.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/functional/cpp/EnergyNorm.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Compile this form with FFC: ffc -l dolfin EnergyNorm.ufl -from ufl import (Coefficient, dx, FiniteElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, dot, grad, triangle) element = FiniteElement("Lagrange", triangle, 2) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/gmg-poisson/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/gmg-poisson/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/gmg-poisson/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/gmg-poisson/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -5,7 +5,7 @@ # the variational problem in UFL terms in a separate form file # :download:`Poisson.ufl`. We begin by defining the finite element:: -from ufl import (Coefficient, ds, dx, FiniteElement, +from ufl_legacy import (Coefficient, ds, dx, FiniteElement, inner, grad, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/lift-drag/cpp/Functionals.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/lift-drag/cpp/Functionals.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/lift-drag/cpp/Functionals.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/lift-drag/cpp/Functionals.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -26,7 +26,7 @@ # # Compile this form with FFC: ffc -l dolfin Functionals.ufl -from ufl import (Coefficient, ds, FiniteElement, +from ufl_legacy import (Coefficient, ds, FiniteElement, FacetNormal, triangle) cell = triangle diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/matnest/cpp/Stokes.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/matnest/cpp/Stokes.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/matnest/cpp/Stokes.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/matnest/cpp/Stokes.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Compile this form with FFC: ffc -l dolfin -f split Stokes.ufl -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, div, dot, inner, grad, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/meshview-2D2D/cpp/MeshView_2D2D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/meshview-2D2D/cpp/MeshView_2D2D.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/meshview-2D2D/cpp/MeshView_2D2D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/meshview-2D2D/cpp/MeshView_2D2D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (Coefficient, dx, FiniteElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, inner, grad, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/meshview-3D1D/cpp/MeshView_3D1D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/meshview-3D1D/cpp/MeshView_3D1D.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/meshview-3D1D/cpp/MeshView_3D1D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/meshview-3D1D/cpp/MeshView_3D1D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (Cell, Coefficient, dx, FiniteElement, +from ufl_legacy import (Cell, Coefficient, dx, FiniteElement, inner, grad, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/meshview-3D2D/cpp/MeshView_3D2D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/meshview-3D2D/cpp/MeshView_3D2D.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/meshview-3D2D/cpp/MeshView_3D2D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/meshview-3D2D/cpp/MeshView_3D2D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (Cell, Coefficient, dx, FiniteElement, +from ufl_legacy import (Cell, Coefficient, dx, FiniteElement, inner, grad, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/meshview-3D3D/cpp/MeshView_3D3D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/meshview-3D3D/cpp/MeshView_3D3D.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/meshview-3D3D/cpp/MeshView_3D3D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/meshview-3D3D/cpp/MeshView_3D3D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -from ufl import (Coefficient, dx, FiniteElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, inner, grad, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-3d/cpp/MultiMeshH10Norm.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-3d/cpp/MultiMeshH10Norm.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-3d/cpp/MultiMeshH10Norm.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-3d/cpp/MultiMeshH10Norm.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -2,7 +2,7 @@ #M = l2norm(triangle) -from ufl import * +from ufl_legacy import * ORDER = 1 diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-3d/cpp/MultiMeshL2Norm.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-3d/cpp/MultiMeshL2Norm.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-3d/cpp/MultiMeshL2Norm.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-3d/cpp/MultiMeshL2Norm.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -2,7 +2,7 @@ #M = l2norm(triangle) -from ufl import * +from ufl_legacy import * ORDER = 1 diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-3d/cpp/MultiMeshPoisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-3d/cpp/MultiMeshPoisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-3d/cpp/MultiMeshPoisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-3d/cpp/MultiMeshPoisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin MultiMeshPoisson.ufl. -from ufl import (avg, Circumradius, Coefficient, dI, dO, dX, dx, FiniteElement, +from ufl_legacy import (avg, Circumradius, Coefficient, dI, dO, dX, dx, FiniteElement, dot, grad, FacetNormal, jump, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-poisson/cpp/MultiMeshPoisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-poisson/cpp/MultiMeshPoisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-poisson/cpp/MultiMeshPoisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-poisson/cpp/MultiMeshPoisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin MultiMeshPoisson.ufl. -from ufl import (Circumradius, Coefficient, dI, dO, dX, dx, FiniteElement, +from ufl_legacy import (Circumradius, Coefficient, dI, dO, dX, dx, FiniteElement, avg, dot, FacetNormal, grad, jump, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-poisson/cpp/P1.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-poisson/cpp/P1.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-poisson/cpp/P1.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-poisson/cpp/P1.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin P1.ufl -from ufl import (FiniteElement, triangle) +from ufl_legacy import (FiniteElement, triangle) element = FiniteElement("Lagrange", triangle, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-stokes/cpp/MultiMeshStokes.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-stokes/cpp/MultiMeshStokes.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/multimesh-stokes/cpp/MultiMeshStokes.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/multimesh-stokes/cpp/MultiMeshStokes.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin MultiMeshStokes.ufl. -from ufl import (Circumradius, Coefficient, dC, dI, dO, dX, FiniteElement, VectorElement, +from ufl_legacy import (Circumradius, Coefficient, dC, dI, dO, dX, FiniteElement, VectorElement, avg, div, FacetNormal, inner, grad, jump, outer, triangle, TestFunctions, TrialFunctions) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/nonmatching-projection/cpp/P1_projection.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/nonmatching-projection/cpp/P1_projection.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/nonmatching-projection/cpp/P1_projection.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/nonmatching-projection/cpp/P1_projection.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin P1_projection.ufl -from ufl import (Coefficient, dx, FiniteElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, triangle, TestFunction, TrialFunction) P3 = FiniteElement("Lagrange", triangle, 3) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/nonmatching-projection/cpp/P3.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/nonmatching-projection/cpp/P3.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/nonmatching-projection/cpp/P3.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/nonmatching-projection/cpp/P3.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin P3.ufl -from ufl import (FiniteElement, triangle) +from ufl_legacy import (FiniteElement, triangle) element = FiniteElement("Lagrange", triangle, 3) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/poisson1D/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/poisson1D/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/poisson1D/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/poisson1D/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin Poisson.ufl -from ufl import (Coefficient, ds, dx, FiniteElement, +from ufl_legacy import (Coefficient, ds, dx, FiniteElement, dot, grad, interval, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/poisson1D-in-2D/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/poisson1D-in-2D/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/poisson1D-in-2D/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/poisson1D-in-2D/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -25,7 +25,7 @@ # # Compile this form with FFC: ffc -l dolfin Poisson.ufl -from ufl import (Cell, Coefficient, ds, dx, FiniteElement, +from ufl_legacy import (Cell, Coefficient, ds, dx, FiniteElement, dot, grad, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/poisson-disc/cpp/PoissonDisc.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/poisson-disc/cpp/PoissonDisc.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/poisson-disc/cpp/PoissonDisc.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/poisson-disc/cpp/PoissonDisc.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -25,7 +25,7 @@ # -laplace u = 1 # u(r=1) = 0 -from ufl import (Coefficient, dx, FiniteElement, VectorElement, +from ufl_legacy import (Coefficient, dx, FiniteElement, VectorElement, dot, grad, Mesh, SpatialCoordinate, triangle, TestFunction, TrialFunction, FunctionSpace) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/spatial-coordinates/cpp/SpatialCoordinates.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/spatial-coordinates/cpp/SpatialCoordinates.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/spatial-coordinates/cpp/SpatialCoordinates.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/spatial-coordinates/cpp/SpatialCoordinates.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -21,7 +21,7 @@ # # Compile this form with FFC: ffc -l dolfin SpatialCoordinates.ufl -from ufl import (ds, dx, FiniteElement, +from ufl_legacy import (ds, dx, FiniteElement, exp, sin, grad, inner, SpatialCoordinate, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/sym-dirichlet-bc/cpp/Poisson.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/sym-dirichlet-bc/cpp/Poisson.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/sym-dirichlet-bc/cpp/Poisson.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/sym-dirichlet-bc/cpp/Poisson.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin Poisson.ufl -from ufl import (Coefficient, ds, dx, FiniteElement, +from ufl_legacy import (Coefficient, ds, dx, FiniteElement, dot, grad, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/waveguide/cpp/Forms.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/waveguide/cpp/Forms.py --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/waveguide/cpp/Forms.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/waveguide/cpp/Forms.py 2023-06-09 16:54:25.000000000 +0000 @@ -19,8 +19,8 @@ # # Compile this form with FFC: ffc -l dolfin Forms.form -from ufl import * -from ufl.log import set_level +from ufl_legacy import * +from ufl_legacy.log import set_level from ffc.compiler.compiler import compile # Set debug level diff -Nru dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/waveguide/cpp/Forms.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/waveguide/cpp/Forms.ufl --- dolfin-2019.2.0~git20230116.bd54183/demo/undocumented/waveguide/cpp/Forms.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/demo/undocumented/waveguide/cpp/Forms.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -19,7 +19,7 @@ # # Compile this form with FFC: ffc -l dolfin Forms.form -from ufl import (dx, Dx, FiniteElement, inner, +from ufl_legacy import (dx, Dx, FiniteElement, inner, triangle, TestFunction, TrialFunction) element = FiniteElement("Nedelec 1st kind H(curl)", triangle, 3) diff -Nru dolfin-2019.2.0~git20230116.bd54183/dolfin/ale/Poisson1D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/dolfin/ale/Poisson1D.ufl --- dolfin-2019.2.0~git20230116.bd54183/dolfin/ale/Poisson1D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/dolfin/ale/Poisson1D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -from ufl import (dx, FiniteElement, +from ufl_legacy import (dx, FiniteElement, grad, inner, interval, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/dolfin/ale/Poisson2D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/dolfin/ale/Poisson2D.ufl --- dolfin-2019.2.0~git20230116.bd54183/dolfin/ale/Poisson2D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/dolfin/ale/Poisson2D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -from ufl import (dx, FiniteElement, +from ufl_legacy import (dx, FiniteElement, grad, inner, triangle, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/dolfin/ale/Poisson3D.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/dolfin/ale/Poisson3D.ufl --- dolfin-2019.2.0~git20230116.bd54183/dolfin/ale/Poisson3D.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/dolfin/ale/Poisson3D.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -from ufl import (dx, FiniteElement, +from ufl_legacy import (dx, FiniteElement, grad, inner, tetrahedron, TestFunction, TrialFunction) diff -Nru dolfin-2019.2.0~git20230116.bd54183/dolfin/io/XDMFFile.cpp dolfin-2019.2.0~legacy20230609.8b85e9d.ar/dolfin/io/XDMFFile.cpp --- dolfin-2019.2.0~git20230116.bd54183/dolfin/io/XDMFFile.cpp 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/dolfin/io/XDMFFile.cpp 2023-06-09 16:54:25.000000000 +0000 @@ -2134,10 +2134,10 @@ if (MPI::size(comm) == 1 or cell_dim == tdim) { - // FIXME: fail with ghosts? - value_data.resize(meshfunction.size()); + const std::size_t num_cells_local = mesh->topology().ghost_offset(cell_dim); + value_data.resize( num_cells_local); std::copy(meshfunction.values(), - meshfunction.values() + meshfunction.size(), + meshfunction.values() + num_cells_local, value_data.begin()); } else diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/demo/undocumented/mplot/demo_mplot.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/demo/undocumented/mplot/demo_mplot.py --- dolfin-2019.2.0~git20230116.bd54183/python/demo/undocumented/mplot/demo_mplot.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/demo/undocumented/mplot/demo_mplot.py 2023-06-09 16:54:25.000000000 +0000 @@ -18,7 +18,7 @@ from dolfin import * -import ufl +import ufl_legacy as ufl import os exit(0) diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/common/plotting.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/common/plotting.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/common/plotting.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/common/plotting.py 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ import dolfin import dolfin.cpp as cpp -import ufl +import ufl_legacy as ufl import numpy as np __all__ = ['plot'] diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/assembling.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/assembling.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/assembling.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/assembling.py 2023-06-09 16:54:25.000000000 +0000 @@ -29,13 +29,13 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from dolfin.fem.form import Form from dolfin import MPI from dolfin.function.multimeshfunction import MultiMeshFunction -from ufl.form import sub_forms_by_domain +from ufl_legacy.form import sub_forms_by_domain __all__ = ["assemble", "assemble_mixed", "assemble_local", "assemble_system", "assemble_multimesh", "SystemAssembler"] diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/dirichletbc.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/dirichletbc.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/dirichletbc.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/dirichletbc.py 2023-06-09 16:54:25.000000000 +0000 @@ -7,7 +7,7 @@ # version. import types -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from dolfin.mesh.subdomain import CompiledSubDomain from dolfin.function.constant import Constant diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/formmanipulations.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/formmanipulations.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/formmanipulations.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/formmanipulations.py 2023-06-09 16:54:25.000000000 +0000 @@ -16,11 +16,10 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -import ufl -import ufl.algorithms.elementtransformations -import ufl.algorithms.formsplitter +import ufl_legacy as ufl +from ufl_legacy.algorithms import elementtransformations, formsplitter -from ufl.geometry import SpatialCoordinate +from ufl_legacy.geometry import SpatialCoordinate from dolfin.function.functionspace import FunctionSpace from dolfin.function.function import Function from dolfin.function.argument import Argument @@ -101,7 +100,7 @@ """ mesh = V.mesh() - element = ufl.algorithms.elementtransformations.increase_order(V.ufl_element()) + element = elementtransformations.increase_order(V.ufl_element()) constrained_domain = V.dofmap().constrained_domain return FunctionSpace(mesh, element, constrained_domain=constrained_domain) @@ -113,7 +112,7 @@ """ mesh = V.mesh() - element = ufl.algorithms.elementtransformations.change_regularity(V.ufl_element(), family) + element = elementtransformations.change_regularity(V.ufl_element(), family) constrained_domain = V.dofmap().constrained_domain return FunctionSpace(mesh, element, constrained_domain=constrained_domain) @@ -127,4 +126,4 @@ def extract_blocks(form, i=None, j=None): - return ufl.algorithms.formsplitter.extract_blocks(form, i, j) + return formsplitter.extract_blocks(form, i, j) diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/form.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/form.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/form.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/form.py 2023-06-09 16:54:25.000000000 +0000 @@ -7,7 +7,7 @@ # either version 3 of the License, or (at your option) any later # version. -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from dolfin.jit.jit import dolfin_pc, ffc_jit diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/multimeshdirichletbc.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/multimeshdirichletbc.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/multimeshdirichletbc.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/multimeshdirichletbc.py 2023-06-09 16:54:25.000000000 +0000 @@ -5,7 +5,7 @@ # version. import types -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from dolfin.function.constant import Constant from dolfin.function.multimeshfunctionspace import MultiMeshFunctionSpace diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/norms.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/norms.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/norms.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/norms.py 2023-06-09 16:54:25.000000000 +0000 @@ -24,9 +24,9 @@ # along with DOLFIN. If not, see . from math import sqrt -import ufl +import ufl_legacy as ufl import functools -from ufl import (grad, div, curl) +from ufl_legacy import (grad, div, curl) import dolfin.cpp as cpp from dolfin.fem.assembling import assemble, assemble_multimesh from dolfin.fem.interpolation import interpolate diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/problem.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/problem.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/problem.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/problem.py 2023-06-09 16:54:25.000000000 +0000 @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -from ufl.form import sub_forms_by_domain +from ufl_legacy.form import sub_forms_by_domain import dolfin.cpp as cpp import dolfin.fem.solving diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/projection.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/projection.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/projection.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/projection.py 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp import dolfin from dolfin.function.argument import TestFunction, TrialFunction diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/solving.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/solving.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/fem/solving.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/fem/solving.py 2023-06-09 16:54:25.000000000 +0000 @@ -25,8 +25,8 @@ from dolfin.function.function import Function # Import UFL -import ufl -from ufl.algorithms.ad import expand_derivatives +import ufl_legacy as ufl +from ufl_legacy.algorithms.ad import expand_derivatives # Local imports from dolfin.fem.form import Form diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/argument.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/argument.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/argument.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/argument.py 2023-06-09 16:54:25.000000000 +0000 @@ -19,7 +19,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -import ufl +import ufl_legacy as ufl from .functionspace import FunctionSpace, MixedFunctionSpace from .multimeshfunctionspace import MultiMeshFunctionSpace diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/constant.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/constant.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/constant.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/constant.py 2023-06-09 16:54:25.000000000 +0000 @@ -18,7 +18,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp import numpy diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/expression.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/expression.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/expression.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/expression.py 2023-06-09 16:54:25.000000000 +0000 @@ -9,9 +9,9 @@ import types import numpy -import ufl -from ufl import product -from ufl.utils.indexflattening import (flatten_multiindex, +import ufl_legacy as ufl +from ufl_legacy import product +from ufl_legacy.utils.indexflattening import (flatten_multiindex, shape_to_strides) import dolfin.cpp as cpp import dolfin.function.jit as jit diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/function.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/function.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/function.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/function.py 2023-06-09 16:54:25.000000000 +0000 @@ -20,9 +20,9 @@ # along with DOLFIN. If not, see . import numpy as np -import ufl -from ufl.classes import ComponentTensor, Sum, Product, Division -from ufl.utils.indexflattening import shape_to_strides, flatten_multiindex +import ufl_legacy as ufl +from ufl_legacy.classes import ComponentTensor, Sum, Product, Division +from ufl_legacy.utils.indexflattening import shape_to_strides, flatten_multiindex import dolfin.cpp as cpp import dolfin.la as la from dolfin.function.functionspace import FunctionSpace, MixedFunctionSpace @@ -39,9 +39,9 @@ Utility func for checking division and multiplication of a Function with scalars in linear combinations of Functions """ - from ufl.constantvalue import ScalarValue - from ufl.classes import ComponentTensor, MultiIndex, Indexed - from ufl.algebra import Division, Product, Sum + from ufl_legacy.constantvalue import ScalarValue + from ufl_legacy.classes import ComponentTensor, MultiIndex, Indexed + from ufl_legacy.algebra import Division, Product, Sum # ops = e.ufl_operands # FIXME: What should be checked!? @@ -114,7 +114,7 @@ Utility func for extracting Functions and scalars in linear combinations of Functions """ - from ufl.classes import ComponentTensor, Sum, Product, Division + from ufl_legacy.classes import ComponentTensor, Sum, Product, Division linear_comb = linear_comb or [] # First check u diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/functionspace.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/functionspace.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/functionspace.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/functionspace.py 2023-06-09 16:54:25.000000000 +0000 @@ -6,7 +6,7 @@ # either version 3 of the License, or (at your option) any later # version. -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from dolfin.jit.jit import ffc_jit diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/multimeshfunction.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/multimeshfunction.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/multimeshfunction.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/multimeshfunction.py 2023-06-09 16:54:25.000000000 +0000 @@ -19,7 +19,7 @@ # along with DOLFIN. If not, see . # -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from dolfin.function.multimeshfunctionspace import MultiMeshFunctionSpace diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/multimeshfunctionspace.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/multimeshfunctionspace.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/multimeshfunctionspace.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/multimeshfunctionspace.py 2023-06-09 16:54:25.000000000 +0000 @@ -6,7 +6,7 @@ # either version 3 of the License, or (at your option) any later # version. -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from dolfin.function.functionspace import FunctionSpace diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/specialfunctions.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/specialfunctions.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/function/specialfunctions.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/function/specialfunctions.py 2023-06-09 16:54:25.000000000 +0000 @@ -21,7 +21,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with DOLFIN. If not, see . -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from dolfin.function.expression import BaseExpression diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/__init__.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/__init__.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/__init__.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/__init__.py 2023-06-09 16:54:25.000000000 +0000 @@ -198,8 +198,8 @@ from .multistage.multistagesolvers import PointIntegralSolver, RKSolver from .multistage.rushlarsenschemes import RL1, RL2, GRL1, GRL2 -# Import from ufl -from ufl import (FiniteElement, TensorElement, VectorElement, +# Import from ufl (2022.2 or earlier) +from ufl_legacy import (FiniteElement, TensorElement, VectorElement, MixedElement, NodalEnrichedElement, rhs, lhs, conditional, le, lt, ge, gt, split, cross, inner, dot, grad, nabla_grad, curl, dx, div, Measure, det, pi, sin, cos, tan, acos, asin, atan, @@ -209,4 +209,4 @@ sym, tr, Identity, variable, diff, as_vector, as_tensor, as_matrix, system, outer, dev, skew, elem_mult, elem_div, elem_pow, elem_op, erf, inv) -from ufl.formoperators import action +from ufl_legacy.formoperators import action diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/mesh/__init__.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/mesh/__init__.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/mesh/__init__.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/mesh/__init__.py 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from . import svgtools diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/mesh/ufl_util.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/mesh/ufl_util.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/mesh/ufl_util.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/mesh/ufl_util.py 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -import ufl +import ufl_legacy as ufl def ufl_cell(mesh): diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/multistage/factorize.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/multistage/factorize.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/multistage/factorize.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/multistage/factorize.py 2023-06-09 16:54:25.000000000 +0000 @@ -26,12 +26,12 @@ # First added: 2014-11-28 # Last changed: 2014-11-28 -# from ufl import * -from ufl import as_ufl -from ufl.corealg.multifunction import MultiFunction -from ufl.corealg.map_dag import map_expr_dag -from ufl.classes import Argument, FixedIndex -from ufl.log import error as ufl_error +# from ufl_legacy import * +from ufl_legacy import as_ufl +from ufl_legacy.corealg.multifunction import MultiFunction +from ufl_legacy.corealg.map_dag import map_expr_dag +from ufl_legacy.classes import Argument, FixedIndex +from ufl_legacy.log import error as ufl_error __all__ = ["extract_tested_expressions"] diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/multistage/multistagescheme.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/multistage/multistagescheme.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/multistage/multistagescheme.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/multistage/multistagescheme.py 2023-06-09 16:54:25.000000000 +0000 @@ -26,17 +26,17 @@ import numpy as np import functools -import ufl +import ufl_legacy as ufl import dolfin.cpp as cpp from dolfin.function.constant import Constant from dolfin.function.expression import Expression from dolfin.function.function import Function from dolfin.fem.formmanipulations import derivative, adjoint -from ufl import action as ufl_action +from ufl_legacy import action as ufl_action from dolfin.fem.form import Form -import ufl.algorithms -from ufl.algorithms import expand_derivatives +import ufl_legacy.algorithms +from ufl_legacy.algorithms import expand_derivatives # FIXME: Add support for algebraic parts (at least for implicit) # FIXME: Add support for implicit/explicit split ala IMEX schemes diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/dolfin/multistage/rushlarsenschemes.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/multistage/rushlarsenschemes.py --- dolfin-2019.2.0~git20230116.bd54183/python/dolfin/multistage/rushlarsenschemes.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/dolfin/multistage/rushlarsenschemes.py 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # along with DOLFIN. If not, see . import functools -import ufl +import ufl_legacy as ufl from dolfin.function.constant import Constant from dolfin.function.function import Function @@ -37,8 +37,8 @@ from dolfin import DOLFIN_EPS from dolfin import TrialFunction -import ufl.algorithms -from ufl.algorithms import (expand_derivatives, expand_indices, +import ufl_legacy.algorithms +from ufl_legacy.algorithms import (expand_derivatives, expand_indices, extract_coefficients) diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/setup.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/setup.py --- dolfin-2019.2.0~git20230116.bd54183/python/setup.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/setup.py 2023-06-09 16:54:25.000000000 +0000 @@ -22,9 +22,9 @@ "pybind11", "mpi4py", "petsc4py" , - "dev-fenics-ffc", - "dev-fenics-ufl", - "dev-fenics-dijitso"] + "fenics-ffc", + "fenics-ufl-legacy", + "fenics-dijitso"] class CMakeExtension(Extension): def __init__(self, name, sourcedir=''): diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/adaptivity/test_error_control.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/adaptivity/test_error_control.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/adaptivity/test_error_control.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/adaptivity/test_error_control.py 2023-06-09 16:54:25.000000000 +0000 @@ -18,7 +18,7 @@ # along with DOLFIN. If not, see . import pytest -from ufl.algorithms import replace +from ufl_legacy.algorithms import replace from dolfin import * from dolfin.fem.adaptivesolving import * diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_coordinate_derivative.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_coordinate_derivative.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_coordinate_derivative.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_coordinate_derivative.py 2023-06-09 16:54:25.000000000 +0000 @@ -22,8 +22,8 @@ import pytest import numpy as np from dolfin import * -from ufl import replace -from ufl.log import UFLException +from ufl_legacy import replace +from ufl_legacy.log import UFLException from dolfin_utils.test import skip_in_parallel def test_first_shape_derivative(): diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_form.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_form.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_form.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_form.py 2023-06-09 16:54:25.000000000 +0000 @@ -22,7 +22,7 @@ import pytest import numpy -import ufl +import ufl_legacy as ufl from dolfin import * from dolfin_utils.test import skip_in_parallel, fixture diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_formsplitter.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_formsplitter.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_formsplitter.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_formsplitter.py 2023-06-09 16:54:25.000000000 +0000 @@ -26,7 +26,7 @@ import pytest from dolfin import * -from ufl.log import UFLException +from ufl_legacy.log import UFLException from dolfin_utils.test import skip_in_parallel, fixture from dolfin.fem.assembling import _create_dolfin_form diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_interior_facet_integral_sides.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_interior_facet_integral_sides.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_interior_facet_integral_sides.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_interior_facet_integral_sides.py 2023-06-09 16:54:25.000000000 +0000 @@ -1,4 +1,4 @@ -import ufl +import ufl_legacy as ufl from dolfin import * from dolfin_utils.test import skip_in_parallel diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_mixedassembler.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_mixedassembler.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_mixedassembler.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_mixedassembler.py 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ import pytest import numpy as np from dolfin import * -from ufl.log import UFLException +from ufl_legacy.log import UFLException from dolfin_utils.test import skip_in_parallel, fixture diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_symbolic_geometry_assembly.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_symbolic_geometry_assembly.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/fem/test_symbolic_geometry_assembly.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/fem/test_symbolic_geometry_assembly.py 2023-06-09 16:54:25.000000000 +0000 @@ -1,11 +1,11 @@ from dolfin import * -import ufl +import ufl_legacy as ufl import numpy import sys import pytest from dolfin_utils.test import set_parameters_fixture, skip_in_parallel, fixture -from ufl.classes import CellOrientation, CellNormal, CellCoordinate, \ +from ufl_legacy.classes import CellOrientation, CellNormal, CellCoordinate, \ CellOrigin, Jacobian, JacobianInverse, JacobianDeterminant # This was for debugging, don't enable this permanently here in tests diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/function/test_constant.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/function/test_constant.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/function/test_constant.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/function/test_constant.py 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ import pytest from numpy import array from dolfin import * -from ufl import UFLException +from ufl_legacy import UFLException def test_name_argument(): u = Constant(1.0) @@ -58,7 +58,7 @@ def testGrad(): - import ufl + import ufl_legacy as ufl zero = ufl.constantvalue.Zero((2, 3)) c0 = Constant(1.) c3 = Constant(array([2, 3]), tetrahedron) diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/function/test_function.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/function/test_function.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/function/test_function.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/function/test_function.py 2023-06-09 16:54:25.000000000 +0000 @@ -19,7 +19,7 @@ import pytest from dolfin import * -import ufl +import ufl_legacy as ufl from dolfin_utils.test import skip_in_parallel, pushpop_parameters, fixture @@ -80,7 +80,7 @@ def test_assign(V, W): - from ufl.algorithms import replace + from ufl_legacy.algorithms import replace for V0, V1, vector_space in [(V, W, False), (W, V, True)]: u = Function(V0) diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/function/test_function_space.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/function/test_function_space.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/function/test_function_space.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/function/test_function_space.py 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ import pytest from dolfin import * -from ufl.log import UFLException +from ufl_legacy.log import UFLException from dolfin_utils.test import fixture diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/function/test_special_functions.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/function/test_special_functions.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/function/test_special_functions.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/function/test_special_functions.py 2023-06-09 16:54:25.000000000 +0000 @@ -22,7 +22,7 @@ import pytest from dolfin import * -import ufl +import ufl_legacy as ufl import dolfin from dolfin_utils.test import skip_in_parallel diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/mesh/test_mesh.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/mesh/test_mesh.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/mesh/test_mesh.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/mesh/test_mesh.py 2023-06-09 16:54:25.000000000 +0000 @@ -109,7 +109,7 @@ def test_UFLCell(interval, square, rectangle, cube, box): - import ufl + import ufl_legacy as ufl assert ufl.interval == interval.ufl_cell() assert ufl.triangle == square.ufl_cell() assert ufl.triangle == rectangle.ufl_cell() @@ -118,7 +118,7 @@ def test_UFLDomain(interval, square, rectangle, cube, box): - import ufl + import ufl_legacy as ufl def _check_ufl_domain(mesh): domain = mesh.ufl_domain() diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/multimesh/test_multimesh.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/multimesh/test_multimesh.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/multimesh/test_multimesh.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/multimesh/test_multimesh.py 2023-06-09 16:54:25.000000000 +0000 @@ -24,7 +24,7 @@ import pytest from dolfin import * -import ufl +import ufl_legacy as ufl import numpy from dolfin_utils.test import fixture, skip_in_parallel diff -Nru dolfin-2019.2.0~git20230116.bd54183/python/test/unit/multistage/test_factorizer.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/multistage/test_factorizer.py --- dolfin-2019.2.0~git20230116.bd54183/python/test/unit/multistage/test_factorizer.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/python/test/unit/multistage/test_factorizer.py 2023-06-09 16:54:25.000000000 +0000 @@ -1,6 +1,6 @@ from dolfin.multistage.factorize import extract_tested_expressions, ScalarFactorizer, map_expr_dag -from ufl import * +from ufl_legacy import * def test_scalar_factorizer(): U = FiniteElement("CG", triangle, 1) @@ -52,7 +52,7 @@ sin(TestFunction(V)[1]), ] - from ufl.classes import Sum, Operator, Expr, Argument + from ufl_legacy.classes import Sum, Operator, Expr, Argument for expr in expressions: func = ScalarFactorizer() diff -Nru dolfin-2019.2.0~git20230116.bd54183/test/unit/cpp/function/Projection.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/cpp/function/Projection.ufl --- dolfin-2019.2.0~git20230116.bd54183/test/unit/cpp/function/Projection.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/cpp/function/Projection.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -23,7 +23,7 @@ # # Compile this form with FFC: ffc -l dolfin Projection.form. -from ufl import (Coefficient, dx, FiniteElement, tetrahedron, +from ufl_legacy import (Coefficient, dx, FiniteElement, tetrahedron, TestFunction, TrialFunction) element = FiniteElement("Lagrange", tetrahedron, 2) diff -Nru dolfin-2019.2.0~git20230116.bd54183/test/unit/cpp/la/forms/ReactionDiffusionAction.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/cpp/la/forms/ReactionDiffusionAction.ufl --- dolfin-2019.2.0~git20230116.bd54183/test/unit/cpp/la/forms/ReactionDiffusionAction.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/cpp/la/forms/ReactionDiffusionAction.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Linear form the action of a simple reaction-diffusion problem -from ufl import (Coefficient, dot, dx, FiniteElement, grad, +from ufl_legacy import (Coefficient, dot, dx, FiniteElement, grad, TestFunction, TrialFunction, triangle) V = FiniteElement("Lagrange", triangle, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/test/unit/cpp/la/forms/ReactionDiffusion.ufl dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/cpp/la/forms/ReactionDiffusion.ufl --- dolfin-2019.2.0~git20230116.bd54183/test/unit/cpp/la/forms/ReactionDiffusion.ufl 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/cpp/la/forms/ReactionDiffusion.ufl 2023-06-09 16:54:25.000000000 +0000 @@ -20,7 +20,7 @@ # # Bilinear and linear forms for a simple reaction-diffusion problem -from ufl import (Coefficient, dot, dx, FiniteElement, grad, +from ufl_legacy import (Coefficient, dot, dx, FiniteElement, grad, TestFunction, TrialFunction, triangle) V = FiniteElement("Lagrange", triangle, 1) diff -Nru dolfin-2019.2.0~git20230116.bd54183/test/unit/python/fem/test_splitter.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/python/fem/test_splitter.py --- dolfin-2019.2.0~git20230116.bd54183/test/unit/python/fem/test_splitter.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/python/fem/test_splitter.py 2023-06-09 16:54:25.000000000 +0000 @@ -26,7 +26,7 @@ import pytest from dolfin import * -from ufl.log import UFLException +from ufl_legacy.log import UFLException from dolfin_utils.test import fixture diff -Nru dolfin-2019.2.0~git20230116.bd54183/test/unit/python/function/test_function_space_product.py dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/python/function/test_function_space_product.py --- dolfin-2019.2.0~git20230116.bd54183/test/unit/python/function/test_function_space_product.py 2023-01-16 14:00:23.000000000 +0000 +++ dolfin-2019.2.0~legacy20230609.8b85e9d.ar/test/unit/python/function/test_function_space_product.py 2023-06-09 16:54:25.000000000 +0000 @@ -26,7 +26,7 @@ import pytest from dolfin import * -from ufl.log import UFLException +from ufl_legacy.log import UFLException from dolfin_utils.test import fixture