ngsolve 6.2.2505__cp39-cp39-win_amd64.whl → 6.2.2505.post70.dev0__cp39-cp39-win_amd64.whl

netgen/include/bilinearform.hpp

@@ -915,7 +915,7 @@ namespace ngcomp
   };
 
 
-
+  // template <int DIM_ELEMENT, int DIM_SPACE>
   class ApplyIntegrationPoints : public BaseMatrix
   {
     Array<shared_ptr<CoefficientFunction>> coefs;

netgen/include/diffop_impl.hpp

@@ -312,10 +312,12 @@ namespace ngfem
   
   template <typename DIFFOP>
   void T_DifferentialOperator<DIFFOP> ::
-  CalcTransformationMatrix (const BaseMappedIntegrationPoint & mip,
+  CalcTransformationMatrix (const BaseMappedIntegrationPoint & bmip,
                             SliceMatrix<double> trans,
                             LocalHeap & lh) const
   {
+    const MappedIntegrationPoint<DIM_ELEMENT,DIM_SPACE> & mip =
+      static_cast<const MappedIntegrationPoint<DIM_ELEMENT,DIM_SPACE>&> (bmip);
     DIFFOP::CalcTransformationMatrix(mip, trans, lh);    
   }
   

netgen/include/fespace.hpp

@@ -448,7 +448,8 @@ ANY                  1 1 1 1 | 15
     virtual void GetDofNrs (NodeId ni, Array<DofId> & dnums) const;
     BitArray GetDofs (const Region & reg) const;
     Table<int> CreateDofTable (VorB vorb) const;
-
+    virtual void SelectDofs (const string & name, BitArray & dofs) const;
+                  
     /// get coupling types of dofs
     virtual void GetDofCouplingTypes (int elnr, Array<COUPLING_TYPE> & dnums) const;
     
@@ -1141,7 +1142,8 @@ ANY                  1 1 1 1 | 15
     void GetEdgeDofNrs (int ednr, Array<DofId> & dnums) const override;
     void GetFaceDofNrs (int fanr, Array<DofId> & dnums) const override;
     void GetInnerDofNrs (int elnr, Array<DofId> & dnums) const override;
-
+    void SelectDofs (const string & name, BitArray & dofs) const override;
+    
     void SolveM(CoefficientFunction * rho, BaseVector & vec, Region * definedon,
                         LocalHeap & lh) const override;
     void ApplyM(CoefficientFunction * rho, BaseVector & vec, Region * definedon,

netgen/include/gridfunction.hpp

@@ -166,7 +166,7 @@ namespace ngcomp
     ///
     shared_ptr<FESpace> GetFESpace() const { return fespace; }
     ///
-    shared_ptr<MeshAccess> GetMeshAccess() const { return fespace->GetMeshAccess(); }
+    const shared_ptr<MeshAccess> & GetMeshAccess() const { return fespace->GetMeshAccess(); }
     ///
     virtual string GetClassName () const
     {

netgen/include/h1amg.hpp

@@ -9,6 +9,20 @@
 namespace ngcomp
 {
   using namespace ngla;
+
+
+
+  struct H1AMG_Parameters
+  {
+    int verbose = 0;
+    int smoothing_steps = 3;
+    int coarsenings_per_level = 3; // number of binary coarsenings per level
+    bool block_smoother = true;    // block or point smoother ?
+    bool use_smoothed_prolongation = true;
+    int max_coarse = 10;
+    int max_level = 20;
+  };
+
   
   template <class SCAL>
   class NGS_DLL_HEADER H1AMG_Matrix : public ngla::BaseMatrix
@@ -26,6 +40,7 @@ namespace ngcomp
                   ngcore::FlatArray<ngcore::IVec<2>> e2v,
                   ngcore::FlatArray<double> edge_weights,
                   ngcore::FlatArray<double> vertex_weights,
+                  const H1AMG_Parameters & param,                  
                   size_t level);
 
     virtual int VHeight() const override { return size; }
@@ -50,7 +65,9 @@ namespace ngcomp
 
     ParallelHashTable<IVec<2>,double> edge_weights_ht;
     ParallelHashTable<IVec<1>,double> vertex_weights_ht;
-
+    
+    H1AMG_Parameters param;
+    
   public:
 
     static shared_ptr<Preconditioner> CreateBF (shared_ptr<BilinearForm> bfa, const Flags & flags, const string & name)
@@ -71,6 +88,12 @@ namespace ngcomp
         cout << IM(3) << "Create H1AMG" << endl;
       else
         cout << IM(3) << "Create H1AMG, complex" << endl;
+      
+      param.verbose = int(flags.GetNumFlag("verbose", 0));
+      param.smoothing_steps = int(flags.GetNumFlag("smoothingsteps", 1));    
+      param.use_smoothed_prolongation = flags.GetDefineFlagX("smoothedprolongation").IsMaybeTrue();
+      param.max_coarse = int(flags.GetNumFlag("maxcoarse", 10));
+      param.max_level = int(flags.GetNumFlag("maxlevel", 20));
     }
 
     virtual void InitLevel (shared_ptr<BitArray> _freedofs) override

netgen/include/hdivhofespace.hpp

@@ -143,6 +143,8 @@ namespace ngcomp
 	} 
     }
 
+    void SelectDofs (const string & name, BitArray & dofs) const override;
+
     int GetFirstInnerDof(int elnr) const { return(first_inner_dof[elnr]);}; 
     // virtual int LowOrderDof() const { if(discont) return(0); else return(1);}