From: bangerth Date: Fri, 20 Jan 2012 03:42:00 +0000 (+0000) Subject: Commit the second part of the patch by Jason Sheldon since that apparently got lost... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2061462c3d3a2e3c7cdb2a7fdc7bdc82c577345;p=dealii-svn.git Commit the second part of the patch by Jason Sheldon since that apparently got lost the first time around. git-svn-id: https://svn.dealii.org/trunk@24909 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/fe/fe_tools.cc b/deal.II/source/fe/fe_tools.cc index acc38538a5..c80ee34957 100644 --- a/deal.II/source/fe/fe_tools.cc +++ b/deal.II/source/fe/fe_tools.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -2180,6 +2180,19 @@ namespace FETools // never get here Assert (false, ExcInternalError()); } + else if (name_part == "FE_Nothing") + { + // remove the () from FE_Nothing() + name.erase(0,2); + + // this is a bit of a hack, as + // FE_Nothing does not take a + // degree, but it does take an + // argument, which defaults to 1, + // so this properly returns + // FE_Nothing() + return fe_name_map.find(name_part)->second->get(1); + } else { // Make sure no other thread