Remove unused non-NGP code (#486)

* Remove unused classes after transition to NGP * Remove deprecated code used during NGP transition
Exawind · Jan 13, 2020 · 8960c45 · 8960c45
1 parent 2191d04
commit 8960c45
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 1,026 deletions.
diff --git a/include/AssembleMomentumEdgeOpenSolverAlgorithm.h b/include/AssembleMomentumEdgeOpenSolverAlgorithm.h
diff --git a/include/ComputeGeometryBoundaryAlgorithm.h b/include/ComputeGeometryBoundaryAlgorithm.h
diff --git a/include/ComputeGeometryInteriorAlgorithm.h b/include/ComputeGeometryInteriorAlgorithm.h
diff --git a/include/ngp_algorithms/NgpAlgDriver.h b/include/ngp_algorithms/NgpAlgDriver.h
@@ -118,24 +118,6 @@ class NgpAlgDriver
     }
   }
 
-  template<
-    template <typename> class NGPAlg,
-    typename LegacyAlg,
-    class... Args>
-  void register_elem_algorithm(
-    AlgorithmType algType,
-    stk::mesh::Part* part,
-    const std::string& algSuffix,
-    Args&&... args)
-  {
-    if (!nalu_ngp::is_ngp_element(part->topology()))
-      register_legacy_algorithm<LegacyAlg>(
-        algType, part, algSuffix, std::forward<Args>(args)...);
-    else
-      register_elem_algorithm<NGPAlg>(
-        algType, part, algSuffix, std::forward<Args>(args)...);
-  }
-
   /** Register an face algorithm
    *
    *  @param algType Type of algorithm being registered (e.g., INLET, WALL, * OPEN)
@@ -192,42 +174,6 @@ class NgpAlgDriver
     }
   }
 
-  template<
-    template <typename> class NGPAlg,
-    typename LegacyAlg,
-    class... Args>
-  void register_face_algorithm(
-    AlgorithmType algType,
-    stk::mesh::Part* part,
-    const std::string& algSuffix,
-    Args&&... args)
-  {
-    if (!nalu_ngp::is_ngp_face(part->topology()))
-      register_legacy_algorithm<LegacyAlg>(
-        algType, part, algSuffix, std::forward<Args>(args)...);
-    else
-      register_face_algorithm<NGPAlg>(
-        algType, part, algSuffix, std::forward<Args>(args)...);
-  }
-
-  template<template <typename> class NgpAlg,
-           typename LegacyAlg,
-           class ... Args>
-  void register_face_elem_algorithm(
-    AlgorithmType algType,
-    stk::mesh::Part* part,
-    const stk::topology elemTopo,
-    const std::string& algSuffix,
-    Args&& ... args)
-  {
-    if (!nalu_ngp::is_ngp_face(part->topology()))
-      register_legacy_algorithm<LegacyAlg>(
-        algType, part, algSuffix, std::forward<Args>(args) ...);
-    else
-      register_face_elem_algorithm<NgpAlg>(
-        algType, part, elemTopo, algSuffix, std::forward<Args>(args) ... );
-  }
-
 protected:
   template <typename NaluAlg, class... Args>
   void register_algorithm_impl(

diff --git a/include/ngp_utils/NgpCreateElemInstance.h b/include/ngp_utils/NgpCreateElemInstance.h
@@ -42,24 +42,7 @@ inline bool is_ngp_element(const stk::topology topo)
 {
   if (topo.is_super_topology()) return false;
 
-  bool isNGP = false;
-  switch (topo.value()) {
-  case stk::topology::HEX_8:
-  case stk::topology::TET_4:
-  case stk::topology::PYRAMID_5:
-  case stk::topology::WEDGE_6:
-  case stk::topology::QUAD_4_2D:
-  case stk::topology::TRI_3_2D:
-  case stk::topology::HEX_27:
-  case stk::topology::QUAD_9_2D:
-    isNGP = true;
-    break;
-
-  default:
-    throw std::logic_error("Invalid element topology provided");
-  }
-
-  return isNGP;
+  return true;
 }
 
 /** Has the sideset MasterElement for the topolgy fully transitioned to NGP?
@@ -75,21 +58,7 @@ inline bool is_ngp_face(const stk::topology topo)
 {
   if (topo.is_super_topology()) return false;
 
-  bool isNGP = false;
-  switch (topo.value()) {
-  case stk::topology::QUAD_4:
-  case stk::topology::TRI_3:
-  case stk::topology::LINE_2:
-  case stk::topology::QUAD_9:
-  case stk::topology::LINE_3:
-    isNGP = true;
-    break;
-
-  default:
-    throw std::logic_error("Invalid face topology provided");
-  }
-
-  return isNGP;
+  return true;
 }
 
 /** Create an interior element algorithm for the given topology
@@ -117,7 +86,8 @@ BaseType* create_elem_algorithm(
     case stk::topology::TRI_3_2D:
       return new T<AlgTraitsTri3_2D>(std::forward<Args>(args)...);
     default:
-      return nullptr;
+      throw std::runtime_error(
+        "NGP elem algorithm not implemented for " + topo.name());
   }
 }
 
@@ -140,7 +110,8 @@ BaseType* create_face_algorithm(
     case stk::topology::LINE_3:
       return new T<AlgTraitsEdge3_2D>(std::forward<Args>(args)...);
     default:
-      return nullptr;
+      throw std::runtime_error(
+        "NGP face algorithm not implemented for " + topo.name());
   }
 }