xfem 2.1.2405.dev38__tar.gz → 2.1.2406.dev1__tar.gz

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/.ci/build_pip.sh

@@ -31,7 +31,7 @@ pip wheel -vvv .
 rm -rf _skbuild
 #auditwheel repair xfem*.whl
 #rm -f *.whl
-rename linux_ manylinux_2_17_x86_64.manylinux2014_ xfem*.whl
+rename linux_ manylinux_2_28_x86_64.manylinux2014_ xfem*.whl
 mv xfem*.whl wheelhouse/
 rm -rf *.whl
 

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/.gitlab-ci.yml

@@ -273,7 +273,7 @@ pages:
 
 pip_linux:
   #image: quay.io/pypa/manylinux2014_x86_64
-  image: sameli/manylinux2014_x86_64_cuda_11.7      
+  image: quay.io/pypa/manylinux_2_28_x86_64    
 
   stage: deploy
   script:

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xfem
-Version: 2.1.2405.dev38
+Version: 2.1.2406.dev1
 Summary: (ngs)xfem is an Add-on library to Netgen/NGSolve for unfitted/cut FEM.
 Author-Email: Christoph Lehrenfeld <lehrenfeld@math.uni-goettingen.de>
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/pyproject.toml

@@ -12,7 +12,17 @@ classifiers = [
 ]
 
 [build-system]
-requires = ["setuptools>=45", "setuptools_scm[toml]>=8", "toml", "scikit-build-core>=0.9.0", "pybind11_stubgen", "cmake>=3.26.1", "ngsolve>=6.2.2405"]
+requires = ["setuptools>=45", 
+            "setuptools_scm[toml]>=8", 
+            "scikit-build-core>=0.9.0", 
+            "pybind11_stubgen", 
+            "cmake>=3.26.1", 
+            "ngsolve>=6.2.2405",
+            "toml;  python_version >= '3.11'", 
+            "tomli>=1.1.0; python_version < '3.11'"
+            ]
+
+
 build-backend = "scikit_build_core.build"
 
 [tool.scikit-build]
@@ -47,7 +57,7 @@ skip = """
 """
 
 [tool.cibuildwheel.linux]
-repair-wheel-command = "mv {wheel} {dest_dir} && rename linux_x86_64 manylinux_2_17_x86_64.manylinux2014_x86_64 {dest_dir}/*-linux_x86_64*.whl"
+repair-wheel-command = "mv {wheel} {dest_dir} && rename linux_x86_64 manylinux_2_28_x86_64.manylinux2014_x86_64 {dest_dir}/*-linux_x86_64*.whl"
 
 
 [tool.cibuildwheel.macos]

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/python/__init__.py

@@ -135,6 +135,15 @@ Evaluates the time derivative (w.r.t. the reference time interval) of a Space-Ti
         return add
     raise Exception("cannot form dt")
 
+def ddtref(func):
+    """
+Evaluates the 2nd time derivative (w.r.t. the reference time interval) of a Space-Time function.
+    """
+    add = func.Operator("ddt")
+    if add:
+        return add
+    raise Exception("cannot form ddt")
+
 def dt(func):
     """
 Deprecated: use "dtref" instead

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/python/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.2405.dev38'
-__version_tuple__ = version_tuple = (2, 1, 2405, 'dev38')
+__version__ = version = '2.1.2406.dev1'
+__version_tuple__ = version_tuple = (2, 1, 2406, 'dev1')

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/spacetime/SpaceTimeFE.cpp

@@ -155,6 +155,33 @@ namespace ngfem
 
     }
 
+    template <int D>
+    void SpaceTimeFE<D> :: CalcDDtShape (const IntegrationPoint & ip,
+                                     BareSliceVector<> ddshape) const
+
+    {
+        // matrix of derivatives:
+
+           Matrix<double> time_ddshape(tFE->GetNDof(),1);
+           IntegrationPoint z(override_time ? time : ip.Weight());
+
+           if(!IsSpaceTimeIntegrationPoint(ip))//only effectiv if sanity check is on
+             throw Exception("SpaceTimeFE :: CalcShape called with a mere space IR");
+           
+           tFE->CalcDDShape(z,time_ddshape);
+
+           Vector<> space_shape(sFE->GetNDof());
+           sFE->CalcShape(ip,space_shape);
+
+           int ii = 0;
+           for(int j = 0; j < tFE->GetNDof(); j++) {
+              for(int i=0; i< sFE->GetNDof(); i++) {
+                 ddshape(ii++) = space_shape(i)*time_ddshape(j,0);
+              }
+           }
+
+    }
+
    void LagrangePolyHornerCalc::CalcNewtonBasisCoeffs() {
         NewtonBasisCoeffs.SetSize(nodes.Size(), nodes.Size());
         for(int i=0; i<nodes.Size(); i++){

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/spacetime/SpaceTimeFE.hpp

@@ -38,6 +38,9 @@ namespace ngfem
       virtual void CalcDtShape (const IntegrationPoint & ip,
                                BareSliceVector<> dshape) const;
 
+      virtual void CalcDDtShape (const IntegrationPoint & ip,
+                               BareSliceVector<> dshape) const;
+
       virtual void CalcDShape (const IntegrationPoint & ip,
                                BareSliceMatrix<> dshape) const;
 

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/spacetime/SpaceTimeFESpace.cpp

@@ -63,14 +63,16 @@ SpaceTimeFESpace :: SpaceTimeFESpace (shared_ptr<MeshAccess> ama, shared_ptr<FES
       Switch<2> (ma->GetDimension()-2, [&] (auto SDIM) {
         enum {SDIM2 = SDIM()+2}; // work around MSVC compile issue
         Switch<3> (dimension-1, [&] (auto DIM) {
-          additional_evaluators.Set ("dt", make_shared<T_DifferentialOperator<DiffOpDtVec<SDIM2,DIM()+1>>>());
+          additional_evaluators.Set ("dt", make_shared<T_DifferentialOperator<DiffOpDtVec<SDIM2,DIM()+1,1>>>());
+          additional_evaluators.Set ("ddt", make_shared<T_DifferentialOperator<DiffOpDtVec<SDIM2,DIM()+1,2>>>());
           additional_evaluators.Set ("hesse", make_shared<T_DifferentialOperator<DiffOpHesse<DIM()+1>>> ());
         });
       });
     }
     else
       Switch<3> (ma->GetDimension()-1, [&] (auto DIM) {
-        additional_evaluators.Set ("dt", make_shared<T_DifferentialOperator<DiffOpDt<DIM+1>>>());
+        additional_evaluators.Set ("dt", make_shared<T_DifferentialOperator<DiffOpDt<DIM+1,1>>>());
+        additional_evaluators.Set ("ddt", make_shared<T_DifferentialOperator<DiffOpDt<DIM+1,2>>>());
         additional_evaluators.Set ("fix_tref_bottom", make_shared<T_DifferentialOperator<DiffOpFixt<DIM+1,0>>>());
         additional_evaluators.Set ("fix_tref_top", make_shared<T_DifferentialOperator<DiffOpFixt<DIM+1,1>>>());
         additional_evaluators.Set ("hesse", make_shared<T_DifferentialOperator<DiffOpHesse<DIM+1>>> ());

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/spacetime/diffopDt.cpp

@@ -8,9 +8,9 @@
 namespace ngfem
 {
 
-  template <int SpaceD>
+  template <int SpaceD, int DerivOrder>
     template<typename FEL, typename MIP, typename MAT>
-  void DiffOpDt<SpaceD>::GenerateMatrix (const FEL & bfel, const MIP & mip,
+  void DiffOpDt<SpaceD, DerivOrder>::GenerateMatrix (const FEL & bfel, const MIP & mip,
                                              MAT & mat, LocalHeap & lh)
   {
       IntegrationPoint ip(mip.IP());
@@ -18,21 +18,29 @@ namespace ngfem
 
       const SpaceTimeFE<SpaceD>* scafed = dynamic_cast<const SpaceTimeFE<SpaceD> * > (& bfel);
       FlatVector<> dtshape (scafed->GetNDof(),lh);
-      scafed->CalcDtShape(ip,dtshape);
+      if (DerivOrder == 1)
+        scafed->CalcDtShape(ip,dtshape);
+      else
+        scafed->CalcDDtShape(ip,dtshape);
       mat.Row(0) = dtshape;
     }
 
 // explicit instantiation (needed for clang starting from NGSolve v6.2.2103 - not sure why exactly though)
-  template void DiffOpDt<1>::GenerateMatrix(const FiniteElement & bfel, const ngfem::MappedIntegrationPoint<1, 1, double> & mip,
-                                            ngbla::FlatMatrixFixHeight<1, double, 1> & mat, LocalHeap & lh);
-
-  template class T_DifferentialOperator<DiffOpDt<1>>;
-  template class T_DifferentialOperator<DiffOpDt<2>>;
-  template class T_DifferentialOperator<DiffOpDt<3>>;
-
-  template <int SpaceD, int D>
+  template void DiffOpDt<1,1>::GenerateMatrix(const FiniteElement & bfel, const ngfem::MappedIntegrationPoint<1, 1, double> & mip,
+                                              ngbla::FlatMatrixFixHeight<1, double, 1> & mat, LocalHeap & lh);
+  template void DiffOpDt<1,2>::GenerateMatrix(const FiniteElement & bfel, const ngfem::MappedIntegrationPoint<1, 1, double> & mip,
+                                              ngbla::FlatMatrixFixHeight<1, double, 1> & mat, LocalHeap & lh);
+
+  template class T_DifferentialOperator<DiffOpDt<1,1>>;
+  template class T_DifferentialOperator<DiffOpDt<2,1>>;
+  template class T_DifferentialOperator<DiffOpDt<3,1>>;
+  template class T_DifferentialOperator<DiffOpDt<1,2>>;
+  template class T_DifferentialOperator<DiffOpDt<2,2>>;
+  template class T_DifferentialOperator<DiffOpDt<3,2>>;
+
+  template <int SpaceD, int D, int DerivOrder>
   template <typename FEL, typename MIP, typename MAT>
-  void DiffOpDtVec<SpaceD, D>::GenerateMatrix (const FEL & bfel, const MIP & mip,
+  void DiffOpDtVec<SpaceD, D, DerivOrder>::GenerateMatrix (const FEL & bfel, const MIP & mip,
                                              MAT & mat, LocalHeap & lh)
   {
       IntegrationPoint ip(mip.IP());
@@ -40,27 +48,40 @@ namespace ngfem
 
       const SpaceTimeFE<SpaceD>& scafed = dynamic_cast<const SpaceTimeFE<SpaceD>& > (bfel);
       FlatVector<> dtshape (scafed.GetNDof(),lh);
-      scafed.CalcDtShape(ip,dtshape);
+
+      if (DerivOrder == 1)  
+        scafed.CalcDtShape(ip,dtshape);
+      else  
+        scafed.CalcDDtShape(ip,dtshape);
       for (int j = 0; j < D; j++)
         for (int k = 0; k < dtshape.Size(); k++)
             mat(j,k*D+j) = dtshape(k);
     }
 
-  template class T_DifferentialOperator<DiffOpDtVec<0, 1>>;
-  template class T_DifferentialOperator<DiffOpDtVec<0, 2>>;
-  template class T_DifferentialOperator<DiffOpDtVec<0, 3>>;
-
-  template class T_DifferentialOperator<DiffOpDtVec<1, 1>>;
-  template class T_DifferentialOperator<DiffOpDtVec<1, 2>>;
-  template class T_DifferentialOperator<DiffOpDtVec<1, 3>>;
-
-  template class T_DifferentialOperator<DiffOpDtVec<2, 1>>;
-  template class T_DifferentialOperator<DiffOpDtVec<2, 2>>;
-  template class T_DifferentialOperator<DiffOpDtVec<2, 3>>;
-
-  template class T_DifferentialOperator<DiffOpDtVec<3, 1>>;
-  template class T_DifferentialOperator<DiffOpDtVec<3, 2>>;
-  template class T_DifferentialOperator<DiffOpDtVec<3, 3>>;
+  template class T_DifferentialOperator<DiffOpDtVec<0, 1, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<0, 2, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<0, 3, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<1, 1, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<1, 2, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<1, 3, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<2, 1, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<2, 2, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<2, 3, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<3, 1, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<3, 2, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<3, 3, 1>>;
+  template class T_DifferentialOperator<DiffOpDtVec<0, 1, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<0, 2, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<0, 3, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<1, 1, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<1, 2, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<1, 3, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<2, 1, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<2, 2, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<2, 3, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<3, 1, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<3, 2, 2>>;
+  template class T_DifferentialOperator<DiffOpDtVec<3, 3, 2>>;
 
   template <int SpaceD, int time>
   template <typename FEL, typename MIP, typename MAT>

{xfem-2.1.2405.dev38 → xfem-2.1.2406.dev1}/spacetime/diffopDt.hpp

@@ -7,8 +7,8 @@
 namespace ngfem
 {
 
-template<int SpaceD>
-  class DiffOpDt : public DiffOp<DiffOpDt<SpaceD>>
+template<int SpaceD, int DerivOrder>
+  class DiffOpDt : public DiffOp<DiffOpDt<SpaceD, DerivOrder>>
   {
 
   public:
@@ -23,8 +23,8 @@ template<int SpaceD>
                                 MAT & mat, LocalHeap & lh);
   };
 
-  template <int SpaceD, int D>
-  class DiffOpDtVec : public DiffOp<DiffOpDtVec<SpaceD, D>>
+  template <int SpaceD, int D, int DerivOrder>
+  class DiffOpDtVec : public DiffOp<DiffOpDtVec<SpaceD, D, DerivOrder>>
   {
 
   public:
@@ -105,20 +105,40 @@ template<int SpaceD>
 
 
 #ifndef FILE_DIFFOPDT_CPP
-  extern template class T_DifferentialOperator<DiffOpDt<1>>;
-  extern template class T_DifferentialOperator<DiffOpDt<2>>;
-  extern template class T_DifferentialOperator<DiffOpDt<3>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<0, 1>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<0, 2>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<0, 3>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<1, 1>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<1, 2>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<2, 1>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<2, 2>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<2, 3>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<3, 1>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<3, 2>>;
-  extern template class T_DifferentialOperator<DiffOpDtVec<3, 3>>;
+  extern template class T_DifferentialOperator<DiffOpDt<1,1>>;
+  extern template class T_DifferentialOperator<DiffOpDt<2,1>>;
+  extern template class T_DifferentialOperator<DiffOpDt<3,1>>;
+  extern template class T_DifferentialOperator<DiffOpDt<1,1>>;
+  extern template class T_DifferentialOperator<DiffOpDt<2,1>>;
+  extern template class T_DifferentialOperator<DiffOpDt<3,1>>;
+  extern template class T_DifferentialOperator<DiffOpDt<1,2>>;
+  extern template class T_DifferentialOperator<DiffOpDt<2,2>>;
+  extern template class T_DifferentialOperator<DiffOpDt<3,2>>;
+  extern template class T_DifferentialOperator<DiffOpDt<1,2>>;
+  extern template class T_DifferentialOperator<DiffOpDt<2,2>>;
+  extern template class T_DifferentialOperator<DiffOpDt<3,2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<0, 1, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<0, 2, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<0, 3, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<1, 1, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<1, 2, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<2, 1, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<2, 2, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<2, 3, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<3, 1, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<3, 2, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<3, 3, 1>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<0, 1, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<0, 2, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<0, 3, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<1, 1, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<1, 2, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<2, 1, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<2, 2, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<2, 3, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<3, 1, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<3, 2, 2>>;
+  extern template class T_DifferentialOperator<DiffOpDtVec<3, 3, 2>>;
   extern template class T_DifferentialOperator<DiffOpFixt<1, 0>>;
   extern template class T_DifferentialOperator<DiffOpFixt<1, 1>>;
   extern template class T_DifferentialOperator<DiffOpFixt<2, 0>>;