Merge branch 'fix_order_policy' into 'master'

fix for order policy parsing from python See merge request jschoeberl/ngsolve!299
NGSolve · Feb 6, 2018 · 39895ab3eb6e7cc3c6ed4f83500c31c15e8d9fd6 · 39895ab
2 parents 06b1f78 + 3e03097
commit 39895ab3eb6e7cc3c6ed4f83500c31c15e8d9fd6
Unified Split

Showing with 8 additions and 0 deletions.

+3 −0 comp/fespace.cpp

+5 −0 comp/python_comp.cpp
diff --git a/comp/fespace.cpp b/comp/fespace.cpp
@@ -45,6 +45,9 @@ namespace ngcomp

    order = int (flags.GetNumFlag ("order", 1));

+    if (flags.NumFlagDefined("order_policy"))
+      SetOrderPolicy(ORDER_POLICY(int(flags.GetNumFlag("order_policy",1))));
+
    if (flags.NumFlagDefined("order_left"))
      {
        auto order_left = int(flags.GetNumFlag("order_left", 1));
diff --git a/comp/python_comp.cpp b/comp/python_comp.cpp
@@ -1533,6 +1533,11 @@ kwargs : For a description of the possible kwargs have a look a bit further down
                                defonlist.Append(i+1);
                            flags->SetFlag("definedonbound", defonlist);
                          }
+                      }),
+                     py::arg("order_policy") = py::cpp_function
+                     ([] (ORDER_POLICY op, Flags* flags, py::list info)
+                      {
+                        flags->SetFlag("order_policy", int(op));
                      })
                     );
                     return special;