ngsolve 6.2.2502.post11.dev1__cp311-cp311-manylinux_2_28_x86_64.whl → 6.2.2503__cp311-cp311-manylinux_2_28_x86_64.whl

{ngsolve-6.2.2502.post11.dev1.data → ngsolve-6.2.2503.data}/data/bin/ngs_nvcc

@@ -11,4 +11,4 @@ if [ -f /usr/local/cuda/bin/nvcc ]
   else NVCC=nvcc
 fi
 
-$NVCC  -DHAVE_NETGEN_SOURCES -DHAVE_DLFCN_H -DHAVE_CXA_DEMANGLE -DUSE_TIMEOFDAY -DTCL -DLAPACK -DUSE_PARDISO -DNGS_PYTHON -D_GLIBCXX_USE_CXX11_ABI=1 -DNETGEN_PYTHON -DNG_PYTHON -DPYBIND11_SIMPLE_GIL_MANAGEMENT -DPARALLEL -DNG_MPI_WRAPPER -arch=native  -Xcompiler -std=c++17 -Xcompiler -DMAX_SYS_DIM=3 -Xcompiler -march=core-avx2 -Xcompiler -fabi-version=19 -Xcompiler -fPIC  -I/opt/_internal/cpython-3.11.11/include -I/opt/_internal/cpython-3.11.11/include/python3.11 -I$NGSCXX_DIR/../include/netgen -I$NGSCXX_DIR/../include/netgen/include $PY_INCLUDE_FLAGS $*
+$NVCC  -DHAVE_NETGEN_SOURCES -DHAVE_DLFCN_H -DHAVE_CXA_DEMANGLE -DUSE_TIMEOFDAY -DTCL -DLAPACK -DUSE_PARDISO -DNGS_PYTHON -D_GLIBCXX_USE_CXX11_ABI=1 -DNETGEN_PYTHON -DNG_PYTHON -DPYBIND11_SIMPLE_GIL_MANAGEMENT -DPARALLEL -DNG_MPI_WRAPPER -arch=native  -Xcompiler -std=c++17 -Xcompiler -DMAX_SYS_DIM=3 -Xcompiler -march=core-avx2 -Xcompiler -fabi-version=17 -Xcompiler -fPIC  -I/opt/_internal/cpython-3.11.11/include -I/opt/_internal/cpython-3.11.13/include/python3.11 -I$NGSCXX_DIR/../include/netgen -I$NGSCXX_DIR/../include/netgen/include $PY_INCLUDE_FLAGS $*

{ngsolve-6.2.2502.post11.dev1.data → ngsolve-6.2.2503.data}/data/bin/ngscxx

@@ -10,6 +10,6 @@ export CCACHE_NOHASHDIR=1
 
 
 if [ -f /usr/bin/ccache ]
-  then /usr/bin/ccache $NGSCXX -O3 -DNDEBUG   -DHAVE_NETGEN_SOURCES -DHAVE_DLFCN_H -DHAVE_CXA_DEMANGLE -DUSE_TIMEOFDAY -DTCL -DLAPACK -DUSE_PARDISO -DNGS_PYTHON -D_GLIBCXX_USE_CXX11_ABI=1 -DNETGEN_PYTHON -DNG_PYTHON -DPYBIND11_SIMPLE_GIL_MANAGEMENT -DPARALLEL -DNG_MPI_WRAPPER -std=c++17 -DMAX_SYS_DIM=3 -march=core-avx2 -fabi-version=19 -fPIC  -I/opt/_internal/cpython-3.11.11/include -I/opt/_internal/cpython-3.11.11/include/python3.11 -I$NGSCXX_DIR/../include/netgen -I$NGSCXX_DIR/../include/netgen/include $PY_INCLUDE_FLAGS $*
-  else $NGSCXX -O3 -DNDEBUG   -DHAVE_NETGEN_SOURCES -DHAVE_DLFCN_H -DHAVE_CXA_DEMANGLE -DUSE_TIMEOFDAY -DTCL -DLAPACK -DUSE_PARDISO -DNGS_PYTHON -D_GLIBCXX_USE_CXX11_ABI=1 -DNETGEN_PYTHON -DNG_PYTHON -DPYBIND11_SIMPLE_GIL_MANAGEMENT -DPARALLEL -DNG_MPI_WRAPPER -std=c++17 -DMAX_SYS_DIM=3 -march=core-avx2 -fabi-version=19 -fPIC  -I/opt/_internal/cpython-3.11.11/include -I/opt/_internal/cpython-3.11.11/include/python3.11 -I$NGSCXX_DIR/../include/netgen -I$NGSCXX_DIR/../include/netgen/include $PY_INCLUDE_FLAGS $*
+  then /usr/bin/ccache $NGSCXX -O3 -DNDEBUG   -DHAVE_NETGEN_SOURCES -DHAVE_DLFCN_H -DHAVE_CXA_DEMANGLE -DUSE_TIMEOFDAY -DTCL -DLAPACK -DUSE_PARDISO -DNGS_PYTHON -D_GLIBCXX_USE_CXX11_ABI=1 -DNETGEN_PYTHON -DNG_PYTHON -DPYBIND11_SIMPLE_GIL_MANAGEMENT -DPARALLEL -DNG_MPI_WRAPPER -std=c++17 -DMAX_SYS_DIM=3 -march=core-avx2 -fabi-version=17 -fPIC  -I/opt/_internal/cpython-3.11.11/include -I/opt/_internal/cpython-3.11.13/include/python3.11 -I$NGSCXX_DIR/../include/netgen -I$NGSCXX_DIR/../include/netgen/include $PY_INCLUDE_FLAGS $*
+  else $NGSCXX -O3 -DNDEBUG   -DHAVE_NETGEN_SOURCES -DHAVE_DLFCN_H -DHAVE_CXA_DEMANGLE -DUSE_TIMEOFDAY -DTCL -DLAPACK -DUSE_PARDISO -DNGS_PYTHON -D_GLIBCXX_USE_CXX11_ABI=1 -DNETGEN_PYTHON -DNG_PYTHON -DPYBIND11_SIMPLE_GIL_MANAGEMENT -DPARALLEL -DNG_MPI_WRAPPER -std=c++17 -DMAX_SYS_DIM=3 -march=core-avx2 -fabi-version=17 -fPIC  -I/opt/_internal/cpython-3.11.11/include -I/opt/_internal/cpython-3.11.13/include/python3.11 -I$NGSCXX_DIR/../include/netgen -I$NGSCXX_DIR/../include/netgen/include $PY_INCLUDE_FLAGS $*
 fi

ngsolve-6.2.2503.data/data/bin/ngspy

@@ -0,0 +1,2 @@
+#! /usr/bin/bash
+LD_PRELOAD=$LD_PRELOAD: /opt/_internal/cpython-3.11.13/bin/python $*

ngsolve-6.2.2503.data/data/include/netgen/intrules_SauterSchwab.hpp

@@ -0,0 +1,25 @@
+#ifndef INTRULES_HPP
+#define INTRULES_HPP
+
+#include <bla.hpp>
+
+namespace ngsbem
+{
+  using namespace ngbla;
+  
+  // x, y in triangle [(0,0), (1,0), (0,1)]
+  tuple<Array<Vec<2>>, Array<Vec<2>>, Array<double>> IdenticPanelIntegrationRule (int order);
+
+
+  // x, y in triangle [(0,0), (1,0), (0,1)]
+  // x=(0,0) and y=(0,0) are common vertices
+  tuple<Array<Vec<2>>, Array<Vec<2>>, Array<double>> CommonVertexIntegrationRule (int order);
+  
+
+  // x, y in triangle [(0,0), (1,0), (0,1)]
+  // x in [(0,0),(1,0)] and y in [(0,0),(1,0)] are common edges
+  tuple<Array<Vec<2>>, Array<Vec<2>>, Array<double>> CommonEdgeIntegrationRule (int order);
+  
+}
+
+#endif

{ngsolve-6.2.2502.post11.dev1.data → ngsolve-6.2.2503.data}/data/include/netgen/mptools.hpp

@@ -16,9 +16,10 @@ namespace ngcomp
   class Region;
 }
 
-namespace ngfem
+namespace ngsbem
 {
-
+  using namespace ngfem;
+  
 
   template <typename entry_type = Complex>
   class NGS_DLL_HEADER SphericalHarmonics
@@ -217,22 +218,53 @@ namespace ngfem
   class MPSingular
   {
   public:
+    /*
     template <typename T>
     static void Eval (int order, double r, double scale, T && values)
     {
       SphericalHankel1(order, r, scale,  values);
     }
+    */
+
+    template <typename T>
+    static void Eval (int order, double kappa, double r, double rtyp, T && values)
+    {
+      double scale = Scale(kappa, rtyp);
+      SphericalHankel1(order, r*kappa, scale,  values);
+    }
+
+    static double Scale (double kappa, double rtyp)
+    {
+      return min(1.0, rtyp*kappa);      
+    }
   };
+
+
   
   // jn
   class MPRegular
   {
-  public:    
+  public:
+    /*
     template <typename T>
     static void Eval (int order, double r, double scale, T && values)
     {
       SphericalBessel (order, r, 1.0/scale, values);
     }
+    */
+
+    template <typename T>
+    static void Eval (int order, double kappa, double r, double rtyp, T && values)
+    {
+      double scale = Scale(kappa, rtyp);
+      SphericalBessel (order, r*kappa, 1.0/scale, values);      
+    }
+
+    static double Scale (double kappa, double rtyp)
+    {
+      return 1.0/ min(1.0, 0.25*rtyp*kappa);
+    }
+    
   };
   
   
@@ -243,22 +275,30 @@ namespace ngfem
   {
     SphericalHarmonics<entry_type> sh;
     double kappa;
-    double scale;
+    double rtyp;
+    // double scale;
   public:
+  /*
     MultiPole (int aorder, double akappa, double ascale = 1) 
       : sh(aorder), kappa(akappa), scale(ascale) { }
+  */
 
+    MultiPole (int aorder, double akappa, double artyp) 
+    : sh(aorder), kappa(akappa), rtyp(artyp) { }
+
+  
     entry_type & Coef(int n, int m) { return sh.Coef(n,m); }
     auto & SH() { return sh; }
     const auto & SH() const { return sh; }
     double Kappa() const { return kappa; }
-    double Scale() const { return scale; }    
+    double Scale() const { return RADIAL::Scale(kappa, rtyp); }
+    double RTyp() const { return rtyp; }
     int Order() const { return sh.Order(); }
     
     MultiPole Truncate(int neworder) const
     {
       if (neworder > sh.Order()) neworder=sh.Order();
-      MultiPole nmp(neworder, kappa);
+      MultiPole nmp(neworder, kappa, rtyp);
       nmp.sh.Coefs() = sh.Coefs().Range(sqr(neworder+1));
       return nmp;
     }
@@ -277,15 +317,27 @@ namespace ngfem
     void AddDipole (Vec<3> x, Vec<3> d, entry_type c);
     void AddCurrent (Vec<3> ap, Vec<3> ep, Complex j, int num=100);
     
-    
+    /*
     void ChangeScaleTo (double newscale)
     {
-      double fac = scale/newscale;
+      double fac = Scale()/newscale;
       double prod = 1;
       for (int n = 0; n <= sh.Order(); n++, prod*= fac)
         sh.CoefsN(n) *= prod;
       scale = newscale;
     }
+    */
+    void ChangeRTypTo (double new_rtyp)
+    {
+      // double fac = Scale()/newscale;
+      double fac = RADIAL::Scale(kappa, rtyp) / RADIAL::Scale(kappa, new_rtyp);
+      double prod = 1;
+      for (int n = 0; n <= sh.Order(); n++, prod*= fac)
+        sh.CoefsN(n) *= prod;
+      // scale = newscale;
+      rtyp = new_rtyp;
+    }
+    
 
     Vector<double> Spectrum (bool scaled) const
     {
@@ -294,7 +346,7 @@ namespace ngfem
       for (int n = 0; n <= Order(); n++)
         {
           spec(n) = fac * L2Norm2(sh.CoefsN(n));
-          if (!scaled) fac *= sqr(scale);
+          if (!scaled) fac *= sqr(Scale());
         }
       return spec;
     }
@@ -631,7 +683,7 @@ namespace ngfem
           {
             if (charges.Size()+dipoles.Size()+currents.Size() == 0)
               {
-                mp = MultiPole<MPSingular,entry_type> (-1, mp.Kappa());
+                mp = MultiPole<MPSingular,entry_type> (-1, mp.Kappa(), 1.);
                 return;
               }
 
@@ -728,7 +780,7 @@ namespace ngfem
 
     double Kappa() const { return root.mp.Kappa(); }
     
-    void AddCharge(Vec<3> x, Complex c)
+    void AddCharge(Vec<3> x, entry_type c)
     {
       root.AddCharge(x, c);
     }
@@ -946,7 +998,7 @@ namespace ngfem
                   mp.TransformAdd (ch->mp, ch->center-center);
                 ch->LocalizeExpansion(allow_refine);
               }
-            mp = MultiPole<MPRegular,elem_type>(-1, mp.Kappa());
+            mp = MultiPole<MPRegular,elem_type>(-1, mp.Kappa(), 1.);
             //mp.SH().Coefs()=0.0;
           }
       }
@@ -1070,7 +1122,7 @@ namespace ngfem
             }
 
         if (total_targets == 0)
-          mp = MultiPole<MPRegular>(-1, mp.Kappa());
+          mp = MultiPole<MPRegular,elem_type>(-1, mp.Kappa(),1.);
       }
       
 

{ngsolve-6.2.2502.post11.dev1.data → ngsolve-6.2.2503.data}/data/include/netgen/potentialtools.hpp

@@ -10,7 +10,7 @@
 #include <meshaccess.hpp>
 
 
-namespace ngcomp
+namespace ngsbem
 {
   
   extern void AddCurrentDensity (SingularMLMultiPole<Vec<3,Complex>> & mp, shared_ptr<CoefficientFunction> current, ngcomp::Region reg);

{ngsolve-6.2.2502.post11.dev1.data → ngsolve-6.2.2503.data}/data/lib/cmake/ngsolve/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2502-11-g4d6a78d51")
+set(PACKAGE_VERSION "6.2.2503")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..
@@ -20,7 +20,7 @@ set(NGSOLVE_CMAKE_BUILD_TYPE "Release")
 set(NGSOLVE_CMAKE_THREAD_LIBS_INIT "")
 set(NGSOLVE_MKL_LIBRARIES "MKL::MKL")
 set(NGSOLVE_PYBIND_INCLUDE_DIR "")
-set(NGSOLVE_PYTHON_INCLUDE_DIRS "/opt/_internal/cpython-3.11.11/include/python3.11")
+set(NGSOLVE_PYTHON_INCLUDE_DIRS "/opt/_internal/cpython-3.11.13/include/python3.11")
 set(NGSOLVE_PYTHON_LIBRARIES "Python3_LIBRARY-NOTFOUND")
 set(NGSOLVE_PYTHON_PACKAGES_INSTALL_DIR  "")
 set(NGSOLVE_TCL_INCLUDE_PATH "/usr/include")
@@ -30,8 +30,8 @@ set(NGSOLVE_TK_INCLUDE_PATH "/usr/include")
 set(NGSOLVE_TK_LIBRARY "/usr/lib64/libtkstub8.6.a")
 set(NGSOLVE_X11_X11_LIB "/usr/lib64/libX11.so")
 set(NGSOLVE_X11_Xmu_LIB "/usr/lib64/libXmu.so")
-set(NGSOLVE_ZLIB_INCLUDE_DIRS "/builds/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/linux-x86_64-3.11/cmake-build/dependencies/zlib/include")
-set(NGSOLVE_ZLIB_LIBRARIES "/builds/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/linux-x86_64-3.11/cmake-build/dependencies/zlib/lib/libz.a")
+set(NGSOLVE_ZLIB_INCLUDE_DIRS "/builds/ngsolve/netgen/_skbuild/linux-x86_64-3.11/cmake-build/dependencies/zlib/include")
+set(NGSOLVE_ZLIB_LIBRARIES "/builds/ngsolve/netgen/_skbuild/linux-x86_64-3.11/cmake-build/dependencies/zlib/lib/libz.a")
 
 set(NGSOLVE_INTEL_MIC       OFF)
 set(NGSOLVE_USE_CCACHE ON)
@@ -51,7 +51,7 @@ set(NGSOLVE_MAX_SYS_DIM       3)
 
 set(NGSOLVE_COMPILE_FLAGS " -DHAVE_NETGEN_SOURCES -DHAVE_DLFCN_H -DHAVE_CXA_DEMANGLE -DUSE_TIMEOFDAY -DTCL -DLAPACK -DUSE_PARDISO -DNGS_PYTHON -D_GLIBCXX_USE_CXX11_ABI=1 -DNETGEN_PYTHON -DNG_PYTHON -DPYBIND11_SIMPLE_GIL_MANAGEMENT -DPARALLEL -DNG_MPI_WRAPPER" CACHE STRING "Preprocessor definitions of ngscxx")
 set(NGSOLVE_LINK_FLAGS " -L$NGSCXX_DIR/../lib/python3.11/site-packages/netgen_mesher.libs -Wl,--rpath=$NGSCXX_DIR/../lib/python3.11/site-packages/netgen_mesher.libs" CACHE STRING "Link flags set in ngsld")
-set(NGSOLVE_INCLUDE_DIRS /opt/_internal/cpython-3.11.11/include;/opt/_internal/cpython-3.11.11/include/python3.11 CACHE STRING "Include dirs set in ngscxx")
+set(NGSOLVE_INCLUDE_DIRS /opt/_internal/cpython-3.11.11/include;/opt/_internal/cpython-3.11.13/include/python3.11 CACHE STRING "Include dirs set in ngscxx")
 
 set(NGSOLVE_INSTALL_DIR_PYTHON  lib/python3.11/site-packages)
 set(NGSOLVE_INSTALL_DIR_BIN     bin)

{ngsolve-6.2.2502.post11.dev1.data → ngsolve-6.2.2503.data}/data/lib/cmake/ngsolve/ngsolve-targets-release.cmake

@@ -45,6 +45,16 @@ set_target_properties(ngfem PROPERTIES
 list(APPEND _cmake_import_check_targets ngfem )
 list(APPEND _cmake_import_check_files_for_ngfem "${_IMPORT_PREFIX}/lib/python3.11/site-packages/netgen_mesher.libs/libngfem.so" )
 
+# Import target "ngsbem" for configuration "Release"
+set_property(TARGET ngsbem APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(ngsbem PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/python3.11/site-packages/netgen_mesher.libs/libngsbem.so"
+  IMPORTED_SONAME_RELEASE "libngsbem.so"
+  )
+
+list(APPEND _cmake_import_check_targets ngsbem )
+list(APPEND _cmake_import_check_files_for_ngsbem "${_IMPORT_PREFIX}/lib/python3.11/site-packages/netgen_mesher.libs/libngsbem.so" )
+
 # Import target "ngcomp" for configuration "Release"
 set_property(TARGET ngcomp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 set_target_properties(ngcomp PROPERTIES

{ngsolve-6.2.2502.post11.dev1.data → ngsolve-6.2.2503.data}/data/lib/cmake/ngsolve/ngsolve-targets.cmake

@@ -19,7 +19,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_cmake_targets_defined "")
 set(_cmake_targets_not_defined "")
 set(_cmake_expected_targets "")
-foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack netgen_python ngstd ngbla ngla ngfem ngcomp ngsolve ngscudalib)
+foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack netgen_python ngstd ngbla ngla ngfem ngsbem ngcomp ngsolve ngscudalib)
   list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
   if(TARGET "${_cmake_expected_target}")
     list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
@@ -107,6 +107,13 @@ set_target_properties(ngfem PROPERTIES
   INTERFACE_LINK_LIBRARIES "ngbla;ngstd"
 )
 
+# Create imported target ngsbem
+add_library(ngsbem SHARED IMPORTED)
+
+set_target_properties(ngsbem PROPERTIES
+  INTERFACE_LINK_LIBRARIES "ngcomp;ngfem;ngla;ngbla;ngstd"
+)
+
 # Create imported target ngcomp
 add_library(ngcomp SHARED IMPORTED)
 
@@ -118,7 +125,7 @@ set_target_properties(ngcomp PROPERTIES
 add_library(ngsolve SHARED IMPORTED)
 
 set_target_properties(ngsolve PROPERTIES
-  INTERFACE_LINK_LIBRARIES "netgen_libs;ngsolve;ngcomp;ngfem;ngbla;ngla;ngstd"
+  INTERFACE_LINK_LIBRARIES "netgen_libs;ngsolve;ngcomp;ngfem;ngsbem;ngbla;ngla;ngstd"
 )
 
 # Create imported target ngscudalib

{ngsolve-6.2.2502.post11.dev1.data → ngsolve-6.2.2503.data}/data/lib/python3.11/site-packages/ngsolve/config/config.py

@@ -29,15 +29,15 @@ NGSOLVE_INSTALL_DIR_INCLUDE  = "include/netgen"
 NGSOLVE_INSTALL_DIR_CMAKE    = "lib/cmake/ngsolve"
 NGSOLVE_INSTALL_DIR_RES      = "share"
 
-NGSOLVE_VERSION = "6.2.2502-11-g4d6a78d51"
-NGSOLVE_VERSION_GIT = "v6.2.2502-11-g4d6a78d51"
-NGSOLVE_VERSION_PYTHON = "6.2.2502.post11.dev1"
+NGSOLVE_VERSION = "6.2.2503"
+NGSOLVE_VERSION_GIT = "v6.2.2503-0-ga44fe5348"
+NGSOLVE_VERSION_PYTHON = "6.2.2503"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "11"
-NGSOLVE_VERSION_PATCH = "2502"
-NGSOLVE_VERSION_HASH = "g4d6a78d51"
+NGSOLVE_VERSION_TWEAK = "0"
+NGSOLVE_VERSION_PATCH = "2503"
+NGSOLVE_VERSION_HASH = "ga44fe5348"
 
 CMAKE_CXX_COMPILER           = "/opt/rh/gcc-toolset-14/root/usr/bin/c++"
 CMAKE_CUDA_COMPILER          = ""

{ngsolve-6.2.2502.post11.dev1.dist-info → ngsolve-6.2.2503.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: ngsolve
-Version: 6.2.2502.post11.dev1
+Version: 6.2.2503
 Summary: NGSolve
 Author: The NGSolve team
 License: LGPL2.1
 License-File: LICENSE
-Requires-Dist: netgen-mesher==6.2.2502.post3.dev0
+Requires-Dist: netgen-mesher==6.2.2503
 Requires-Dist: mkl
 Dynamic: author
 Dynamic: license