ngstrefftz 0.3.2607.dev15__tar.gz → 0.3.2607.dev25__tar.gz

{ngstrefftz-0.3.2607.dev15 → ngstrefftz-0.3.2607.dev25}/CMakeLists.txt

@@ -37,6 +37,24 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_BINARY_DIR}/cmake_modules)
 set(addon_name ngstrefftz)
 project(ngstrefftz)
 include(${CMAKE_BINARY_DIR}/cmake_modules/ngsolve_addon.cmake)
+set(NGSTREFFTZ_USE_XFEM AUTO CACHE STRING "Build with xfem support")
+set_property(CACHE NGSTREFFTZ_USE_XFEM PROPERTY STRINGS AUTO ON OFF)
+if(NOT NGSTREFFTZ_USE_XFEM STREQUAL "OFF")
+  if(NOT xfem_DIR)
+    execute_process(COMMAND ${Python3_EXECUTABLE} -c
+      "import importlib.util; from pathlib import Path; print(Path(importlib.util.find_spec('xfem').origin).parent / 'cmake')"
+      OUTPUT_VARIABLE xfem_DIR OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
+  endif()
+  find_package(xfem CONFIG QUIET)
+  if(xfem_FOUND)
+    set(NGSTREFFTZ_USE_XFEM ON)
+  elseif(NGSTREFFTZ_USE_XFEM STREQUAL "ON")
+    message(FATAL_ERROR "NGSTREFFTZ_USE_XFEM=ON but xfem was not found")
+  else()
+    set(NGSTREFFTZ_USE_XFEM OFF)
+    message(WARNING "xfem not found, building without aggregation support")
+  endif()
+endif()
 set(NGSTREFFTZ_USE_NGSTENTS AUTO CACHE STRING "Build with ngstents support")
 set_property(CACHE NGSTREFFTZ_USE_NGSTENTS PROPERTY STRINGS AUTO ON OFF)
 if(NOT NGSTREFFTZ_USE_NGSTENTS STREQUAL "OFF")
@@ -73,12 +91,17 @@ add_ngsolve_addon(ngstrefftz
     #src/airy.cpp #for testing, requires boost
   )
 target_compile_definitions(ngstrefftz PRIVATE NGSTREFFTZ_EXPORTS)
+if(NGSTREFFTZ_USE_XFEM)
+  target_sources(ngstrefftz PRIVATE src/aggregatedl2space.cpp)
+  target_compile_definitions(ngstrefftz PRIVATE NGSTREFFTZ_USE_XFEM)
+  target_link_libraries(ngstrefftz PRIVATE xfem::core)
+endif()
 if(NGSTREFFTZ_USE_NGSTENTS)
   target_sources(ngstrefftz PRIVATE src/twavetents.cpp src/mesh1dtents.cpp)
   target_compile_definitions(ngstrefftz PRIVATE NGSTREFFTZ_USE_NGSTENTS)
   target_link_libraries(ngstrefftz PRIVATE ngstents::core)
-  ngsolve_addon_set_relative_rpath(ngstrefftz "../ngstents")
 endif()
+ngsolve_addon_set_relative_rpath(ngstrefftz "../ngstents" "../xfem")
 # add dynamic loader library to link libraries (on linux)
 if(CMAKE_DL_LIBS)
     target_link_libraries(ngstrefftz PRIVATE ${CMAKE_DL_LIBS})
@@ -138,6 +161,7 @@ message("${BoldCyan}
     Doxygen: ........... ${NGSTREFFTZ_BUILD_DOC}
     GTest: ............. ${NGSTREFFTZ_USE_GTEST}
     ngstents: .......... ${NGSTREFFTZ_USE_NGSTENTS}
+    xfem: .............. ${NGSTREFFTZ_USE_XFEM}
 
 With 'make install' the package will be installed to: ${CMAKE_INSTALL_PREFIX}
 Make sure to add it to the python path:
@@ -155,16 +179,21 @@ file(COPY
     ${CMAKE_SOURCE_DIR}/test/tents.py
     ${CMAKE_SOURCE_DIR}/test/conforming_trefftz.py
     ${CMAKE_SOURCE_DIR}/test/boxint.py
+    ${CMAKE_SOURCE_DIR}/test/aggregate_embtrefftz.py
     DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing)
-add_test(NAME embtrefftz COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/embt.py)
-add_test(NAME conforming_trefftz COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/conforming_trefftz.py)
-add_test(NAME trefftz COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/trefftz.py)
-set(tests_with_pythonpath embtrefftz trefftz)
+add_test(NAME embtrefftz COMMAND ${Python3_EXECUTABLE} -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/embt.py)
+add_test(NAME conforming_trefftz COMMAND ${Python3_EXECUTABLE} -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/conforming_trefftz.py)
+add_test(NAME trefftz COMMAND ${Python3_EXECUTABLE} -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/trefftz.py)
+set(tests_with_pythonpath embtrefftz conforming_trefftz trefftz box)
 if(NGSTREFFTZ_USE_NGSTENTS)
-  add_test(NAME tents COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/tents.py)
+  add_test(NAME tents COMMAND ${Python3_EXECUTABLE} -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/tents.py)
   list(APPEND tests_with_pythonpath tents)
 endif()
-add_test(NAME box COMMAND python3 -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/boxint.py)
+add_test(NAME box COMMAND ${Python3_EXECUTABLE} -m doctest ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/boxint.py)
+if(NGSTREFFTZ_USE_XFEM)
+  add_test(NAME aggregate_embtrefftz COMMAND ${Python3_EXECUTABLE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Testing/aggregate_embtrefftz.py)
+  list(APPEND tests_with_pythonpath aggregate_embtrefftz)
+endif()
 #WORKING_DIRECTORY ${ CMAKE_CURRENT_SOURCE_DIR }
 set_tests_properties(${tests_with_pythonpath}
     PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:${NGSOLVE_INSTALL_DIR}/${NGSOLVE_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH})

{ngstrefftz-0.3.2607.dev15 → ngstrefftz-0.3.2607.dev25}/PKG-INFO

@@ -1,14 +1,15 @@
 Metadata-Version: 2.2
 Name: ngstrefftz
-Version: 0.3.2607.dev15
+Version: 0.3.2607.dev25
 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.2607
-Requires-Dist: ngstents==0.1.2607rc1
+Requires-Dist: ngsolve==6.2.2608
+Requires-Dist: ngstents==0.1.2608rc1
+Requires-Dist: xfem==2.1.2608
 Description-Content-Type: text/markdown
 
 # NGSTrefftz

{ngstrefftz-0.3.2607.dev15 → ngstrefftz-0.3.2607.dev25}/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.3.2607.dev15'
-__version_tuple__ = version_tuple = (0, 3, 2607, 'dev15')
+__version__ = version = '0.3.2607.dev25'
+__version_tuple__ = version_tuple = (0, 3, 2607, 'dev25')
 
-__commit_id__ = commit_id = 'g67e347b30'
+__commit_id__ = commit_id = 'g2526e1fdf'

{ngstrefftz-0.3.2607.dev15 → ngstrefftz-0.3.2607.dev25}/docs/requirements.txt

@@ -22,5 +22,3 @@ myst_parser>=3.0.1
 numpy>=2.0.0
 scipy>=1.13.1
 webgui-jupyter-widgets>=0.2.35
-
-# xfem==2.1.2606

{ngstrefftz-0.3.2607.dev15 → ngstrefftz-0.3.2607.dev25}/pyproject.toml

@@ -9,8 +9,9 @@ classifiers = [
   "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
 ]
 dependencies = [
-  "ngsolve==6.2.2607",
-  "ngstents==0.1.2607rc1",
+  "ngsolve==6.2.2608",
+  "ngstents==0.1.2608rc1",
+  "xfem==2.1.2608",
 ]
 
 [project.urls]
@@ -19,8 +20,9 @@ Repository = "https://github.com/PaulSt/ngstrefftz"
 
 [build-system]
 requires = [
-  "ngsolve==6.2.2607",
-  "ngstents==0.1.2607rc1",
+  "ngsolve==6.2.2608",
+  "ngstents==0.1.2608rc1",
+  "xfem==2.1.2608",
   "scikit-build-core>=0.9.0",
   "pybind11_stubgen",
   "setuptools>=45",

{ngstrefftz-0.3.2607.dev15 → ngstrefftz-0.3.2607.dev25}/src/__init__.py

@@ -1,4 +1,13 @@
 import ngsolve
+import sys
+
+# xfem registers its DLL directory before loading our extension on Windows.
+if sys.platform == "win32":
+    try:
+        import xfem as _xfem
+    except ModuleNotFoundError as _error:
+        if _error.name != "xfem":
+            raise
 
 try:
     import ngstents as _ngstents

ngstrefftz-0.3.2607.dev25/src/aggregatedl2space.cpp

@@ -0,0 +1,160 @@
+#include "aggregatedl2space.hpp"
+
+#include <python_comp.hpp>
+
+namespace ngcomp
+{
+  AggregatedL2Space::AggregatedL2Space (
+      shared_ptr<MeshAccess> ama, const Flags &flags,
+      shared_ptr<ElementAggregation> aaggregation)
+      : MonomialFESpace (ama, Flags (flags).SetFlag (
+                                  "order", flags.GetNumFlag ("order", 0))),
+        aggregation (aaggregation)
+  {
+    type = "aggregatedl2";
+  }
+
+  void AggregatedL2Space::Update ()
+  {
+    FESpace::Update ();
+
+    const size_t ne = ma->GetNE (VOL);
+    const size_t npatches = aggregation->GetNPatches (true);
+    element_to_patch.SetSize (ne);
+    element_to_patch = -1;
+    centers2.SetSize (npatches);
+    centers3.SetSize (npatches);
+    scales.SetSize (npatches);
+
+    Array<size_t> els;
+    for (size_t patch = 0; patch < npatches; patch++)
+      {
+        aggregation->GetPatch (patch, els);
+        for (size_t el : els)
+          element_to_patch[el] = patch;
+        if (D == 2)
+          UpdateGeometry<2> (patch, els);
+        else
+          UpdateGeometry<3> (patch, els);
+      }
+
+    SetNDof (npatches * local_ndof);
+    UpdateCouplingDofArray ();
+  }
+
+  void AggregatedL2Space::UpdateCouplingDofArray ()
+  {
+    ctofdof.SetSize (GetNDof ());
+    ctofdof = UNUSED_DOF;
+    for (size_t el : Range (ma->GetNE (VOL)))
+      if (element_to_patch[el] >= 0 && DefinedOn (ElementId (VOL, el)))
+        for (size_t j : Range (local_ndof))
+          ctofdof[element_to_patch[el] * local_ndof + j]
+              = aggregation->GetElsInNontrivialPatch ()->Test (el)
+                    ? WIREBASKET_DOF
+                    : LOCAL_DOF;
+  }
+
+  void AggregatedL2Space::GetDofNrs (ElementId ei, Array<DofId> &dnums) const
+  {
+    dnums.SetSize0 ();
+    if (ei.VB () != VOL || !DefinedOn (ei) || element_to_patch[ei.Nr ()] < 0)
+      return;
+    const int first = element_to_patch[ei.Nr ()] * local_ndof;
+    for (size_t j : Range (local_ndof))
+      dnums.Append (first + j);
+  }
+
+  DofPatches AggregatedL2Space::GetDofPatches () const
+  {
+    size_t npatches = aggregation->GetNPatches (true);
+    TableCreator<size_t> elements (npatches);
+    Array<size_t> els;
+    for (; !elements.Done (); elements++)
+      for (size_t p : Range (npatches))
+        {
+          aggregation->GetPatch (p, els);
+          for (size_t el : els)
+            elements.Add (p, el);
+        }
+    DofPatches patches{ elements.MoveTable (),
+                        Table<DofId> (npatches, local_ndof) };
+    auto dofs = patches.dofs.AsArray ();
+    for (size_t d : Range (dofs))
+      dofs[d] = d;
+    return patches;
+  }
+
+  FiniteElement &
+  AggregatedL2Space::GetFE (ElementId ei, Allocator &alloc) const
+  {
+    if (ei.VB () != VOL)
+      return MonomialFESpace::GetFE (ei, alloc);
+    const int patch = element_to_patch[ei.Nr ()];
+    const ELEMENT_TYPE et = ma->GetElType (ei);
+    if (patch < 0 || !DefinedOn (ei))
+      return SwitchET<ET_TRIG, ET_QUAD, ET_TET, ET_HEX, ET_PRISM, ET_PYRAMID> (
+          et, [&alloc] (auto type) -> FiniteElement & {
+            return *new (alloc) DummyFE<type.ElementType ()>;
+          });
+    if (D == 2)
+      return *(new (alloc) ScalarMappedElement<2> (local_ndof, order, basismat,
+                                                   et, centers2[patch],
+                                                   Vec<2> (scales[patch])));
+    return *(new (alloc) ScalarMappedElement<3> (local_ndof, order, basismat,
+                                                 et, centers3[patch],
+                                                 Vec<3> (scales[patch])));
+  }
+
+  template <int DIM>
+  void AggregatedL2Space::UpdateGeometry (size_t patch, FlatArray<size_t> els)
+  {
+    Vec<DIM> center = 0.0;
+    size_t npoints = 0;
+    for (size_t el : els)
+      for (int vertex : ma->GetElVertices (ElementId (VOL, el)))
+        {
+          center += ma->GetPoint<DIM> (vertex);
+          npoints++;
+        }
+    center *= 1.0 / npoints;
+
+    double diameter = 0.0;
+    for (size_t el : els)
+      for (int vertex : ma->GetElVertices (ElementId (VOL, el)))
+        diameter
+            = max (diameter, L2Norm (ma->GetPoint<DIM> (vertex) - center));
+
+    if constexpr (DIM == 2)
+      centers2[patch] = center;
+    else
+      centers3[patch] = center;
+    scales[patch] = 1.0 / diameter;
+  }
+
+  template void
+  AggregatedL2Space::UpdateGeometry<2> (size_t, FlatArray<size_t>);
+  template void
+  AggregatedL2Space::UpdateGeometry<3> (size_t, FlatArray<size_t>);
+}
+
+#ifdef NGS_PYTHON
+void ExportAggregatedL2Space (py::module m)
+{
+  using namespace ngcomp;
+  py::class_<AggregatedL2Space, shared_ptr<AggregatedL2Space>, FESpace> (
+      m, "AggregatedL2Space")
+      .def (py::init ([] (shared_ptr<MeshAccess> ma,
+                          shared_ptr<ElementAggregation> aggregation,
+                          py::kwargs kwargs) {
+              Flags flags = ngcore::CreateFlagsFromKwArgs (kwargs);
+              auto fes
+                  = make_shared<AggregatedL2Space> (ma, flags, aggregation);
+              fes->Update ();
+              fes->FinalizeUpdate ();
+              fes->ConnectAutoUpdate ();
+              return fes;
+            }),
+            py::arg ("mesh"), py::arg ("aggregation"));
+}
+#endif

ngstrefftz-0.3.2607.dev25/src/aggregatedl2space.hpp

@@ -0,0 +1,45 @@
+#ifndef FILE_AGGREGATEDL2SPACE_HPP
+#define FILE_AGGREGATEDL2SPACE_HPP
+
+#include "monomialfespace.hpp"
+#include "dofpatches.hpp"
+#include <xfem/aggregates.hpp>
+
+namespace ngcomp
+{
+  class AggregatedL2Space : public MonomialFESpace, public DofPatchProvider
+  {
+    shared_ptr<ElementAggregation> aggregation;
+    Array<int> element_to_patch;
+    Array<Vec<2>> centers2;
+    Array<Vec<3>> centers3;
+    Array<double> scales;
+
+  public:
+    AggregatedL2Space (shared_ptr<MeshAccess> ama, const Flags &flags,
+                       shared_ptr<ElementAggregation> aaggregation);
+
+    void Update () override;
+    void UpdateCouplingDofArray () override;
+    void GetDofNrs (ElementId ei, Array<DofId> &dnums) const override;
+    FiniteElement &GetFE (ElementId ei, Allocator &alloc) const override;
+    DofPatches GetDofPatches () const override;
+
+    string GetClassName () const override { return "AggregatedL2Space"; }
+    shared_ptr<ElementAggregation> GetAggregation () const
+    {
+      return aggregation;
+    }
+
+  private:
+    template <int DIM>
+    void UpdateGeometry (size_t patch, FlatArray<size_t> els);
+  };
+}
+
+#ifdef NGS_PYTHON
+#include <python_ngstd.hpp>
+void ExportAggregatedL2Space (py::module m);
+#endif
+
+#endif

ngstrefftz-0.3.2607.dev25/src/dofpatches.hpp

@@ -0,0 +1,24 @@
+#ifndef FILE_DOFPATCHES_HPP
+#define FILE_DOFPATCHES_HPP
+
+#include <comp.hpp>
+
+namespace ngcomp
+{
+  /// Independent trial DOF groups; their element supports may overlap.
+  /// Matching trial/test providers must number corresponding groups alike.
+  struct DofPatches
+  {
+    Table<size_t> elements;
+    Table<DofId> dofs;
+  };
+
+  class DofPatchProvider
+  {
+  public:
+    virtual ~DofPatchProvider () = default;
+    virtual DofPatches GetDofPatches () const = 0;
+  };
+}
+
+#endif