ngstrefftz 0.3.2406.dev41__tar.gz → 0.3.2406.dev89__tar.gz

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/.github/workflows/build.yml

@@ -73,8 +73,8 @@ jobs:
       - name: install ngsolve
         run: |
           cd NGSTrefftz
-          pip install numpy scipy mkl-devel==2024.* mkl==2024.*
-          pip install --pre ngsolve
+          pip install numpy scipy  mkl-devel==2025.* mkl==2025.*
+          pip install ngsolve
       - name: build ngstrefftz gtest
         run: |
           mkdir $GITHUB_WORKSPACE/NGSTrefftz/make
@@ -117,9 +117,12 @@ jobs:
           fetch-depth: 0
       - name: Build wheels
         if: ${{ matrix.doit }}
-        uses: pypa/cibuildwheel@v2.22.0
+        uses: pypa/cibuildwheel@v2.23.2
         env:
           CIBW_BUILD_VERBOSITY: 1
+      - name: Setup tmate session
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
       - uses: actions/upload-artifact@v4
         if: ${{ matrix.doit }}
         with:
@@ -179,16 +182,16 @@ jobs:
         uses: actions/checkout@v4
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: paulstdocker/ngstrefftz
           # generate Docker tags based on the following events/attributes
-          tags: type=semver,pattern={{version}}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
       - name: Login to DockerHub
         uses: docker/login-action@v3
         if: github.event_name == 'release' && github.event.action == 'created'
@@ -196,7 +199,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: "Dockerfile"
@@ -265,7 +268,6 @@ jobs:
         uses: sphinx-notes/pages@v2
         with:
           repository_path: "NGSTrefftz"
-          publish: false
           #requirements_path: ./docs/requirements.txt
       - name: Download pyodide stuff
         if: false

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/CMakeLists.txt

@@ -10,9 +10,9 @@ if(NOT WIN32)
   set(BoldWhite   "${Esc}[1;37m")
 endif()
 
-set(ngsolve_addon_commit_hash 379d1efbd3a95001da7ca0d7005ae2c9eb892653)
+set(ngsolve_addon_commit_hash refs/heads/main)
 file(DOWNLOAD https://raw.githubusercontent.com/NGSolve/ngsolve-addon-template/${ngsolve_addon_commit_hash}/ngsolve_addon.cmake ${CMAKE_BINARY_DIR}/cmake_modules/ngsolve_addon.cmake)
-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_BINARY_DIR}/cmake_modules")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_BINARY_DIR}/cmake_modules)
 
 ### ngstrefftz
 
@@ -70,7 +70,7 @@ set(NGSTREFFTZ_USE_LAPACK ${NGSOLVE_USE_LAPACK} CACHE BOOL "Try to use lapack fr
 if (NGSTREFFTZ_USE_MKL)
     file(DOWNLOAD
     https://raw.githubusercontent.com/NGSolve/ngsolve/master/cmake/cmake_modules/FindMKL.cmake
-    "${CMAKE_BINARY_DIR}/cmake_modules/FindMKL.cmake")
+    ${CMAKE_BINARY_DIR}/cmake_modules/FindMKL.cmake)
 
     #file(COPY ${CMAKE_SOURCE_DIR}/FindMKL.cmake DESTINATION
     #"${CMAKE_BINARY_DIR}/cmake_modules/FindMKL.cmake")
@@ -111,18 +111,14 @@ if (NGSTREFFTZ_USE_MKL)
       endif()
     endif()
 
-    file(WRITE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/findmklconf.py
-        "from contextlib import suppress;import importlib.metadata; \
-        [print( f.locate().parent.resolve().absolute().as_posix()) \
-        if f.match('MKLConfig.cmake') else 0 for f in importlib.metadata.files('mkl-devel')]")
-    execute_process(COMMAND ${Python3_EXECUTABLE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/findmklconf.py
-        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE MKL_CONF_FROM_PY)
+    file(WRITE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/findmklconf.py "from contextlib import suppress;import importlib.metadata; [print( f.locate().parent.resolve().absolute().as_posix()) if f.match('MKLConfig.cmake') else 0 for f in importlib.metadata.files('mkl-devel')]")
+    execute_process(COMMAND ${Python3_EXECUTABLE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/findmklconf.py ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE MKL_CONF_FROM_PY)
     if(MKL_CONF_FROM_PY)
         message(STATUS "MKL_CONF_FROM_PY=${MKL_CONF_FROM_PY}")
         message(STATUS "pylibdir=${python3_library_dir}")
-        set(MKL_ROOT "${MKL_CONF_FROM_PY}/../../.." CACHE PATH "MKL root directory" )
-        set(MKL_LIBRARY "${MKL_ROOT}/lib/libmkl_rt.so.2" CACHE PATH "MKL library" )
-        set(MKL_INCLUDE_DIR "${MKL_ROOT}/include" CACHE PATH "MKL include directory" )
+        set(MKL_ROOT ${MKL_CONF_FROM_PY}/../../.. CACHE PATH "MKL root directory" )
+        set(MKL_LIBRARY ${MKL_ROOT}/lib/libmkl_rt.so.2 CACHE PATH "MKL library" )
+        set(MKL_INCLUDE_DIR ${MKL_ROOT}/include CACHE PATH "MKL include directory" )
     endif()
     #set(MKL_VERSION_H "${MKL_ROOT}/include/mkl_version.h")
 
@@ -175,7 +171,7 @@ if (NGSTREFFTZ_BUILD_DOC)
 endif (NGSTREFFTZ_BUILD_DOC)
 
 ### install
-set_target_properties(ngstrefftz PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngstrefftz")
+set_target_properties(ngstrefftz PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngstrefftz)
 file(COPY ${CMAKE_SOURCE_DIR}/src/__init__.py DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngstrefftz)
 set(install_dir ${ADDON_INSTALL_DIR_PYTHON}/ngstrefftz)
 install(TARGETS ngstrefftz DESTINATION ${install_dir})
@@ -218,7 +214,7 @@ add_test(NAME tents COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
 add_test(NAME box COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/boxint.py)
 #WORKING_DIRECTORY ${ CMAKE_CURRENT_SOURCE_DIR }
 set_tests_properties(embtrefftz trefftz tents
-    PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:${NGSOLVE_INSTALL_DIR}/${NGSOLVE_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH}")
+    PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:${NGSOLVE_INSTALL_DIR}/${NGSOLVE_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH})
 
 if(NGSTREFFTZ_USE_GTEST)
     #target_compile_options(_trefftz PRIVATE -Wall)# -Wextra -Wpedantic)

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/Dockerfile

@@ -7,7 +7,7 @@ WORKDIR /home/app
 #RUN cd /home/app/ngstrefftz/docs && pip install -r requirements.txt
 #RUN cd /home/app/ngstrefftz/docs && sphinx-build -M html . _build -vvv
 
-RUN pip install ngstrefftz 
+RUN pip install ngstrefftz --pre
 ENV PYTHONPATH=$PYTHONPATH:/usr/local/lib/python3.10/site-packages/
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/
 

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/PKG-INFO

@@ -1,13 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ngstrefftz
-Version: 0.3.2406.dev41
+Version: 0.3.2406.dev89
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Author-Email: Paul Stocker <paul.stocker@univie.ac.at>
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Project-URL: Documentation, https://paulst.github.io/NGSTrefftz
 Project-URL: Repository, https://github.com/PaulSt/ngstrefftz
 Requires-Python: >=3.8
-Requires-Dist: ngsolve>=6.2.2406.post134.dev1
+Requires-Dist: ngsolve==6.2.2501
 Description-Content-Type: text/markdown
 
 # NGSTrefftz
@@ -62,6 +62,10 @@ pip install ngsolve --pre
    * [ngsolve](https://www.ngsolve.org) >= 6.2  (to access the newest features the nightly version of NGSolve works best)
 
 ## News
+⚠️ Apr, 2025: `TrefftzEmbedding` has a new interface, please check the documentation for details.
+
+🚀 Jul, 2024: Conforming Trefftz embedding implementation by [@johann-cm](https://github.com/johann-cm) 
+
 ⚠️ Oct, 2022: With v0.2.0 the git history has undergone a major cleanup, please make sure to clone the repo anew.
 
 🚀 Oct, 2022: New and improved implementation of the embedded Trefftz method via `EmbeddedTrefftzFES`!
@@ -76,7 +80,7 @@ pip install ngsolve --pre
 
 🚀 Nov, 2021: NGSTrefftz now comes in a docker and with binder notebooks! 
 
-## Papers using the code
+## Publications using the code
 * *A unified framework for Trefftz-like discretization methods*  
 Philip L. Lederer, Christoph Lehrenfeld, Paul Stocker, Igor Voulis  
 [![arXiv](https://img.shields.io/badge/arXiv-2412.00806-b31b1b.svg)](https://arxiv.org/abs/2412.00806)
@@ -101,6 +105,11 @@ Lise-Marie Imbert-Gérard, Andrea Moiola, Paul Stocker
 * *Tent pitching and Trefftz-DG method for the acoustic wave equation*  
 Ilaria Perugia, Joachim Schöberl, Paul Stocker, Christoph Wintersteiger   
 [![arXiv](https://img.shields.io/badge/arXiv-1907.02367-b31b1b.svg)](https://arxiv.org/abs/1907.02367)
+* *Space-time Trefftz DG methods for parabolic PDEs*  
+Constanze Heil, [Master's thesis](https://doi.org/10.25625/ZSA8UU/2L4C1E)
+* *Embedded Trefftz Trace DG Methods for PDEs on unfitted Surfaces*  
+Erik Schlesinger, [Master's thesis](https://doi.org/10.25625/QTOPWD/93ZYRQ)
+
 
 If you are using `ngstrefftz` in your academic work, please consider citing 
 ```

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/README.md

@@ -50,6 +50,10 @@ pip install ngsolve --pre
    * [ngsolve](https://www.ngsolve.org) >= 6.2  (to access the newest features the nightly version of NGSolve works best)
 
 ## News
+⚠️ Apr, 2025: `TrefftzEmbedding` has a new interface, please check the documentation for details.
+
+🚀 Jul, 2024: Conforming Trefftz embedding implementation by [@johann-cm](https://github.com/johann-cm) 
+
 ⚠️ Oct, 2022: With v0.2.0 the git history has undergone a major cleanup, please make sure to clone the repo anew.
 
 🚀 Oct, 2022: New and improved implementation of the embedded Trefftz method via `EmbeddedTrefftzFES`!
@@ -64,7 +68,7 @@ pip install ngsolve --pre
 
 🚀 Nov, 2021: NGSTrefftz now comes in a docker and with binder notebooks! 
 
-## Papers using the code
+## Publications using the code
 * *A unified framework for Trefftz-like discretization methods*  
 Philip L. Lederer, Christoph Lehrenfeld, Paul Stocker, Igor Voulis  
 [![arXiv](https://img.shields.io/badge/arXiv-2412.00806-b31b1b.svg)](https://arxiv.org/abs/2412.00806)
@@ -89,6 +93,11 @@ Lise-Marie Imbert-Gérard, Andrea Moiola, Paul Stocker
 * *Tent pitching and Trefftz-DG method for the acoustic wave equation*  
 Ilaria Perugia, Joachim Schöberl, Paul Stocker, Christoph Wintersteiger   
 [![arXiv](https://img.shields.io/badge/arXiv-1907.02367-b31b1b.svg)](https://arxiv.org/abs/1907.02367)
+* *Space-time Trefftz DG methods for parabolic PDEs*  
+Constanze Heil, [Master's thesis](https://doi.org/10.25625/ZSA8UU/2L4C1E)
+* *Embedded Trefftz Trace DG Methods for PDEs on unfitted Surfaces*  
+Erik Schlesinger, [Master's thesis](https://doi.org/10.25625/QTOPWD/93ZYRQ)
+
 
 If you are using `ngstrefftz` in your academic work, please consider citing 
 ```

ngstrefftz-0.3.2406.dev89/_version.py

@@ -0,0 +1,21 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '0.3.2406.dev89'
+__version_tuple__ = version_tuple = (0, 3, 2406, 'dev89')

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/conf.py

@@ -114,6 +114,7 @@ templates_path = ['_static']
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'paper', 'env', 'jupyter_execute']
 
+autoclass_content = 'both'
 
 # -- Options for HTML output -------------------------------------------------
 

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/docu.rst

@@ -41,7 +41,11 @@ Then we can solve the reduced problem: Find :math:`\bu_\IT` so that
 
 The solution in the full polynomial space is then given by :math:`\bu=\bT\bu_\IT`
 
-.. autofunction:: ngstrefftz.TrefftzEmbedding
+.. autoclass:: ngstrefftz.TrefftzEmbedding
+
+   .. automethod:: Embed
+   .. automethod:: GetEmbedding
+   .. automethod:: GetParticularSolution
 
 .. autofunction:: ngstrefftz.EmbeddedTrefftzFES
 

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/notebooks/embTrefftz-adv.ipynb

@@ -119,7 +119,9 @@
     "lop = rhs*grad(v)[0]*dx\n",
     "\n",
     "with TaskManager():\n",
-    "    PP,uf = TrefftzEmbedding(op,fes,lop,eps)\n",
+    "    emb = TrefftzEmbedding(op,lop,eps=eps)\n",
+    "PP = emb.GetEmbedding()\n",
+    "uf = emb.GetParticularSolution()\n",
     "PPT = PP.CreateTranspose()\n",
     "with TaskManager():\n",
     "    TA = PPT@a.mat@PP\n",
@@ -127,7 +129,7 @@
     "    gfu = GridFunction(fes)\n",
     "    gfu.vec.data = PP*Tgfu + uf\n",
     "error = sqrt(Integrate((gfu-exact)**2, mesh))\n",
-    "print(\"svdt error : {:13.8e}\".format(error))"
+    "print(\"error =\", error)"
    ]
   },
   {
@@ -158,7 +160,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.3"
+   "version": "3.13.2"
   }
  },
  "nbformat": 4,

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/notebooks/embTrefftz-helm.ipynb

@@ -99,7 +99,7 @@
     "    fes2 = L2(mesh, order=order-2, dgjumps=True,complex=True)\n",
     "    v = fes2.TestFunction()\n",
     "    op = -omega**2*u*v*dx - Lap(u)*v*dx\n",
-    "    PP = TrefftzEmbedding(op,fes,test_fes=fes2)\n",
+    "    PP = TrefftzEmbedding(op).GetEmbedding()\n",
     "    return PP"
    ]
   },
@@ -261,7 +261,7 @@
     "    gfu = GridFunction(fes)\n",
     "    gfu.vec.data = PP*TU\n",
     "error = sqrt(Integrate((gfu-exact)*Conj(gfu-exact), mesh).real)\n",
-    "print(\"error \",error)"
+    "print(\"error =\",error)"
    ]
   },
   {
@@ -310,7 +310,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.13.2"
   }
  },
  "nbformat": 4,

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/notebooks/embTrefftz-poi.ipynb

@@ -99,16 +99,18 @@
     "mean_dvdn = 0.5 * (grad(v)+grad(v.Other()))\n",
     "\n",
     "a = BilinearForm(fes,symmetric=True)\n",
-    "a += grad(u)*grad(v) * dx \\\n",
+    "aterms = grad(u)*grad(v) * dx \\\n",
     "    +alpha*order**2/h*jump_u*jump_v * dx(skeleton=True) \\\n",
     "    +(-mean_dudn*jump_v-mean_dvdn*jump_u) * dx(skeleton=True) \\\n",
     "    +alpha*order**2/h*u*v * ds(skeleton=True) \\\n",
     "    +(-n*grad(u)*v-n*grad(v)*u)* ds(skeleton=True)\n",
+    "a += aterms\n",
     "\n",
     "f = LinearForm(fes)\n",
-    "f += rhs*v * dx \\\n",
+    "fterms = rhs*v * dx \\\n",
     "     +alpha*order**2/h*bndc*v * ds(skeleton=True) \\\n",
     "     +(-n*grad(v)*bndc)* ds(skeleton=True)\n",
+    "f += fterms\n",
     "with TaskManager():\n",
     "    a.Assemble()\n",
     "    f.Assemble()"
@@ -162,15 +164,17 @@
     "op = Lap(u)*Lap(v)*dx\n",
     "lop = -rhs*Lap(v)*dx\n",
     "with TaskManager():\n",
-    "    PP,uf = TrefftzEmbedding(op,fes,lop,eps)\n",
+    "    emb = TrefftzEmbedding(op,lop,eps=eps)\n",
+    "PP = emb.GetEmbedding()\n",
     "PPT = PP.CreateTranspose()\n",
+    "uf = emb.GetParticularSolution()\n",
     "with TaskManager():\n",
     "    TA = PPT@a.mat@PP\n",
     "    Tgfu = TA.Inverse(inverse=\"sparsecholesky\")*(PPT*(f.vec-a.mat*uf))\n",
     "    gfu = GridFunction(fes)\n",
     "    gfu.vec.data = PP*Tgfu + uf\n",
     "error = sqrt(Integrate((gfu-exact)**2, mesh))\n",
-    "print(\"svdt\",error)"
+    "print(\"error =\",error)"
    ]
   },
   {
@@ -183,6 +187,78 @@
     "from ngsolve.webgui import Draw\n",
     "Draw(BoundaryFromVolumeCF(gfu),mesh,'gfu')"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "671d538f-ced6-4d2d-846a-4a2a814deb62",
+   "metadata": {},
+   "source": [
+    "### Using EmbeddedTrefftzFES\n",
+    "To use an $\\texttt{EmbeddedTrefftzFES}$ for a problem with a right-hand-side we first assemble the (Bi)linearForm over the Trefftz space, as in the homogeneous case. "
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "010f6931-1a61-4968-9d82-1cbd1a35814e",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "etfes = EmbeddedTrefftzFES(emb)\n",
+    "a = BilinearForm(etfes)\n",
+    "a += aterms\n",
+    "f = LinearForm(etfes)\n",
+    "f += fterms\n",
+    "a.Assemble()\n",
+    "f.Assemble()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "3040df22-2053-4da1-9d38-f90841d5669b",
+   "metadata": {},
+   "source": [
+    "#### Computing the residuum\n",
+    "Then we compute the residuum $\\bT^T \\bl-\\bT^T \\bA\\bu_f$. We compute $\\bT^T \\bA\\bu_f$ directly, using a mixed BilinearForm with trial functions in the base space and test functions from the embedded Trefftz space."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "d8c58374-e1e5-4c44-a725-c43a47d5bf6f",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "res = f.vec.CreateVector()\n",
+    "af = BilinearForm(fes,etfes)\n",
+    "af += aterms\n",
+    "af.Apply(uf,res)\n",
+    "f.vec.data -= res"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "ee0df904-d840-420c-a3c2-7e439432380d",
+   "metadata": {},
+   "source": [
+    "Now we are ready to solve and then compute the solution from $u_{\\IT} +u_{h,f}$."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "940d3fd3-9cbd-4bbf-8b70-875c4ab5e034",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "tgfu = GridFunction(etfes)\n",
+    "tgfu.vec.data = a.mat.Inverse() * f.vec\n",
+    "gfu.vec.data = emb.Embed(tgfu.vec)\n",
+    "gfu.vec.data += uf\n",
+    "\n",
+    "error = sqrt(Integrate((gfu-exact)**2, mesh))\n",
+    "print(\"error =\",error)"
+   ]
   }
  ],
  "metadata": {
@@ -201,7 +277,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.7"
+   "version": "3.13.2"
   }
  },
  "nbformat": 4,

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/notebooks/embTrefftz-stokes.ipynb

@@ -126,8 +126,8 @@
     "        + InnerProduct(grad(p),wu) * dx + div(u)*wp*dx\n",
     "\n",
     "    lop = rhs * wu * dx(bonus_intorder=5)\n",
-    "    PP, uf = TrefftzEmbedding(op,fes,lop,eps=10**-6,test_fes=test_fes)\n",
-    "    return PP, uf"
+    "    emb = TrefftzEmbedding(op,lop,eps=10**-6)\n",
+    "    return emb.GetEmbedding(), emb.GetParticularSolution()"
    ]
   },
   {
@@ -333,7 +333,7 @@
    "source": [
     "uh = gfu.components[0]\n",
     "Draw(uh,mesh,\"u\")\n",
-    "print(sqrt(Integrate(InnerProduct(uh-uexact,uh-uexact),mesh)))"
+    "print(\"error =\",sqrt(Integrate(InnerProduct(uh-uexact,uh-uexact),mesh)))"
    ]
   }
  ],
@@ -353,7 +353,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.3"
+   "version": "3.13.2"
   }
  },
  "nbformat": 4,

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/notebooks/embTrefftz-wave.ipynb

@@ -263,7 +263,7 @@
     "\n",
     "eps=10**-12\n",
     "with TaskManager():\n",
-    "    PP = TrefftzEmbedding(op,fes,eps)\n",
+    "    PP = TrefftzEmbedding(op,eps=eps).GetEmbedding()\n",
     "PPT = PP.CreateTranspose()\n",
     "with TaskManager():\n",
     "    TA = PPT@a.mat@PP\n",
@@ -282,7 +282,7 @@
    "outputs": [],
    "source": [
     "error = Integrate((CF(tgfu.components)-CoefficientFunction((sig_ex,v_ex)))**2,mesh)\n",
-    "print(error)"
+    "print(\"error =\",error)"
    ]
   }
  ],
@@ -302,7 +302,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.13.2"
   }
  },
  "nbformat": 4,

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/notebooks/embTrefftz.ipynb

@@ -171,20 +171,14 @@
     "    f.Assemble()"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "id": "4f1de24c",
-   "metadata": {},
-   "source": [
-    "### Trefftz embedding"
-   ]
-  },
   {
    "cell_type": "markdown",
    "id": "19d5d04a",
    "metadata": {},
    "source": [
-    "We use the function $\\texttt{TrefftzEmbedding}$ and pass the operator \n",
+    "### Trefftz embedding\n",
+    "\n",
+    "We use the class $\\texttt{TrefftzEmbedding}$ and pass the operator \n",
     "$$\n",
     "\\newcommand{\\Vhp}{V^p(\\Th)}\n",
     "\\newcommand{\\bT}{\\mathbf{T}}\n",
@@ -223,7 +217,29 @@
     "u,v = fes.TnT()\n",
     "op = Lap(u)*Lap(v)*dx\n",
     "with TaskManager():\n",
-    "    PP = TrefftzEmbedding(op,fes,eps)\n",
+    "    emb = TrefftzEmbedding(op,eps=eps)\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "3a51e93c-f31c-43ac-9865-e6227d126660",
+   "metadata": {},
+   "source": [
+    "From the $\\texttt{TrefftzEmbedding}$ we can get the matrix $\\bT$ to compute\n",
+    "\n",
+    "$$\n",
+    "   \\bT^T\\bA\\bT ~ \\bu_\\IT = \\bT^T \\bl.\n",
+    "$$"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "26b4df44-dbae-4a12-925d-0604e0d01546",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "PP = emb.GetEmbedding()\n",
     "PPT = PP.CreateTranspose()\n",
     "with TaskManager():\n",
     "    TA = PPT@a.mat@PP\n",
@@ -240,15 +256,7 @@
    "outputs": [],
    "source": [
     "error = sqrt(Integrate((tgfu-exact)**2, mesh))\n",
-    "print(\"embedded Trefftz error \",error)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "8f34efc5",
-   "metadata": {},
-   "source": [
-    "### Trefftz embedding type 2"
+    "print(\"error =\",error)"
    ]
   },
   {
@@ -256,6 +264,8 @@
    "id": "c02fb15b",
    "metadata": {},
    "source": [
+    "### Trefftz embedding type 2\n",
+    "\n",
     "We can also construct the embedding by finding the kernel of\n",
     "\n",
     "$$\n",
@@ -279,7 +289,8 @@
     "v = fes2.TestFunction()\n",
     "op = Lap(u)*v*dx\n",
     "with TaskManager():\n",
-    "    PP = TrefftzEmbedding(op,fes,test_fes=fes2)\n",
+    "    emb = TrefftzEmbedding(op)\n",
+    "PP = emb.GetEmbedding()\n",
     "PPT = PP.CreateTranspose()\n",
     "with TaskManager():\n",
     "    TA = PPT@a.mat@PP\n",
@@ -296,7 +307,7 @@
    "outputs": [],
    "source": [
     "error = sqrt(Integrate((tgfu-exact)**2, mesh))\n",
-    "print(\"embedded Trefftz error \",error)"
+    "print(\"error =\",error)"
    ]
   },
   {
@@ -304,10 +315,11 @@
    "id": "0e852921",
    "metadata": {},
    "source": [
-    "## Trefftz embedding via FESpace\n",
+    "### Trefftz embedding via FESpace\n",
     "The following improves the runtime of the embedded Trefftz method by avoiding the full assembly of the larger system matrix. Instead we directly assemble the matrix $\\bT^T\\bA\\bT$ using the local embedding matrices.\n",
     "\n",
-    "We use `EmbeddedTrefftzFES` to construct an embedded space from an underlying `L2` space."
+    "We use `EmbeddedTrefftzFES` to construct an embedded space from the $\\texttt{TrefftzEmbedding}$. \n",
+    "This avoids the assembly of the full DG system and of the embedding matrix."
    ]
   },
   {
@@ -318,12 +330,7 @@
    "outputs": [],
    "source": [
     "with TaskManager():\n",
-    "    fes = L2(mesh, order=order, dgjumps=True)\n",
-    "    u,v = fes.TnT()\n",
-    "    op = Lap(u)*Lap(v)*dx\n",
-    "    \n",
-    "    etfes = EmbeddedTrefftzFES(fes)\n",
-    "    etfes.SetOp(op,eps=eps)\n",
+    "    etfes = EmbeddedTrefftzFES(emb)\n",
     "\n",
     "    a,f = lapdg(etfes,exact)\n",
     "    a.Assemble()\n",
@@ -341,7 +348,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print(\"embedded Trefftz error \",sqrt(Integrate((gfu-exact)**2, mesh)))"
+    "print(\"error =\",sqrt(Integrate((gfu-exact)**2, mesh)))"
    ]
   }
  ],
@@ -361,7 +368,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.7"
+   "version": "3.13.2"
   }
  },
  "nbformat": 4,

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/notebooks/index.ipynb

@@ -62,7 +62,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.13.2"
   }
  },
  "nbformat": 4,

{ngstrefftz-0.3.2406.dev41 → ngstrefftz-0.3.2406.dev89}/docs/notebooks/laplace.ipynb

@@ -245,7 +245,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.7"
+   "version": "3.13.2"
   }
  },
  "nbformat": 4,