ngsolve 6.2.2505.post17.dev0__cp39-cp39-macosx_10_15_universal2.whl → 6.2.2505.post95.dev0__cp39-cp39-macosx_10_15_universal2.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/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/hcurlcurlfe.hpp

@@ -88,6 +88,9 @@ namespace ngfem
                                    BareSliceVector<> coefs) const = 0;
 
     
+    virtual void CalcMappedShape (const SIMD<BaseMappedIntegrationPoint> & bmip, 
+                                         BareSliceMatrix<SIMD<double>> shapes) const = 0;
+
     virtual void CalcMappedShape (const SIMD_BaseMappedIntegrationRule & bmir, 
                                          BareSliceMatrix<SIMD<double>> shapes) const = 0;
     
@@ -931,6 +934,23 @@ namespace ngfem
       else
         throw Exception("HCurlCurl::CalcMappedCurlShape implemented only for TRIG and TET");
     }
+
+
+    virtual void CalcMappedShape (const SIMD<BaseMappedIntegrationPoint> & bmip, 
+                                         BareSliceMatrix<SIMD<double>> shape) const override
+    {
+      Switch<4-DIM>
+        (bmip.DimSpace()-DIM,[this, &bmip, shape](auto CODIM)
+         {
+           constexpr auto DIMSPACE = DIM+CODIM.value;
+           auto & mip = static_cast<const SIMD<MappedIntegrationPoint<DIM,DIM+CODIM.value>>&> (bmip);
+            this->Cast() -> T_CalcShape (GetTIP(mip),
+                                          SBLambda ([shape,DIMSPACE] (size_t j, auto val) 
+                                                    {
+                                                      shape.Rows(j*sqr(DIMSPACE), (j+1)*sqr(DIMSPACE)).Col(0).Range(0,sqr(DIMSPACE)) = val.Value().AsVector();
+                                                    }));
+         });
+    }
       
     virtual void CalcMappedShape (const SIMD_BaseMappedIntegrationRule & bmir, 
                                          BareSliceMatrix<SIMD<double>> shapes) const override