xfem 2.1.2507.dev33__tar.gz → 2.1.2604.dev2__tar.gz

{xfem-2.1.2507.dev33 → xfem-2.1.2604.dev2}/.github/workflows/pypi.yml

@@ -23,7 +23,7 @@ jobs:
             cmake-generator: "Visual Studio 16 2019"
             cmake_generator_platform: "x64"
             doit: ${{ inputs.level != 'quick' }}
-            cibw_build: cp39-* cp310-* cp311-* cp312-* cp313-*
+            cibw_build: cp311-* cp312-* cp313-* cp314-*
 
     steps:
       - uses: actions/checkout@v4
@@ -33,7 +33,7 @@ jobs:
           fetch-depth: 0
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.2
+        uses: pypa/cibuildwheel@v2.23.0
 
       - uses: actions/upload-artifact@v4
         with:

{xfem-2.1.2507.dev33 → xfem-2.1.2604.dev2}/CMakeLists.txt

@@ -24,7 +24,7 @@ include_directories ("${PROJECT_BINARY_DIR}")
 if(SKBUILD_PROJECT_VERSION)
   set(NGSXFEM_VERSION ${SKBUILD_PROJECT_VERSION})
 else()
-  set(NGSXFEM_VERSION "2.1.2507.dev0")
+  set(NGSXFEM_VERSION "2.1.2603.dev0")
   file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/python/_version.py "__version__ = \"${NGSXFEM_VERSION}\"\n")
 endif()
 

{xfem-2.1.2507.dev33 → xfem-2.1.2604.dev2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: xfem
-Version: 2.1.2507.dev33
+Version: 2.1.2604.dev2
 Summary: (ngs)xfem is an Add-on library to Netgen/NGSolve for unfitted/cut FEM.
 Author-Email: Christoph Lehrenfeld <lehrenfeld@math.uni-goettingen.de>
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Project-URL: github, https://github.com/ngsxfem/ngsxfem
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Requires-Dist: ngsolve==6.2.2603
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"

{xfem-2.1.2507.dev33 → xfem-2.1.2604.dev2}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [{name="Christoph Lehrenfeld", email= "lehrenfeld@math.uni-goettingen.
 description = "(ngs)xfem is an Add-on library to Netgen/NGSolve for unfitted/cut FEM."
 urls = {github="https://github.com/ngsxfem/ngsxfem"}
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 #dependencies = [] # ngsolve will be added automatically
 classifiers = [
   "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
@@ -18,7 +18,7 @@ requires = ["setuptools>=45",
             "pybind11_stubgen", 
             "cmake>=3.26.1", 
             "numpy", 
-            "ngsolve>=6.2.2506",
+            "ngsolve>=6.2.2603",
             "toml;  python_version >= '3.11'", 
             "tomli>=1.1.0; python_version < '3.11'"
             ]
@@ -50,6 +50,7 @@ testpaths = ["tests"]
 [tool.cibuildwheel]
 #build-verbosity = 1
 manylinux-x86_64-image = "cerbsim/manylinux_2_28_x86_64_cuda_12.8"
+build = "cp310-* cp311-* cp312-* cp313-* cp314-*"
 skip = """
   pp*
   *_i686
@@ -57,6 +58,9 @@ skip = """
   *win32
 """
 
+[tool.cibuildwheel.windows]
+build = "cp311-* cp312-* cp313-* cp314-*"
+
 [tool.cibuildwheel.linux]
 repair-wheel-command = "mv {wheel} {dest_dir} && rename linux_x86_64 manylinux_2_28_x86_64.manylinux2014_x86_64 {dest_dir}/*-linux_x86_64*.whl"
 

{xfem-2.1.2507.dev33 → xfem-2.1.2604.dev2}/python/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.1.2507.dev33'
-__version_tuple__ = version_tuple = (2, 1, 2507, 'dev33')
+__version__ = version = '2.1.2604.dev2'
+__version_tuple__ = version_tuple = (2, 1, 2604, 'dev2')
 
-__commit_id__ = commit_id = 'g7fac60381'
+__commit_id__ = commit_id = 'gf016cdefe'

{xfem-2.1.2507.dev33 → xfem-2.1.2604.dev2}/tests/pytests/test_simd_lf_blf.py

@@ -557,7 +557,60 @@ def test_ghost_penalty(order, quad):
     assert diff < 1e-9
 
 
-# copy from test_differential_symbol.pytest - this test compares the result SIMD to non-SIMD
+# Regression test: SIMD path for dCut(skeleton=True) with L2 FE space and
+# specialcf.normal (flux terms).  Without ComputeNormalsAndMeasure on the SIMD
+# MIRs, the normal vector and facet surface measure are wrong, making flux
+# contributions vanish and the jump term have an incorrect magnitude.
+@pytest.mark.parametrize("order", [1, 2, 3])
+@pytest.mark.parametrize("DOM", [POS, NEG])
+def test_cut_facet_dg_l2(order, DOM):
+    mesh = Mesh(unit_square.GenerateMesh(maxh=0.2))
+    levelset = (x - 0.5)**2 + (y - 0.5)**2 - 0.33**2
+
+    if order > 1:
+        lsetmeshadap = LevelSetMeshAdaptation(mesh, order=order, levelset=levelset)
+    else:
+        lsetmeshadap = NoDeformation(mesh, levelset)
+    lset_h = lsetmeshadap.lset_p1
+    deform = lsetmeshadap.deform
+
+    ci = CutInfo(mesh, lset_h)
+    els_hasdom = ci.GetElementsOfType(HAS(DOM))
+    facets_dom = GetFacetsWithNeighborTypes(mesh, a=els_hasdom, b=els_hasdom)
+
+    V = L2(mesh, order=order, dgjumps=True)
+    u, v = V.TnT()
+
+    nF = specialcf.normal(mesh.dim)
+    h = specialcf.mesh_size
+    jump_u = u - u.Other()
+    jump_v = v - v.Other()
+    flux_u = -0.5 * (grad(u) + grad(u.Other())) * nF
+    flux_v = -0.5 * (grad(v) + grad(v.Other())) * nF
+    form = 1/h * jump_u * jump_v + flux_u * jump_v + flux_v * jump_u
+
+    dw = dCut(lset_h, DOM, definedonelements=facets_dom, deformation=deform,
+              skeleton=True, element_boundary=False)
+
+    a1 = RestrictedBilinearForm(V, element_restriction=els_hasdom,
+                                facet_restriction=facets_dom, check_unused=False)
+    a1 += form * dw
+    a2 = RestrictedBilinearForm(V, element_restriction=els_hasdom,
+                                facet_restriction=facets_dom, check_unused=False)
+    a2 += form * dw
+
+    ngsxfemglobals.simd_eval = True
+    a1.Assemble()
+    ngsxfemglobals.simd_eval = False
+    a2.Assemble()
+
+    diff = a1.mat.AsVector().CreateVector()
+    diff.data = a1.mat.AsVector() - a2.mat.AsVector()
+    rel_diff = Norm(diff) / max(Norm(a2.mat.AsVector()), 1e-30)
+    assert rel_diff < 1e-9
+
+
+
 @pytest.mark.parametrize('order', [1, 2, 3])
 @pytest.mark.parametrize('DOM', [POS, NEG])
 @pytest.mark.parametrize('skeleton', [True, False])

{xfem-2.1.2507.dev33 → xfem-2.1.2604.dev2}/xfem/symboliccutbfi.cpp

@@ -1097,6 +1097,9 @@ namespace ngfem
         simd_mir1.SetOtherMIR(&simd_mir2);
         simd_mir2.SetOtherMIR(&simd_mir1);
 
+        simd_mir1.ComputeNormalsAndMeasure(eltype1, LocalFacetNr1);
+        simd_mir2.ComputeNormalsAndMeasure(eltype2, LocalFacetNr2);
+
         for (int l1 : Range(test_proxies)) {
           HeapReset hr(lh);
           auto proxy2 = test_proxies[l1];