Some more edits to get disabling of NEDELEC_ONE refinement working

Author: lindsayad

include/fe/fe_abstract.h

@@ -609,6 +609,11 @@ class FEAbstract : public ReferenceCountedObject<FEAbstract>
    */
   void add_p_level_in_reinit(bool value) { _add_p_level_in_reinit = value; }
 
+  /**
+   * Whether to add p-refinement levels in init/reinit methods
+   */
+  bool add_p_level_in_reinit() const { return _add_p_level_in_reinit; }
+
 protected:
 
   /**

include/systems/generic_projector.h

@@ -2549,10 +2549,12 @@ void GenericProjector<FFunctor, GFunctor, FValue, ProjectionAction>::ProjectSide
             continue;
 
           FEType fe_type = base_fe_type;
+          const auto & dof_map = system.get_dof_map();
+          const bool add_p_level = dof_map.should_p_refine_var(var);
 
           // This may be a p refined element
           fe_type.order =
-            libMesh::Order (fe_type.order + elem.p_level());
+            libMesh::Order (fe_type.order + add_p_level*elem.p_level());
 
           // If this is a Lagrange element with DoFs on sides then by
           // convention we interpolate at the node rather than project
@@ -2664,7 +2666,7 @@ void GenericProjector<FFunctor, GFunctor, FValue, ProjectionAction>::ProjectSide
 
           std::vector<unsigned int> side_dofs;
           FEInterface::dofs_on_side(&elem, dim, base_fe_type,
-                                    context.side, side_dofs);
+                                    context.side, side_dofs, add_p_level);
 
           this->construct_projection
             (dof_indices, side_dofs, var_component,

src/systems/fem_context.C

@@ -2025,20 +2025,24 @@ FEMContext::build_new_fe( const FEGenericBase<OutputShape>* fe,
   libmesh_assert(this->has_elem() || fe_type.family == SCALAR);
 
 #ifdef LIBMESH_ENABLE_AMR
+  const bool add_p_level = fe->add_p_level_in_reinit();
   if ((algebraic_type() == OLD) &&
       this->has_elem())
     {
       if (this->get_elem().p_refinement_flag() == Elem::JUST_REFINED)
-        fe_type.order = static_cast<Order>(fe_type.order - 1);
+        fe_type.order = static_cast<Order>(fe_type.order - add_p_level);
       else if (this->get_elem().p_refinement_flag() == Elem::JUST_COARSENED)
-        fe_type.order = static_cast<Order>(fe_type.order + 1);
+        fe_type.order = static_cast<Order>(fe_type.order + add_p_level);
     }
 #endif // LIBMESH_ENABLE_AMR
 
   const unsigned int elem_dim = this->has_elem() ? this->get_elem().dim() : 0;
 
   FEGenericBase<OutputShape>* fe_new =
     cached_fe<OutputShape>(elem_dim, fe_type, get_derivative_level);
+#ifdef LIBMESH_ENABLE_AMR
+  fe_new->add_p_level_in_reinit(add_p_level);
+#endif // LIBMESH_ENABLE_AMR
 
   // Map the physical co-ordinates to the master co-ordinates using the inverse_map from fe_interface.h
   // Build a vector of point co-ordinates to send to reinit