ngstrefftz 0.3.2505.dev25__tar.gz → 0.3.2506.dev2__tar.gz

{ngstrefftz-0.3.2505.dev25 → ngstrefftz-0.3.2506.dev2}/CMakeLists.txt

@@ -10,8 +10,26 @@ if(NOT WIN32)
   set(BoldWhite   "${Esc}[1;37m")
 endif()
 
+function(download_if_possible url file)
+  get_filename_component(dir "${file}" DIRECTORY)
+  file(MAKE_DIRECTORY "${dir}")
+  file(DOWNLOAD "${url}" "${file}.tmp" STATUS status SHOW_PROGRESS TIMEOUT 10)
+  list(GET status 0 code)
+  if(NOT code EQUAL 0)
+    if(EXISTS "${file}")
+      message(WARNING "offline: using existing ${file}")
+    else()
+      message(FATAL_ERROR "failed to download ${file}")
+    endif()
+  else()
+    file(RENAME "${file}.tmp" "${file}")
+  endif()
+endfunction()
+
 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)
+download_if_possible (
+    "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)
 
 ### ngstrefftz
@@ -76,9 +94,9 @@ set(NGSTREFFTZ_USE_LAPACK ${NGSOLVE_USE_LAPACK} CACHE BOOL "Try to use lapack fr
 
 ### link LAPACK or MKL if possible
 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)
+    download_if_possible(
+        "https://raw.githubusercontent.com/NGSolve/ngsolve/master/cmake/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")

{ngstrefftz-0.3.2505.dev25 → ngstrefftz-0.3.2506.dev2}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.2
 Name: ngstrefftz
-Version: 0.3.2505.dev25
+Version: 0.3.2506.dev2
 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.9
-Requires-Dist: ngsolve==6.2.2504
+Requires-Dist: ngsolve==6.2.2506
 Description-Content-Type: text/markdown
 
 # NGSTrefftz

{ngstrefftz-0.3.2505.dev25 → ngstrefftz-0.3.2506.dev2}/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.3.2505.dev25'
-__version_tuple__ = version_tuple = (0, 3, 2505, 'dev25')
+__version__ = version = '0.3.2506.dev2'
+__version_tuple__ = version_tuple = (0, 3, 2506, 'dev2')
 
-__commit_id__ = commit_id = 'ge7c6b8609'
+__commit_id__ = commit_id = 'g6778f15df'

{ngstrefftz-0.3.2505.dev25 → ngstrefftz-0.3.2506.dev2}/docs/requirements.txt

@@ -21,6 +21,6 @@ myst_parser>=3.0.1
 numpy>=2.0.0
 scipy>=1.13.1
 webgui-jupyter-widgets>=0.2.35
-#ngstrefftz==0.3.2504
+#ngstrefftz==0.3.2506
 #ngsolve==6.2.2404.post22.dev0
-xfem==2.1.2504
+xfem==2.1.2506

{ngstrefftz-0.3.2505.dev25 → ngstrefftz-0.3.2506.dev2}/pyproject.toml

@@ -9,7 +9,7 @@ classifiers = [
   "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
 ]
 dependencies = [
-  "ngsolve==6.2.2504",
+  "ngsolve==6.2.2506",
 ]
 
 
@@ -18,7 +18,7 @@ Documentation = "https://paulst.github.io/NGSTrefftz"
 Repository = "https://github.com/PaulSt/ngstrefftz"
 
 [build-system]
-requires = ["ngsolve==6.2.2504",
+requires = ["ngsolve==6.2.2506",
             "scikit-build-core>=0.9.0",
             "pybind11_stubgen",
             "setuptools>=45",

{ngstrefftz-0.3.2505.dev25 → ngstrefftz-0.3.2506.dev2}/src/embtrefftz.cpp

@@ -1,5 +1,6 @@
 #include "embtrefftz.hpp"
 #include "monomialfespace.hpp"
+#include "trefftzfespace.hpp"
 #include <cfloat>
 #include <compressedfespace.hpp>
 
@@ -690,7 +691,8 @@ namespace ngcomp
     Vector<double> sing_val_max;
     Vector<double> sing_val_min;
     std::atomic<size_t> active_elements = 0;
-    double check_conformity_max_deviation = 0.0;
+    double conformity_residual = 0.0;
+    double trefftz_residual = 0.0;
 
     auto ma = fes->GetMeshAccess ();
     const size_t num_elements = ma->GetNE (VOL);
@@ -758,15 +760,16 @@ namespace ngcomp
           size_t ndof = dofs.Size ();
           size_t ndof_test = dofs_test.Size ();
           size_t ndof_conforming = dofs_conforming.Size ();
-          FlatMatrix<SCAL> elmat_A (ndof_test + ndof_conforming, ndof, lh);
-          auto [elmat_Cl, elmat_L] = elmat_A.SplitRows (ndof_conforming);
 
+          FlatMatrix<SCAL> elmat_A (ndof_test + ndof_conforming, ndof, lh);
           FlatMatrix<SCAL> elmat_B (ndof_test + ndof_conforming,
                                     ndof_conforming, lh);
+          Matrix<SCAL> elmat_A_copy;
           elmat_A = static_cast<SCAL> (0.);
           elmat_B = static_cast<SCAL> (0.);
 
-          // elmat_cr is a view into elamt_b
+          // split conformity part
+          auto [elmat_Cl, elmat_L] = elmat_A.SplitRows (ndof_conforming);
           auto elmat_Cr = elmat_B.Rows (ndof_conforming);
 
           // the diff. operator L operates only on volume terms
@@ -837,8 +840,7 @@ namespace ngcomp
 
           FlatMatrix<SCAL, ColMajor> UT (elmat_A.Height (), lh),
               V (elmat_A.Width (), lh);
-          Matrix<SCAL> elmat_A_copy;
-          if (fes_conformity && check_conformity > 0)
+          if (stats)
             elmat_A_copy = elmat_A;
           getSVD<SCAL> (elmat_A, UT, V);
 
@@ -859,25 +861,8 @@ namespace ngcomp
           // T_c solves A @ T_c = B,
           elmat_Tc = elmat_A_inv * elmat_B;
 
-          double maxentry = 0.0;
-          if (fes_conformity && check_conformity > 0)
-            {
-              Matrix<SCAL> test = elmat_A_copy * elmat_Tc - elmat_B;
-              for (size_t i = 0; i < test.Height (); i++)
-                for (size_t j = 0; j < test.Width (); j++)
-                  if (abs (test (i, j)) > maxentry)
-                    maxentry = abs (test (i, j));
-              if (maxentry > check_conformity)
-                throw Exception ((std::stringstream{}
-                                  << "too many conformity constraints in "
-                                     "Trefftz embedding, max entry: "
-                                  << std::scientific << maxentry)
-                                     .str ());
-            }
-
           // if (get_range)
           // elmat_Tt = U.Cols (0, dofs.Size () - ndof_trefftz_i);
-
           if (fes_ip)
             {
               FlatMatrix<SCAL, ColMajor> Vtemp (V.Width (), V.Height (), lh);
@@ -929,18 +914,26 @@ namespace ngcomp
                   sing_val_max[i] = max (sing_val_max[i], abs (diag (i)));
                   sing_val_min[i] = min (sing_val_min[i], abs (diag (i)));
                 }
-              check_conformity_max_deviation
-                  = std::max (check_conformity_max_deviation, maxentry);
+              Matrix<SCAL> test = elmat_A_copy * elmat_Tc - elmat_B;
+              for (auto &cr : test.AsVector ())
+                if (abs (cr) > conformity_residual)
+                  conformity_residual = abs (cr);
+              test = elmat_A_copy * elmat_Tt;
+              for (auto &tr : test.AsVector ())
+                if (abs (tr) > trefftz_residual)
+                  trefftz_residual = abs (tr);
             }
         });
+
     if (stats)
       {
         sing_val_avg /= active_elements.load ();
         (*stats)["singavg"] = Vector<double> (sing_val_avg);
         (*stats)["singmax"] = Vector<double> (sing_val_max);
         (*stats)["singmin"] = Vector<double> (sing_val_min);
-        (*stats)["conformity_deviation"]
-            = Vector<double> ({ check_conformity_max_deviation });
+        (*stats)["conformity_residual"]
+            = Vector<double> ({ conformity_residual });
+        (*stats)["trefftz_residual"] = Vector<double> ({ trefftz_residual });
       }
 
     if constexpr (std::is_same_v<double, SCAL>)
@@ -963,13 +956,11 @@ namespace ngcomp
       size_t _ndof_trefftz, double _eps, shared_ptr<FESpace> _fes,
       shared_ptr<FESpace> _fes_test, shared_ptr<FESpace> _fes_conformity,
       shared_ptr<SumOfIntegrals> _fes_ip, shared_ptr<BitArray> _ignoredofs,
-      shared_ptr<std::map<std::string, Vector<double>>> _stats,
-      double _check_conformity)
+      shared_ptr<std::map<std::string, Vector<double>>> _stats)
       : top (_top), trhs (_trhs), cop (_cop), crhs (_crhs), fes_ip (_fes_ip),
-        ignoredofs (_ignoredofs), stats (_stats),
-        check_conformity (_check_conformity)
+        ignoredofs (_ignoredofs), stats (_stats)
   {
-    if (_ndof_trefftz == 0)
+    if (_ndof_trefftz == std::numeric_limits<size_t>::max ())
       ndof_trefftz = _eps;
     else if (_eps == 0.0)
       ndof_trefftz = _ndof_trefftz;
@@ -1525,15 +1516,14 @@ void ExportEmbTrefftz (py::module m)
                         shared_ptr<FESpace> fes_conformity,
                         shared_ptr<SumOfIntegrals> fes_ip,
                         shared_ptr<BitArray> ignoredofs,
-                        optional<py::dict> pystats, double check_conformity) {
+                        optional<py::dict> pystats) {
             shared_ptr<std::map<std::string, Vector<double>>> stats = nullptr;
             if (pystats)
               stats = make_shared<std::map<std::string, Vector<double>>> ();
             std::shared_ptr<TrefftzEmbedding> emb
                 = std::make_shared<TrefftzEmbedding> (
                     top, trhs, cop, crhs, ndof_trefftz, eps, fes, fes_test,
-                    fes_conformity, fes_ip, ignoredofs, stats,
-                    check_conformity);
+                    fes_conformity, fes_ip, ignoredofs, stats);
             if (pystats)
               for (auto const &x : *stats)
                 (*pystats)[py::cast (x.first)] = py::cast (x.second);
@@ -1562,15 +1552,14 @@ void ExportEmbTrefftz (py::module m)
                  :param ignoredofs: BitArray of dofs from fes to be ignored in the embedding
                  :param stats: optional dictionary to store statistics about the singular values,
                      input dictionary is modified
-                 :param check_conformity: if > 0 checks the viability of the conformity constraint
             )mydelimiter",
           py::arg ("top") = nullptr, py::arg ("trhs") = nullptr,
           py::arg ("cop") = nullptr, py::arg ("crhs") = nullptr,
-          py::arg ("ndof_trefftz") = 0, py::arg ("eps") = 0.0,
-          py::arg ("fes") = nullptr, py::arg ("fes_test") = nullptr,
-          py::arg ("fes_conformity") = nullptr, py::arg ("fes_ip") = nullptr,
-          py::arg ("ignoredofs") = nullptr, py::arg ("stats") = nullopt,
-          py::arg ("check_conformity") = 0.0) // py::none ())
+          py::arg ("ndof_trefftz") = std::numeric_limits<size_t>::max (),
+          py::arg ("eps") = 0.0, py::arg ("fes") = nullptr,
+          py::arg ("fes_test") = nullptr, py::arg ("fes_conformity") = nullptr,
+          py::arg ("fes_ip") = nullptr, py::arg ("ignoredofs") = nullptr,
+          py::arg ("stats") = nullopt) // py::none ())
       .def ("Embed",
             static_cast<shared_ptr<BaseVector> (ngcomp::TrefftzEmbedding::*) (
                 const shared_ptr<const BaseVector>) const> (
@@ -1617,6 +1606,7 @@ void ExportEmbTrefftz (py::module m)
   ExportETSpace<ngcomp::VectorL2FESpace> (m, "VectorL2EmbTrefftzFESpace");
   ExportETSpace<ngcomp::MonomialFESpace> (m, "MonomialEmbTrefftzFESpace");
   ExportETSpace<ngcomp::CompoundFESpace> (m, "CompoundEmbTrefftzFESpace");
+  ExportETSpace<ngcomp::TrefftzFESpace> (m, "TrefftzEmbTrefftzFESpace");
 
   m.def (
       "EmbeddedTrefftzFES",
@@ -1636,6 +1626,9 @@ void ExportEmbTrefftz (py::module m)
         else if (dynamic_pointer_cast<ngcomp::CompoundFESpace> (fes))
           nfes = make_shared<
               ngcomp::EmbTrefftzFESpace<ngcomp::CompoundFESpace>> (emb);
+        else if (dynamic_pointer_cast<ngcomp::TrefftzFESpace> (fes))
+          nfes = make_shared<
+              ngcomp::EmbTrefftzFESpace<ngcomp::TrefftzFESpace>> (emb);
         else
           throw Exception ("Unknown base fes");
         return nfes;

{ngstrefftz-0.3.2505.dev25 → ngstrefftz-0.3.2506.dev2}/src/embtrefftz.hpp

@@ -39,7 +39,6 @@ namespace ngcomp
     std::variant<size_t, double> ndof_trefftz;
 
     shared_ptr<std::map<std::string, Vector<double>>> stats = nullptr;
-    const double check_conformity;
 
     /// elmat = (elmat_conforming | elmat_trefftz)
     Array<optional<Matrix<double>>> etmats;
@@ -74,8 +73,7 @@ namespace ngcomp
                       shared_ptr<SumOfIntegrals> _fes_ip = nullptr,
                       shared_ptr<BitArray> _ignoredofs = nullptr,
                       shared_ptr<std::map<std::string, Vector<double>>> _stats
-                      = nullptr,
-                      double _check_conformity = 0.0);
+                      = nullptr);
 
     shared_ptr<BaseVector>
     Embed (const shared_ptr<const BaseVector> tgfu) const;

{ngstrefftz-0.3.2505.dev25 → ngstrefftz-0.3.2506.dev2}/src/trefftzfespace.cpp

@@ -95,8 +95,8 @@ namespace ngcomp
   }
 
   TrefftzFESpace ::TrefftzFESpace (shared_ptr<MeshAccess> ama,
-                                   const Flags &flags)
-      : FESpace (ama, flags)
+                                   const Flags &flags, bool checkflags)
+      : FESpace (ama, flags, checkflags)
   {
     type = "trefftzfespace";
 

{ngstrefftz-0.3.2505.dev25 → ngstrefftz-0.3.2506.dev2}/src/trefftzfespace.hpp

@@ -176,7 +176,8 @@ namespace ngcomp
     FiniteElement &TGetFE (ElementId ei, Allocator &alloc) const;
 
   public:
-    TrefftzFESpace (shared_ptr<MeshAccess> ama, const Flags &flags);
+    TrefftzFESpace (shared_ptr<MeshAccess> ama, const Flags &flags,
+                    bool checkflags = false);
     ~TrefftzFESpace ();
     void Update () override;
     void UpdateCouplingDofArray () override;