ngsolve 6.2.2503__cp310-cp310-win_amd64.whl → 6.2.2504.post44.dev0__cp310-cp310-win_amd64.whl

netgen/include/mptools.hpp

@@ -218,13 +218,11 @@ namespace ngsbem
   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)
@@ -235,7 +233,8 @@ namespace ngsbem
 
     static double Scale (double kappa, double rtyp)
     {
-      return min(1.0, rtyp*kappa);      
+      // return min(1.0, rtyp*kappa);
+      return min(1.0, 0.5*rtyp*kappa);      
     }
   };
 
@@ -245,13 +244,11 @@ namespace ngsbem
   class MPRegular
   {
   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)
@@ -262,7 +259,8 @@ namespace ngsbem
 
     static double Scale (double kappa, double rtyp)
     {
-      return 1.0/ min(1.0, 0.25*rtyp*kappa);
+      // return 1.0/ min(1.0, 0.25*rtyp*kappa);
+      return 1.0/ min(1.0, 0.5*rtyp*kappa);
     }
     
   };
@@ -276,12 +274,7 @@ namespace ngsbem
     SphericalHarmonics<entry_type> sh;
     double kappa;
     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) { }
@@ -362,8 +355,8 @@ namespace ngsbem
           return;
         }
       
-      static Timer t("mptool Transform "+ToString(typeid(RADIAL).name())+ToString(typeid(TARGET).name()));      
-      RegionTimer reg(t);
+      // static Timer t("mptool Transform "+ToString(typeid(RADIAL).name())+ToString(typeid(TARGET).name()));      
+      // RegionTimer reg(t);
       
       double len = L2Norm(dist);
       double theta, phi;
@@ -379,7 +372,10 @@ namespace ngsbem
         phi = atan2(dist(1), dist(0));
         
       
-      MultiPole<RADIAL,entry_type> tmp(*this);
+      // MultiPole<RADIAL,entry_type> tmp{*this};
+      MultiPole<RADIAL,entry_type> tmp(Order(), kappa, rtyp);
+      tmp.SH().Coefs() = SH().Coefs();
+      
       tmp.SH().RotateZ(phi);
       tmp.SH().RotateY(theta);
 
@@ -434,11 +430,9 @@ namespace ngsbem
       Array<tuple<Vec<3>, Vec<3>, Complex,int>> currents;
       int total_sources;
       
-      Node (Vec<3> acenter, double ar, int alevel, int order, double kappa)
-        : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*kappa), kappa, min(1.0, r*kappa))
-          // : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*kappa), kappa, 1.0)
+      Node (Vec<3> acenter, double ar, int alevel, double akappa)
+        : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*akappa), akappa, ar) // min(1.0, ar*akappa))
       {
-        // cout << "singml, add node, level = " << level << endl;
         if (level < nodes_on_level.Size())
           nodes_on_level[level]++;
       }
@@ -453,7 +447,7 @@ namespace ngsbem
             cc(0) += (i&1) ? r/2 : -r/2;
             cc(1) += (i&2) ? r/2 : -r/2;
             cc(2) += (i&4) ? r/2 : -r/2;
-            childs[i] = make_unique<Node> (cc, r/2, level+1, max(mp.SH().Order()/2, 8), mp.Kappa());
+            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa());
           }
       }
       
@@ -473,7 +467,8 @@ namespace ngsbem
 
         charges.Append( tuple{x,c} );
 
-        if (r*mp.Kappa() < 1e-8) return;
+        // if (r*mp.Kappa() < 1e-8) return;
+        if (level > 20) return;
         if (charges.Size() < maxdirect && r*mp.Kappa() < 1)
           return;
 
@@ -588,9 +583,17 @@ namespace ngsbem
             return sum;
           }
 
-        for (auto [x,c] : charges)
-          if (double rho = L2Norm(p-x); rho > 0)
-            sum += (1/(4*M_PI))*exp(Complex(0,rho*mp.Kappa())) / rho * c;
+        // static Timer t("fmm direct eval"); RegionTimer reg(t);
+        if (mp.Kappa() < 1e-8)
+          {
+            for (auto [x,c] : charges)
+              if (double rho = L2Norm(p-x); rho > 0)
+                sum += (1/(4*M_PI))*Complex(1,rho*mp.Kappa()) / rho * c;
+          }
+        else
+          for (auto [x,c] : charges)
+            if (double rho = L2Norm(p-x); rho > 0)
+              sum += (1/(4*M_PI))*exp(Complex(0,rho*mp.Kappa())) / rho * c;
         
         for (auto [x,d,c] : dipoles)
           if (double rho = L2Norm(p-x); rho > 0)
@@ -771,8 +774,8 @@ namespace ngsbem
     bool havemp = false;
     
   public:
-    SingularMLMultiPole (Vec<3> center, double r, int order, double kappa)
-      : root(center, r, 0, order, kappa)
+    SingularMLMultiPole (Vec<3> center, double r, double kappa)
+      : root(center, r, 0, kappa)
     {
       nodes_on_level = 0;
       nodes_on_level[0] = 1;
@@ -842,6 +845,7 @@ namespace ngsbem
       for (int i = 0; i <= maxlevel; i++)
         cout << "sing " <<  i << ": " << nodes_on_level[i] << endl;
       */
+      
       root.CalcTotalSources();
       root.CalcMP();
       
@@ -886,8 +890,8 @@ namespace ngsbem
 
       Array<const typename SingularMLMultiPole<elem_type>::Node*> singnodes;
 
-      Node (Vec<3> acenter, double ar, int alevel, int order, double kappa)
-        : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*kappa), kappa, 1.0/min(1.0, 0.25*r*kappa))
+      Node (Vec<3> acenter, double ar, int alevel, double kappa)
+        : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*kappa), kappa, ar) // 1.0/min(1.0, 0.25*r*kappa))
           // : center(acenter), r(ar), level(alevel), mp(MPOrder(ar*kappa), kappa, 1.0)
       {
         if (level < nodes_on_level.Size())
@@ -905,7 +909,7 @@ namespace ngsbem
             cc(0) += (i&1) ? r/2 : -r/2;
             cc(1) += (i&2) ? r/2 : -r/2;
             cc(2) += (i&4) ? r/2 : -r/2;
-            childs[i] = make_unique<Node> (cc, r/2, level+1, max(mp.SH().Order()/2, 8), mp.Kappa());
+            childs[i] = make_unique<Node> (cc, r/2, level+1, mp.Kappa());
           }
       }
 
@@ -1027,7 +1031,7 @@ namespace ngsbem
           sum = mp.Eval(p-center);
 
 
-        static Timer t("mptool direct evaluate"); RegionTimer r(t);
+        // static Timer t("mptool direct evaluate"); RegionTimer r(t);
         for (auto sn : singnodes)
           sum += sn->EvaluateMP(p);
 
@@ -1089,7 +1093,8 @@ namespace ngsbem
 
         targets.Append( x );
 
-        if (r*mp.Kappa() < 1e-8) return;
+        // if (r*mp.Kappa() < 1e-8) return;
+        if (level > 20) return;        
         if (targets.Size() < maxdirect && r*mp.Kappa() < 1)
           return;
 
@@ -1145,8 +1150,8 @@ namespace ngsbem
     shared_ptr<SingularMLMultiPole<elem_type>> singmp;
     
   public:
-  RegularMLMultiPole (shared_ptr<SingularMLMultiPole<elem_type>> asingmp, Vec<3> center, double r, int order)
-      : root(center, r, 0, order, asingmp->Kappa()), singmp(asingmp)
+  RegularMLMultiPole (shared_ptr<SingularMLMultiPole<elem_type>> asingmp, Vec<3> center, double r)
+      : root(center, r, 0, asingmp->Kappa()), singmp(asingmp)
     {
       if (!singmp->havemp) throw Exception("first call Calc for singular MP");
 
@@ -1175,8 +1180,8 @@ namespace ngsbem
       }
     }
 
-    RegularMLMultiPole (Vec<3> center, double r, int order, double kappa)
-      : root(center, r, 0, order, kappa)
+    RegularMLMultiPole (Vec<3> center, double r, double kappa)
+      : root(center, r, 0, kappa)
     {
       nodes_on_level = 0;
       nodes_on_level[0] = 1;
@@ -1189,6 +1194,8 @@ namespace ngsbem
 
     void CalcMP(shared_ptr<SingularMLMultiPole<elem_type>> asingmp)
     {
+      static Timer t("mptool regular MLMP"); RegionTimer rg(t);
+      
       singmp = asingmp;
 
       root.CalcTotalTargets();
@@ -1205,6 +1212,7 @@ namespace ngsbem
         cout << "reg " << i << ": " << RegularMLMultiPole::nodes_on_level[i] << endl;
       */
 
+      static Timer tloc("mptool regular localize expansion"); RegionTimer rloc(tloc);      
       root.LocalizeExpansion(false);
     }
 
@@ -1251,132 +1259,5 @@ namespace ngsbem
 
 
   
-  // ******************** Coefficient Functions *********************
-
-  
-  class SphericalHarmonicsCF : public CoefficientFunction
-  {
-    SphericalHarmonics<Complex> sh;
-  public:
-    SphericalHarmonicsCF (int order)
-      : CoefficientFunction(1, true), sh(order) { }
-    Complex & Coef(int n, int m) { return sh.Coef(n,m); } 
-    
-    virtual double Evaluate (const BaseMappedIntegrationPoint & ip) const override
-    { throw Exception("real eval not available"); }
-
-    virtual void Evaluate (const BaseMappedIntegrationPoint & mip, FlatVector<Complex> values) const override
-    {
-      values(0) = sh.Eval(mip.GetPoint());
-    }
-    
-    virtual void Evaluate (const BaseMappedIntegrationRule & ir, BareSliceMatrix<Complex> values) const override
-    {
-      for (int i = 0; i < ir.Size(); i++)
-        {
-          auto & mip = ir[i];
-          values(i,0) = sh.Eval(mip.GetPoint());
-        }
-    }
-
-    auto & SH() { return sh; }
-  };
-
-
-
-  template <typename entry_type> class RegularMLMultiPoleCF;
-  
-
-  template <typename RADIAL, typename entry_type=Complex>
-  class MultiPoleCF : public CoefficientFunction
-  {
-    MultiPole<RADIAL, entry_type> mp;
-    Vec<3> center;
-  public:
-    MultiPoleCF (int order, double kappa, Vec<3> acenter, double scale = 1)
-      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mp(order, kappa, scale), center(acenter) { }
-
-    entry_type & Coef(int n, int m) { return mp.Coef(n,m); } 
-    auto & SH() { return mp.SH(); }
-    auto & MP() { return mp; }
-    Vec<3> Center() const { return center; }
-    
-    virtual double Evaluate (const BaseMappedIntegrationPoint & ip) const override
-    { throw Exception("real eval not available"); }
-
-    virtual void Evaluate (const BaseMappedIntegrationPoint & mip, FlatVector<Complex> values) const override
-    {
-      if constexpr (std::is_same<entry_type, Complex>())
-        values(0) = mp.Eval(mip.GetPoint()-center);
-      else
-        values = mp.Eval(mip.GetPoint()-center);
-    }
-
-    template <typename TARGET>
-    void ShiftZ (double z, MultiPole<TARGET, entry_type> & target) { mp.ShiftZ(z, target); }
-
-    using CoefficientFunction::Transform;        
-    template <typename TARGET>
-    void Transform (MultiPoleCF<TARGET, entry_type> & target)
-    {
-      mp.Transform (target.MP(), target.Center()-center);
-    }
-  };
-
-  template <typename entry_type>
-  class SingularMLMultiPoleCF : public CoefficientFunction
-  {
-    shared_ptr<SingularMLMultiPole<entry_type>> mlmp;
-  public:
-    SingularMLMultiPoleCF (Vec<3> center, double r, int order, double kappa)
-      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<SingularMLMultiPole<entry_type>>(center, r, order, kappa)} { }
-    
-    virtual double Evaluate (const BaseMappedIntegrationPoint & ip) const override
-    { throw Exception("real eval not available"); }
-    
-    virtual void Evaluate (const BaseMappedIntegrationPoint & mip, FlatVector<Complex> values) const override
-    {
-      // values(0) = mlmp->Evaluate(mip.GetPoint());
-
-      if constexpr (std::is_same<entry_type, Complex>())
-        values(0) = mlmp->Evaluate(mip.GetPoint());
-      else
-        values = mlmp->Evaluate(mip.GetPoint());
-
-      
-    }
-    
-    shared_ptr<SingularMLMultiPole<entry_type>> MLMP() const { return mlmp; }
-    shared_ptr<RegularMLMultiPoleCF<entry_type>> CreateRegularExpansion(Vec<3> center, double r) const;
-  };
-  
-
-  template <typename entry_type>
-  class RegularMLMultiPoleCF : public CoefficientFunction
-  {
-    shared_ptr<RegularMLMultiPole<entry_type>> mlmp;
-  public:
-    RegularMLMultiPoleCF (shared_ptr<SingularMLMultiPoleCF<entry_type>> asingmp, Vec<3> center, double r, int order)
-      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLMultiPole<entry_type>>(asingmp->MLMP(), center, r, order)} { } 
-    RegularMLMultiPoleCF (shared_ptr<SingularMLMultiPole<entry_type>> asingmp, Vec<3> center, double r, int order)
-      : CoefficientFunction(sizeof(entry_type)/sizeof(Complex), true), mlmp{make_shared<RegularMLMultiPole<entry_type>>(asingmp, center, r, order)} { } 
-    
-    virtual double Evaluate (const BaseMappedIntegrationPoint & ip) const override
-    { throw Exception("real eval not available"); }
-
-    virtual void Evaluate (const BaseMappedIntegrationPoint & mip, FlatVector<Complex> values) const override
-    {
-      // values(0) = mlmp->Evaluate(mip.GetPoint());
-
-      if constexpr (std::is_same<entry_type, Complex>())
-        values(0) = mlmp->Evaluate(mip.GetPoint());
-      else
-        values = mlmp->Evaluate(mip.GetPoint());
-    }
-
-    shared_ptr<RegularMLMultiPole<entry_type>> MLMP() { return mlmp; }
-  };
-
-  
 }
 #endif

netgen/include/potentialtools.hpp

@@ -12,6 +12,8 @@
 
 namespace ngsbem
 {
+
+  extern void AddChargeDensity (SingularMLMultiPole<Complex> & mp, shared_ptr<CoefficientFunction> current, ngcomp::Region reg);
   
   extern void AddCurrentDensity (SingularMLMultiPole<Vec<3,Complex>> & mp, shared_ptr<CoefficientFunction> current, ngcomp::Region reg);
  

netgen/include/preconditioner.hpp

@@ -99,12 +99,12 @@ namespace ngcomp
     virtual void InitLevel (shared_ptr<BitArray> freedofs = NULL) { ; }
     virtual void FinalizeLevel (const ngla::BaseMatrix * mat = NULL) { ; }
     virtual void AddElementMatrix (FlatArray<int> dnums,
-				   const FlatMatrix<double> & elmat,
+				   FlatMatrix<double> elmat,
 				   ElementId ei, 
 				   LocalHeap & lh) { ; }
 
     virtual void AddElementMatrix (FlatArray<int> dnums,
-				   const FlatMatrix<Complex> & elmat,
+				   FlatMatrix<Complex> elmat,
 				   ElementId ei, 
 				   LocalHeap & lh) { ; }
 
@@ -186,12 +186,12 @@ namespace ngcomp
     static DocInfo GetDocu ();
     
     ///
-    virtual bool IsComplex() const { return jacobi->IsComplex(); }
+    virtual bool IsComplex() const override { return jacobi->IsComplex(); }
     
     ///
-    virtual void FinalizeLevel (const BaseMatrix * mat);
+    virtual void FinalizeLevel (const BaseMatrix * mat) override;
 
-    virtual void Update ()
+    virtual void Update () override
     {
       if (GetTimeStamp() < bfa->GetTimeStamp())
         FinalizeLevel (&bfa->GetMatrix());
@@ -201,14 +201,14 @@ namespace ngcomp
 
 
     ///
-    virtual const BaseMatrix & GetMatrix() const
+    virtual const BaseMatrix & GetMatrix() const override
     {
       if (!jacobi)
         ThrowPreconditionerNotReady();
       return *jacobi;
     }
     
-    virtual shared_ptr<BaseMatrix> GetMatrixPtr()
+    virtual shared_ptr<BaseMatrix> GetMatrixPtr() override
     {
       if (!jacobi)
         ThrowPreconditionerNotReady();
@@ -216,12 +216,12 @@ namespace ngcomp
     }
 
     ///
-    virtual const BaseMatrix & GetAMatrix() const
+    virtual const BaseMatrix & GetAMatrix() const override
     {
       return bfa->GetMatrix(); 
     }
     ///
-    virtual const char * ClassName() const
+    virtual const char * ClassName() const override
     { return "Local Preconditioner"; }
     void LocPrecTest () const;
   };
@@ -258,29 +258,29 @@ namespace ngcomp
       ; // delete pre;
     }
     
-    virtual void InitLevel (shared_ptr<BitArray> _freedofs);
+    virtual void InitLevel (shared_ptr<BitArray> _freedofs) override;
 
-    virtual void FinalizeLevel (const BaseMatrix *);
+    virtual void FinalizeLevel (const BaseMatrix *) override;
     virtual void AddElementMatrix (FlatArray<int> dnums,
-				   const FlatMatrix<SCAL> & elmat,
+				   FlatMatrix<SCAL> elmat,
 				   ElementId id, 
-				   LocalHeap & lh);
+				   LocalHeap & lh) override;
 
-    virtual void Update ()
+    virtual void Update () override
     {
       if (timestamp < bfa->GetTimeStamp())
         throw Exception("A BDDC preconditioner must be defined before assembling");
     }  
 
-    virtual const BaseMatrix & GetAMatrix() const
+    virtual const BaseMatrix & GetAMatrix() const override
     {
       return bfa->GetMatrix();
     }
 
-    virtual const BaseMatrix & GetMatrix() const;
-    virtual shared_ptr<BaseMatrix> GetMatrixPtr();
+    virtual const BaseMatrix & GetMatrix() const override;
+    virtual shared_ptr<BaseMatrix> GetMatrixPtr() override;
 
-    virtual void CleanUpLevel ()
+    virtual void CleanUpLevel () override
     {
       /*
       delete pre;
@@ -290,10 +290,10 @@ namespace ngcomp
     }
 
 
-    virtual void Mult (const BaseVector & x, BaseVector & y) const;
-    virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const;
+    virtual void Mult (const BaseVector & x, BaseVector & y) const override;
+    virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;
 
-    virtual const char * ClassName() const
+    virtual const char * ClassName() const override
     { return "BDDC Preconditioner"; }
   };
 

netgen/include/sparsematrix_dyn.hpp

@@ -42,20 +42,19 @@ namespace ngla
           fm = matvec(i);
         }
     }
-
+    
     virtual int VHeight() const override { return size; }
     virtual int VWidth() const override { return width; }
-
+    
     virtual void Mult (const BaseVector & x, BaseVector & y) const override;
     virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;
-
+    
     AutoVector CreateRowVector() const override
-    { throw Exception("CreateRowVector not implemented for SparseMatrixDynamic!"); }
+    { throw make_unique<VVector<TSCAL>> (VWidth()); }
     AutoVector CreateColVector() const override
-    { throw  Exception("CreateColVector not implemented for SparseMatrixDynamic!"); }
-
+    { throw make_unique<VVector<TSCAL>> (VHeight()); }
+    
     virtual tuple<int,int> EntrySizes() const override { return { bh, bw }; }
-
   };
   
 

netgen/include/sparsematrix_impl.hpp

@@ -233,7 +233,8 @@ namespace ngla
       throw Exception(string("MAX_SYS_DIM = ")+to_string(MAX_SYS_DIM)+string(", need ")+to_string(mat_traits<TM>::HEIGHT));
       return nullptr;
     }
-    else return make_shared<JacobiPrecond<TM,TV_ROW,TV_COL>> (*this, inner);
+    else return make_shared<JacobiPrecond<TM,TV_ROW,TV_COL>> ( dynamic_pointer_cast<SparseMatrix>
+                                                               (const_cast<SparseMatrix*>(this)->shared_from_this()), inner);
   }
   
   template <class TM, class TV_ROW, class TV_COL>    
@@ -860,7 +861,8 @@ namespace ngla
   shared_ptr<BaseJacobiPrecond>
   SparseMatrixSymmetric<TM,TV> :: CreateJacobiPrecond (shared_ptr<BitArray> inner) const 
   { 
-    return make_shared<JacobiPrecondSymmetric<TM,TV>> (*this, inner);
+    return make_shared<JacobiPrecondSymmetric<TM,TV>> ( dynamic_pointer_cast<SparseMatrixSymmetric>
+                                                        (const_cast<SparseMatrixSymmetric*>(this)->shared_from_this()), inner);
   }
   
 

netgen/include/special_matrix.hpp

@@ -182,6 +182,8 @@ namespace ngla
 
     virtual void MultAdd (double s, const BaseVector & x, BaseVector & y) const override;
     virtual void MultTransAdd (double s, const BaseVector & x, BaseVector & y) const override;
+
+    virtual shared_ptr<BaseSparseMatrix> CreateSparseMatrix() const override;    
   };
 
 

netgen/include/symbolicintegrator.hpp

@@ -604,6 +604,7 @@ public:
 
   class SymbolicFacetLinearFormIntegrator : public FacetLinearFormIntegrator
   {
+  protected:
     shared_ptr<CoefficientFunction> cf;
     Array<ProxyFunction*> proxies;
     Array<CoefficientFunction*> cache_cfs;
@@ -614,7 +615,7 @@ public:
     SIMD_IntegrationRule simd_ir;   // if non-empty use this integration-rule
 
   public:
-    SymbolicFacetLinearFormIntegrator (shared_ptr<CoefficientFunction> acf, VorB avb);
+    NGS_DLL_HEADER SymbolicFacetLinearFormIntegrator (shared_ptr<CoefficientFunction> acf, VorB avb);
 
     virtual VorB VB() const override { return vb; }
     virtual bool BoundaryForm() const override { return vb == BND; }

ngsolve/__init__.py

@@ -75,6 +75,7 @@ from .utils import x, y, z, dx, ds, grad, Grad, curl, div, Deviator, PyId, PyTra
 from . import solvers
 from . import preconditioners
 from . import timestepping
+from .solve_implementation import Solve
 
 try:
     from netgen.occ import unit_square, unit_cube

ngsolve/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2503")
+set(PACKAGE_VERSION "6.2.2504-44-g8fbbbc389")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..
@@ -23,15 +23,15 @@ set(NGSOLVE_PYBIND_INCLUDE_DIR "")
 set(NGSOLVE_PYTHON_INCLUDE_DIRS "C:/Python310/include")
 set(NGSOLVE_PYTHON_LIBRARIES "C:/Python310/libs/python310.lib")
 set(NGSOLVE_PYTHON_PACKAGES_INSTALL_DIR  "")
-set(NGSOLVE_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.10/cmake-build/dependencies/src/project_tcl/generic")
+set(NGSOLVE_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.10/cmake-build/dependencies/src/project_tcl/generic")
 set(NGSOLVE_TCL_LIBRARY "C:/Python310/tcl/tclstub86.lib")
 set(NGSOLVE_TK_DND_LIBRARY "")
-set(NGSOLVE_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.10/cmake-build/dependencies/src/project_tk/generic")
+set(NGSOLVE_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.10/cmake-build/dependencies/src/project_tk/generic")
 set(NGSOLVE_TK_LIBRARY "C:/Python310/tcl/tkstub86.lib")
 set(NGSOLVE_X11_X11_LIB "")
 set(NGSOLVE_X11_Xmu_LIB "")
-set(NGSOLVE_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.10/cmake-build/dependencies/zlib/include")
-set(NGSOLVE_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/netgen/_skbuild/win-amd64-3.10/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
+set(NGSOLVE_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.10/cmake-build/dependencies/zlib/include")
+set(NGSOLVE_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.10/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
 
 set(NGSOLVE_INTEL_MIC       OFF)
 set(NGSOLVE_USE_CCACHE ON)

ngsolve/cmake/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 ngsbem ngcomp ngsolve)
+foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack ngstd ngbla ngla ngfem ngsbem ngcomp ngsolve)
   list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
   if(TARGET "${_cmake_expected_target}")
     list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
@@ -69,14 +69,6 @@ set_target_properties(ngs_lapack PROPERTIES
   INTERFACE_LINK_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/venv_ngs/Library/lib/mkl_rt.lib"
 )
 
-# Create imported target netgen_python
-add_library(netgen_python INTERFACE IMPORTED)
-
-set_target_properties(netgen_python PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "C:/Python310/include"
-  INTERFACE_LINK_LIBRARIES "C:/Python310/libs/python310.lib"
-)
-
 # Create imported target ngstd
 add_library(ngstd INTERFACE IMPORTED)
 

ngsolve/config/config.py

@@ -29,15 +29,15 @@ NGSOLVE_INSTALL_DIR_INCLUDE  = "netgen/include"
 NGSOLVE_INSTALL_DIR_CMAKE    = "ngsolve/cmake"
 NGSOLVE_INSTALL_DIR_RES      = "share"
 
-NGSOLVE_VERSION = "6.2.2503"
-NGSOLVE_VERSION_GIT = "v6.2.2503-0-ga44fe5348"
-NGSOLVE_VERSION_PYTHON = "6.2.2503"
+NGSOLVE_VERSION = "6.2.2504-44-g8fbbbc389"
+NGSOLVE_VERSION_GIT = "v6.2.2504-44-g8fbbbc389"
+NGSOLVE_VERSION_PYTHON = "6.2.2504.post44.dev0"
 
 NGSOLVE_VERSION_MAJOR = "6"
 NGSOLVE_VERSION_MINOR = "2"
-NGSOLVE_VERSION_TWEAK = "0"
-NGSOLVE_VERSION_PATCH = "2503"
-NGSOLVE_VERSION_HASH = "ga44fe5348"
+NGSOLVE_VERSION_TWEAK = "44"
+NGSOLVE_VERSION_PATCH = "2504"
+NGSOLVE_VERSION_HASH = "g8fbbbc389"
 
 CMAKE_CXX_COMPILER           = "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.44.35207/bin/Hostx64/x64/cl.exe"
 CMAKE_CUDA_COMPILER          = ""

ngsolve/preconditioners.py

@@ -1,6 +1,7 @@
 from ngsolve.comp import MultiGridPreconditioner as MultiGrid
 from ngsolve.comp import LocalPreconditioner as Local
 from ngsolve.comp import HCurlAMG
+from ngsolve.comp import H1AMG
 from ngsolve.comp import BDDCPreconditioner as BDDC