netgen-mesher 6.2.2506.post31.dev0__cp314-cp314-win_amd64.whl → 6.2.2506.post42.dev0__cp314-cp314-win_amd64.whl

netgen/__init__.pyi

@@ -17,6 +17,6 @@ def _get_diagnostics():
 def load_occ_libs():
     ...
 __diagnostics_template: str = '\nNetgen diagnostics:\n    sys.platform:          {sys.platform}\n    sys.executable:        {sys.executable}\n    sys.version:           {sys.version}\n    Netgen python version: {config.PYTHON_VERSION}\n    Netgen path            {__file__}\n    Netgen config          {config.__file__}\n    Netgen version         {config.NETGEN_VERSION}\n    sys.path: {sys.path}\n'
-_netgen_bin_dir: str = 'C:\\gitlabci\\tools\\builds\\3zsqG5ns\\0\\ngsolve\\netgen\\_skbuild\\win-amd64-3.14\\cmake-install\\netgen'
-_netgen_lib_dir: str = 'C:\\gitlabci\\tools\\builds\\3zsqG5ns\\0\\ngsolve\\netgen\\_skbuild\\win-amd64-3.14\\cmake-install\\netgen'
+_netgen_bin_dir: str = 'C:\\gitlabci\\tools\\builds\\3zsqG5ns\\0\\ngsolve\\ngsolve\\external_dependencies\\netgen\\_skbuild\\win-amd64-3.14\\cmake-install\\netgen'
+_netgen_lib_dir: str = 'C:\\gitlabci\\tools\\builds\\3zsqG5ns\\0\\ngsolve\\ngsolve\\external_dependencies\\netgen\\_skbuild\\win-amd64-3.14\\cmake-install\\netgen'
 v: sys.version_info  # value = sys.version_info(major=3, minor=14, micro=0, releaselevel='final', serial=0)

netgen/cmake/NetgenConfig.cmake

@@ -1,9 +1,9 @@
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
-set(NETGEN_VERSION "6.2.2506-31-ga34e6d60")
+set(NETGEN_VERSION "6.2.2506-42-gf1114198")
 set(NETGEN_VERSION_MAJOR "6")
 set(NETGEN_VERSION_MINOR "2")
 set(NETGEN_VERSION_PATCH "2506")
-set(NETGEN_VERSION_TWEAK "31")
+set(NETGEN_VERSION_TWEAK "42")
 
 get_filename_component(NETGEN_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
@@ -17,7 +17,7 @@ get_filename_component(NETGEN_LIBRARY_DIR "${NETGEN_CMAKE_DIR}/../lib" ABSOLUTE)
 get_filename_component(NETGEN_PYTHON_DIR "${NETGEN_CMAKE_DIR}/../../" ABSOLUTE)
 get_filename_component(NETGEN_RESOURCE_DIR "${NETGEN_CMAKE_DIR}/../../share" ABSOLUTE)
 
-set(NETGEN_SOURCE_DIR "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen")
+set(NETGEN_SOURCE_DIR "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen")
 
 set(NETGEN_BUILD_FOR_CONDA "ON")
 set(NETGEN_CHECK_RANGE "OFF")
@@ -42,15 +42,15 @@ set(NETGEN_OPENGL_LIBRARIES "opengl32;glu32")
 set(NETGEN_PYTHON_EXECUTABLE "C:/Python314/python.exe")
 set(NETGEN_PYTHON_INCLUDE_DIRS "C:/Python314/Include")
 set(NETGEN_PYTHON_LIBRARIES "C:/Python314/libs/python314.lib")
-set(NETGEN_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.14/cmake-build/dependencies/src/project_tcl/generic")
+set(NETGEN_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.14/cmake-build/dependencies/src/project_tcl/generic")
 set(NETGEN_TCL_LIBRARY "C:/Python314/tcl/tclstub86.lib")
 set(NETGEN_TK_DND_LIBRARY "")
-set(NETGEN_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.14/cmake-build/dependencies/src/project_tk/generic")
+set(NETGEN_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.14/cmake-build/dependencies/src/project_tk/generic")
 set(NETGEN_TK_LIBRARY "C:/Python314/tcl/tkstub86.lib")
 set(NETGEN_X11_X11_LIB "")
 set(NETGEN_X11_Xmu_LIB "")
-set(NETGEN_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.14/cmake-build/dependencies/zlib/include")
-set(NETGEN_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.14/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
+set(NETGEN_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.14/cmake-build/dependencies/zlib/include")
+set(NETGEN_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.14/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
 
 set(NETGEN_USE_GUI ON)
 set(NETGEN_USE_PYTHON ON)

netgen/config/__init__.pyi

@@ -5,7 +5,7 @@ __all__: list[str] = ['BUILD_FOR_CONDA', 'BUILD_STUB_FILES', 'CHECK_RANGE', 'CMA
 BUILD_FOR_CONDA: bool = True
 BUILD_STUB_FILES: bool = True
 CHECK_RANGE: bool = False
-CMAKE_INSTALL_PREFIX: str = 'C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.14/cmake-install'
+CMAKE_INSTALL_PREFIX: str = 'C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.14/cmake-install'
 DEBUG_LOG: bool = False
 ENABLE_CPP_CORE_GUIDELINES_CHECK: bool = False
 ENABLE_UNIT_TESTS: bool = False
@@ -14,14 +14,14 @@ INTEL_MIC: bool = False
 NETGEN_PYTHON_PACKAGE_NAME: str = 'netgen-mesher'
 NETGEN_PYTHON_RPATH: str = 'netgen'
 NETGEN_PYTHON_RPATH_BIN: str = 'netgen'
-NETGEN_VERSION: str = '6.2.2506-31-ga34e6d60'
-NETGEN_VERSION_GIT: str = 'v6.2.2506-31-ga34e6d60'
-NETGEN_VERSION_HASH: str = 'ga34e6d60'
+NETGEN_VERSION: str = '6.2.2506-42-gf1114198'
+NETGEN_VERSION_GIT: str = 'v6.2.2506-42-gf1114198'
+NETGEN_VERSION_HASH: str = 'gf1114198'
 NETGEN_VERSION_MAJOR: str = '6'
 NETGEN_VERSION_MINOR: str = '2'
 NETGEN_VERSION_PATCH: str = '2506'
-NETGEN_VERSION_PYTHON: str = '6.2.2506.post31.dev0'
-NETGEN_VERSION_TWEAK: str = '31'
+NETGEN_VERSION_PYTHON: str = '6.2.2506.post42.dev0'
+NETGEN_VERSION_TWEAK: str = '42'
 NG_COMPILE_FLAGS: str = '/arch:AVX2'
 NG_INSTALL_DIR_BIN: str = 'netgen'
 NG_INSTALL_DIR_CMAKE: str = 'netgen/cmake'
@@ -49,4 +49,4 @@ USE_SPDLOG: bool = False
 is_python_package: bool = True
 ngcore_compile_definitions: str = 'NETGEN_PYTHON;NG_PYTHON;PYBIND11_SIMPLE_GIL_MANAGEMENT;_WIN32_WINNT=0x1000;WNT;WNT_WINDOW;NOMINMAX;MSVC_EXPRESS;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC;WIN32'
 ngcore_compile_options: str = '/arch:AVX2;/bigobj;$<BUILD_INTERFACE:/MP;/W1;/wd4068>'
-version: str = 'v6.2.2506-31-ga34e6d60'
+version: str = 'v6.2.2506-42-gf1114198'

netgen/config/config.py

@@ -26,7 +26,7 @@ USE_OCC             = _cmake_to_bool("ON")
 USE_PYTHON          = _cmake_to_bool("ON")
 USE_SPDLOG          = _cmake_to_bool("")
 
-CMAKE_INSTALL_PREFIX  = "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.14/cmake-install"
+CMAKE_INSTALL_PREFIX  = "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.14/cmake-install"
 NG_INSTALL_DIR_PYTHON   = "."
 NG_INSTALL_DIR_BIN      = "netgen"
 NG_INSTALL_DIR_LIB      = "netgen/lib"
@@ -42,15 +42,15 @@ NG_COMPILE_FLAGS           = "/arch:AVX2"
 ngcore_compile_options     = "/arch:AVX2;/bigobj;$<BUILD_INTERFACE:/MP;/W1;/wd4068>"
 ngcore_compile_definitions = "NETGEN_PYTHON;NG_PYTHON;PYBIND11_SIMPLE_GIL_MANAGEMENT;_WIN32_WINNT=0x1000;WNT;WNT_WINDOW;NOMINMAX;MSVC_EXPRESS;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC;WIN32"
 
-NETGEN_VERSION = "6.2.2506-31-ga34e6d60"
-NETGEN_VERSION_GIT = "v6.2.2506-31-ga34e6d60"
-NETGEN_VERSION_PYTHON = "6.2.2506.post31.dev0"
+NETGEN_VERSION = "6.2.2506-42-gf1114198"
+NETGEN_VERSION_GIT = "v6.2.2506-42-gf1114198"
+NETGEN_VERSION_PYTHON = "6.2.2506.post42.dev0"
 
 NETGEN_VERSION_MAJOR = "6"
 NETGEN_VERSION_MINOR = "2"
-NETGEN_VERSION_TWEAK = "31"
+NETGEN_VERSION_TWEAK = "42"
 NETGEN_VERSION_PATCH = "2506"
-NETGEN_VERSION_HASH = "ga34e6d60"
+NETGEN_VERSION_HASH = "gf1114198"
 
 PYTHON_VERSION       = "3.14.0"
 PYTHON_VERSION_MAJOR = "3"

netgen/config/config.pyi

@@ -7,7 +7,7 @@ def get_cmake_dir():
 BUILD_FOR_CONDA: bool = True
 BUILD_STUB_FILES: bool = True
 CHECK_RANGE: bool = False
-CMAKE_INSTALL_PREFIX: str = 'C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.14/cmake-install'
+CMAKE_INSTALL_PREFIX: str = 'C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.14/cmake-install'
 DEBUG_LOG: bool = False
 ENABLE_CPP_CORE_GUIDELINES_CHECK: bool = False
 ENABLE_UNIT_TESTS: bool = False
@@ -16,14 +16,14 @@ INTEL_MIC: bool = False
 NETGEN_PYTHON_PACKAGE_NAME: str = 'netgen-mesher'
 NETGEN_PYTHON_RPATH: str = 'netgen'
 NETGEN_PYTHON_RPATH_BIN: str = 'netgen'
-NETGEN_VERSION: str = '6.2.2506-31-ga34e6d60'
-NETGEN_VERSION_GIT: str = 'v6.2.2506-31-ga34e6d60'
-NETGEN_VERSION_HASH: str = 'ga34e6d60'
+NETGEN_VERSION: str = '6.2.2506-42-gf1114198'
+NETGEN_VERSION_GIT: str = 'v6.2.2506-42-gf1114198'
+NETGEN_VERSION_HASH: str = 'gf1114198'
 NETGEN_VERSION_MAJOR: str = '6'
 NETGEN_VERSION_MINOR: str = '2'
 NETGEN_VERSION_PATCH: str = '2506'
-NETGEN_VERSION_PYTHON: str = '6.2.2506.post31.dev0'
-NETGEN_VERSION_TWEAK: str = '31'
+NETGEN_VERSION_PYTHON: str = '6.2.2506.post42.dev0'
+NETGEN_VERSION_TWEAK: str = '42'
 NG_COMPILE_FLAGS: str = '/arch:AVX2'
 NG_INSTALL_DIR_BIN: str = 'netgen'
 NG_INSTALL_DIR_CMAKE: str = 'netgen/cmake'
@@ -51,4 +51,4 @@ USE_SPDLOG: bool = False
 is_python_package: bool = True
 ngcore_compile_definitions: str = 'NETGEN_PYTHON;NG_PYTHON;PYBIND11_SIMPLE_GIL_MANAGEMENT;_WIN32_WINNT=0x1000;WNT;WNT_WINDOW;NOMINMAX;MSVC_EXPRESS;_CRT_SECURE_NO_WARNINGS;HAVE_STRUCT_TIMESPEC;WIN32'
 ngcore_compile_options: str = '/arch:AVX2;/bigobj;$<BUILD_INTERFACE:/MP;/W1;/wd4068>'
-version: str = 'v6.2.2506-31-ga34e6d60'
+version: str = 'v6.2.2506-42-gf1114198'

netgen/include/core/array.hpp

@@ -455,7 +455,7 @@ namespace ngcore
     using BaseArrayObject<FlatArray>::ILLEGAL_POSITION;
 
     /// initialize array 
-    NETGEN_INLINE FlatArray () = default;
+    FlatArray () = default;
     // { ; } // size = 0; data = 0; }
 
     /// copy constructor allows size-type conversion 
@@ -1442,8 +1442,24 @@ namespace ngcore
   template <class T, typename TLESS>
   void QuickSort (FlatArray<T> data, TLESS less)
   {
-    if (data.Size() <= 1) return;
+    constexpr size_t INSERTION_SORT_THRESHOLD = 16;
+    
+    if (data.Size() <= INSERTION_SORT_THRESHOLD) {
+      // insertion sort
+      for (ptrdiff_t k = 1; k < data.Size(); ++k)
+        {
+          auto newval = data[k];
+          ptrdiff_t l = k;
+          for ( ; l > 0 && less(newval, data[l-1]); --l)
+            data[l] = data[l-1];
+          data[l] = newval;
+        }
+      
+      return;
+    }
 
+    // if (data.Size() <= 1) return;
+    
     ptrdiff_t i = 0;
     ptrdiff_t j = data.Size()-1;
 

netgen/include/core/autodiff.hpp

@@ -9,7 +9,6 @@
 
 namespace ngcore
 {
-  using ngcore::IfPos;
 
 // Automatic differentiation datatype
 
@@ -247,7 +246,6 @@ NETGEN_INLINE AutoDiffVec<D,SCAL> operator* (const AutoDiffVec<D,SCAL> & x, cons
 }
 
 /// AutoDiffVec times AutoDiffVec
-using ngcore::sqr;
 template<int D, typename SCAL>
 NETGEN_INLINE AutoDiffVec<D,SCAL> sqr (const AutoDiffVec<D,SCAL> & x) throw()
 {

netgen/include/core/autodiffdiff.hpp

@@ -9,8 +9,6 @@
 
 namespace ngcore
 {
-  using ngcore::IfPos;
-
 // Automatic second differentiation datatype
 
 

netgen/include/core/bitarray.hpp

@@ -155,7 +155,7 @@ public:
   
   NGCORE_API auto * Data() const { return data; }
 
-  const size_t GetMemoryUsage() const { return owns_data ? (size+CHAR_BIT-1)/CHAR_BIT : 0; }
+  size_t GetMemoryUsage() const { return owns_data ? (size+CHAR_BIT-1)/CHAR_BIT : 0; }
   const MemoryTracer& GetMemoryTracer() const { return mt; }
   void StartMemoryTracing() const
   {

netgen/include/core/memtracer.hpp

@@ -199,16 +199,16 @@ namespace ngcore
 #else // defined(NETGEN_TRACE_MEMORY) && !defined(__CUDA_ARCH__)
   public:
     NETGEN_INLINE MemoryTracer() {}
-    MemoryTracer( std::string /* name */ ) {}
+    NETGEN_INLINE MemoryTracer( std::string /* name */ ) {}
     template <typename... TRest>
-    MemoryTracer( std::string /* name */, TRest & ... ) {}
+    NETGEN_INLINE MemoryTracer( std::string /* name */, TRest & ... ) {}
 
-    void Alloc(size_t /* size */) const {}
-    void Free(size_t /* size */) const {}
-    int GetId() const { return 0; }
+    NETGEN_INLINE void Alloc(size_t /* size */) const {}
+    NETGEN_INLINE void Free(size_t /* size */) const {}
+    NETGEN_INLINE int GetId() const { return 0; }
 
     template <typename... TRest>
-    void Track(TRest&...) const {}
+    NETGEN_INLINE void Track(TRest&...) const {}
 
     static std::string GetName(int /* id */) { return ""; }
     std::string GetName() const { return ""; }

netgen/include/core/simd_arm64.hpp

@@ -31,7 +31,93 @@ namespace ngcore
   };
 
 
-  // *************************** int64 ***************************
+  // *************************** int32 ***************************
+
+
+  
+  template<>
+  class SIMD<int32_t,2>
+  {
+    int32x2_t data;
+  public:
+    static constexpr int Size() { return 2; }
+    SIMD() {}
+    SIMD (int32_t val) : data{val,val} {}
+    SIMD (int32_t v0, int32_t v1) : data{v0,v1} { }
+    SIMD (SIMD<int32_t,1> lo, SIMD<int32_t,1> hi) : data{lo[0], hi[0] } { }     
+    SIMD (std::array<int32_t, 2> arr) : data{arr[0], arr[1]} { } 
+    
+    SIMD (int32x2_t _data) { data = _data; }
+
+    NETGEN_INLINE auto Data() const { return data; }
+    NETGEN_INLINE auto & Data() { return data; }
+
+    SIMD<int32_t,1> Lo() const { return Get<0>(); }
+    SIMD<int32_t,1> Hi() const { return Get<1>(); } 
+    
+    int32_t operator[] (int i) const { return data[i]; }
+    int32_t & operator[] (int i)  { return ((int32_t*)&data)[i]; }
+
+    template <int I>
+    int32_t Get() const { return data[I]; }
+    static SIMD FirstInt(int n0=0) { return { n0+0, n0+1 }; }
+  };
+
+
+  template<>
+  class SIMD<int32_t,4>
+  {
+    int32x4_t data;
+  public:
+    static constexpr int Size() { return 4; }
+    SIMD() {}
+    SIMD (int32_t val) : data{val,val,val,val} {}
+    SIMD (int32_t v0, int32_t v1, int32_t v2, int32_t v3) : data{v0,v1,v2,v3} { }
+    SIMD (std::array<int32_t, 4> arr) : data{arr[0], arr[1], arr[2], arr[3]} { } 
+    
+    SIMD (int32x4_t _data) { data = _data; }
+    SIMD (SIMD<int32_t,2> lo, SIMD<int32_t,2> hi) : data{vcombine_s32(lo.Data(), hi.Data())} {}
+    SIMD (int32_t * p) : data{vld1q_s32(p)} { }
+
+    NETGEN_INLINE auto Data() const { return data; }
+    NETGEN_INLINE auto & Data() { return data; }
+
+    SIMD<int32_t,2> Lo() const { return vget_low_s32(data); }
+    SIMD<int32_t,2> Hi() const { return vget_high_s32(data); }
+    
+    int32_t operator[] (int i) const { return data[i]; }
+    int32_t & operator[] (int i)  { return ((int32_t*)&data)[i]; }
+
+    void Store (int32_t * p) { vst1q_s32(p, data); }
+          
+    template <int I>
+    int32_t Get() const { return data[I]; }
+    static SIMD FirstInt(int n0=0) { return { n0+0, n0+1, n0+2, n0+3 }; }
+  };
+  
+
+  
+  NETGEN_INLINE auto Min (SIMD<int32_t,2> a, SIMD<int32_t,2> b) {
+    return SIMD<int32_t,2>(vmin_s32(a.Data(), b.Data()));
+  }
+  
+  NETGEN_INLINE auto Max (SIMD<int32_t,2> a, SIMD<int32_t,2> b) {
+    return SIMD<int32_t,2>(vmax_s32(a.Data(), b.Data()));
+  }
+
+  
+  NETGEN_INLINE auto Min (SIMD<int32_t,4> a, SIMD<int32_t,4> b) {
+    return SIMD<int32_t,4>(vminq_s32(a.Data(), b.Data()));
+  }
+  
+  NETGEN_INLINE auto Max (SIMD<int32_t,4> a, SIMD<int32_t,4> b) {
+    return SIMD<int32_t,4>(vmaxq_s32(a.Data(), b.Data()));
+  }
+
+
+  
+
+  // *************************** int64 ***************************  
  
   template<>
   class SIMD<int64_t,2>

netgen/include/core/simd_generic.hpp

@@ -48,6 +48,13 @@ namespace ngcore
       return k;
   }
 
+  constexpr size_t LargestPowerOfTwo (size_t x)
+  {
+    size_t y = 1;
+    while (2*y <= x) y *= 2;
+    return y;
+  }
+  
 
   template <typename T, int N=GetDefaultSIMDSize()> class SIMD;
 
@@ -89,7 +96,8 @@ namespace ngcore
   template <int N>
   class alignas(GetLargestNativeSIMDPart(N)*sizeof(int64_t)) SIMD<mask64,N>
   {
-    static constexpr int N1 = GetLargestNativeSIMDPart(N);
+    // static constexpr int N1 = GetLargestNativeSIMDPart(N);
+    static constexpr size_t N1 = LargestPowerOfTwo(N-1);
     static constexpr int N2 = N-N1;
 
     SIMD<mask64,N1> lo;
@@ -111,6 +119,113 @@ namespace ngcore
     }
 
 
+  ////////////////////////////////////////////////////////////////////////////
+  // int32
+
+  template<>
+  class SIMD<int32_t,1>
+  {
+    int32_t data;
+
+  public:
+    static constexpr int Size() { return 1; }
+    SIMD () {}
+    SIMD (const SIMD &) = default;
+    SIMD & operator= (const SIMD &) = default;
+    // SIMD (int val) : data{val} {}
+    SIMD (int32_t val) : data{val} {}
+    SIMD (size_t val) : data(val) {}
+    explicit SIMD (std::array<int32_t, 1> arr) : data{arr[0]} {}
+    
+
+    
+    int32_t operator[] (int i) const { return ((int32_t*)(&data))[i]; }
+    auto Data() const { return data; }
+    static SIMD FirstInt(int32_t n0=0) { return {n0}; }
+    template <int I>
+    int32_t Get()
+    {
+      static_assert(I==0);
+      return data;
+    }
+  };
+
+  template<int N>
+  class alignas(GetLargestNativeSIMDPart(N)*sizeof(int64_t)) SIMD<int32_t,N>
+  {
+    // static constexpr int N1 = GetLargestNativeSIMDPart(N);
+    static constexpr size_t N1 = LargestPowerOfTwo(N-1);        
+    static constexpr int N2 = N-N1;
+
+    SIMD<int32_t,N1> lo;
+    SIMD<int32_t,N2> high;
+
+  public:
+    static constexpr int Size() { return N; }
+
+    SIMD () {}
+    SIMD (const SIMD &) = default;
+    SIMD & operator= (const SIMD &) = default;
+
+    // SIMD (int val) : lo{val}, high{val} { ; }
+    SIMD (int32_t val) : lo{val}, high{val} { ; }
+    SIMD (size_t val) : lo{val}, high{val} { ; }
+    SIMD (int32_t * p) : lo{p}, high{p+N1} { ; }
+    
+    SIMD (SIMD<int32_t,N1> lo_, SIMD<int32_t,N2> high_) : lo(lo_), high(high_) { ; }
+
+    explicit SIMD( std::array<int32_t, N> arr )
+        : lo(detail::array_range<N1>(arr, 0)),
+          high(detail::array_range<N2>(arr, N1))
+      {}
+
+
+    template<typename ...T>
+    explicit SIMD(const T... vals)
+      : lo(detail::array_range<N1>(std::array<int32_t, N>{vals...}, 0)),
+        high(detail::array_range<N2>(std::array<int32_t, N>{vals...}, N1))
+      {
+        static_assert(sizeof...(vals)==N, "wrong number of arguments");
+      }
+
+
+    template<typename T, typename std::enable_if<std::is_convertible<T, std::function<int32_t(int)>>::value, int>::type = 0>
+      SIMD (const T & func)
+    {
+      for(auto i : IntRange(N1))
+          lo[i] = func(i);
+      for(auto i : IntRange(N2))
+          high[i] = func(N1+i);
+    }
+    
+    auto Lo() const { return lo; }
+    auto Hi() const { return high; }
+
+    int32_t operator[] (int i) const { return ((int32_t*)(&lo))[i]; }
+
+    void Store (int32_t * p) { lo.Store(p); high.Store(p+N1); }
+
+    
+    /*
+    operator tuple<int32_t&,int32_t&,int32_t&,int32_t&> ()
+    { return tuple<int32_t&,int32_t&,int32_t&,int32_t&>((*this)[0], (*this)[1], (*this)[2], (*this)[3]); }
+    */
+
+    /*
+    static SIMD FirstInt() { return { 0, 1, 2, 3 }; }
+    */
+    static SIMD FirstInt(int32_t n0=0) { return {SIMD<int32_t,N1>::FirstInt(n0), SIMD<int32_t,N2>::FirstInt(n0+N1)}; }
+    template <int I>
+    int32_t Get()
+    {
+      static_assert(I>=0 && I<N, "Index out of range");
+      if constexpr(I<N1) return lo.template Get<I>();
+      else               return high.template Get<I-N1>();
+    }
+  };
+
+
+
   ////////////////////////////////////////////////////////////////////////////
   // int64
 
@@ -145,7 +260,8 @@ namespace ngcore
   template<int N>
   class alignas(GetLargestNativeSIMDPart(N)*sizeof(int64_t)) SIMD<int64_t,N>
   {
-    static constexpr int N1 = GetLargestNativeSIMDPart(N);
+    // static constexpr int N1 = GetLargestNativeSIMDPart(N);
+    static constexpr size_t N1 = LargestPowerOfTwo(N-1);        
     static constexpr int N2 = N-N1;
 
     SIMD<int64_t,N1> lo;
@@ -209,6 +325,7 @@ namespace ngcore
     }
   };
 
+  
 
   ////////////////////////////////////////////////////////////////////////////
   // double
@@ -262,7 +379,8 @@ namespace ngcore
   template<int N>
   class alignas(GetLargestNativeSIMDPart(N)*sizeof(double)) SIMD<double, N>
   {
-    static constexpr int N1 = GetLargestNativeSIMDPart(N);
+    // static constexpr int N1 = GetLargestNativeSIMDPart(N);
+    static constexpr size_t N1 = LargestPowerOfTwo(N-1);    
     static constexpr int N2 = N-N1;
 
     SIMD<double, N1> lo;
@@ -314,7 +432,7 @@ namespace ngcore
 
     template<typename ...T>
     explicit SIMD(const T... vals)
-    : lo(detail::array_range<N1>(std::array<double, N>{vals...}, 0)),
+      : lo(detail::array_range<N1>(std::array<double, N>{vals...}, 0)),
       high(detail::array_range<N2>(std::array<double, N>{vals...}, N1))
       {
         static_assert(sizeof...(vals)==N, "wrong number of arguments");
@@ -327,8 +445,8 @@ namespace ngcore
       high.Store(p+N1, mask.Hi());
     }
 
-    auto Lo() const { return lo; }
-    auto Hi() const { return high; }
+    NETGEN_INLINE auto Lo() const { return lo; }
+    NETGEN_INLINE auto Hi() const { return high; }
 
     double operator[] (int i) const { return ((double*)(&lo))[i]; }
 
@@ -642,7 +760,11 @@ namespace ngcore
     reciprocal square root 
     Quake III algorithm, or intrinsics 
    */
+  //
+#ifndef __CUDACC__
   NETGEN_INLINE double rsqrt (double x) { return 1.0/sqrt(x); }
+#endif
+  
   template <int N>  
   SIMD<double,N> rsqrt (SIMD<double,N> x)
   {
@@ -661,6 +783,29 @@ namespace ngcore
   }
 
 
+
+  
+  template <typename T, int N>
+  auto Min (SIMD<T,N> a, SIMD<T,N> b)
+  {
+    if constexpr (N==1)
+      return SIMD<T,1> (std::min(a[0], b[0]));
+    else
+      return SIMD<T,N> (Min(a.Lo(), b.Lo()), Min(a.Hi(), b.Hi()));
+  }
+  
+  template <typename T, int N>
+  auto Max (SIMD<T,N> a, SIMD<T,N> b)
+  {
+    if constexpr (N==1)
+      return SIMD<T,1> (std::max(a[0], b[0]));
+    else
+      return SIMD<T,N> (Max(a.Lo(), b.Lo()), Max(a.Hi(), b.Hi()));
+  }
+  
+
+
+  
   
   template <typename T, int N>
   ostream & operator<< (ostream & ost, SIMD<T,N> simd)
@@ -862,6 +1007,42 @@ namespace ngcore
                              FMAddSub(a.Hi(), b.Hi(), c.Hi()));
     }
   }
+
+
+
+
+  template <int BASE, typename Tuple, std::size_t ... Is>
+  auto subtuple (const Tuple& tup, std::index_sequence<Is...>)
+  {
+    return std::make_tuple(std::get<BASE+Is>(tup)...);
+  }
+  
+  template <typename ...Args, typename T, int M>
+  auto Concat (std::tuple<SIMD<T,M>, Args...> tup)
+  {
+    constexpr size_t N = std::tuple_size<std::tuple<SIMD<T,M>, Args...>>();
+    
+    if constexpr (N == 1)
+      return get<0>(tup);
+    else
+      {
+        static constexpr size_t N1 = LargestPowerOfTwo(N-1);
+        static constexpr int N2 = N-N1;
+        
+        auto SEQ1 = std::make_index_sequence<N1>();
+        auto sub1 = subtuple<0>(tup, SEQ1);
+        
+        auto SEQ2 = std::make_index_sequence<N2>();
+        auto sub2 = subtuple<N1>(tup, SEQ2);
+      
+        auto S1 = Concat(sub1);
+        auto S2 = Concat(sub2);
+        return SIMD<T,S1.Size()+S2.Size()>(S1, S2);
+      }
+  }
+  
+
+  
 }
 
 

netgen/include/core/table.hpp

@@ -262,7 +262,7 @@ namespace ngcore
     const MemoryTracer& GetMemoryTracer() const { return mt; }
 
   private:
-    size_t GetMemUsage() const { return size == 0 ? 0 : sizeof(T)*index[size] + sizeof(IndexType) * size+1; }
+    NETGEN_INLINE size_t GetMemUsage() const { return size == 0 ? 0 : sizeof(T)*index[size] + sizeof(IndexType) * size+1; }
     MemoryTracer mt;
   };
 

netgen/include/core/taskmanager.hpp

@@ -94,10 +94,14 @@ namespace ngcore
     NGCORE_API void StartWorkers();
     NGCORE_API void StopWorkers();
 
-    void SuspendWorkers(int asleep_usecs = 1000 )
+    bool IsSleeping() const { return sleep; }
+
+    int SuspendWorkers(int asleep_usecs = 1000 )
       {
+        int old_sleep_usecs = sleep_usecs;
         sleep_usecs = asleep_usecs;
         sleep = true;
+        return old_sleep_usecs;
       }
     void ResumeWorkers() { sleep = false; }
 
@@ -179,6 +183,35 @@ namespace ngcore
     }
   };
 
+  class SuspendTaskManager
+  {
+    int old_sleep_usecs = 0;
+    bool old_sleep = false;
+    TaskManager * tm = nullptr;
+
+  public:
+    SuspendTaskManager(int asleep_usecs=1000)
+      : tm(task_manager)
+    {
+      if(!tm)
+          return;
+
+      old_sleep = tm->IsSleeping();
+      old_sleep_usecs = tm->SuspendWorkers(asleep_usecs);
+    }
+
+    ~SuspendTaskManager()
+    {
+      if(!tm)
+          return;
+
+      if(old_sleep) // restore old sleep time
+          tm->SuspendWorkers(old_sleep_usecs);
+      else
+          tm->ResumeWorkers();
+    }
+  };
+
   NETGEN_INLINE int TasksPerThread (int tpt)
   {
     // return task_manager ? tpt*task_manager->GetNumThreads() : 1;

netgen/include/include/netgen_version.hpp

@@ -1,9 +1,9 @@
 #ifndef NETGEN_VERSION_HPP_INCLUDED
 #define NETGEN_VERSION_HPP_INCLUDED
-#define NETGEN_VERSION "6.2.2506-31-ga34e6d60"
+#define NETGEN_VERSION "6.2.2506-42-gf1114198"
 #define NETGEN_VERSION_MAJOR 6
 #define NETGEN_VERSION_MINOR 2
 #define NETGEN_VERSION_PATCH 2506
-#define NETGEN_VERSION_TWEAK 31
-#define NETGEN_VERSION_HASH "ga34e6d60"
+#define NETGEN_VERSION_TWEAK 42
+#define NETGEN_VERSION_HASH "gf1114198"
 #endif // NETGEN_VERSION_HPP_INCLUDED

netgen/version.py

@@ -1,2 +1,2 @@
-__version__ = "6.2.2506.post31.dev0"
+__version__ = "6.2.2506.post42.dev0"
 __package_name__ = "netgen-mesher"

{netgen_mesher-6.2.2506.post31.dev0.dist-info → netgen_mesher-6.2.2506.post42.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netgen-mesher
-Version: 6.2.2506.post31.dev0
+Version: 6.2.2506.post42.dev0
 Summary: Netgen
 Author: The Netgen team
 License: LGPL2.1

{netgen_mesher-6.2.2506.post31.dev0.dist-info → netgen_mesher-6.2.2506.post42.dev0.dist-info}/RECORD

@@ -1,50 +1,50 @@
 netgen/NgOCC.py,sha256=XxpnA0hUy-PXrH9AvGp9DjLJGGTxB6MbPrvGnx-CuZw,186
 netgen/__init__.py,sha256=sXb0NMOsBq6CKv3EPGDZsJRQvOyPNVZV66pHwQfugvo,3385
-netgen/__init__.pyi,sha256=p4sTwSbVK6kNyrQ_XFXSMcDvl4GYeZkyFt46G_elCGQ,1277
+netgen/__init__.pyi,sha256=28DgpLO4oiYbiHpVAkkgsXUoy65MCD86HlkLdFm4M3U,1341
 netgen/__main__.py,sha256=QnWj0m9rN4WqqaSNystMGPwSbbVEUa1rlRyiji4mayc,1328
 netgen/csg.py,sha256=o03kT137QgvvVPwvTlNTj3vwvI4TzxIazF3lIa3bt84,700
 netgen/geom2d.py,sha256=bWob6jDHmMjVd6XVKLFxaP4WS1z8UQFFAftJ4sPQ91k,7664
 netgen/gui.py,sha256=_n41FsU1ftn74qe_YMC7xRvHFUccy2HXf-_3_B0TJdM,2647
-netgen/libnggui.dll,sha256=KU8KDe4HScFB1o-6Gi_HTTk6HCrfaBiVXcCX5GBQJTM,686080
+netgen/libnggui.dll,sha256=YFe8l2OX7qtzi4zHup7g3W6SJXhYzW3XxYxFY1aPIPk,686592
 netgen/libngguipy.lib,sha256=1beK2a7f2X-f77t3qYvHB3mpmsSF2p3KSLCwM0Ungfo,1784
-netgen/libngguipy.pyd,sha256=341Rh9vDytoiDzKEfPyEhx58FI31IVPub1j6JNbIH68,137216
+netgen/libngguipy.pyd,sha256=dXwM37Ie4q6deo3wmRTs8hyVXlruSE5TmYqnk6E_SFo,137216
 netgen/libngpy.lib,sha256=ikOgfUUjs3XAVuEZ-Mz91MZQ76wTMKxbL49OFSHEaCM,1732
-netgen/libngpy.pyd,sha256=BKrURAFPGd0SEojz5nx8HDSgfW3Q_sg-j-wEt3pmmmA,135168
+netgen/libngpy.pyd,sha256=ZJOMpKMm5vTVonb4egJkrbGWPkiYn4wbDRYNYJq1KH0,135168
 netgen/meshing.py,sha256=mlAxtZyPM0aYNza7T4QNw2U9zE_kiLXebUHAEgIqksQ,2673
-netgen/ngcore.dll,sha256=rHhbeyQD22sZIDqJ9L3vCgVhIe6rTjbKoD57QzW-bgU,498176
-netgen/nglib.dll,sha256=u3X1WdQC2bZ49F8okrvJGGB75XLlH6f2DRaVyPj0Y4E,6432256
+netgen/ngcore.dll,sha256=YArDLO4mDWmCGwHNt6NgI3FObZT6yl5ulQaeqbyA65k,498176
+netgen/nglib.dll,sha256=OmBRYnzKv_MfEmmmD6RGeqodYbd9w0tv8_snbRSK2iI,6436352
 netgen/occ.py,sha256=aUIEOr-X1z34LCpZlagi3_asy0PlBThphjwbApDsrE8,1576
 netgen/read_gmsh.py,sha256=SNLxfSzsbqTDLO4VqS1GGSo9HkUVqKOD48LhxKsrZ-8,10736
 netgen/read_meshio.py,sha256=jR2XkPcoxVsLbhGPd3Q0tFrgSx7c3gKC2Qt-HU1CAFM,651
 netgen/stl.py,sha256=0N9Pto43-P4ey3E1JeDpS0cv35m65kE4Aw32t-eHfUE,66
-netgen/togl.dll,sha256=G50MFEW41BdP849Ni8DbCtEiOdvPYVrpM-oasBzUtv8,52224
-netgen/version.py,sha256=hNSpg_6YDqkTjDihFovwEoABpXcEOVR5s5m4CmNgGYI,74
+netgen/togl.dll,sha256=Yj7YZBCgRX8zUJ2RgwEVUgUpIpLBQ8UTdOT6_-gwoAg,52224
+netgen/version.py,sha256=Rrmb0UCCrfJvImy_tAyXHIzmtM5FZ_BMbOaxJAcM6CA,74
 netgen/webgui.py,sha256=xtK8WkBQlrdeYVZJdY2W3Xw5iWAJewfJKAZchPg9emU,17939
-netgen/cmake/NetgenConfig.cmake,sha256=G90bVRIwTlMUAI8aCbUuzUSLBo4RIgCgvRNbhZCyy04,3644
+netgen/cmake/NetgenConfig.cmake,sha256=xao8_dK4N5O8dlgeBAVYAWHKOqrCgXzD7eysHFYFHxw,3794
 netgen/cmake/netgen-targets-release.cmake,sha256=XQbQEyo4xml5GqyddTRK4CQoFgxl6pR_NSUMH_kuSIA,3372
 netgen/cmake/netgen-targets.cmake,sha256=VQ0AtWPRE69kQ-VkK6vkkhWo6rOswz7IoBoQDsOjX7A,5413
 netgen/config/__init__.py,sha256=IjGKWBHvRx572Z6m-5z0q82xuQaWlBABy1whwy2Uxak,23
-netgen/config/__init__.pyi,sha256=oWBxJl_HHzc_LyvWVxwii7awawHbIyLjtNDMTG16K60,3025
+netgen/config/__init__.pyi,sha256=a0V2QgGM8BKcr9Yi6PlHfyGiCH2KPVYPpZ8tCh8dFp0,3055
 netgen/config/__main__.py,sha256=anI_XpgrpEnVnMyrFiH3Yon_tpQZkehnqRTNC02NiBI,93
-netgen/config/config.py,sha256=rrQNIFhayVE6-XqNZvGGT5amP2rKzbzq29rrYuWKx8o,2631
-netgen/config/config.pyi,sha256=eAEl0fHKZwpNFPmzXYXndpqyKT_Tq9sxQkiZerN_Or4,3009
+netgen/config/config.py,sha256=PxF5KoHeeqDCwn0z_ymi16AQYszHOHiogPxpvTKD_Do,2661
+netgen/config/config.pyi,sha256=gNgWmNMGj_wGciWEtSJAtBJEubmfkJTue1Z_Pzq4x0I,3039
 netgen/include/mydefs.hpp,sha256=BOYbv-T15uC4UUBkyq9LugLC2WmnnxVPtAn4uj2pSSM,1392
 netgen/include/nginterface.h,sha256=vCiajAE5SzmcDt6xbUNq-4QTS1PiXArzStq-VGZ2bqc,16508
 netgen/include/nginterface_v2.hpp,sha256=m9qpM4bdahiMwZdN8SPVafRsg_zPuoRK2i32upXQ-vM,10506
 netgen/include/nglib.h,sha256=aN-ltdIakuSTb8ggbYwGCxFv4qwYA1h6jn5edhi7f5Y,24758
 netgen/include/nglib_occ.h,sha256=5JJcSYk4tZPR9ZsFocs2ME0j7TrMNQbcMQxiKSPuvIM,2139
 netgen/include/core/archive.hpp,sha256=qX6ekKrvWgAdSxGlMyrvcqs3oqVneQhdhBPXj-CLO8k,43752
-netgen/include/core/array.hpp,sha256=7hnIzhZzFRi20WHeU7aGh59TUOHunI3sOriPT5DZncc,47760
-netgen/include/core/autodiff.hpp,sha256=24FVK2Z-3AIPjWNVIOgkX5aO-BSX0GKEksec8qP2rg4,31819
-netgen/include/core/autodiffdiff.hpp,sha256=u92dJvoJtz-RC5HB2xkGlzfrUAdg7tU1VUcf9qmKubg,20131
-netgen/include/core/bitarray.hpp,sha256=pnmxmnnRFsUeNx7hCHqamv3xVtAWrP_6EoWKDmbXuo4,5565
+netgen/include/core/array.hpp,sha256=6h4OkaKSDfGTIW6qrU8xN-wTkkLw6nco_84Od9sjCak,48177
+netgen/include/core/autodiff.hpp,sha256=xwDFw_J4XsdaWgp2AF4OTuVNXm56XDguilgTnimHe_0,31775
+netgen/include/core/autodiffdiff.hpp,sha256=_Sl3Lzk70WXqpEit_7TRkU62revIHdBe27GuCaavZmU,20105
+netgen/include/core/bitarray.hpp,sha256=I9bTteOOmIS2zDrp-IdsE5I2bdJ6tMV8ywbnoDk7lrk,5559
 netgen/include/core/concurrentqueue.h,sha256=utRW075m_hTXckRbNtHiCZHmQdRnac1CNneQymbFUmU,150478
 netgen/include/core/exception.hpp,sha256=hIIG7z1U6uA9bVA_EaAmbFSs2DGioKidQVDuU6uo5iY,5501
 netgen/include/core/flags.hpp,sha256=HNYSAOd3K1trD_Zv_dvx1pe_cVNkEr2SOUlgOxYGqsw,8253
 netgen/include/core/hashtable.hpp,sha256=WKPV810-t1wXumXsADyFQARtYCK_kew2TmN0GgPIIdo,30455
 netgen/include/core/localheap.hpp,sha256=bc9I_7dtN3GF7nQDBS_rRVWxcGb2kJf-6wxPu7D1mWQ,7072
 netgen/include/core/logging.hpp,sha256=4H06WOtbzXUVw33ZDr0vzvg-G9EClRQ-1cw6GIPsWZQ,3408
-netgen/include/core/memtracer.hpp,sha256=UFRsDrQRKDnP2cCdepj2JKqQOgHEzHstry5hFJA5heQ,5791
+netgen/include/core/memtracer.hpp,sha256=PzKYxkAe7mKMdzjPxEL3Zngks8GgQek8tKnIXxGrfn4,5875
 netgen/include/core/mpi4py_pycapi.h,sha256=x_1ys0en8LSyNYlo0AKCX5AUpTVsXVRH4FVx08hU56s,7389
 netgen/include/core/mpi_wrapper.hpp,sha256=74ZcjT7kaEjKw5BzxMg6ZPfktK343r6dU6eZzTBMyF0,18756
 netgen/include/core/ng_mpi.hpp,sha256=Vy_29Z2zV2chJ-NhLdvX7sAjFrTgOTfESmkGAu544_I,2633
@@ -60,16 +60,16 @@ netgen/include/core/ranges.hpp,sha256=SbO5YKKmggxGssgc6JGqaqPXA1EKw4_kNMl4gBt75l
 netgen/include/core/register_archive.hpp,sha256=wsne6nF1rJI5FXPcPMpOfDjWx37FXGNWl167xp5oe2g,3308
 netgen/include/core/signal.hpp,sha256=pY5i-_8fGig4oSjV316eUfNNqgr5BJ71Fb4xXAlviyo,1714
 netgen/include/core/simd.hpp,sha256=Klc2yC3TAisMp6D9bTRm6aw6zB7pkBAgjjtecQe-Fv8,4215
-netgen/include/core/simd_arm64.hpp,sha256=OcJRufpu7Zt-GD51JNGoRJl8CvYaF5qw1k4MI2xEo-s,9161
+netgen/include/core/simd_arm64.hpp,sha256=lorUJ_PLlI162_FiaulKJzQ_v0pd3Ov6kBtp0FJtqx8,11859
 netgen/include/core/simd_avx.hpp,sha256=NEIl6bgsoe7od6OZ_SOE0ATPADij-peScfqM3U9oryI,17035
 netgen/include/core/simd_avx512.hpp,sha256=QZleNrUsbVHsSAl4TroYSUM0u5xfNAkwcOcEsqYi6aQ,12393
-netgen/include/core/simd_generic.hpp,sha256=zv-boCF79O-sT8TBGpFPplTsuD1Sf2HCWTC048V3JgA,28519
+netgen/include/core/simd_generic.hpp,sha256=B72BKbDIyfDQ8yHWc2dA2PaAH4eDcv-2vE4ctNb_ay8,33523
 netgen/include/core/simd_math.hpp,sha256=d9oIhoPv1zC0CTSy14cEfCCB-zAbd7gJqFN-UeKNuq8,4183
 netgen/include/core/simd_sse.hpp,sha256=p3dD3E38RmY5fAbb6mUItRC5qOXZboi4XFOKEXdTrcI,11842
 netgen/include/core/statushandler.hpp,sha256=0_vx_ymlcXy-cIMjWj3NUvBB69FN7XOMFvdmHsZF3J0,917
 netgen/include/core/symboltable.hpp,sha256=eaLoIqhxrxoBtuQgjafFpC35A_72pnMSLnP6TZgJdac,3924
-netgen/include/core/table.hpp,sha256=67Nc-oxlJJFNQJPBo1au5xMkDE3uIb0f8di2ZnkXpIc,21929
-netgen/include/core/taskmanager.hpp,sha256=a1MOkeHjMweh98AkAVwebeO5lreDGU_90d0LrlffJLo,29083
+netgen/include/core/table.hpp,sha256=hQ1Y3HJEuaPls5iYjakO24hNz5weOQU1eUgi47SVkk8,21943
+netgen/include/core/taskmanager.hpp,sha256=uprkUSbSn4B55385AgjOe2It9HXvtcb3V7kl5xDxLbU,29791
 netgen/include/core/type_traits.hpp,sha256=Z5WCfiFjFox_DNFYEtnCI8BHiGDLhwmAKtXVrUJhBqU,1982
 netgen/include/core/utils.hpp,sha256=xX8F6-ehJCjnLhtHMHTzVmWdo3_UqJGsRuyu5K77Gzw,9617
 netgen/include/core/version.hpp,sha256=zimaHFJdJWGldeoTHH_Ulyj4NTvvJGUTJ2A4JxMD5uI,3578
@@ -144,7 +144,7 @@ netgen/include/include/myadt.hpp,sha256=MkTlfriceKaM9LZgStFz17svf9nOkluzh2t6zkkr
 netgen/include/include/mydefs.hpp,sha256=BOYbv-T15uC4UUBkyq9LugLC2WmnnxVPtAn4uj2pSSM,1392
 netgen/include/include/mystdlib.h,sha256=ukph3AXh7tug1rkTsJYbPiPeEnIRaOQpC2q85dfYcL0,960
 netgen/include/include/netgen_config.hpp,sha256=LXkjnqyHG0N2O66BXVLeNsy53M8SVtWaj0yC3ts1-mI,1082
-netgen/include/include/netgen_version.hpp,sha256=9YJT3Vy7Td5OgrWmCalwpwVtCsRXrLR_AXNUgJJ39xw,334
+netgen/include/include/netgen_version.hpp,sha256=h1Z9-xPxhX2PLa79KnbAeKX_lAEDuBD_QHyESENxIO4,334
 netgen/include/include/nginterface_v2_impl.hpp,sha256=BeVdzDzJ09rBulpxIEYplQ25FDjiMefb9MS1xNOP29Y,10842
 netgen/include/include/ngsimd.hpp,sha256=lpLvnegyW0Sz0m6PrHecIxIenNAmbba6YuwdkDCSXSo,34
 netgen/include/include/occgeom.hpp,sha256=EhKG2DCsKCJ_dG_WRmctJAM-zHPw20tTSWig1P7PfEk,31
@@ -286,55 +286,55 @@ netgen/libngpy/_csg.pyi,sha256=fYIc_PWKyHhthrnQ_D4buOYQc7jm1ZNL0QwzGx1MpEg,10875
 netgen/libngpy/_geom2d.pyi,sha256=TMrEbyhUHWrdaL3JweH8-ITzkou8DOOrWLe5k-IIRJo,11118
 netgen/libngpy/_meshing.pyi,sha256=38kEZLfsYRxaH67XkBRnUbxKWtRnB6GPISSP9p8Yn5E,276537
 netgen/libngpy/_stl.pyi,sha256=j97_IJPR7ob6XtGGGvpXAeDo6iSelPwobkVxVBnmWBg,4263
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/boundarycondition.geo,sha256=2yBB3PIJpP_8wi4YN7surc2dYhy8PVfJzaHFUOONUjs,404
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/boxcyl.geo,sha256=_uEJ3Ox468WFE1O9YBLHYuf0zh6tGXHi_zHQCZlzizA,590
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/circle_on_cube.geo,sha256=t3VyMusaHvwcRbdgYoO23EtWJqTLOw4eQDqX0cf3zd0,533
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/cone.geo,sha256=qfN50AHOIvDF-DB77pVfE_9fdWVBPc8UlCsKQQ4-PmI,233
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/cube.geo,sha256=1wGMW94hG53stIEz32DrTFQQsCETR1YvLFogmggqvZs,320
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/cubeandring.geo,sha256=P3wzsyrDWe37p429kGA_fx00gn0aSyABxczA8pbufC8,703
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/cubeandspheres.geo,sha256=rZr-PcZPBUVPAxESFIgwZSVN1liEItnR41-rR8lFO6Q,492
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/cubemcyl.geo,sha256=BzV1sixCu0h_nQD1nghQnFmkSFhk1tHg8lu_qnL-F8w,425
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/cubemsphere.geo,sha256=H43RsNjEGimNXlBwokcrm8tCIyNzTdygot_SGBBD5VQ,399
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/cylinder.geo,sha256=St_lCZCfGUg_4bf0sf4zKpccrL7plek2ppy5aXFRN4Q,196
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/cylsphere.geo,sha256=StSt9yZrYIbHHKPGzsmh-Fl49K6xat_busHg_ZpIwkc,230
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/ellipsoid.geo,sha256=Yvh-h5Ig15gCdhBplk2s7miVeYx7x4pnqsCZRl3IbwY,131
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/ellipticcyl.geo,sha256=5GPpcWipFuCZRlquOitKdyrS_Q2VCRKgzvLhZUVHlDk,191
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/extrusion.geo,sha256=n6gf-NyNChYLtLkbxuvJbDsVlzb0TkGVEIiI-34a6T0,1275
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/fichera.geo,sha256=yA0zlhHQBidcwGuLdBAs64evsGtuWgG07-Z1PNV3AXA,637
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/frame.step,sha256=myJ8vcW5Iqrtum4sKkgqjweZvfjlWw6C_vw1NQrRLUU,495592
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/hinge.stl,sha256=U88y-JOIqZyAvFYdMhlf7pd1Fi_YaY1iXnvyiqJUtPY,326551
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/lshape3d.geo,sha256=gj3KQ7RPAj388qL2y-t_ecf8WMdw96JE15IEXE3fw1U,434
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/manyholes.geo,sha256=N_xnr-WIr8CP2euSaO7aoqLJX9f97juULZKvX9E-5hE,474
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/manyholes2.geo,sha256=2Dms-eYAtHKJiRyy7sUfA_LYDmc3pZoAjDVAH6iA0uc,476
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/matrix.geo,sha256=yUDlPlWMOb0QqF1-DDc3jwhCxJuRBo36dNgR4Uzy0Xw,756
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/ortho.geo,sha256=JkcytWfN7_X87LpDPUh8iT2UoYW65LHqEh5gZifABEw,126
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/part1.stl,sha256=ssClX8ffaef1BNnHa_odlIkxjD2Z5d6fhGhet-oIQ8I,101780
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/period.geo,sha256=0z3_wUrdtmsZgpBHlk06XqGLUwLSIe9zrU_q7k-Bx2s,703
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/revolution.geo,sha256=XC4cjDHiOSAKb-67Y6nOz4LL23ncB9fskTsSODdmNlE,206
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/screw.step,sha256=xIz3vwS51TiaK5RZUU-fkTp4-yUaTYz8wvA8hMqXiGk,90246
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/sculpture.geo,sha256=9X6fg5Vwbbu_k5Nn9fklaEvO7XflrW--YqnAUdFVodA,417
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/shaft.geo,sha256=nhcJENx35rF7E5AC6bmnt8XEbG7qy-X83uMPN7-zlgQ,2352
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/shell.geo,sha256=EZi_4-YJAJAfw_iIles-avKoT3BSuDGyTsp2wg0Pc_8,179
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/sphere.geo,sha256=2GPIr83j6ge9quIQPcaHoVB0brfu2z3_QZH3k7_orAw,85
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/sphereincube.geo,sha256=Sehc3p7FBwek0PSEiGCRaEwL5TArpjDDtJOt81mgvUs,431
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/square.in2d,sha256=VfyfuqA9KfOqFFW9UcvX_2cDpKRq0Ap5Cq50aQwWslE,771
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/squarecircle.in2d,sha256=COrrPBQU8pNZ0svUBdBHbwygijTuXxgzCx23DUlmxOU,1169
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/squarehole.in2d,sha256=ificboNC4P3AF565w-0YNYKE4UXt1V6GROu0Vwwng9s,1183
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/torus.geo,sha256=Z0GCUkEiGOvdFmNJUseZmsYveWOBPZCIjskiwC11LEw,95
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/trafo.geo,sha256=lVDTR0v9agG5822lRcgecSMesAhPYII1-nG1uecbAEY,1572
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/twobricks.geo,sha256=DoSqirhsF6uxmSDkNuv4c7u-w6ngjzWTOqwqb7Wz-cE,441
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/twocubes.geo,sha256=_JNZDPpupXUdlLNCJtGoBuHywGD-9LVP7ph2uFXnD0Q,460
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/twocyl.geo,sha256=8Wiz7Gb2dlDOEuV2ZhTNgbFsJRe48Lsw6g_9UAo0auw,331
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/doc/ng4.pdf,sha256=ZllW8BEOtqQHqgiE8vElqxs26AsX9BdkPC9bCtEmW5I,520268
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/py_tutorials/exportNeutral.py,sha256=83EoKK_t0XgmOxQSYK_edS7KbDqvzdyO6pjqYx4k5aI,572
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/py_tutorials/mesh.py,sha256=MmgAPekUk2tcvFUDvA891eHmj42jB7GvRnMaGVlQblY,305
-netgen_mesher-6.2.2506.post31.dev0.data/data/share/netgen/py_tutorials/shaft.geo,sha256=nhcJENx35rF7E5AC6bmnt8XEbG7qy-X83uMPN7-zlgQ,2352
-netgen_mesher-6.2.2506.post31.dev0.dist-info/licenses/AUTHORS,sha256=IA5oqy6AHrQgp3DjzWX623dx-ve7C48MtA06ZphZWvw,52
-netgen_mesher-6.2.2506.post31.dev0.dist-info/licenses/LICENSE,sha256=iFoD9UsVeWEjb0aEPnmXKr_NaJC2y7NovH7KMo_5WhI,26934
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/boundarycondition.geo,sha256=2yBB3PIJpP_8wi4YN7surc2dYhy8PVfJzaHFUOONUjs,404
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/boxcyl.geo,sha256=_uEJ3Ox468WFE1O9YBLHYuf0zh6tGXHi_zHQCZlzizA,590
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/circle_on_cube.geo,sha256=t3VyMusaHvwcRbdgYoO23EtWJqTLOw4eQDqX0cf3zd0,533
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/cone.geo,sha256=qfN50AHOIvDF-DB77pVfE_9fdWVBPc8UlCsKQQ4-PmI,233
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/cube.geo,sha256=1wGMW94hG53stIEz32DrTFQQsCETR1YvLFogmggqvZs,320
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/cubeandring.geo,sha256=P3wzsyrDWe37p429kGA_fx00gn0aSyABxczA8pbufC8,703
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/cubeandspheres.geo,sha256=rZr-PcZPBUVPAxESFIgwZSVN1liEItnR41-rR8lFO6Q,492
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/cubemcyl.geo,sha256=BzV1sixCu0h_nQD1nghQnFmkSFhk1tHg8lu_qnL-F8w,425
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/cubemsphere.geo,sha256=H43RsNjEGimNXlBwokcrm8tCIyNzTdygot_SGBBD5VQ,399
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/cylinder.geo,sha256=St_lCZCfGUg_4bf0sf4zKpccrL7plek2ppy5aXFRN4Q,196
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/cylsphere.geo,sha256=StSt9yZrYIbHHKPGzsmh-Fl49K6xat_busHg_ZpIwkc,230
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/ellipsoid.geo,sha256=Yvh-h5Ig15gCdhBplk2s7miVeYx7x4pnqsCZRl3IbwY,131
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/ellipticcyl.geo,sha256=5GPpcWipFuCZRlquOitKdyrS_Q2VCRKgzvLhZUVHlDk,191
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/extrusion.geo,sha256=n6gf-NyNChYLtLkbxuvJbDsVlzb0TkGVEIiI-34a6T0,1275
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/fichera.geo,sha256=yA0zlhHQBidcwGuLdBAs64evsGtuWgG07-Z1PNV3AXA,637
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/frame.step,sha256=myJ8vcW5Iqrtum4sKkgqjweZvfjlWw6C_vw1NQrRLUU,495592
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/hinge.stl,sha256=U88y-JOIqZyAvFYdMhlf7pd1Fi_YaY1iXnvyiqJUtPY,326551
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/lshape3d.geo,sha256=gj3KQ7RPAj388qL2y-t_ecf8WMdw96JE15IEXE3fw1U,434
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/manyholes.geo,sha256=N_xnr-WIr8CP2euSaO7aoqLJX9f97juULZKvX9E-5hE,474
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/manyholes2.geo,sha256=2Dms-eYAtHKJiRyy7sUfA_LYDmc3pZoAjDVAH6iA0uc,476
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/matrix.geo,sha256=yUDlPlWMOb0QqF1-DDc3jwhCxJuRBo36dNgR4Uzy0Xw,756
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/ortho.geo,sha256=JkcytWfN7_X87LpDPUh8iT2UoYW65LHqEh5gZifABEw,126
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/part1.stl,sha256=ssClX8ffaef1BNnHa_odlIkxjD2Z5d6fhGhet-oIQ8I,101780
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/period.geo,sha256=0z3_wUrdtmsZgpBHlk06XqGLUwLSIe9zrU_q7k-Bx2s,703
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/revolution.geo,sha256=XC4cjDHiOSAKb-67Y6nOz4LL23ncB9fskTsSODdmNlE,206
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/screw.step,sha256=xIz3vwS51TiaK5RZUU-fkTp4-yUaTYz8wvA8hMqXiGk,90246
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/sculpture.geo,sha256=9X6fg5Vwbbu_k5Nn9fklaEvO7XflrW--YqnAUdFVodA,417
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/shaft.geo,sha256=nhcJENx35rF7E5AC6bmnt8XEbG7qy-X83uMPN7-zlgQ,2352
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/shell.geo,sha256=EZi_4-YJAJAfw_iIles-avKoT3BSuDGyTsp2wg0Pc_8,179
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/sphere.geo,sha256=2GPIr83j6ge9quIQPcaHoVB0brfu2z3_QZH3k7_orAw,85
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/sphereincube.geo,sha256=Sehc3p7FBwek0PSEiGCRaEwL5TArpjDDtJOt81mgvUs,431
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/square.in2d,sha256=VfyfuqA9KfOqFFW9UcvX_2cDpKRq0Ap5Cq50aQwWslE,771
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/squarecircle.in2d,sha256=COrrPBQU8pNZ0svUBdBHbwygijTuXxgzCx23DUlmxOU,1169
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/squarehole.in2d,sha256=ificboNC4P3AF565w-0YNYKE4UXt1V6GROu0Vwwng9s,1183
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/torus.geo,sha256=Z0GCUkEiGOvdFmNJUseZmsYveWOBPZCIjskiwC11LEw,95
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/trafo.geo,sha256=lVDTR0v9agG5822lRcgecSMesAhPYII1-nG1uecbAEY,1572
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/twobricks.geo,sha256=DoSqirhsF6uxmSDkNuv4c7u-w6ngjzWTOqwqb7Wz-cE,441
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/twocubes.geo,sha256=_JNZDPpupXUdlLNCJtGoBuHywGD-9LVP7ph2uFXnD0Q,460
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/twocyl.geo,sha256=8Wiz7Gb2dlDOEuV2ZhTNgbFsJRe48Lsw6g_9UAo0auw,331
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/doc/ng4.pdf,sha256=ZllW8BEOtqQHqgiE8vElqxs26AsX9BdkPC9bCtEmW5I,520268
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/py_tutorials/exportNeutral.py,sha256=83EoKK_t0XgmOxQSYK_edS7KbDqvzdyO6pjqYx4k5aI,572
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/py_tutorials/mesh.py,sha256=MmgAPekUk2tcvFUDvA891eHmj42jB7GvRnMaGVlQblY,305
+netgen_mesher-6.2.2506.post42.dev0.data/data/share/netgen/py_tutorials/shaft.geo,sha256=nhcJENx35rF7E5AC6bmnt8XEbG7qy-X83uMPN7-zlgQ,2352
+netgen_mesher-6.2.2506.post42.dev0.dist-info/licenses/AUTHORS,sha256=IA5oqy6AHrQgp3DjzWX623dx-ve7C48MtA06ZphZWvw,52
+netgen_mesher-6.2.2506.post42.dev0.dist-info/licenses/LICENSE,sha256=iFoD9UsVeWEjb0aEPnmXKr_NaJC2y7NovH7KMo_5WhI,26934
 pyngcore/__init__.py,sha256=6t3e6N7ioXrc_Gt0RBQwsVNls0SKuWImfxAUpUSaUIE,25
-pyngcore/pyngcore.cp314-win_amd64.pyd,sha256=-KEJSn0uEdXQaD05bFJ8kCyxORUfE2O8Gh8TWkd-eYg,563200
-netgen_mesher-6.2.2506.post31.dev0.dist-info/METADATA,sha256=g9ugjevIgnUKBUpLajIBPmP9y9aXmfvs5VngIV4TS9U,338
-netgen_mesher-6.2.2506.post31.dev0.dist-info/WHEEL,sha256=lCMqTXlaEtt78xHU31d8Zd4HGN_cBUVXptBXjt73558,96
-netgen_mesher-6.2.2506.post31.dev0.dist-info/entry_points.txt,sha256=qF0WqNwCw9KWb2krQEatrvT8ISVzhgfaVjQyH9eZgbE,48
-netgen_mesher-6.2.2506.post31.dev0.dist-info/top_level.txt,sha256=sPUFsx4uno9u_BrRHk2AvpPk3LUY0xT618VzCQ36bA0,16
-netgen_mesher-6.2.2506.post31.dev0.dist-info/RECORD,,
+pyngcore/pyngcore.cp314-win_amd64.pyd,sha256=pWiILT2aSzMBJC6fH9hsLyROJxgSR2AQH2Vd1yQHxEA,568320
+netgen_mesher-6.2.2506.post42.dev0.dist-info/METADATA,sha256=cxw1UT00Q1yu_TQVUQt_HQlZaNCeqjzK-bddTxRVaWM,338
+netgen_mesher-6.2.2506.post42.dev0.dist-info/WHEEL,sha256=lCMqTXlaEtt78xHU31d8Zd4HGN_cBUVXptBXjt73558,96
+netgen_mesher-6.2.2506.post42.dev0.dist-info/entry_points.txt,sha256=qF0WqNwCw9KWb2krQEatrvT8ISVzhgfaVjQyH9eZgbE,48
+netgen_mesher-6.2.2506.post42.dev0.dist-info/top_level.txt,sha256=sPUFsx4uno9u_BrRHk2AvpPk3LUY0xT618VzCQ36bA0,16
+netgen_mesher-6.2.2506.post42.dev0.dist-info/RECORD,,