ngstrefftz 0.3.2403.dev17__tar.gz → 0.3.2405.dev5__tar.gz

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           python-version: '3.12'
       - name: install ngstrefftz
-        run: cd NGSTrefftz && pip install numpy mkl-devel==2024.* mkl==2024.* && pip install . 
+        run: cd NGSTrefftz && pip install numpy mkl-devel==2024.* mkl==2024.* && pip install . -v
       - name: run test
         run: cd $GITHUB_WORKSPACE/NGSTrefftz/test && python3 -m doctest -v *.py
 

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/CMakeLists.txt

@@ -14,30 +14,13 @@ file(DOWNLOAD https://raw.githubusercontent.com/NGSolve/ngsolve-addon-template/m
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_BINARY_DIR}/cmake_modules")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} CACHE PATH "build dir")
 
-### add ngstents dependency if needed
-set(INSTALL_TENTS ON CACHE BOOL "Install ngstents")
-if (INSTALL_TENTS)# AND NOT TARGET _pytents)
-    include_directories(${CMAKE_SOURCE_DIR}/external_dependencies/ngstents/src)
-    set(addon_name _pytents)
-    project(_pytents)
-    include(${CMAKE_BINARY_DIR}/cmake_modules/ngsolve_addon.cmake)
-    add_ngsolve_addon( _pytents 
-      ${CMAKE_SOURCE_DIR}/external_dependencies/ngstents/src/python_tents.cpp
-      ${CMAKE_SOURCE_DIR}/external_dependencies/ngstents/src/tents.cpp
-      )
-    target_compile_definitions(_pytents PRIVATE NGSTENT_EXPORTS)
-    set_target_properties(_pytents PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngstents")
-    file(WRITE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngstents/__init__.py "from ._pytents import TentSlab, Tent")
-    set(install_dir ${ADDON_INSTALL_DIR_PYTHON}/ngstents)
-    install(TARGETS _pytents DESTINATION ${install_dir})
-    install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngstents/__init__.py DESTINATION ${install_dir})
-endif(INSTALL_TENTS)
-
 ### ngstrefftz
 set(addon_name _trefftz)
 project(_trefftz)
+include_directories(${CMAKE_SOURCE_DIR}/external_dependencies/ngstents/src)
 include(${CMAKE_BINARY_DIR}/cmake_modules/ngsolve_addon.cmake)
 add_ngsolve_addon( _trefftz 
+    ${CMAKE_SOURCE_DIR}/external_dependencies/ngstents/src/tents.cpp
     src/python_trefftz.cpp
     src/diffopmapped.hpp
     src/scalarmappedfe.cpp
@@ -50,83 +33,99 @@ add_ngsolve_addon( _trefftz
     src/monomialfespace.cpp 
     src/mesh1dtents.cpp
     src/condensedg.cpp
+    src/pufe.cpp
+    src/pufespace.cpp
     #src/airy.cpp #for testing, requires boost
   )
-target_link_libraries(_trefftz PRIVATE _pytents)
 target_compile_definitions(_trefftz PRIVATE NGSTREFFTZ_EXPORTS)
+target_compile_definitions(_trefftz PRIVATE NGSTENT_EXPORTS)
 
 ### link LAPACK or MKL if possible
 set(NGSTREFFTZ_USE_MKL ${NGSOLVE_USE_MKL} CACHE BOOL "Try to use mkl")
 set(NGSTREFFTZ_USE_LAPACK ${NGSOLVE_USE_LAPACK} CACHE BOOL "Try to use lapack from ngsolve")
 if (NGSTREFFTZ_USE_MKL)
-    #list(GET NGSOLVE_INCLUDE_DIRS 0 NGSOLVE_MKL_INCLUDE_DIRS)
-    file(DOWNLOAD https://raw.githubusercontent.com/NGSolve/ngsolve/master/cmake/cmake_modules/FindMKL.cmake ${CMAKE_BINARY_DIR}/cmake_modules/FindMKL.cmake)
+    file(DOWNLOAD 
+    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")
+
+    #message(STATUS "MKL_ROOT=${MKL_ROOT}")
+    #message(STATUS "NGSOLVED=${NGSolve_DIR}")
+
 
+    #set(PIP_MKL_ROOT FALSE CACHE BOOL "Set to true if MKL_ROOT is set by pip")
+    #message(STATUS "PIP_MKL_ROOT=${PIP_MKL_ROOT}")
+    #if(PIP_MKL_ROOT AND LINUX)
+        #set(MKL_ROOT "${NGSolve_DIR}/../../.." 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" )
+        #message(STATUS "set MKL_LIBRARY=${MKL_LIBRARY}")
+    #elseif(PIP_MKL_ROOT AND WIN32)
+        #set(MKL_ROOT "${NGSolve_DIR}/../../../.." CACHE PATH "MKL root directory" )
+        #set(MKL_LIBRARY "${MKL_ROOT}/Library/lib/mkl_rt.lib" CACHE PATH "MKL library" )
+        #set(MKL_INCLUDE_DIR "${MKL_ROOT}/Library/include" CACHE PATH "MKL include directory" )
+    #endif()
+
+    set(MKL_ARCH "intel64")
+    if(NOT MKL_INTERFACE)
+        set(MKL_INTERFACE "lp64")
+    endif(NOT MKL_INTERFACE)
     set(MKL_MULTI_THREADED ON CACHE BOOL "Use threaded MKL libs")
     if(NOT MKL_MULTI_THREADED)
       set(MKL_THREADING sequential)
     endif()
     set(MKL_STATIC OFF CACHE BOOL "Link static MKL")
     set(MKL_SDL ON CACHE BOOL "Link single dynamic MKL lib")
-    set(MKL_ARCH "intel64")
     if(NOT MKL_LINK)
       if(MKL_STATIC)
         set(MKL_LINK static)
-      elseif(MKL_SDL AND NOT USE_MPI)
+      elseif(MKL_SDL)
         set(MKL_LINK sdl)
       else()
         set(MKL_LINK dynamic)
       endif()
     endif()
-    #execute_process(COMMAND ${Python3_EXECUTABLE} -c "import sys; print(sys.prefix)"
-        #OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE rootdir)
-    #if(WIN32)
-        #set(MKL_ROOT ${rootdir})
-        #set(MKL_LIBRARY ${rootdir}/Library/lib/mkl_rt.lib)
-        #set(MKL_INCLUDE_DIR ${rootdir}/Library/include)
-    #elseif(UNIX AND NOT APPLE)
-        #set(MKL_ROOT ${rootdir})
-        #set(MKL_LIBRARY ${rootdir}/lib/libmkl_rt.so.2)
-        #set(MKL_INCLUDE_DIR ${rootdir}/include)
-    #endif()
-    find_package(MKL) # HINTS ${MKL_ROOT} ${CMAKE_INSTALL_PREFIX}/../../cmake/mkl ${Python3_ROOT_DIR}/lib/cmake/mkl)
-    #message("MKL minimal: ${MKL_MINIMAL_LIBRARIES}")
-    #message("MKL libraries: ${MKL_LIBRARIES}")
-    #message("MKL link flags: ${MKL_LINK_FLAGS}")
-
-    #if(MKL_FOUND)
-    if(MKL_MINIMAL_LIBRARIES)
-        set(LAPACK_LIBRARIES "${MKL_LIBRARIES}")
-        message(STATUS "Setting LAPACK_LIBRARIES=${LAPACK_LIBRARIES}")
-        target_include_directories(_trefftz PRIVATE "${MKL_INCLUDE_DIRS}")
+
+    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" )
     endif()
-    if(MKL_LIBRARY)
-        message(STATUS "MKL_LIBRARY=${MKL_LIBRARY}")
-        #if(WIN32)
-            #set(LAPACK_LIBRARIES "${MKL_MINIMAL_LIBRARIES}")
-        #else()
-            #set(LAPACK_LIBRARIES "${MKL_LIBRARIES}")
-        #endif()
-    #if(NOT MKL_LIBRARIES)
-        #if(APPLE OR WIN32)
-          #set(MKL_RT_NAME mkl_rt.2)
-        #else()
-          #set(MKL_RT_NAME libmkl_rt.so.2)
-        #endif()
-        get_filename_component(MKL_RT_NAME ${MKL_LIBRARY} NAME)
-        message(STATUS "MKL_RT_NAME=${MKL_RT_NAME}")
-        find_library(MKLRT ${MKL_RT_NAME} HINTS ${MKL_ROOT}/lib ${MKL_LIBRARY})
-        message(STATUS "MKLRT=${MKLRT}")
-        if(MKLRT)
-            set(LAPACK_LIBRARIES ${MKLRT})
-            message(STATUS "MKLRT setting LAPACK_LIBRARIES=${LAPACK_LIBRARIES}")
-        endif()
-    #else()
-        #message("${Red}MKL not found, switching off NGSTREFFTZ_USE_LAPACK!${ColourReset}")
-        #set(NGSTREFFTZ_USE_LAPACK OFF)
+    #set(MKL_VERSION_H "${MKL_ROOT}/include/mkl_version.h")
+
+    #set(d lib/cmake/mkl)
+    #find_package(MKL CONFIG REQUIRED HINTS ${MKL_CONF} ${MKL_ROOT}/${d} PATHS /opt/intel/oneapi/mkl/latest/${d} ~/.local/${d})
+
+    unset(USE_MPI CACHE)
+    find_package(MKL)
+
+    #if(USE_MUMPS)
+        ## include scalapack
+        #set( LAPACK_LIBRARIES "${MKL_LIBRARIES}")
+        #set( ENABLE_SCALAPACK ON)
+    #else(USE_MUMPS)
+        #set( LAPACK_LIBRARIES "${MKL_MINIMAL_LIBRARIES}")
+    #endif(USE_MUMPS)
+
+    if(MKL_FOUND)
+        message(STATUS "Found MKL_MINIMAL_LIBRARIES=${MKL_MINIMAL_LIBRARIES}")
+        set( LAPACK_LIBRARIES "${MKL_MINIMAL_LIBRARIES}")
+    else()
+        message("${Red}MKL not found!${ColourReset}")
     endif()
 endif (NGSTREFFTZ_USE_MKL)
 if(NGSTREFFTZ_USE_LAPACK AND NOT LAPACK_LIBRARIES)
+    message(STATUS "Looking for LAPACK")
     find_package(LAPACK)
 endif(NGSTREFFTZ_USE_LAPACK AND NOT LAPACK_LIBRARIES)
 if(LAPACK_LIBRARIES)
@@ -155,11 +154,10 @@ message("${BoldCyan}
   Enabled functionality:
     LAPACK: ............ ${NGSTREFFTZ_USE_LAPACK} 
     MKL: ............... ${NGSTREFFTZ_USE_MKL}
-    ngstents: .......... ${INSTALL_TENTS}
 
 With 'make install' the package will be installed to: ${CMAKE_INSTALL_PREFIX}
 Make sure to add it to the python path: 
--->   export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${ADDON_INSTALL_DIR_PYTHON}:$PYTHONPATH
+-->   export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${python3_library_dir}:$PYTHONPATH
 ------------------------------------------------------------------------
 \n${ColourReset}")
 

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/PKG-INFO

@@ -1,15 +1,14 @@
 Metadata-Version: 2.1
 Name: ngstrefftz
-Version: 0.3.2403.dev17
+Version: 0.3.2405.dev5
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Author-Email: Paul Stocker <paul.stocker@univie.ac.at>
-License: LGPL2.1
+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.2404.post16
-Requires-Dist: pytest; extra == "test"
-Provides-Extra: test
+Requires-Dist: mkl>=2024.2.0
+Requires-Dist: ngsolve>=6.2.2404.post22.dev0
 Description-Content-Type: text/markdown
 
 # NGSTrefftz

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.2403.dev17'
-__version_tuple__ = version_tuple = (0, 3, 2403, 'dev17')
+__version__ = version = '0.3.2405.dev5'
+__version_tuple__ = version_tuple = (0, 3, 2405, 'dev5')

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/docs/notebooks/tunfitted.ipynb

@@ -270,6 +270,9 @@
   }
  ],
  "metadata": {
+  "nbsphinx": {
+    "allow_errors": true
+  },
   "kernelspec": {
    "display_name": "Python 3 (ipykernel)",
    "language": "python",

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/docs/notebooks/twavetents.ipynb

@@ -18,8 +18,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from ngstrefftz import TWave\n",
-    "from ngstents._pytents import TentSlab\n",
+    "from ngstrefftz import *\n",
     "from ngsolve.TensorProductTools import *\n",
     "from netgen.occ import *\n",
     "from ngsolve import *\n",

ngstrefftz-0.3.2405.dev5/docs/requirements.txt

@@ -0,0 +1,26 @@
+setuptools>=70
+setuptools_scm>=8
+jupyter>=1.0.0
+
+matplotlib>=3.9.0
+matplotlib-inline>=0.1.6
+
+sphinx>=7.3.7
+pandoc>=2.3
+nbconvert>=7.16.4
+nbformat>=5.10.4
+nbsphinx>=0.8.9
+notebook>=7.2.0
+
+Sphinx>=7.3.7
+sphinx-rtd-theme>=2.0.0
+sphinxemoji>=0.3.1
+jupyter_sphinx>=0.5.3
+myst_parser>=3.0.1
+
+numpy>=2.0.0
+scipy>=1.13.1
+ngsolve>=6.2.2404.post22.dev0
+#xfem>=2.1.2404
+ngstrefftz>=0.3.2405.dev4
+webgui-jupyter-widgets>=0.2.35

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/pyproject.toml

@@ -1,21 +1,23 @@
 [project]
 name = "ngstrefftz"
-dynamic = ["version", "dependencies"]
+dynamic = ["version"] #, "dependencies"]
 authors = [ {name = "Paul Stocker", email = "paul.stocker@univie.ac.at"} ]
 description='NGSTrefftz is an add-on to NGSolve for Trefftz methods.'
 readme = "README.md"
-license= { text = "LGPL2.1" }
 requires-python = ">=3.8"
-#classifiers = [
-  #"License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
-#]
+classifiers = [
+  "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
+]
+dependencies = [ "mkl>=2024.2.0", "ngsolve>=6.2.2404.post22.dev0", ]
 
 [project.urls]
 Documentation = "https://paulst.github.io/NGSTrefftz"
 Repository = "https://github.com/PaulSt/ngstrefftz"
 
 [build-system]
-requires = ["setuptools>=45", "setuptools_scm[toml]>=8", "toml", "scikit-build-core>=0.3.3", "pybind11_stubgen", "cmake>=3.26.1", "ngsolve>=6.2.2404", 'mkl-devel>=2024 ; platform_system != "Darwin"']
+requires = ["ngsolve>=6.2.2404.post22.dev0",
+            "setuptools>=45", "setuptools_scm[toml]>=8", "toml", "scikit-build-core>=0.3.3", "pybind11_stubgen", "cmake>=3.26.1",  
+            'mkl==2024.* ; platform_system != "Darwin"', 'mkl-devel==2024.* ; platform_system != "Darwin"']
 build-backend = "scikit_build_core.build"
 
 [tool.scikit-build]
@@ -24,21 +26,16 @@ ninja.version = ">=1.11"
 metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
 sdist.include = ["_version.py"]
 #build-dir = "./build_py/{wheel_tag}" # local build directory - for debugging
-
 experimental = true
 # This adds ngsolve (with exact build-time version) to the dependencies
-metadata.dependencies.provider="ngsolve._scikit_build_core_dependencies"
+#metadata.dependencies.provider="ngsolve._scikit_build_core_dependencies"
+
+[tool.scikit-build.cmake.define]
 
 [tool.setuptools_scm]  # Section required
 write_to = "_version.py"
 local_scheme = "no-local-version"
 
-[project.optional-dependencies]
-test = ["pytest"]
-
-[tool.pytest.ini_options]
-testpaths = ["tests"]
-
 [tool.cibuildwheel]
 #build-verbosity = 1
 skip = """

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/src/__init__.py

@@ -1,7 +1,6 @@
 from ngsolve.fem import ET,IntegrationRule
 from ngsolve.comp import L2,BilinearForm,LinearForm,SymbolicBFI,SymbolicLFI,FESpace
 from ngsolve.fem import CoordCF
-from ngstents import TentSlab, Tent
 from ._trefftz import *
 
 def GetWave(self,U):

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/src/embtrefftz.cpp

@@ -470,7 +470,8 @@ namespace ngcomp
     this->ctofdof.SetSize (newndof);
     for (int i = 0; i < ndof; i++)
       if (all2comp[i] >= 0)
-        this->ctofdof[all2comp[i]] = T::GetDofCouplingType (i);
+        this->ctofdof[all2comp[i]] = fes->GetDofCouplingType (i);
+    // this->ctofdof[all2comp[i]] = T::GetDofCouplingType (i);
 
     T::FinalizeUpdate ();
     return std::get<1> (embtr);
@@ -511,7 +512,7 @@ namespace ngcomp
     if (type == TRANSFORM_MAT_LEFT_RIGHT)
       {
         temp_mat.Cols (0, nz) = mat * (*(ETmats[ei.Nr ()]));
-        mat.Rows (0, nz) = Trans (*(ETmats[ei.Nr ()])) * temp_mat;
+        mat.Cols (0, nz).Rows (0, nz) = Trans (*(ETmats[ei.Nr ()])) * temp_mat;
       }
   }
 
@@ -539,23 +540,55 @@ namespace ngcomp
       }
   }
 
-  template class EmbTrefftzFESpace<L2HighOrderFESpace,
-                                   shared_ptr<L2HighOrderFESpace>>;
-  static RegisterFESpace<
-      EmbTrefftzFESpace<L2HighOrderFESpace, shared_ptr<L2HighOrderFESpace>>>
-      initembt ("L2EmbTrefftzFESpace");
+  template <typename T, typename shrdT>
+  shared_ptr<GridFunction>
+  EmbTrefftzFESpace<T, shrdT>::Embed (shared_ptr<GridFunction> tgfu)
+  {
+    LocalHeap lh (1000 * 1000 * 1000);
+    Flags flags;
+
+    auto tvec = tgfu->GetVectorPtr ();
+
+    auto gfu = CreateGridFunction (this->fes, "pws", flags);
+    gfu->Update ();
+    auto vec = gfu->GetVectorPtr ();
 
-  // template class EmbTrefftzFESpace<VectorL2FESpace,
-  // shared_ptr<VectorL2FESpace>>;
+    this->ma->IterateElements (VOL, lh, [&] (auto ei, LocalHeap &mlh) {
+      Array<DofId> dofs, tdofs;
+      this->fes->GetDofNrs (ei, dofs);
+      tdofs.SetSize (dofs.Size ());
+      tdofs.SetSize0 ();
+
+      for (DofId d : dofs)
+        if (all2comp[d] >= 0)
+          tdofs.Append (all2comp[d]);
+
+      FlatVector<> telvec (tdofs.Size (), mlh);
+      tvec->GetIndirect (tdofs, telvec);
+
+      FlatVector<> elvec (dofs.Size (), mlh);
+      elvec = (*(ETmats[ei.Nr ()])) * telvec;
+      vec->SetIndirect (dofs, elvec);
+    });
+    return gfu;
+  }
+
+  template <typename T, typename shrdT>
+  shared_ptr<BaseMatrix> EmbTrefftzFESpace<T, shrdT>::GetEmbedding ()
+  {
+    return Elmats2Sparse<double> (ETmats, this->fes);
+  }
+
+  // template class EmbTrefftzFESpace<L2HighOrderFESpace,
+  // shared_ptr<L2HighOrderFESpace>>;
   // static RegisterFESpace<
-  // EmbTrefftzFESpace<VectorL2FESpace, shared_ptr<VectorL2FESpace>>>
-  // initembt2 ("VL2EmbTrefftzFESpace");
-
-  template class EmbTrefftzFESpace<MonomialFESpace,
-                                   shared_ptr<MonomialFESpace>>;
-  static RegisterFESpace<
-      EmbTrefftzFESpace<MonomialFESpace, shared_ptr<MonomialFESpace>>>
-      initembt3 ("MonomialEmbTrefftzFESpace");
+  // EmbTrefftzFESpace<L2HighOrderFESpace, shared_ptr<L2HighOrderFESpace>>>
+  // initembt ("L2EmbTrefftzFESpace");
+  // template class EmbTrefftzFESpace<MonomialFESpace,
+  // shared_ptr<MonomialFESpace>>;
+  // static RegisterFESpace<
+  // EmbTrefftzFESpace<MonomialFESpace, shared_ptr<MonomialFESpace>>>
+  // initembt3 ("MonomialEmbTrefftzFESpace");
 }
 
 ////////////////////////// python interface ///////////////////////////
@@ -580,9 +613,13 @@ void ExportETSpace (py::module m, string label)
                }),
                py::arg ("fes"));
 
-  pyspace.def ("SetOp", &ngcomp::EmbTrefftzFESpace<T, shrdT>::SetOp,
-               py::arg ("bf"), py::arg ("lf") = nullptr, py::arg ("eps") = 0,
-               py::arg ("test_fes") = nullptr, py::arg ("tndof") = 0);
+  pyspace
+      .def ("SetOp", &ngcomp::EmbTrefftzFESpace<T, shrdT>::SetOp,
+            py::arg ("bf"), py::arg ("lf") = nullptr, py::arg ("eps") = 0,
+            py::arg ("test_fes") = nullptr, py::arg ("tndof") = 0)
+      .def ("Embed", &ngcomp::EmbTrefftzFESpace<T, shrdT>::Embed)
+      .def ("GetEmbedding",
+            &ngcomp::EmbTrefftzFESpace<T, shrdT>::GetEmbedding);
 }
 
 void ExportEmbTrefftz (py::module m)
@@ -594,6 +631,8 @@ void ExportEmbTrefftz (py::module m)
   // shared_ptr<ngcomp::VectorL2FESpace>> ( m, "VL2EmbTrefftzFESpace");
   ExportETSpace<ngcomp::MonomialFESpace, shared_ptr<ngcomp::MonomialFESpace>> (
       m, "MonomialEmbTrefftzFESpace");
+  ExportETSpace<ngcomp::CompoundFESpace, shared_ptr<ngcomp::CompoundFESpace>> (
+      m, "CompoundEmbTrefftzFESpace");
 
   m.def (
       "EmbeddedTrefftzFES",
@@ -612,6 +651,10 @@ void ExportEmbTrefftz (py::module m)
           nfes = make_shared<ngcomp::EmbTrefftzFESpace<
               ngcomp::MonomialFESpace, shared_ptr<ngcomp::MonomialFESpace>>> (
               dynamic_pointer_cast<ngcomp::MonomialFESpace> (fes));
+        else if (dynamic_pointer_cast<ngcomp::CompoundFESpace> (fes))
+          nfes = make_shared<ngcomp::EmbTrefftzFESpace<
+              ngcomp::CompoundFESpace, shared_ptr<ngcomp::CompoundFESpace>>> (
+              dynamic_pointer_cast<ngcomp::CompoundFESpace> (fes));
         else
           throw Exception ("Unknown base fes");
         return nfes;

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/src/embtrefftz.hpp

@@ -39,12 +39,21 @@ namespace ngcomp
       this->name = "EmbTrefftzFESpace";
       this->type = "embt";
       this->needs_transform_vec = true;
+      shared_ptr<CompoundFESpace> cafes
+          = dynamic_pointer_cast<CompoundFESpace> (afes);
+      if (cafes)
+        for (auto space : cafes->Spaces ())
+          dynamic_cast<CompoundFESpace *> (this)->AddSpace (space);
       // this->Update();
       // this->UpdateDofTables();
       // this->UpdateCouplingDofArray();
       // this->FinalizeUpdate();
     }
 
+    void Update () override { ; };
+
+    void UpdateCouplingDofArray () override { ; }
+
     shared_ptr<BaseVector>
     SetOp (shared_ptr<SumOfIntegrals> bf, shared_ptr<SumOfIntegrals> lf,
            double eps, shared_ptr<FESpace> test_fes, int tndof);
@@ -56,6 +65,10 @@ namespace ngcomp
 
     virtual void VTransformVR (ElementId ei, const SliceVector<double> vec,
                                TRANSFORM_TYPE type) const override;
+
+    shared_ptr<GridFunction> Embed (shared_ptr<GridFunction> tgfu);
+
+    shared_ptr<BaseMatrix> GetEmbedding ();
   };
 }
 

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/src/monomialfespace.cpp

@@ -12,19 +12,19 @@ namespace ngcomp
   {
     type = "monomialfespace";
 
-    D = ma->GetDimension () - 1;
+    D = ma->GetDimension ();
 
     order = int (flags.GetNumFlag ("order", 3));
     useshift = flags.GetNumFlag ("useshift", 1);
     usescale = flags.GetNumFlag ("usescale", 1);
 
-    this->local_ndof = BinCoeff (D + 1 + order, order);
+    this->local_ndof = BinCoeff (D + order, order);
     this->nel = ma->GetNE ();
     this->ndof = local_ndof * nel;
 
     switch (D)
       {
-      case 1:
+      case 2:
         {
           evaluator[VOL]
               = make_shared<T_DifferentialOperator<DiffOpMapped<2>>> ();
@@ -33,10 +33,10 @@ namespace ngcomp
           additional_evaluators.Set (
               "hesse",
               make_shared<T_DifferentialOperator<DiffOpMappedHesse<2>>> ());
-          basismat = MonomialBasis<1> (order);
+          basismat = MonomialBasis<2> (order);
           break;
         }
-      case 2:
+      case 3:
         {
           evaluator[VOL]
               = make_shared<T_DifferentialOperator<DiffOpMapped<3>>> ();
@@ -45,7 +45,7 @@ namespace ngcomp
           additional_evaluators.Set (
               "hesse",
               make_shared<T_DifferentialOperator<DiffOpMappedHesse<3>>> ());
-          basismat = MonomialBasis<2> (order);
+          basismat = MonomialBasis<3> (order);
           break;
         }
       }

{ngstrefftz-0.3.2403.dev17 → ngstrefftz-0.3.2405.dev5}/src/monomialfespace.hpp

@@ -42,7 +42,7 @@ namespace ngcomp
     template <int D> CSR MonomialBasis (int ord) const
     {
       CSR tb;
-      const int npoly = BinCoeff (D + 1 + ord, ord);
+      const int npoly = BinCoeff (D + ord, ord);
       Matrix<> basis (npoly, npoly);
       basis = 0.0;
       for (int i = 0; i < npoly; i++)