ngstrefftz 0.3.2402.dev35__tar.gz → 0.3.2403.dev6__tar.gz

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/Dockerfile

@@ -2,6 +2,11 @@ FROM python:3.10-slim-bullseye
 
 WORKDIR /home/app
 
+#RUN apt --yes update && apt --yes install git pandoc sphinx
+#COPY . /home/app/ngstrefftz
+#RUN cd /home/app/ngstrefftz/docs && pip install -r requirements.txt
+#RUN cd /home/app/ngstrefftz/docs && sphinx-build -M html . _build -vvv
+
 RUN pip install ngstrefftz 
 ENV PYTHONPATH=$PYTHONPATH:/usr/local/lib/python3.10/site-packages/
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ngstrefftz
-Version: 0.3.2402.dev35
+Version: 0.3.2403.dev6
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Home-page: https://github.com/PaulSt/ngstrefftz
 Author: Paul Stocker

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/docs/requirements.txt

@@ -1,11 +1,11 @@
-
-setuptools
+setuptools>=61
 setuptools_scm 
 jupyter>=1.0.0
 
 matplotlib>=3.6.1
 matplotlib-inline>=0.1.6
 
+pandoc>=2.3
 nbconvert>=7.2.1
 nbformat>=5.7.0
 nbsphinx>=0.8.9
@@ -20,6 +20,6 @@ myst_parser>=0.15.0
 numpy>=1.23.4
 scipy>=1.11.1 
 ngsolve>=6.2.2403
-xfem>=2.1.2303.post72.dev0
-ngstrefftz>=0.2.2401
+xfem==2.1.2303.post137.dev0
+ngstrefftz>=0.2.2402
 webgui-jupyter-widgets>=0.2.31

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/src/condensedg.cpp

@@ -94,8 +94,10 @@ namespace ngcomp
                 }
 
             Array<int> els = GetElNeighbours (ma, ei);
-            for (auto elnr : els)
+            int nels = els.Size ();
+            for (int i = 0; i < nels; i++)
               {
+                int elnr = els[i];
                 dnums.SetSize0 ();
                 fes->GetDofNrs (ElementId (elnr), dnums, VISIBLE_DOF);
                 for (DofId d : dnums)
@@ -107,6 +109,7 @@ namespace ngcomp
                   {
                     if (elnr2 == ei.Nr () || els.Contains (elnr2))
                       continue;
+                    els.Append (elnr2);
                     dnums.SetSize0 ();
                     fes->GetDofNrs (ElementId (elnr2), dnums, VISIBLE_DOF);
                     for (DofId d : dnums)

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/src/embtrefftz.cpp

@@ -147,6 +147,7 @@ namespace ngcomp
 
     vector<shared_ptr<Matrix<SCAL>>> ETmats (ne);
     auto lfvec = make_shared<VVector<SCAL>> (ndof);
+    lfvec->operator= (0.0);
 
     size_t active_elements = 0;
     size_t test_local_ndof = test_fes->GetNDof () / ne;
@@ -249,14 +250,15 @@ namespace ngcomp
         nz = tndof;
       else
         {
-          nz = dofs.Size () - test_dofs.Size ();
-          nz = max (nz, 0);
+          nz = max<size_t> (dofs.Size () - test_dofs.Size (), 0);
           for (int i = 0; i < min (elmat.Width (), elmat.Height ()); i++)
             if (abs (elmat (i, i)) < eps)
               nz++;
         }
-      if (dofs.Size () - test_dofs.Size () > nz)
-        throw Exception ("test fes not large enough for given tndof");
+      if (dofs.Size () < nz)
+        throw Exception ("tndof too large, nz: " + to_string (nz)
+                         + ", dofs:" + to_string (dofs.Size ())
+                         + ", test_dofs:" + to_string (test_dofs.Size ()));
 
       if (getrange)
         ETmats[ei.Nr ()]

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/src/monomialfespace.cpp

@@ -98,9 +98,15 @@ namespace ngcomp
           case ET_QUAD:
           case ET_TRIG:
             {
+              Vec<2> scale = 1.0;
+              if (usescale == 2)
+                scale = { 1.0 / ElSize<2> (ei, { 1.0, 0 }),
+                          1.0 / ElSize<2> (ei, { 0, 1.0 }) };
+              else if (usescale != 0)
+                scale = 1.0 / ElSize<2> (ei);
               return *(new (alloc) ScalarMappedElement<2> (
                   local_ndof, order, basismat, eltype, ElCenter<2> (ei),
-                  1.0 / Adiam<2> (ei)));
+                  scale));
               break;
             }
           case ET_HEX:
@@ -108,9 +114,18 @@ namespace ngcomp
           case ET_PYRAMID:
           case ET_TET:
             {
+              Vec<3> scale = 1.0;
+              if (usescale == 2)
+                {
+                  double hx = ElSize<3> (ei, { 1.0, 1.0, 0 });
+                  double ht = ElSize<3> (ei, { 0, 0, 1.0 });
+                  scale = { 1.0 / hx, 1.0 / hx, 1.0 / ht };
+                }
+              else if (usescale != 0)
+                scale = 1.0 / ElSize<3> (ei);
               return *(new (alloc) ScalarMappedElement<3> (
                   local_ndof, order, basismat, eltype, ElCenter<3> (ei),
-                  1.0 / Adiam<3> (ei)));
+                  scale));
               break;
             }
           }

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/src/monomialfespace.hpp

@@ -51,47 +51,29 @@ namespace ngcomp
       MatToCSR (basis, tb);
       return tb;
     }
-
-    template <int D> double Adiam (ElementId ei) const
+    template <int D>
+    double ElSize (ElementId ei, Vec<D> coeff_const = 1.0) const
     {
-      if (usescale == 0)
-        return 1.0;
-      LocalHeap lh (1000 * 1000);
       double anisotropicdiam = 0.0;
       auto vertices_index = ma->GetElVertices (ei);
-
       for (auto vertex1 : vertices_index)
         {
           for (auto vertex2 : vertices_index)
             {
-              Vec<D> v1 = ma->GetPoint<D> (vertex1);
-              Vec<D> v2 = ma->GetPoint<D> (vertex2);
-              IntegrationRule ir (ma->GetElType (ei), 0);
-              ElementTransformation &trafo = ma->GetTrafo (ei, lh);
-              MappedIntegrationPoint<D, D> mip (ir[0], trafo);
-              mip.Point () = v1;
-              double c1 = coeff_cf ? coeff_cf->Evaluate (mip) : 1.0;
-              mip.Point () = v2;
-              double c2 = coeff_cf ? coeff_cf->Evaluate (mip) : 1.0;
-
-              anisotropicdiam = max (
-                  anisotropicdiam,
-                  sqrt (L2Norm2 (v1.Range (0, D - 1) - v2.Range (0, D - 1))
-                        + pow (c1 * v1 (D - 1) - c2 * v2 (D - 1), 2)));
+              Vec<D> v = ma->GetPoint<D> (vertex2) - ma->GetPoint<D> (vertex1);
+              vtimes (v, coeff_const);
+              anisotropicdiam = max (anisotropicdiam, sqrt (L2Norm2 (v)));
             }
         }
       return anisotropicdiam;
     }
-
     template <int D> Vec<D> ElCenter (ElementId ei) const
     {
-      if (useshift == 0)
-        return 1;
       Vec<D> center = 0;
       auto vertices_index = ma->GetElVertices (ei);
       for (auto vertex : vertices_index)
         center += ma->GetPoint<D> (vertex);
-      center *= (1.0 / vertices_index.Size ());
+      center *= (1.0 / vertices_index.Size ()) * useshift;
       return center;
     }
   };

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/src/ngstrefftz.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ngstrefftz
-Version: 0.3.2402.dev35
+Version: 0.3.2403.dev6
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Home-page: https://github.com/PaulSt/ngstrefftz
 Author: Paul Stocker

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/src/trefftzfespace.cpp

@@ -221,27 +221,18 @@ namespace ngcomp
     static Timer t ("QTEll - GetEWSolution");
     RegionTimer reg (t);
     LocalHeap lh (1000 * 1000 * 1000);
-    if (eqtyp != "qtelliptic")
-      throw Exception ("TrefftzFESpace::GetEWSolution: elementwise particular "
-                       "solution not available for eqtyp");
 
     Flags flags;
     flags.SetFlag ("order", order);
-    flags.SetFlag ("usescale", 1);
+    flags.SetFlag ("usescale", this->usescale);
+    if (eqtyp == "qtheat" && usescale != 0)
+      flags.SetFlag ("usescale", 2);
     shared_ptr<FESpace> fes = make_shared<MonomialFESpace> (ma, flags);
     auto pws = CreateGridFunction (fes, "pws", flags);
     pws->Update ();
     // pws->ConnectAutoUpdate();
 
-    switch (D)
-      {
-      case 2:
-        static_cast<QTEllipticBasis<2> *> (basis)->SetRHS (acoeffF);
-        break;
-      case 3:
-        static_cast<QTEllipticBasis<3> *> (basis)->SetRHS (acoeffF);
-        break;
-      }
+    basis->SetRHS (acoeffF);
 
     // for (auto ei : ma->Elements (VOL))
     ma->IterateElements (VOL, lh, [&] (auto ei, LocalHeap &mlh) {
@@ -261,13 +252,27 @@ namespace ngcomp
       switch (D)
         {
         case 2:
-          static_cast<QTEllipticBasis<2> *> (basis)->GetParticularSolution (
-              ElCenter<2> (ei), ElSize<2> (ei), elvec, mlh);
-          break;
+          {
+            Vec<2> scale = 1.0;
+            if (eqtyp == "qtheat")
+              scale
+                  = { ElSize<2> (ei, { 1.0, 0 }), ElSize<2> (ei, { 0, 1.0 }) };
+            else if (usescale != 0)
+              scale = ElSize<2> (ei);
+            basis->GetParticularSolution (ElCenter<2> (ei), scale, elvec, mlh);
+            break;
+          }
         case 3:
-          static_cast<QTEllipticBasis<3> *> (basis)->GetParticularSolution (
-              ElCenter<3> (ei), ElSize<3> (ei), elvec, mlh);
-          break;
+          {
+            Vec<3> scale = 1.0;
+            if (eqtyp == "qtheat")
+              scale = { ElSize<3> (ei, { 1.0, 1.0, 0 }), 0,
+                        ElSize<3> (ei, { 0, 0, 1.0 }) };
+            else if (usescale != 0)
+              scale = ElSize<3> (ei);
+            basis->GetParticularSolution (ElCenter<3> (ei), scale, elvec, mlh);
+            break;
+          }
         }
 
       pws->SetElementVector (dofs, elvec);
@@ -429,6 +434,17 @@ namespace ngcomp
                       local_ndof, order, basismat, eltype, ElCenter<3> (ei),
                       scale));
                 }
+              else if (eqtyp == "qtheat")
+                {
+                  double hx = ElSize<3> (ei, { 1.0, 1.0, 0 });
+                  double ht = ElSize<3> (ei, { 0, 0, 1.0 });
+                  Vec<3> scale ({ 1.0 / hx, 1.0 / hx, 1.0 / ht });
+                  CSR basismat = static_cast<QTHeatBasis<3> *> (basis)->Basis (
+                      ElCenter<3> (ei), hx, ht);
+                  return *(new (alloc) ScalarMappedElement<3> (
+                      local_ndof, order, basismat, eltype, ElCenter<3> (ei),
+                      scale));
+                }
               else
                 {
                   Vec<3> scale = 1.0;
@@ -464,6 +480,8 @@ namespace ngcomp
     docu.short_docu = "Trefftz space for different PDEs. Use kwarg 'eq' to "
                       "choose the PDE, currently implemented are:\n"
                       " - laplace - for Laplace equation\n"
+                      " - qtelliptic - for the quasi-Trefftz space for an "
+                      "elliptic problem\n"
                       " - wave - for the second order acoustic wave equation\n"
                       " - qtwave - for the quasi-Trefftz space\n"
                       " - fowave - for the first order acoustic wave "
@@ -949,7 +967,7 @@ namespace ngcomp
                     qtbasis.Col (indexmap)
                         -= factorial (mii + ej) / factorial (mil)
                            * (AA[IndexMap2<D> (mil, order - 1)]) (j, m)
-                           / pow (elsize, vsum<D, int> (-mil))
+                           * pow (elsize, vsum<D, int> (mil))
                            * (mii[m] + ej[m] - mil[m] + 1)
                            * qtbasis.Col (PolBasis::IndexMap2<D> (
                                mii + ej - mil + em, order));
@@ -957,8 +975,8 @@ namespace ngcomp
                 // vec coeff B
                 qtbasis.Col (indexmap)
                     += factorial (mii + ej) / factorial (mil)
-                       * (BB[IndexMap2<D> (mil, order - 1)]) (j)
-                       / pow (elsize, vsum<D, int> (-mil) - 1)
+                       * (BB[IndexMap2<D> (mil, order - 1)]) (j)*pow (
+                           elsize, vsum<D, int> (mil) + 1)
                        * qtbasis.Col (
                            PolBasis::IndexMap2<D> (mii + ej - mil, order));
 
@@ -967,7 +985,7 @@ namespace ngcomp
                   qtbasis.Col (indexmap)
                       += factorial (mii) / factorial (mil)
                          * CC[IndexMap2<D> (mil, order - 1)]
-                         / pow (elsize, vsum<D, int> (-mil) - 2)
+                         * pow (elsize, vsum<D, int> (mil) + 2)
                          * qtbasis.Col (
                              PolBasis::IndexMap2<D> (mii - mil, order));
               });
@@ -995,9 +1013,10 @@ namespace ngcomp
 
   template <int D>
   void
-  QTEllipticBasis<D>::GetParticularSolution (Vec<D> ElCenter, double elsize,
+  QTEllipticBasis<D>::GetParticularSolution (Vec<D> ElCenter, Vec<D> elsize,
                                              FlatVector<> sol, LocalHeap &lh)
   {
+    double hx = elsize[0];
     static Timer t ("QTEll - GetParticularSolution");
     RegionTimer reg (t);
     IntegrationPoint ip (ElCenter, 0);
@@ -1053,7 +1072,7 @@ namespace ngcomp
                 em[m] = 1;
                 sol (indexmap) -= factorial (mii + ej) / factorial (mil)
                                   * (AA[IndexMap2<D> (mil, order - 1)]) (j, m)
-                                  * pow (elsize, vsum<D, int> (mil))
+                                  * pow (hx, vsum<D, int> (mil))
                                   * (mii[m] + ej[m] - mil[m] + 1)
                                   * sol (PolBasis::IndexMap2<D> (
                                       mii + ej - mil + em, order));
@@ -1062,7 +1081,7 @@ namespace ngcomp
             sol (indexmap)
                 += factorial (mii + ej) / factorial (mil)
                    * (BB[IndexMap2<D> (mil, order - 1)]) (j)*pow (
-                       elsize, vsum<D, int> (mil) + 1)
+                       hx, vsum<D, int> (mil) + 1)
                    * sol (PolBasis::IndexMap2<D> (mii + ej - mil, order));
 
             // scal coeff C
@@ -1070,12 +1089,12 @@ namespace ngcomp
               sol (indexmap)
                   += factorial (mii) / factorial (mil)
                      * CC[IndexMap2<D> (mil, order - 1)]
-                     * pow (elsize, vsum<D, int> (mil) + 2)
+                     * pow (hx, vsum<D, int> (mil) + 2)
                      * sol (PolBasis::IndexMap2<D> (mii - mil, order));
           });
         }
       sol (indexmap) += -FF[PolBasis::IndexMap2<D> (mii, order)]
-                        * pow (elsize, vsum<D, int> (mii) + 2);
+                        * pow (hx, vsum<D, int> (mii) + 2);
       Vec<D, int> eD = 0;
       eD[D - 1] = 2;
       sol (indexmap) *= 1.0 / factorial (mii + eD) / (AA[0](D - 1, D - 1));
@@ -1462,10 +1481,85 @@ namespace ngcomp
     // return gtbstore[encode];
   }
 
+  template <int D>
+  void QTHeatBasis<D>::GetParticularSolution (Vec<D> ElCenter, Vec<D> elsize,
+                                              FlatVector<> sol, LocalHeap &lh)
+  {
+    double hx = elsize[0];
+    double ht = elsize[D - 1];
+    IntegrationPoint ip (ElCenter, 0);
+    Mat<D, D> dummy;
+    FE_ElementTransformation<D, D> et (D == 3 ? ET_TET : ET_TRIG, dummy);
+    MappedIntegrationPoint<D, D> mip (ip, et, 0);
+    for (int i = 0; i < D; i++)
+      mip.Point ()[i] = ElCenter[i];
+
+    int ndiffs = (BinCoeff (D + order - 1, order - 1));
+    Vector<Matrix<>> AA (ndiffs);
+    ndiffs = (BinCoeff (D + order, order));
+    FlatVector<> FF (ndiffs, lh);
+
+    TraversePol<D> (order, [&] (int i, Vec<D, int> coeff) {
+      int index = PolBasis::IndexMap2<D> (coeff, order);
+      FF[index] = FFder[index]->Evaluate (mip);
+      if (vsum<D, int> (coeff) < order)
+        {
+          index = PolBasis::IndexMap2<D> (coeff, order - 1);
+          AA[index].SetSize (D - 1, D - 1);
+          AAder[index]->Evaluate (mip, AA[index].AsVector ());
+        }
+    });
+
+    const int ndof = (BinCoeff (D - 1 + order, order)
+                      + BinCoeff (D - 1 + order - 1, order - 1));
+    const int npoly = (BinCoeff (D + order, order));
+    sol = 0;
+    // start recursion
+    TraversePol2<D> (order, [&] (int i, Vec<D, int> coeff) {
+      if (coeff[0] <= 1)
+        return;
+      int indexmap = PolBasis::IndexMap2<D> (coeff, order);
+      Vec<D, int> mii = coeff;
+      mii[0] = mii[0] - 2;
+      Vec<D, int> et = 0;
+      et[D - 1] = 1;
+      sol (indexmap) += hx * hx / ht * (mii[D - 1] + 1) / coeff[0]
+                        / (coeff[0] - 1)
+                        * sol (PolBasis::IndexMap2<D> (mii + et, order));
+      for (int j = 0; j < D - 1; j++)
+        {
+          Vec<D, int> ej = 0;
+          ej[j] = 1;
+          TraversePol<D> (mii + ej, [&] (int i2, Vec<D, int> mil) {
+            // matrix coeff A
+            for (int m = 0; m < D - 1; m++)
+              {
+                if (i2 == 0 && m == 0 && j == 0)
+                  continue;
+                Vec<D, int> em = 0;
+                em[m] = 1;
+                sol (indexmap)
+                    -= (AA[IndexMap2<D> (mil, order - 1)]) (j, m)
+                       * pow (hx, vsum<D - 1, int> (mil))
+                       * pow (ht, mil[D - 1]) * (mii[m] + ej[m] - mil[m] + 1)
+                       * (mii[j] + 1) / (mii[0] + 2) / (mii[0] + 1)
+                       / factorial (mil)
+                       * sol (PolBasis::IndexMap2<D> (mii + ej - mil + em,
+                                                      order));
+              }
+          });
+        }
+      sol (indexmap) += -FF[PolBasis::IndexMap2<D> (mii, order)]
+                        * pow (hx, vsum<D - 1, int> (coeff))
+                        * pow (ht, coeff[D - 1]) / factorial (coeff);
+      sol (indexmap) *= 1.0 / (AA[0](0, 0));
+    });
+    // cout << sol << endl;
+  }
+
   // template class QTHeatBasis<1>;
   template class QTHeatBasis<2>;
   template class QTHeatBasis<3>;
-
 }
 
 #ifdef NGS_PYTHON
@@ -1488,6 +1582,9 @@ void ExportTrefftzFESpace (py::module m)
           R"mydelimiter(
                 Set coefficient of Trefftz space. 
 
+                For an elliptic problem, the coefficients are given by
+                - div(coeffA*grad(u)) + coeffB*grad(u) + coeffC u = 0
+
                 For the first order wave equation, the coefficients are given by
                 grad(v) + coeffB dt sigma = 0
                 div(sigma) + 1/coeffA**2 dt v = 0

{ngstrefftz-0.3.2402.dev35 → ngstrefftz-0.3.2403.dev6}/src/trefftzfespace.hpp

@@ -15,6 +15,26 @@ namespace ngcomp
   public:
     PolBasis () { ; }
     PolBasis (int aorder) : order (aorder) { ; }
+
+    virtual void SetRHS (shared_ptr<CoefficientFunction> coeffF)
+    {
+      throw Exception ("SetRHS not implemented for this basis");
+    }
+    virtual void GetParticularSolution (Vec<1> ElCenter, Vec<1> elsize,
+                                        FlatVector<> sol, LocalHeap &lh)
+    {
+      throw Exception ("GetParticularSolution not implemented for this basis");
+    }
+    virtual void GetParticularSolution (Vec<2> ElCenter, Vec<2> elsize,
+                                        FlatVector<> sol, LocalHeap &lh)
+    {
+      throw Exception ("GetParticularSolution not implemented for this basis");
+    }
+    virtual void GetParticularSolution (Vec<3> ElCenter, Vec<3> elsize,
+                                        FlatVector<> sol, LocalHeap &lh)
+    {
+      throw Exception ("GetParticularSolution not implemented for this basis");
+    }
     template <int D>
     void ComputeDerivs (int order, shared_ptr<CoefficientFunction> acoeff,
                         Vector<shared_ptr<CoefficientFunction>> &ders)
@@ -225,12 +245,12 @@ namespace ngcomp
       this->ComputeDerivs<D> (order - 1, coeffC, CCder);
     }
     CSR Basis (Vec<D> ElCenter, double elsize = 1.0);
-    void SetRHS (shared_ptr<CoefficientFunction> coeffF)
+    void SetRHS (shared_ptr<CoefficientFunction> coeffF) override
     {
       this->ComputeDerivs<D> (order, coeffF, FFder);
     }
-    void GetParticularSolution (Vec<D> ElCenter, double elsize,
-                                FlatVector<> sol, LocalHeap &lh);
+    void GetParticularSolution (Vec<D> ElCenter, Vec<D> elsize,
+                                FlatVector<> sol, LocalHeap &lh) override;
   };
 
   template <int D> class QTWaveBasis : public PolBasis
@@ -303,6 +323,7 @@ namespace ngcomp
     std::map<string, CSR> gtbstore;
 
     Vector<shared_ptr<CoefficientFunction>> AAder;
+    Vector<shared_ptr<CoefficientFunction>> FFder;
 
   public:
     QTHeatBasis (int aorder, shared_ptr<CoefficientFunction> coeffA)
@@ -314,6 +335,12 @@ namespace ngcomp
       this->ComputeDerivs<D> (order - 1, coeffA, AAder);
     }
     CSR Basis (Vec<D> ElCenter, double hx, double ht);
+    void SetRHS (shared_ptr<CoefficientFunction> coeffF) override
+    {
+      this->ComputeDerivs<D> (order, coeffF, FFder);
+    }
+    void GetParticularSolution (Vec<D> ElCenter, Vec<D> elsize,
+                                FlatVector<> sol, LocalHeap &lh);
   };
 }