netgen-mesher 6.2.2504.post11.dev0__cp313-cp313-win_amd64.whl → 6.2.2506.post48.dev0__cp313-cp313-win_amd64.whl

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/core/utils.hpp

@@ -63,18 +63,13 @@ namespace ngcore
 
   inline TTimePoint GetTimeCounter() noexcept
   {
-#if defined(__APPLE__) && defined(NETGEN_ARCH_ARM64)
-    return mach_absolute_time();
-#elif defined(NETGEN_ARCH_AMD64)
+#if defined(NETGEN_ARCH_AMD64)
     return __rdtsc();
-#elif defined(NETGEN_ARCH_ARM64) && defined(__GNUC__)
-    // __GNUC__ is also defined by CLANG. Use inline asm to read Generic Timer
+#elif defined(NETGEN_ARCH_ARM64)
     unsigned long long tics;
     __asm __volatile("mrs %0, CNTVCT_EL0" : "=&r" (tics));
     return tics;
-#elif defined(__EMSCRIPTEN__)
-    return std::chrono::high_resolution_clock::now().time_since_epoch().count();
-#elif defined(_MSC_VER) && defined(_M_ARM64)
+#elif defined(__EMSCRIPTEN__) || (defined(_MSC_VER) && defined(_M_ARM64))
     return std::chrono::high_resolution_clock::now().time_since_epoch().count();
 #else
 #warning "Unsupported CPU architecture"

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.2504-11-gfea644ae"
+#define NETGEN_VERSION "6.2.2506-48-g8263c0bc"
 #define NETGEN_VERSION_MAJOR 6
 #define NETGEN_VERSION_MINOR 2
-#define NETGEN_VERSION_PATCH 2504
-#define NETGEN_VERSION_TWEAK 11
-#define NETGEN_VERSION_HASH "gfea644ae"
+#define NETGEN_VERSION_PATCH 2506
+#define NETGEN_VERSION_TWEAK 48
+#define NETGEN_VERSION_HASH "g8263c0bc"
 #endif // NETGEN_VERSION_HPP_INCLUDED

netgen/include/meshing/basegeom.hpp

@@ -42,10 +42,7 @@ namespace netgen
     string GetName() const { return name ? *name : "default"; }
     Vec<4> GetColor() { return col ? *col : Vec<4>{0., 1., 0., 1.}; }
 
-    void DoArchive(Archive& ar)
-    {
-        ar & name & col & maxh & hpref & layer;
-    }
+    void DoArchive(Archive& ar);
   };
 
   class GeometryShape;

netgen/include/meshing/global.hpp

@@ -31,23 +31,6 @@ namespace netgen
 
   DLL_HEADER extern mutex tcl_todo_mutex;
 
-  class DLL_HEADER multithreadt
-  {
-  public:
-    int pause;
-    int testmode;
-    int redraw;
-    int drawing;
-    int terminate;
-    int running;
-    double percent;
-    const char * task;
-    bool demorunning;
-    string * tcl_todo = new string("");  // tcl commands set from parallel thread
-    multithreadt();
-  };
-
-  DLL_HEADER extern volatile multithreadt multithread;
 
   class DebugParameters;
   class Mesh;

netgen/include/meshing/hpref_tet.hpp

@@ -4184,6 +4184,47 @@ HPRef_Struct reftet_3f_0e_0v =
 
 
 
+
+// HP_TET_ALFELD
+int reftet_Alfeld_splitedges[][3] =
+{
+  { 0, 0, 0 }
+};
+int reftet_Alfeld_splitfaces[][4] =
+{
+  { 0, 0, 0, 0 }
+};
+
+int reftet_Alfeld_splitelements[][5] =
+  {
+    { 1, 2, 3, 4, 5},
+    { 0 }
+  };
+
+HPREF_ELEMENT_TYPE reftet_Alfeld_newelstypes[] =
+{
+  HP_TET, HP_TET, HP_TET, HP_TET,
+  HP_NONE, 
+};
+
+int reftet_Alfeld_newels[][8] =
+{
+  { 1, 2, 3, 5 }, 
+  { 1, 4, 2, 5 }, 
+  { 1, 3, 4, 5 },
+  { 3, 2, 4, 5 }
+};
+HPRef_Struct reftet_Alfeld =
+{
+  HP_TET,
+  reftet_Alfeld_splitedges, 
+  reftet_Alfeld_splitfaces,
+  reftet_Alfeld_splitelements,  
+  reftet_Alfeld_newelstypes,
+  reftet_Alfeld_newels
+};
+
+
 /*
 
 */

netgen/include/meshing/hprefinement.hpp

@@ -189,6 +189,8 @@ enum HPREF_ELEMENT_TYPE {
   
   HP_TET_3F_0E_0V = 700,  // 3 singular faces, no additional points or edges  NEW   done 
 
+  HP_TET_ALFELD,
+  
   HP_PRISM = 1000,
   HP_PRISM_SINGEDGE,
   HP_PRISM_SINGEDGE_V12,

netgen/include/meshing/meshtype.hpp

@@ -903,7 +903,7 @@ namespace netgen
     int HasFace(const Element2d& el) const;
   };
 
-  ostream & operator<<(ostream  & s, const Element2d & el);
+  DLL_HEADER ostream & operator<<(ostream  & s, const Element2d & el);
 
 
 
@@ -1334,6 +1334,7 @@ namespace netgen
     auto PNums() const { return FlatArray<const PointIndex> (GetNP(), &pnums[0]); }
     auto PNums() { return FlatArray<PointIndex> (GetNP(), &pnums[0]); }
     
+    auto Vertices() const { return FlatArray<const PointIndex> (2, &pnums[0]); }
     
     ELEMENT_TYPE GetType() const
     {

netgen/include/meshing/msghandler.hpp

@@ -45,13 +45,16 @@ namespace netgen
 			     const MyStr& s5="", const MyStr& s6="", const MyStr& s7="", const MyStr& s8="");
   extern DLL_HEADER void PrintTime(const MyStr& s1="", const MyStr& s2="", const MyStr& s3="", const MyStr& s4="", 
 			const MyStr& s5="", const MyStr& s6="", const MyStr& s7="", const MyStr& s8="");
-  extern DLL_HEADER void SetStatMsg(const MyStr& s);
 
-  extern DLL_HEADER void PushStatus(const MyStr& s);
-  extern DLL_HEADER void PushStatusF(const MyStr& s);
-  extern DLL_HEADER void PopStatus();
-  extern DLL_HEADER void SetThreadPercent(double percent);
-  extern DLL_HEADER void GetStatus(MyStr & s, double & percentage);
+
+
+
+  inline void PushStatusF(const std::string& s)
+  {
+    PushStatus (s);
+    PrintFnStart(s);
+  }
+
 }
 
 

netgen/include/meshing/topology.hpp

@@ -390,7 +390,7 @@ inline short int MeshTopology :: GetNEdges (ELEMENT_TYPE et)
       // default:
       // cerr << "Ng_ME_GetNEdges, illegal element type " << et << endl;
     }
-  return -99;
+  return 0;
 }
 
 
@@ -431,7 +431,7 @@ inline short int MeshTopology :: GetNFaces (ELEMENT_TYPE et)
       return 6;
 
     default:
-      return -99;
+      return 0;
       // default:
       // cerr << "Ng_ME_GetNVertices, illegal element type " << et << endl;
     }

netgen/include/nginterface.h

@@ -353,10 +353,11 @@ extern "C" {
 
   DLL_HEADER void RunParallel ( void * (*fun)(void *), void * in);
 
-  DLL_HEADER void Ng_PushStatus (const char * str);
+  #define NG_STATUS_USES_STD_STRING
+  DLL_HEADER void Ng_PushStatus (const std::string& str);
   DLL_HEADER void Ng_PopStatus ();
   DLL_HEADER void Ng_SetThreadPercentage (double percent);
-  DLL_HEADER void Ng_GetStatus (char ** str, double & percent);
+  DLL_HEADER void Ng_GetStatus (std::string& str, double & percent);
 
   DLL_HEADER void Ng_SetTerminate(void);
   DLL_HEADER void Ng_UnSetTerminate(void);

netgen/include/occ/occ_utils.hpp

@@ -71,6 +71,20 @@ namespace netgen
         return gp_Pnt(p(0), p(1), p(2));
     }
 
+    inline void CheckValidPropertyType(const TopoDS_Shape & shape)
+    {
+        switch (shape.ShapeType())
+        {
+          case TopAbs_SOLID:
+          case TopAbs_FACE:
+          case TopAbs_EDGE:
+          case TopAbs_VERTEX:
+            break;
+          default:
+            throw Exception("Cannot query properties of compound shapes - setting properties sets property on all highest dimension subshape type");
+        }
+    }
+
     DLL_HEADER Box<3> GetBoundingBox( const TopoDS_Shape & shape );
 
     struct OCCIdentification
@@ -152,6 +166,10 @@ namespace netgen
       {
         return SubShapes(TopAbs_SOLID);
       }
+      ListOfShapes Shells() const
+      {
+        return SubShapes(TopAbs_SHELL);
+      }
       ListOfShapes Faces() const
       {
         return SubShapes(TopAbs_FACE);
@@ -199,6 +217,14 @@ namespace netgen
       return sub;
     }
 
+    inline ListOfShapes GetShells(const TopoDS_Shape & shape)
+    {
+      ListOfShapes sub;
+      for (TopExp_Explorer e(shape, TopAbs_SHELL); e.More(); e.Next())
+        sub.push_back(e.Current());
+      return sub;
+    }
+
     inline ListOfShapes GetFaces(const TopoDS_Shape & shape)
     {
       ListOfShapes sub;

netgen/include/occ/occgeom.hpp

@@ -146,6 +146,14 @@ namespace netgen
 
     static ShapeProperties& GetProperties(const TopoDS_Shape& shape)
     {
+      try
+        {
+          CheckValidPropertyType(shape);
+        }
+      catch(Exception& e)
+        {
+          cerr << "WARNING: " << e.what() << endl;
+        }
       auto index = OCCGeometry::global_shape_property_indices.FindIndex(shape);
       if(index > 0)
         return OCCGeometry::global_shape_properties

netgen/include/pybind11/attr.h

@@ -12,6 +12,7 @@
 
 #include "detail/common.h"
 #include "cast.h"
+#include "trampoline_self_life_support.h"
 
 #include <functional>
 
@@ -81,6 +82,10 @@ struct dynamic_attr {};
 /// Annotation which enables the buffer protocol for a type
 struct buffer_protocol {};
 
+/// Annotation which enables releasing the GIL before calling the C++ destructor of wrapped
+/// instances (pybind/pybind11#1446).
+struct release_gil_before_calling_cpp_dtor {};
+
 /// Annotation which requests that a special metaclass is created for a type
 struct metaclass {
     handle value;
@@ -188,6 +193,7 @@ struct argument_record {
 
 /// Internal data structure which holds metadata about a bound function (signature, overloads,
 /// etc.)
+#define PYBIND11_DETAIL_FUNCTION_RECORD_ABI_ID "v1" // PLEASE UPDATE if the struct is changed.
 struct function_record {
     function_record()
         : is_constructor(false), is_new_style_constructor(false), is_stateless(false),
@@ -267,12 +273,18 @@ struct function_record {
     /// Pointer to next overload
     function_record *next = nullptr;
 };
+// The main purpose of this macro is to make it easy to pin-point the critically related code
+// sections.
+#define PYBIND11_ENSURE_PRECONDITION_FOR_FUNCTIONAL_H_PERFORMANCE_OPTIMIZATIONS(...)              \
+    static_assert(                                                                                \
+        __VA_ARGS__,                                                                              \
+        "Violation of precondition for pybind11/functional.h performance optimizations!")
 
 /// Special data structure which (temporarily) holds metadata about a bound class
 struct type_record {
     PYBIND11_NOINLINE type_record()
         : multiple_inheritance(false), dynamic_attr(false), buffer_protocol(false),
-          default_holder(true), module_local(false), is_final(false) {}
+          module_local(false), is_final(false), release_gil_before_calling_cpp_dtor(false) {}
 
     /// Handle to the parent scope
     handle scope;
@@ -301,6 +313,12 @@ struct type_record {
     /// Function pointer to class_<..>::dealloc
     void (*dealloc)(detail::value_and_holder &) = nullptr;
 
+    /// Function pointer for casting alias class (aka trampoline) pointer to
+    /// trampoline_self_life_support pointer. Sidesteps cross-DSO RTTI issues
+    /// on platforms like macOS (see PR #5728 for details).
+    get_trampoline_self_life_support_fn get_trampoline_self_life_support
+        = [](void *) -> trampoline_self_life_support * { return nullptr; };
+
     /// List of base classes of the newly created type
     list bases;
 
@@ -322,15 +340,17 @@ struct type_record {
     /// Does the class implement the buffer protocol?
     bool buffer_protocol : 1;
 
-    /// Is the default (unique_ptr) holder type used?
-    bool default_holder : 1;
-
     /// Is the class definition local to the module shared object?
     bool module_local : 1;
 
     /// Is the class inheritable from python classes?
     bool is_final : 1;
 
+    /// Solves pybind/pybind11#1446
+    bool release_gil_before_calling_cpp_dtor : 1;
+
+    holder_enum_t holder_enum_v = holder_enum_t::undefined;
+
     PYBIND11_NOINLINE void add_base(const std::type_info &base, void *(*caster)(void *) ) {
         auto *base_info = detail::get_type_info(base, false);
         if (!base_info) {
@@ -340,18 +360,22 @@ struct type_record {
                           + "\" referenced unknown base type \"" + tname + "\"");
         }
 
-        if (default_holder != base_info->default_holder) {
+        // SMART_HOLDER_BAKEIN_FOLLOW_ON: Refine holder compatibility checks.
+        bool this_has_unique_ptr_holder = (holder_enum_v == holder_enum_t::std_unique_ptr);
+        bool base_has_unique_ptr_holder
+            = (base_info->holder_enum_v == holder_enum_t::std_unique_ptr);
+        if (this_has_unique_ptr_holder != base_has_unique_ptr_holder) {
             std::string tname(base.name());
             detail::clean_type_id(tname);
             pybind11_fail("generic_type: type \"" + std::string(name) + "\" "
-                          + (default_holder ? "does not have" : "has")
+                          + (this_has_unique_ptr_holder ? "does not have" : "has")
                           + " a non-default holder type while its base \"" + tname + "\" "
-                          + (base_info->default_holder ? "does not" : "does"));
+                          + (base_has_unique_ptr_holder ? "does not" : "does"));
         }
 
         bases.append((PyObject *) base_info->type);
 
-#if PY_VERSION_HEX < 0x030B0000
+#ifdef PYBIND11_BACKWARD_COMPATIBILITY_TP_DICTOFFSET
         dynamic_attr |= base_info->type->tp_dictoffset != 0;
 #else
         dynamic_attr |= (base_info->type->tp_flags & Py_TPFLAGS_MANAGED_DICT) != 0;
@@ -603,6 +627,14 @@ struct process_attribute<module_local> : process_attribute_default<module_local>
     static void init(const module_local &l, type_record *r) { r->module_local = l.value; }
 };
 
+template <>
+struct process_attribute<release_gil_before_calling_cpp_dtor>
+    : process_attribute_default<release_gil_before_calling_cpp_dtor> {
+    static void init(const release_gil_before_calling_cpp_dtor &, type_record *r) {
+        r->release_gil_before_calling_cpp_dtor = true;
+    }
+};
+
 /// Process a 'prepend' attribute, putting this at the beginning of the overload chain
 template <>
 struct process_attribute<prepend> : process_attribute_default<prepend> {

netgen/include/pybind11/buffer_info.h

@@ -102,22 +102,22 @@ struct buffer_info {
     template <typename T>
     buffer_info(const T *ptr, ssize_t size, bool readonly = true)
         : buffer_info(
-            const_cast<T *>(ptr), sizeof(T), format_descriptor<T>::format(), size, readonly) {}
+              const_cast<T *>(ptr), sizeof(T), format_descriptor<T>::format(), size, readonly) {}
 
     explicit buffer_info(Py_buffer *view, bool ownview = true)
         : buffer_info(
-            view->buf,
-            view->itemsize,
-            view->format,
-            view->ndim,
-            {view->shape, view->shape + view->ndim},
-            /* Though buffer::request() requests PyBUF_STRIDES, ctypes objects
-             * ignore this flag and return a view with NULL strides.
-             * When strides are NULL, build them manually.  */
-            view->strides
-                ? std::vector<ssize_t>(view->strides, view->strides + view->ndim)
-                : detail::c_strides({view->shape, view->shape + view->ndim}, view->itemsize),
-            (view->readonly != 0)) {
+              view->buf,
+              view->itemsize,
+              view->format,
+              view->ndim,
+              {view->shape, view->shape + view->ndim},
+              /* Though buffer::request() requests PyBUF_STRIDES, ctypes objects
+               * ignore this flag and return a view with NULL strides.
+               * When strides are NULL, build them manually.  */
+              view->strides
+                  ? std::vector<ssize_t>(view->strides, view->strides + view->ndim)
+                  : detail::c_strides({view->shape, view->shape + view->ndim}, view->itemsize),
+              (view->readonly != 0)) {
         // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
         this->m_view = view;
         // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
@@ -176,7 +176,7 @@ private:
                 detail::any_container<ssize_t> &&strides_in,
                 bool readonly)
         : buffer_info(
-            ptr, itemsize, format, ndim, std::move(shape_in), std::move(strides_in), readonly) {}
+              ptr, itemsize, format, ndim, std::move(shape_in), std::move(strides_in), readonly) {}
 
     Py_buffer *m_view = nullptr;
     bool ownview = false;