ngstrefftz 0.3.2507.dev6__tar.gz → 0.3.2507.dev8__tar.gz

{ngstrefftz-0.3.2507.dev6 → ngstrefftz-0.3.2507.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ngstrefftz
-Version: 0.3.2507.dev6
+Version: 0.3.2507.dev8
 Summary: NGSTrefftz is an add-on to NGSolve for Trefftz methods.
 Author-Email: Paul Stocker <paul.stocker@univie.ac.at>
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)

{ngstrefftz-0.3.2507.dev6 → ngstrefftz-0.3.2507.dev8}/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.3.2507.dev6'
-__version_tuple__ = version_tuple = (0, 3, 2507, 'dev6')
+__version__ = version = '0.3.2507.dev8'
+__version_tuple__ = version_tuple = (0, 3, 2507, 'dev8')
 
-__commit_id__ = commit_id = 'g90603121e'
+__commit_id__ = commit_id = 'g25f082f1b'

{ngstrefftz-0.3.2507.dev6 → ngstrefftz-0.3.2507.dev8}/src/embtrefftz.cpp

@@ -761,6 +761,14 @@ namespace ngcomp
           size_t ndof_test = dofs_test.Size ();
           size_t ndof_conforming = dofs_conforming.Size ();
 
+          if (ndof_test == 0 && ndof_conforming == 0)
+            {
+              Identity Id (ndof);
+              etmats[element_id.Nr ()] = make_optional<Matrix<SCAL>> (Id);
+              local_ndofs_trefftz[element_id.Nr ()] = ndof;
+              return;
+            }
+
           FlatMatrix<SCAL> elmat_A (ndof_test + ndof_conforming, ndof, lh);
           FlatMatrix<SCAL> elmat_B (ndof_test + ndof_conforming,
                                     ndof_conforming, lh);

{ngstrefftz-0.3.2507.dev6 → ngstrefftz-0.3.2507.dev8}/src/tp0fespace.cpp

@@ -85,28 +85,48 @@ namespace ngcomp
     return docu;
   }
 
+  int TP0FESpace ::LocalNDof (ELEMENT_TYPE eltype, int order) const
+  {
+    switch (eltype)
+      {
+      case ET_TRIG:
+        return (order - 1) * order / 2;
+      case ET_QUAD:
+        return (order + 1) * (order - 1);
+      default:
+        throw Exception ("TP0FESpace::LocalNDof: element type not supported");
+      }
+  }
+
   void TP0FESpace ::Update ()
   {
     FESpace::Update ();
     if (order_policy == OLDSTYLE_ORDER)
       order_policy = CONSTANT_ORDER;
+
+    nel = ma->GetNE ();
+    first_element_dof.SetSize (nel);
     if (order_policy == CONSTANT_ORDER || order_inner.Size () == 0)
       {
-        order_inner.SetSize (0);
-        nel = ma->GetNE ();
-        ndof = LocalNDof (this->order) * nel;
+        order_inner.SetSize0 ();
+        ndof = 0;
+        for (int i = 0; i < nel; i++)
+          {
+            first_element_dof[i] = ndof;
+            ndof += LocalNDof (ma->GetElement (ElementId (VOL, i)).GetType (),
+                               this->order);
+          }
+        // ndof = LocalNDof (this->order) * nel;
         SetNDof (ndof);
       }
     else if (order_policy == VARIABLE_ORDER)
       {
-        nel = ma->GetNE ();
         ndof = 0;
-        first_element_dof.SetSize (nel);
-        first_element_dof.SetSize0 ();
         for (int i = 0; i < nel; i++)
           {
-            first_element_dof.Append (ndof);
-            ndof += LocalNDof (order_inner[i]);
+            first_element_dof[i] = ndof;
+            ndof += LocalNDof (ma->GetElement (ElementId (VOL, i)).GetType (),
+                               order_inner[i]);
           }
         SetNDof (ndof);
       }
@@ -154,20 +174,15 @@ namespace ngcomp
     dnums.SetSize (0);
     if (!DefinedOn (ei) || ei.VB () != VOL)
       return;
-    if (first_element_dof.Size () > 0 && order_inner.Size () > 0)
-      {
-        int first_dof = first_element_dof[ei.Nr ()];
-        int local_ndof = LocalNDof (order_inner[ei.Nr ()]);
-        for (int j = first_dof; j < first_dof + local_ndof; j++)
-          dnums.Append (j);
-      }
+    int first_dof = first_element_dof[ei.Nr ()];
+    int local_ndof;
+    if (order_inner.Size () > 0)
+      local_ndof
+          = LocalNDof (ma->GetElement (ei).GetType (), order_inner[ei.Nr ()]);
     else
-      {
-        int local_ndof = LocalNDof (this->order);
-        for (size_t j = ei.Nr () * local_ndof; j < local_ndof * (ei.Nr () + 1);
-             j++)
-          dnums.Append (j);
-      }
+      local_ndof = LocalNDof (ma->GetElement (ei).GetType (), this->order);
+    for (int j = first_dof; j < first_dof + local_ndof; j++)
+      dnums.Append (j);
   }
 
   void TP0FESpace ::UpdateCouplingDofArray ()
@@ -185,34 +200,48 @@ namespace ngcomp
 
   FiniteElement &TP0FESpace ::GetFE (ElementId ei, Allocator &alloc) const
   {
-
     Ngs_Element ngel = ma->GetElement (ei);
     ELEMENT_TYPE eltype = ngel.GetType ();
     int D = ma->GetDimension ();
     int order = order_inner.Size () > 0 ? order_inner[ei.Nr ()] : this->order;
 
-    if (ei.IsVolume ())
+    if (ei.IsVolume () && order > 1)
       {
-        switch (D)
-          {
-          case 2:
+        if (D == 2)
+          switch (eltype)
             {
-              ElementTransformation &trafo = ma->GetTrafo (ei, alloc);
-              IntegrationPoint ip;
-              Mat<2, 2> jac;
-              trafo.CalcJacobian (ip, jac);
-              double xscale = L2Norm (jac.Col (0));
-              double yscale = L2Norm (jac.Col (1));
-              int zero_axis = yscale > xscale ? 1 : 0;
-
-              return *(new (alloc)
-                           TP0FE (LocalNDof (order), order,
-                                  IVec<4> (ngel.Vertices ()), zero_axis));
-              break;
+            case ET_QUAD:
+              {
+                ElementTransformation &trafo = ma->GetTrafo (ei, alloc);
+                IntegrationPoint ip;
+                Mat<2, 2> jac;
+                trafo.CalcJacobian (ip, jac);
+                double xscale = L2Norm (jac.Col (0));
+                double yscale = L2Norm (jac.Col (1));
+                int zero_axis = yscale > xscale ? 1 : 0;
+
+                return *(new (alloc)
+                             TP0FE (LocalNDof (ET_QUAD, order), order,
+                                    IVec<4> (ngel.Vertices ()), zero_axis));
+                break;
+              }
+            case ET_TRIG:
+              {
+                Ngs_Element ngel
+                    = ma->GetElement<ET_trait<ET_TRIG>::DIM, VOL> (ei.Nr ());
+                L2HighOrderFE<ET_TRIG> *hofe
+                    = new (alloc) L2HighOrderFE<ET_TRIG> ();
+                hofe->SetVertexNumbers (ngel.vertices);
+                hofe->L2HighOrderFE<ET_TRIG>::SetOrder (order - 2);
+                hofe->L2HighOrderFE<ET_TRIG>::ComputeNDof ();
+                return *hofe;
+                break;
+              }
+            default:
+              throw Exception ("eltype not supported in TP0FE");
             }
-          default:
-            throw Exception ("dimension not supported in TP0FE");
-          }
+        else
+          throw Exception ("dimension not supported in TP0FE");
       }
     try
       {

{ngstrefftz-0.3.2507.dev6 → ngstrefftz-0.3.2507.dev8}/src/tp0fespace.hpp

@@ -37,12 +37,22 @@ namespace ngcomp
                                 MAT &mat, LocalHeap &lh)
     {
       HeapReset hr (lh);
-      Cast (fel).CalcShape (mip.IP (), mat.Row (0));
-    }
-
-    static const TP0FE &Cast (const FiniteElement &fel)
-    {
-      return static_cast<const TP0FE &> (fel);
+      // Cast (fel).CalcShape (mip.IP (), mat.Row (0));
+      if (fel.Order () < 2)
+        return;
+      switch (fel.ElementType ())
+        {
+        case ET_QUAD:
+          static_cast<const TP0FE &> (fel).CalcShape (mip.IP (), mat.Row (0));
+          break;
+        case ET_TRIG:
+          static_cast<const L2HighOrderFE<ET_TRIG> &> (fel).CalcShape (
+              mip.IP (), mat.Row (0));
+          break;
+        default:
+          throw Exception ("MyDiffOpId: " + ToString (fel.ElementType ())
+                           + " not supported");
+        }
     }
   };
 
@@ -79,7 +89,7 @@ namespace ngcomp
     Array<int> order_inner;
     Array<int> first_element_dof;
 
-    int LocalNDof (int order) const { return (order + 1) * (order - 1); }
+    int LocalNDof (ELEMENT_TYPE eltype, int order) const;
 
   public:
     TP0FESpace (shared_ptr<MeshAccess> ama, const Flags &flags);