ngstrefftz 0.3.2602.dev4__tar.gz → 0.3.2602.dev9__tar.gz

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/.github/workflows/build.yml

@@ -45,14 +45,14 @@ jobs:
           submodules: true
           path: "NGSTrefftz"
           fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.13"
+      #- uses: actions/setup-python@v6
+        #with:
+          #python-version: "3.13"
       - name: install ngstrefftz
         #env:
         #NGSTREFFTZ_USE_GTEST: 'ON'
         run: |
-          python3 -m pip install --break-system-packages numpy scipy
+          python3 -m pip install --break-system-packages numpy scipy 
           cd NGSTrefftz && python3 -m pip install --break-system-packages . -v
       - name: run test
         run: cd $GITHUB_WORKSPACE/NGSTrefftz/test && python3 -m doctest -v *.py
@@ -75,7 +75,8 @@ jobs:
       - name: install ngsolve
         run: |
           cd NGSTrefftz
-          pip install numpy scipy tomli mkl-devel==2025.* mkl==2025.*
+          pip install tomli numpy scipy 
+          # pip install mkl-devel==2025.* mkl==2025.*
           # pip install ngsolve
           python3 <<'PY'
           import tomllib, pathlib, subprocess, sys
@@ -107,12 +108,12 @@ jobs:
           - os: ubuntu-latest
             doit: ${{ inputs.level == 'quick' }}
             cibw_build: cp313-*
-          - os: windows-2022
+          - os: windows-2025
             cibw-arch: AMD64
-            cmake-generator: "Visual Studio 16 2019"
+            cmake-generator: "Visual Studio 17 2022"
             cmake_generator_platform: "x64"
             doit: ${{ inputs.level != 'quick' }}
-            cibw_build: cp310-* cp311-* cp312-* cp313-* cp314-*
+            cibw_build: cp311-* cp312-* cp313-* cp314-*
     env:
       CIBW_BUILD: ${{ matrix.cibw_build }}
     steps:
@@ -267,8 +268,8 @@ jobs:
           merge-multiple: true
       #- name: Display structure of downloaded files
         #run: ls -R $GITHUB_WORKSPACE/wheels
-      #- name: install ngstrefftz
-        #run: pip install $GITHUB_WORKSPACE/wheels/*-cp313-cp313-manylinux_2_28_x86_64.manylinux2014_x86_64.whl
+      - name: install ngstrefftz
+        run: pip install $GITHUB_WORKSPACE/wheels/*-cp313-cp313-manylinux_2_28_x86_64.manylinux2014_x86_64.whl
       - name: Build Sphinx HTML
         run: sphinx-build -b html $GITHUB_WORKSPACE/NGSTrefftz/docs $GITHUB_WORKSPACE/NGSTrefftz/docs/_build/html
       #- name: Download pyodide stuff

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/PKG-INFO

@@ -1,13 +1,15 @@
 Metadata-Version: 2.2
 Name: ngstrefftz
-Version: 0.3.2602.dev4
+Version: 0.3.2602.dev9
 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.10
-Requires-Dist: ngsolve==6.2.2601
+Requires-Dist: mkl<2026.0,>=2024; platform_system != "Darwin"
+Requires-Dist: mkl-devel<2026.0,>=2024; platform_system != "Darwin"
+Requires-Dist: ngsolve==6.2.2603
 Description-Content-Type: text/markdown
 
 # NGSTrefftz

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.3.2602.dev4'
-__version_tuple__ = version_tuple = (0, 3, 2602, 'dev4')
+__version__ = version = '0.3.2602.dev9'
+__version_tuple__ = version_tuple = (0, 3, 2602, 'dev9')
 
-__commit_id__ = commit_id = 'g6b5d55733'
+__commit_id__ = commit_id = 'g95bb94f98'

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/docs/requirements.txt

@@ -22,5 +22,5 @@ numpy>=2.0.0
 scipy>=1.13.1
 webgui-jupyter-widgets>=0.2.35
 
-ngstrefftz==0.3.2506
-xfem==2.1.2506
+#ngstrefftz==0.3.2506
+xfem==2.1.2603

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/external_dependencies/ngstents/.github/workflows/build.yml

@@ -13,8 +13,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13]
+        os: [ubuntu-latest, macos-latest]
         include:
+	  - os: ubuntu-latest
+            cibw_build: cp313-*
           - os: windows-2022
             cibw-arch: AMD64
             cmake-generator: "Visual Studio 17 2022"
@@ -28,11 +30,11 @@ jobs:
           fetch-depth: 0
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.0
+        uses: pypa/cibuildwheel@@v2.23.2
 
       - uses: actions/upload-artifact@v4
         with:
-          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          name: cibw-wheels-${{ matrix.os }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -72,38 +74,3 @@ jobs:
         skip-existing: true
         password: ${{ secrets.PYPI_API_TOKEN }}
 
-  docs:
-    runs-on: ubuntu-24.04
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    permissions:
-      pages: write
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
-          submodules: 'False'
-          path: '.'
-      - name: apt-get
-        run: sudo apt-get update && DEBIAN_FRONTEND="noninteractive" sudo apt-get -y install python3-testresources npm nodejs pandoc -y
-      - name: pip install requirements
-        run: |
-          python3 -m pip install --break-system-packages build webgui_jupyter_widgets scikit-build-core pybind11_stubgen cmake ngsolve "numpy<2" matplotlib setuptools-scm "ninja>=1.5" toml "setuptools_scm[toml]>=8"
-          python3 -m build -wn .
-          python3 -m pip install --break-system-packages dist/*.whl
-          python3 -c 'import ngstents'
-      - name: Build the book
-        run: |
-          cd docs
-          python3 -m pip install --break-system-packages jupyter-book
-          jupyter-book build .
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: "docs/_build/html"
-      - name: Deploy to GitHub Pages
-        if: github.ref == 'refs/heads/master'
-        id: deployment
-        uses: actions/deploy-pages@v4

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/external_dependencies/ngstents/docs/_config.yml

@@ -1,34 +1,22 @@
 # Book settings
 # Learn more at https://jupyterbook.org/customize/config.html
 
-title: NGS-Tents
+title: ngsTents
 author: Jay Gopalakrishnan
+logo: figs/ngsTentsLogo.png
 copyright : "2024"  # Copyright year to be placed in the footer
 
 repository:
   url: https://github.com/jayggg/ngstents
+  path_to_book: docs # Optional path to your book, relative to the repository root
+  branch: gh-pages   # Which repo branch to use when creating links
 
 # Force re-execution of notebooks on each build.
 # See https://jupyterbook.org/content/execute.html
 execute:
-  execute_notebooks: force
+  execute_notebooks: auto
   timeout: 5000
   
-# Define the name of the latex output file for PDF builds
-# latex:
-#  latex_documents:
-#    targetname: ngstentsdoc.tex
-#
-# Add a bibtex file so that we can create citations
-# bibtex_bibfiles:
-#   - references.bib
-#
-# Information about where the book exists on the web
-# repository:
-# url: https://jayggg.github.io/ngstents/
-#   path_to_book: docs  # Optional path to your book, relative to the repository root
-#  branch: master  # Which branch of the repository should be used when creating links (optional)
-
 
 # Add GitHub buttons to your book
 # See https://jupyterbook.org/customize/config.html#add-a-link-to-your-repository

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/external_dependencies/ngstents/docs/_toc.yml

@@ -1,11 +1,10 @@
 # Table of contents
-# Learn more at https://jupyterbook.org/customize/toc.html
 
 format: jb-book
-root: readme
+root: index.ipynb
 
 parts:
-  - caption: NGS-Tents Concepts & Usage
+  - caption: Concepts & Usage
     numbered: False
     chapters:
     - file: StartPitching.ipynb

ngstrefftz-0.3.2602.dev9/external_dependencies/ngstents/docs/assets/css/style.scss

@@ -0,0 +1,2 @@
+/* docs/assets/css/style.scss */
+body { background: #fff; }

ngstrefftz-0.3.2602.dev9/external_dependencies/ngstents/docs/do

@@ -0,0 +1,2 @@
+jupyter-book build .
+ghp-import -n -p -f _build/html 

ngstrefftz-0.3.2602.dev9/external_dependencies/ngstents/docs/index.ipynb

@@ -0,0 +1,49 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "096ca91a-ba85-4b6c-b103-72bd888f6567",
+   "metadata": {},
+   "source": [
+    "# Spacetime Tents in NGSolve"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "b694b134-565e-4208-841e-3f7ac8b082c1",
+   "metadata": {},
+   "source": [
+    "The **ngsTents** package is a c++ extension of the NGSolve finite element library, designed to ease experimentation with solvers based on spacetime tents for hyperbolic systems. A python front-end (`import ngstents`) allows new equations (linear or nonlinear conservation laws) to be solved by easily defining required fluxes and numerical fluxes in a few lines of code."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "3e80540e-f0bd-414a-93af-f7a26d5ed062",
+   "metadata": {},
+   "source": [
+    "This documentation introduces *concepts* on which ngsTents are based on as well as the *usage* of the package. It is structured as two hands-on lecture notebooks. These lectures were first presented in an NGSolve User Meeting and were prepared by [Jay Gopalakrishnan](https://web.pdx.edu/~gjay/). Send all comments to gjay@pdx.edu or pull requests via [ngstents repository in GitHub](https://github.com/jayggg/ngstents). \n"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.14.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/external_dependencies/ngstents/pyproject.toml

@@ -12,7 +12,14 @@ classifiers = [
 ]
 
 [build-system]
-requires = ["ngsolve>=6.2.2503", "matplotlib", "cmake", "setuptools>=45", "setuptools_scm[toml]>=8", "toml", "scikit-build-core>=0.3.3", "pybind11_stubgen", "cmake>=3.26.1"]
+requires = ["ngsolve>=6.2.2506",
+            "matplotlib",
+	    "setuptools>=45",
+	    "setuptools_scm>=8",
+	    "toml;  python_version >= '3.11'",
+            "tomli>=1.1.0; python_version < '3.11'",
+	    "scikit-build-core>=0.9.0",
+	    "cmake>=3.26.1"]
 build-backend = "scikit_build_core.build"
 
 ##########################################################################

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/pyproject.toml

@@ -9,7 +9,9 @@ classifiers = [
   "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
 ]
 dependencies = [
-  "ngsolve==6.2.2601",
+  "mkl>=2024,<2026.0 ; platform_system != 'Darwin'",
+  "mkl-devel>=2024,<2026.0 ; platform_system != 'Darwin'",
+  "ngsolve==6.2.2603",
 ]
 
 
@@ -18,15 +20,16 @@ Documentation = "https://paulst.github.io/NGSTrefftz"
 Repository = "https://github.com/PaulSt/ngstrefftz"
 
 [build-system]
-requires = ["ngsolve==6.2.2601",
+requires = ["ngsolve==6.2.2603",
             "scikit-build-core>=0.9.0",
             "pybind11_stubgen",
             "setuptools>=45",
             "setuptools_scm>=8",
             "toml;  python_version >= '3.11'",
             "tomli>=1.1.0; python_version < '3.11'",
-            "mkl==2025.* ; platform_system != 'Darwin'",
-            "mkl-devel==2025.* ; platform_system != 'Darwin'"]
+            "mkl>=2024,<2026.0 ; platform_system != 'Darwin'",
+            "mkl-devel>=2024,<2026.0 ; platform_system != 'Darwin'",
+            ]
 build-backend = "scikit_build_core.build"
 
 [tool.scikit-build]

{ngstrefftz-0.3.2602.dev4 → ngstrefftz-0.3.2602.dev9}/src/embtrefftz.cpp

@@ -402,23 +402,50 @@ Elmats2Sparse (const FlatArray<optional<Matrix<SCAL>>> &etmats,
 
 void calculateBilinearFormIntegrators (
     const SumOfIntegrals &bf,
-    Array<shared_ptr<BilinearFormIntegrator>> bfis[4])
+    Array<shared_ptr<BilinearFormIntegrator>> bfis[4],
+    shared_ptr<MeshAccess> ma)
 {
   for (auto icf : bf.icfs)
     {
       DifferentialSymbol &dx = icf->dx;
-      bfis[dx.vb] += icf->MakeBilinearFormIntegrator ();
+      shared_ptr<BilinearFormIntegrator> bfi
+          = icf->MakeBilinearFormIntegrator ();
+
+      if (dx.definedon) // DifferentialSymbol cannot set definedon region as it
+                        // has no mesh access.
+        {
+          if (auto definedon_string = get_if<string> (&*dx.definedon);
+              definedon_string)
+            {
+              Region reg (ma, dx.vb, *definedon_string);
+              bfi->SetDefinedOn (reg.Mask ());
+            }
+        }
+
+      bfis[dx.vb] += bfi;
     }
 }
 
 void calculateLinearFormIntegrators (
     const SumOfIntegrals &trhs,
-    Array<shared_ptr<LinearFormIntegrator>> lfis[4])
+    Array<shared_ptr<LinearFormIntegrator>> lfis[4], shared_ptr<MeshAccess> ma)
 {
   for (auto icf : trhs.icfs)
     {
       DifferentialSymbol &dx = icf->dx;
-      lfis[dx.vb] += icf->MakeLinearFormIntegrator ();
+      shared_ptr<LinearFormIntegrator> lfi = icf->MakeLinearFormIntegrator ();
+
+      if (dx.definedon)
+        {
+          if (auto definedon_string = get_if<string> (&*dx.definedon);
+              definedon_string)
+            {
+              Region reg (ma, dx.vb, *definedon_string);
+              lfi->SetDefinedOn (reg.Mask ());
+            }
+        }
+
+      lfis[dx.vb] += lfi;
     }
 }
 
@@ -458,14 +485,31 @@ bool fesHasInactiveDofs (const FESpace &fes)
 }
 
 bool bfIsDefinedOnElement (const SumOfIntegrals &bf,
-                           const Ngs_Element &mesh_element)
+                           const Ngs_Element &mesh_element,
+                           shared_ptr<MeshAccess> ma)
 {
   for (auto icf : bf.icfs)
     {
-      if (icf->dx.vb == mesh_element.VB ())
-        if ((!icf->dx.definedonelements)
-            || (icf->dx.definedonelements->Test (mesh_element.Nr ())))
-          return true;
+      if (icf->dx.vb != mesh_element.VB ())
+        continue;
+
+      if (!icf->dx.definedonelements
+          || icf->dx.definedonelements->Test (mesh_element.Nr ()))
+        return true;
+
+      if (icf->dx.definedon) // check region
+        {
+          if (auto definedon_string = get_if<string> (&*icf->dx.definedon);
+              definedon_string)
+            {
+              Region reg (ma, icf->dx.vb, *definedon_string);
+              const BitArray &definedon = reg.Mask ();
+              size_t mat = ma->GetElIndex (mesh_element);
+              if (mat >= definedon.Size ())
+                return false;
+              return definedon.Test (mat);
+            }
+        }
     }
   return false;
 }
@@ -651,7 +695,8 @@ void calculateParticularSolution (
     {
       for (const auto &lfi : lfis[vorb])
         {
-          if (lfi->DefinedOnElement (ei.Nr ()))
+          if (lfi->DefinedOnElement (ei.Nr ())
+              && lfi->DefinedOn (ma.GetElIndex (ei)))
             {
               auto &mapped_trafo
                   = trafo.AddDeformation (lfi->GetDeformation ().get (), mlh);
@@ -756,15 +801,15 @@ namespace ngcomp
     Array<shared_ptr<BilinearFormIntegrator>> op_integrators[4],
         cop_lhs_integrators[4], cop_rhs_integrators[4];
     if (top)
-      calculateBilinearFormIntegrators (*top, op_integrators);
+      calculateBilinearFormIntegrators (*top, op_integrators, ma);
     if (cop && crhs)
       {
-        calculateBilinearFormIntegrators (*cop, cop_lhs_integrators);
-        calculateBilinearFormIntegrators (*crhs, cop_rhs_integrators);
+        calculateBilinearFormIntegrators (*cop, cop_lhs_integrators, ma);
+        calculateBilinearFormIntegrators (*crhs, cop_rhs_integrators, ma);
       }
     Array<shared_ptr<BilinearFormIntegrator>> fes_ip_integrators[4];
     if (fes_ip)
-      calculateBilinearFormIntegrators (*fes_ip, fes_ip_integrators);
+      calculateBilinearFormIntegrators (*fes_ip, fes_ip_integrators, ma);
 
     Array<optional<Matrix<SCAL>>> etmats (num_elements);
     Array<optional<Matrix<SCAL>>> etmats_trefftz_inv (num_elements);
@@ -779,7 +824,7 @@ namespace ngcomp
     particular_solution_vec->operator= (0.0);
     Array<shared_ptr<LinearFormIntegrator>> lfis[4];
     if (trhs)
-      calculateLinearFormIntegrators (*trhs, lfis);
+      calculateLinearFormIntegrators (*trhs, lfis, ma);
 
     // we compute embedding matrices E_C, E_T and particular solution u_p that
     // satisfy
@@ -797,9 +842,9 @@ namespace ngcomp
 
           // skip this element, if the bilinear forms are not defined
           // on this element
-          if (!(top && bfIsDefinedOnElement (*top, mesh_element))
-              && !(cop && bfIsDefinedOnElement (*cop, mesh_element))
-              && !(crhs && bfIsDefinedOnElement (*crhs, mesh_element)))
+          if (!(top && bfIsDefinedOnElement (*top, mesh_element, ma))
+              && !(cop && bfIsDefinedOnElement (*cop, mesh_element, ma))
+              && !(crhs && bfIsDefinedOnElement (*crhs, mesh_element, ma)))
             return;
 
           Array<DofId> dofs, dofs_test, dofs_conforming;
@@ -1091,7 +1136,7 @@ namespace ngcomp
       particular_solution_vec = make_shared<VVector<double>> (fes->GetNDof ());
     particular_solution_vec->operator= (0.0);
     Array<shared_ptr<LinearFormIntegrator>> lfis[4];
-    calculateLinearFormIntegrators (*_trhs, lfis);
+    calculateLinearFormIntegrators (*_trhs, lfis, ma);
 
     ma->IterateElements (
         vb, clh, [&] (Ngs_Element mesh_element, LocalHeap &lh) {