Merge branch 'fix_facetfe_segment_order' into 'master'

fix order of facetfe segments (was not set at all) See merge request jschoeberl/ngsolve!296
NGSolve · Feb 2, 2018 · e669607 · e669607
2 parents 9080131 + 24a6307
commit e669607
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/comp/facetfespace.cpp b/comp/facetfespace.cpp
@@ -481,6 +481,7 @@ namespace ngcomp
 
     FacetFE<ET> * fe =  new (alloc) FacetFE<ET> ();
     fe -> SetVertexNumbers (ngel.Vertices());
+    fe -> SetOrder(0);
     if (ET_trait<ET>::DIM >= 2)
       for (int i = 0; i < ET_trait<ET>::N_FACET; i++)
         fe -> SetOrder (i, order_facet[ngel.Facets()[i]][0]);

diff --git a/fem/facetfe.hpp b/fem/facetfe.hpp
@@ -101,7 +101,7 @@ namespace ngfem
 	facet_order[i] = ao;
     }
 
-    void SetOrder (int nr, int o) { facet_order[nr] = o; }
+    void SetOrder (int nr, int o) { facet_order[nr] = o; order = max2(order,o); }
 
     void SetOrder (FlatArray<int> & ao)
     {