Clean up FEType declaration a little

Alex pointed out that we could pull p_refinement out of the ifdefs here,
and we should be able to do the same with order without changing struct
ordering.

Author: roystgnr

include/fe/fe_type.h

@@ -197,6 +197,11 @@ class FEType
 {
 public:
 
+  /**
+   * The approximation order of the element (at 0 p-refinement level).
+   */
+  OrderWrapper order;
+
 #ifndef LIBMESH_ENABLE_INFINITE_ELEMENTS
 
   /**
@@ -216,23 +221,12 @@ class FEType
     p_refinement(true)
   {}
 
-  /**
-   * The approximation order of the element (at 0 p-refinement level).
-   */
-  OrderWrapper order;
-
   /**
    * The type of finite element.  Valid types are \p LAGRANGE,
    * \p HIERARCHIC, etc...
    */
   FEFamily family;
 
-  /**
-   * Whether or not the finite elements for this type increase their p
-   * refinement level on geometric elements of increased p level.
-   */
-  bool p_refinement;
-
 #else
 
   /**
@@ -263,11 +257,6 @@ class FEType
     p_refinement(true)
   {}
 
-  /**
-   * The approximation order in the base of the infinite element.
-   */
-  OrderWrapper order;
-
   /**
    * The approximation order in radial direction of the infinite element.
    */
@@ -294,14 +283,14 @@ class FEType
    */
   InfMapType inf_map;
 
+#endif // ifndef LIBMESH_ENABLE_INFINITE_ELEMENTS
+
   /**
    * Whether or not the finite elements for this type increase their p
    * refinement level on geometric elements of increased p level.
    */
   bool p_refinement;
 
-#endif // ifndef LIBMESH_ENABLE_INFINITE_ELEMENTS
-
   /**
    * "Fluent API" for constructing a non-default p_refinement, for
    * easier compatibility between non-InfFE and InfFE code