xfem 2.1.2607.dev10__tar.gz → 2.1.2607.dev14__tar.gz

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/CMakeLists.txt

@@ -29,7 +29,7 @@ else()
 endif()
 
 set(XFEM_INSTALL_DIR_PYTHON ${ADDON_INSTALL_DIR_PYTHON})
-set(XFEM_INSTALL_DIR_INCLUDE ${ADDON_INSTALL_DIR_INCLUDE})
+set(XFEM_INSTALL_DIR_INCLUDE ${XFEM_INSTALL_DIR_PYTHON}/xfem/include)
 set(XFEM_INSTALL_DIR_RES ${ADDON_INSTALL_DIR_RES})
 
 add_definitions(-DNGSXFEM_VERSION="${NGSXFEM_VERSION}")

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/INSTALLATION.md

@@ -64,3 +64,17 @@ and open a browser on your host machine (not in the docker) and paste in the URL
 ``` 
 docker run -p 8888:8888 -v ${PWD}:/home/jovyan ngsxfem/ngsxfem-jupyter
 ```
+
+## Using the C++ core
+
+The installation includes the shared C++ library, headers, and CMake package.
+In your CMake project, you can use 
+```cmake
+    execute_process(COMMAND ${Python3_EXECUTABLE} -m xfem.config OUTPUT_VARIABLE xfem_DIR OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
+```
+to locate the `xfem` package or use `-Dxfem_DIR=<that directory>`. Then link the exported target
+```cmake
+find_package(xfem CONFIG REQUIRED)
+target_link_libraries(my_target PRIVATE xfem::core)
+```
+Headers keep the source directory layout, e.g. `#include <xfem/aggregates.hpp>` and `#include <cutint/lsetintdomain.hpp>`.

xfem-2.1.2607.dev14/NGSolveAddonConfig.cmake.in

@@ -0,0 +1,10 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+find_dependency(Python3 COMPONENTS Interpreter Development.Module)
+
+if(NOT NGSolve_DIR)
+  execute_process(COMMAND "${Python3_EXECUTABLE}" -m ngsolve.config OUTPUT_VARIABLE NGSolve_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+find_dependency(NGSolve CONFIG)
+include("${CMAKE_CURRENT_LIST_DIR}/@NGSOLVE_ADDON_PACKAGE@Targets.cmake")

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xfem
-Version: 2.1.2607.dev10
+Version: 2.1.2607.dev14
 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)

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/cutint/CMakeLists.txt

@@ -2,6 +2,6 @@ install( FILES
   cutintegral.hpp fieldeval.hpp lsetintdomain.hpp
   mlsetintegration.hpp spacetimecutrule.hpp 
   straightcutrule.hpp xdecompose.hpp xintegration.hpp
-  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}
+  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}/cutint
   )
 

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/cutint/lsetintdomain.cpp

@@ -172,132 +172,4 @@ namespace xintegration
   }
   
 
-  typedef CoefficientFunction CF;
-  typedef GridFunction GF;
-
-  shared_ptr<LevelsetIntegrationDomain> PyDict2LevelsetIntegrationDomain(py::dict dictionary)
-  {
-    if (!dictionary.contains("levelset"))
-      throw Exception("You need to provide (a) levelset(s).");
-    
-    if (!dictionary.contains("domain_type"))
-      throw Exception("You need to provide (a) domain type(s).");
-
-    optional<double> tref = nullopt;
-
-    if (dictionary.contains("tref"))
-      tref = py::cast<double>(dictionary["tref"]);
-
-    py::object lset = dictionary["levelset"];
-    py::object dt_in = dictionary["domain_type"];
-
-    int subdivlvl = 0;
-    if (dictionary.contains("subdivlvl"))
-    {
-      auto subdivlvl_ = py::extract<int>(dictionary["subdivlvl"]);
-      if (!subdivlvl_.check())
-        throw Exception("data type for subdivlvl not admissible.");
-      subdivlvl = subdivlvl_();
-    }
-    
-    int order = -1;
-    if (dictionary.contains("order"))
-    {
-      auto order_ = py::extract<int>(dictionary["order"]);
-      if (!order_.check())
-        throw Exception("data type for order not admissible.");
-      order = order_();
-    }
-    
-    int time_order = -1;
-    if (dictionary.contains("time_order"))
-    {
-      auto time_order_ = py::extract<int>(dictionary["time_order"]);
-      if (!time_order_.check())
-        throw Exception("data type for time_order not admissible.");
-      time_order= time_order_();
-    }
-
-    SWAP_DIMENSIONS_POLICY quad_dir_policy = FIND_OPTIMAL;
-    if (dictionary.contains("quad_dir_policy"))
-    {
-      auto quad_dir_policy_ = py::extract<SWAP_DIMENSIONS_POLICY>(dictionary["quad_dir_policy"]);
-      if (!quad_dir_policy_.check())
-        throw Exception("data type for quad_dir_policy not admissible.");
-      quad_dir_policy = quad_dir_policy_();
-    }
-    
-    if (py::extract<DOMAIN_TYPE> (dt_in).check())
-    {
-      py::extract<shared_ptr<CF>> pycf(lset);
-      py::extract<int> dt(dt_in);
-      if (!dt.check())
-        throw Exception("dt is not a domain type");
-      shared_ptr<GridFunction> gf_lset = nullptr;
-      shared_ptr<CoefficientFunction> cf_lset = nullptr;
-      tie(cf_lset,gf_lset) = CF2GFForStraightCutRule(pycf(),subdivlvl);
-      return make_shared<LevelsetIntegrationDomain>(cf_lset,gf_lset,DOMAIN_TYPE(dt()),order,time_order,subdivlvl,quad_dir_policy,tref);
-    }
-    else
-    {
-      if (subdivlvl > 0)
-        throw Exception("multi level sets don't work with subdivlvl > 0");
-      if (time_order > -1)
-        throw Exception("multi level sets don't work with time_order > 0");
-
-      py::extract<py::tuple> lset_tuple_(lset);
-      if (!lset_tuple_.check())
-        throw Exception("lset is neither a level set nor a tuple ... need new candidates..");
-      py::tuple lset_tuple(lset_tuple_());
-      for (int i = 0; i < py::len(lset_tuple); i++)
-        if (!(py::extract<shared_ptr<GridFunction>>(lset_tuple[i]).check()))
-          throw Exception("lsets need to be GridFunctions!");
-      
-      Array<shared_ptr<GridFunction>> gf_lsets;
-      gf_lsets = makeCArray<shared_ptr<GridFunction>> (lset_tuple);
-
-      
-      if (py::isinstance<py::tuple>(dt_in))
-      {
-        Array<DOMAIN_TYPE> dts_ = makeCArray<DOMAIN_TYPE> (py::extract<py::tuple>(dt_in)());
-        Array<Array<DOMAIN_TYPE>> dts(1);
-        dts[0] = dts_;
-        return make_shared<LevelsetIntegrationDomain>(gf_lsets,dts,order,time_order,subdivlvl,quad_dir_policy,tref);
-      }
-      
-      py::list dts_list;
-      if (py::hasattr(dt_in, "as_list") && py::isinstance<py::list>(dt_in.attr("as_list")))
-        dts_list = dt_in.attr("as_list");      
-      else if (py::isinstance<py::list>(dt_in))
-        dts_list = dt_in;
-      else
-        throw Exception("domain_type is neither a tuple nor a list nor a DomainTypeArray.");
-
-      Array<Array<DOMAIN_TYPE>> dtas(py::len(dts_list));
-      int common_length = -1; //not a list
-      for (int i = 0; i < py::len(dts_list); i++)
-      {
-        auto dta(dts_list[i]);
-
-        // Check for valid input
-        if (!py::isinstance<py::tuple>(dta))
-        {
-          throw Exception("domain_type arrays are incompatible. Maybe you used a list instead of a tuple?");
-        }
-        else
-        {
-          if ((i>0) && (common_length != py::len(dta)))
-            throw Exception("domain_type arrays have different length");
-          else
-            common_length = py::len(dta);
-        }
-
-        // Input valid. Pass input on 
-        dtas[i] = makeCArray<DOMAIN_TYPE> (dta);
-      }
-
-      return make_shared<LevelsetIntegrationDomain>(gf_lsets,dtas,order,time_order,subdivlvl,quad_dir_policy,tref);
-    }
-  }
-  
 } // end of namespace

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/cutint/lsetintdomain.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include "../utils/ngsxstd.hpp"
-#include <python_ngstd.hpp>
 
 using namespace ngfem;
 using namespace ngcomp;
@@ -169,7 +168,6 @@ namespace xintegration
 
   std::tuple<shared_ptr<CoefficientFunction>,shared_ptr<GridFunction>> CF2GFForStraightCutRule(shared_ptr<CoefficientFunction> cflset, int subdivlvl = 0);
   
-  shared_ptr<LevelsetIntegrationDomain> PyDict2LevelsetIntegrationDomain(py::dict dictionary);
 
   
 }

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/cutint/python_cutint.cpp

@@ -14,7 +14,137 @@ using namespace xintegration;
 
 typedef CoefficientFunction CF;
 typedef GridFunction GF;
-  
+
+namespace xintegration
+{
+  typedef CoefficientFunction CF;
+  typedef GridFunction GF;
+
+  shared_ptr<LevelsetIntegrationDomain> PyDict2LevelsetIntegrationDomain(py::dict dictionary)
+  {
+    if (!dictionary.contains("levelset"))
+      throw Exception("You need to provide (a) levelset(s).");
+
+    if (!dictionary.contains("domain_type"))
+      throw Exception("You need to provide (a) domain type(s).");
+
+    optional<double> tref = nullopt;
+
+    if (dictionary.contains("tref"))
+      tref = py::cast<double>(dictionary["tref"]);
+
+    py::object lset = dictionary["levelset"];
+    py::object dt_in = dictionary["domain_type"];
+
+    int subdivlvl = 0;
+    if (dictionary.contains("subdivlvl"))
+    {
+      auto subdivlvl_ = py::extract<int>(dictionary["subdivlvl"]);
+      if (!subdivlvl_.check())
+        throw Exception("data type for subdivlvl not admissible.");
+      subdivlvl = subdivlvl_();
+    }
+
+    int order = -1;
+    if (dictionary.contains("order"))
+    {
+      auto order_ = py::extract<int>(dictionary["order"]);
+      if (!order_.check())
+        throw Exception("data type for order not admissible.");
+      order = order_();
+    }
+
+    int time_order = -1;
+    if (dictionary.contains("time_order"))
+    {
+      auto time_order_ = py::extract<int>(dictionary["time_order"]);
+      if (!time_order_.check())
+        throw Exception("data type for time_order not admissible.");
+      time_order= time_order_();
+    }
+
+    SWAP_DIMENSIONS_POLICY quad_dir_policy = FIND_OPTIMAL;
+    if (dictionary.contains("quad_dir_policy"))
+    {
+      auto quad_dir_policy_ = py::extract<SWAP_DIMENSIONS_POLICY>(dictionary["quad_dir_policy"]);
+      if (!quad_dir_policy_.check())
+        throw Exception("data type for quad_dir_policy not admissible.");
+      quad_dir_policy = quad_dir_policy_();
+    }
+
+    if (py::extract<DOMAIN_TYPE> (dt_in).check())
+    {
+      py::extract<shared_ptr<CF>> pycf(lset);
+      py::extract<int> dt(dt_in);
+      if (!dt.check())
+        throw Exception("dt is not a domain type");
+      shared_ptr<GridFunction> gf_lset = nullptr;
+      shared_ptr<CoefficientFunction> cf_lset = nullptr;
+      tie(cf_lset,gf_lset) = CF2GFForStraightCutRule(pycf(),subdivlvl);
+      return make_shared<LevelsetIntegrationDomain>(cf_lset,gf_lset,DOMAIN_TYPE(dt()),order,time_order,subdivlvl,quad_dir_policy,tref);
+    }
+    else
+    {
+      if (subdivlvl > 0)
+        throw Exception("multi level sets don't work with subdivlvl > 0");
+      if (time_order > -1)
+        throw Exception("multi level sets don't work with time_order > 0");
+
+      py::extract<py::tuple> lset_tuple_(lset);
+      if (!lset_tuple_.check())
+        throw Exception("lset is neither a level set nor a tuple ... need new candidates..");
+      py::tuple lset_tuple(lset_tuple_());
+      for (int i = 0; i < py::len(lset_tuple); i++)
+        if (!(py::extract<shared_ptr<GridFunction>>(lset_tuple[i]).check()))
+          throw Exception("lsets need to be GridFunctions!");
+
+      Array<shared_ptr<GridFunction>> gf_lsets;
+      gf_lsets = makeCArray<shared_ptr<GridFunction>> (lset_tuple);
+
+
+      if (py::isinstance<py::tuple>(dt_in))
+      {
+        Array<DOMAIN_TYPE> dts_ = makeCArray<DOMAIN_TYPE> (py::extract<py::tuple>(dt_in)());
+        Array<Array<DOMAIN_TYPE>> dts(1);
+        dts[0] = dts_;
+        return make_shared<LevelsetIntegrationDomain>(gf_lsets,dts,order,time_order,subdivlvl,quad_dir_policy,tref);
+      }
+
+      py::list dts_list;
+      if (py::hasattr(dt_in, "as_list") && py::isinstance<py::list>(dt_in.attr("as_list")))
+        dts_list = dt_in.attr("as_list");
+      else if (py::isinstance<py::list>(dt_in))
+        dts_list = dt_in;
+      else
+        throw Exception("domain_type is neither a tuple nor a list nor a DomainTypeArray.");
+
+      Array<Array<DOMAIN_TYPE>> dtas(py::len(dts_list));
+      int common_length = -1; //not a list
+      for (int i = 0; i < py::len(dts_list); i++)
+      {
+        auto dta(dts_list[i]);
+
+        // Check for valid input
+        if (!py::isinstance<py::tuple>(dta))
+        {
+          throw Exception("domain_type arrays are incompatible. Maybe you used a list instead of a tuple?");
+        }
+        else
+        {
+          if ((i>0) && (common_length != py::len(dta)))
+            throw Exception("domain_type arrays have different length");
+          else
+            common_length = py::len(dta);
+        }
+
+        // Input valid. Pass input on
+        dtas[i] = makeCArray<DOMAIN_TYPE> (dta);
+      }
+
+      return make_shared<LevelsetIntegrationDomain>(gf_lsets,dtas,order,time_order,subdivlvl,quad_dir_policy,tref);
+    }
+  }
+} // end of namespace
 
 void ExportNgsx_cutint(py::module &m)
 {

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/lsetcurving/CMakeLists.txt

@@ -1,6 +1,6 @@
 install( FILES
   shiftintegrators.hpp calcpointshift.hpp lsetrefine.hpp
   projshift.hpp shiftedevaluate.hpp
-  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}
+  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}/lsetcurving
   )
 

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/ngsolve_addon.cmake

@@ -4,6 +4,7 @@
 # Don't change anything here (unless you know what you are doing!)
 ###############################################################################
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(_NGSOLVE_ADDON_HELPER_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
 # Set default build type to RelWithDebInfo
 if(NOT CMAKE_BUILD_TYPE)
@@ -31,7 +32,7 @@ macro(add_ngsolve_addon module_name)
   add_library(${module_name} SHARED ${ARGN})
   target_include_directories(${module_name} BEFORE PRIVATE $<TARGET_PROPERTY:ngsolve,INTERFACE_INCLUDE_DIRECTORIES>)
   target_link_libraries(${module_name} PUBLIC ngsolve Python3::Module)
-  set_target_properties(${module_name} PROPERTIES PREFIX "" CXX_STANDARD 20)
+  set_target_properties(${module_name} PROPERTIES PREFIX "" CXX_STANDARD 17)
 
   # Python does not recognize .dll (Windows) and .dylib (MacOS) file endings as modules
   if(WIN32)
@@ -92,17 +93,67 @@ else()
   set(ADDON_INSTALL_DIR_CMAKE ${NETGEN_INSTALL_DIR_CMAKE})
 endif()
 
+function(ngsolve_addon_set_relative_rpath target)
+  if(APPLE)
+    set(_origin "@loader_path")
+  elseif(UNIX)
+    set(_origin "\$ORIGIN")
+  endif()
+  if(_origin)
+    foreach(_path ${ARGN})
+      list(APPEND _rpaths "${_origin}/${_path}")
+    endforeach()
+    set_target_properties(${target} PROPERTIES INSTALL_RPATH "${_rpaths}" BUILD_RPATH_USE_ORIGIN TRUE)
+  endif()
+endfunction()
+
+function(add_ngsolve_addon_library target)
+  include(CMakePackageConfigHelpers)
+  cmake_parse_arguments(ARG "" "PACKAGE;EXPORT_NAME"
+    "SOURCES;PUBLIC_HEADERS" ${ARGN})
+  if(NOT ARG_EXPORT_NAME)
+    set(ARG_EXPORT_NAME "${target}")
+  endif()
+  if(SKBUILD)
+    set(_package_destination "${ARG_PACKAGE}")
+  else()
+    set(_package_destination "${ADDON_INSTALL_DIR_PYTHON}/${ARG_PACKAGE}")
+  endif()
+  set(_cmake_destination "${_package_destination}/cmake")
+
+  add_library(${target} SHARED ${ARG_SOURCES})
+  add_library(${ARG_PACKAGE}::${ARG_EXPORT_NAME} ALIAS ${target})
+  target_include_directories(${target} BEFORE PRIVATE $<TARGET_PROPERTY:ngsolve,INTERFACE_INCLUDE_DIRECTORIES>)
+  target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:${_package_destination}/include>)
+  target_link_libraries(${target} PUBLIC ngsolve Python3::Module)
+  set_target_properties(${target} PROPERTIES CXX_STANDARD 17 EXPORT_NAME "${ARG_EXPORT_NAME}" MACOSX_RPATH TRUE)
+  if(SKBUILD AND NOT WIN32)
+    file(RELATIVE_PATH _ngsolve_lib "/${NGSOLVE_INSTALL_DIR_PYTHON}/${ARG_PACKAGE}" "/${NGSOLVE_INSTALL_DIR_LIB}")
+    ngsolve_addon_set_relative_rpath(${target} "${_ngsolve_lib}")
+  elseif(NOT WIN32)
+    set_target_properties(${target} PROPERTIES INSTALL_RPATH "${NGSOLVE_LIBRARY_DIR}")
+  endif()
+
+  install(TARGETS ${target} EXPORT ${ARG_PACKAGE}-targets RUNTIME DESTINATION "${_package_destination}" LIBRARY DESTINATION "${_package_destination}" ARCHIVE DESTINATION "${_package_destination}")
+  install(FILES ${ARG_PUBLIC_HEADERS} DESTINATION "${_package_destination}/include/${ARG_PACKAGE}")
+  install(EXPORT ${ARG_PACKAGE}-targets FILE "${ARG_PACKAGE}Targets.cmake" NAMESPACE "${ARG_PACKAGE}::" DESTINATION "${_cmake_destination}")
+
+  set(NGSOLVE_ADDON_PACKAGE "${ARG_PACKAGE}")
+  configure_package_config_file( "${_NGSOLVE_ADDON_HELPER_DIR}/NGSolveAddonConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${ARG_PACKAGE}Config.cmake" INSTALL_DESTINATION "${_cmake_destination}")
+  set(_version "${SKBUILD_PROJECT_VERSION_FULL}")
+  if(NOT _version)
+    set(_version "${PROJECT_VERSION}")
+  endif()
+  set(_config_files "${CMAKE_CURRENT_BINARY_DIR}/${ARG_PACKAGE}Config.cmake")
+  if(_version)
+    write_basic_package_version_file( "${CMAKE_CURRENT_BINARY_DIR}/${ARG_PACKAGE}ConfigVersion.cmake" VERSION "${_version}" COMPATIBILITY SameMajorVersion)
+    list(APPEND _config_files "${CMAKE_CURRENT_BINARY_DIR}/${ARG_PACKAGE}ConfigVersion.cmake")
+  endif()
+  install(FILES ${_config_files} DESTINATION "${_cmake_destination}")
+endfunction()
+
 macro(ngsolve_generate_stub_files module_name)
-  # Set PYTHONPATH so pybind11_stubgen can import the addon module, and
-  # propagate LD_LIBRARY_PATH so its native .so can load ngsolve shared libs.
-  set(stubgen_generation_code "
-    set(ENV{PYTHONPATH} \"${stubgen_working_dir}\")
-    set(ENV{LD_LIBRARY_PATH} \"${NETGEN_DIR}/${NETGEN_INSTALL_DIR_LIB}:$ENV{LD_LIBRARY_PATH}\")
-    execute_process(
-      WORKING_DIRECTORY \"${stubgen_working_dir}\"
-      COMMAND \"${Python3_EXECUTABLE}\" -m pybind11_stubgen --ignore-all-errors
-              -o \"${CMAKE_CURRENT_BINARY_DIR}/stubs\" ${module_name}
-    )")
+  set(stubgen_generation_code "execute_process(WORKING_DIRECTORY ${stubgen_working_dir} COMMAND ${Python3_EXECUTABLE} -m pybind11_stubgen --ignore-all-errors -o ${CMAKE_CURRENT_BINARY_DIR}/stubs ${module_name})")
   set(stubgen_directory "${CMAKE_CURRENT_BINARY_DIR}/stubs/${module_name}/")
   set(stubgen_file "${CMAKE_CURRENT_BINARY_DIR}/stubs/${module_name}.pyi")
   set(stubgen_install_destination ${ADDON_INSTALL_DIR_PYTHON}/${module_name}/)

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/python/CMakeLists.txt

@@ -1,5 +1,7 @@
-target_sources(xfem PRIVATE
-      python_ngsxfem.cpp
+add_ngsolve_addon_library(xfem_core
+      PACKAGE xfem
+      EXPORT_NAME core
+      SOURCES
       ../cutint/lsetintdomain.cpp
       ../cutint/fieldeval.cpp
       ../cutint/spacetimecutrule.cpp
@@ -13,7 +15,6 @@ target_sources(xfem PRIVATE
       ../lsetcurving/projshift.cpp
       ../lsetcurving/shiftedevaluate.cpp
       ../lsetcurving/shiftintegrators.cpp
-      ../python/python_ngsxfem.cpp
       ../spacetime/diffopDt.cpp
       ../spacetime/diffopFixt.cpp
       ../spacetime/SpaceTimeFE.cpp
@@ -36,8 +37,17 @@ target_sources(xfem PRIVATE
       ../xfem/xfiniteelement.cpp
       ../xfem/aggregates.cpp
 )
+target_include_directories(xfem_core PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>)
+target_compile_definitions(xfem_core PRIVATE NGSXFEM_EXPORTS
+      PUBLIC $<$<BOOL:${SPACETIME_SANITY_CHECKS}>:SPACETIME_SANITY_CHECKS>)
+set_target_properties(xfem_core PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+
+target_sources(xfem PRIVATE python_ngsxfem.cpp)
+target_link_libraries(xfem PRIVATE xfem_core)
+ngsolve_addon_set_relative_rpath(xfem ".")
+
 install (FILES
-        __init__.py cutmg.py mlset.py lset_spacetime.py lset_smoothblend.py lsetcurv.py utils.py ngs_check.py _version.py
+        __init__.py config.py cutmg.py mlset.py lset_spacetime.py lset_smoothblend.py lsetcurv.py utils.py ngs_check.py _version.py
         DESTINATION ${XFEM_INSTALL_DIR_PYTHON}/xfem
         COMPONENT xfem
 )

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/python/__init__.py

@@ -12,7 +12,12 @@ xfem.mlset ... multiple level sets
 xfem.utils ... some example level set geometries
 """
 
+import os
+import sys
 
+if sys.platform.startswith("win"):
+    _dll_directory = os.add_dll_directory(os.path.dirname(__file__))
+del os, sys
 
 from ngsolve import (L2, VOL, BitArray, CoefficientFunction, FESpace,
                      GridFunction, H1, IfPos, LinearForm, Parameter, dx)

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/python/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.1.2607.dev10'
-__version_tuple__ = version_tuple = (2, 1, 2607, 'dev10')
+__version__ = version = '2.1.2607.dev14'
+__version_tuple__ = version_tuple = (2, 1, 2607, 'dev14')
 
-__commit_id__ = commit_id = 'g4c1bbbdda'
+__commit_id__ = commit_id = 'g0868c6fbd'

xfem-2.1.2607.dev14/python/config.py

@@ -0,0 +1,13 @@
+from pathlib import Path
+
+def get_cmake_dir():
+    return str(Path(__file__).resolve().parent / "cmake")
+
+def get_include_dir():
+    return str(Path(__file__).resolve().parent / "include")
+
+def get_library_dir():
+    return str(Path(__file__).resolve().parent)
+
+if __name__ == "__main__":
+    print(get_cmake_dir())

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/spacetime/CMakeLists.txt

@@ -5,6 +5,6 @@ install( FILES
   diffopFixt.hpp
   timecf.hpp
   spacetime_vtk.hpp
-  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}
+  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}/spacetime
 )
 

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/utils/CMakeLists.txt

@@ -6,5 +6,5 @@ install( FILES
   ngsxstd.hpp
   spacetimechecks.hpp
   bitarraycf.hpp
-  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}
+  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}/utils
 )

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/utils/ngsxstd.cpp

@@ -57,7 +57,7 @@ ostream & operator<< (ostream & ost, COMBINED_DOMAIN_TYPE cdt)
   return ost;
 }
 
-//GlobalNgsxfemVariables globxvar;
+GlobalNgsxfemVariables globxvar;
 
 GlobalNgsxfemVariables::GlobalNgsxfemVariables() {
     SetDefaults();

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/utils/ngsxstd.hpp

@@ -7,6 +7,16 @@
 
 using namespace ngbla;
 
+#ifdef _WIN32
+#ifdef NGSXFEM_EXPORTS
+#define NGSXFEM_API __declspec(dllexport)
+#else
+#define NGSXFEM_API __declspec(dllimport)
+#endif
+#else
+#define NGSXFEM_API
+#endif
+
 enum SWAP_DIMENSIONS_POLICY {FIRST_ALLOWED, FIND_OPTIMAL, ALWAYS_NONE};
 
 // /// domain types: two domains: POS/NEG and the diving interface IF
@@ -120,4 +130,4 @@ public:
     void Output();
 };
 
-extern GlobalNgsxfemVariables globxvar;
+extern NGSXFEM_API GlobalNgsxfemVariables globxvar;

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/utils/python_utils.cpp

@@ -13,8 +13,6 @@
 #include "../utils/restrictedfespace.hpp"
 #include "../utils/ngsxstd.hpp"
 
-GlobalNgsxfemVariables globxvar;
-
 using namespace ngcomp;
 typedef BitArray BA;
 

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/utils/restrictedfespace.cpp

@@ -198,7 +198,7 @@ namespace ngfem
   // LocalHeap & lh) const
   {
     if (fel.GetNDof() == 0)
-      flux.AddSize(fel.GetNDof(),diffop->Dim()) = 0.0;
+      flux.AddSize(diffop->Dim(), mir.Size()) = 0.0;
     else
       diffop->Apply(fel, mir, x, flux);
   }
@@ -211,7 +211,7 @@ namespace ngfem
   // LocalHeap & lh) const
   {
     if (fel.GetNDof() == 0)
-      flux.AddSize(fel.GetNDof(),diffop->Dim()) = 0.0;
+      flux.AddSize(diffop->Dim(), mir.Size()) = 0.0;
     else
       diffop->Apply(fel, mir, x, flux);
   }

{xfem-2.1.2607.dev10 → xfem-2.1.2607.dev14}/xfem/CMakeLists.txt

@@ -8,6 +8,6 @@ install( FILES
   xfiniteelement.hpp
   symboliccutbfi.hpp
   symboliccutlfi.hpp
-  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}
+  DESTINATION ${XFEM_INSTALL_DIR_INCLUDE}/xfem
   )