From e14c24b7c330802c5f7345a6b5dd3463d3abb490 Mon Sep 17 00:00:00 2001 From: Marco Tezzele Date: Fri, 24 Apr 2015 12:04:40 +0200 Subject: [PATCH] Added fe_bernstein in fe_tools.cc. Now get_fe_from_name works. --- source/fe/fe_tools.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/fe/fe_tools.cc b/source/fe/fe_tools.cc index 75b263d3a0..c52bf824ba 100644 --- a/source/fe/fe_tools.cc +++ b/source/fe/fe_tools.cc @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -141,6 +142,8 @@ namespace = FEFactoryPointer(new FETools::FEFactory >); result["FE_Q"] = FEFactoryPointer(new FETools::FEFactory >); + result["FE_Bernstein"] + = FEFactoryPointer(new FETools::FEFactory >); result["FE_Nothing"] = FEFactoryPointer(new FETools::FEFactory >); } @@ -162,6 +165,8 @@ namespace = FEFactoryPointer(new FETools::FEFactory >); result["FE_Q"] = FEFactoryPointer(new FETools::FEFactory >); + result["FE_Bernstein"] + = FEFactoryPointer(new FETools::FEFactory >); } // The function filling the vector fe_name_map below. It iterates @@ -1342,10 +1347,6 @@ namespace FETools // have to figure out what the // base elements are. this can // only be done recursively - - - - if (name_part == "FESystem") { // next we have to get at the @@ -1492,9 +1493,9 @@ namespace FETools // Make sure no other thread // is just adding an element Threads::Mutex::ScopedLock lock (fe_name_map_lock); - AssertThrow (fe_name_map.find(name_part) != fe_name_map.end(), ExcInvalidFEName(name)); + // Now, just the (degree) // or (Quadrature<1>(degree+1)) // part should be left. -- 2.39.5