]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Commit the second part of the patch by Jason Sheldon since that apparently got lost...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 20 Jan 2012 03:42:00 +0000 (03:42 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 20 Jan 2012 03:42:00 +0000 (03:42 +0000)
git-svn-id: https://svn.dealii.org/trunk@24909 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/source/fe/fe_tools.cc

index acc38538a5d8dd345edb1d3561a7dadf607f567e..c80ee3495747740ca84f2d4d867d3131b265972b 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.