From 02c0a94bae3a212d4cf5803424238015221620bc Mon Sep 17 00:00:00 2001
From: mperego <mperego@sandia.gov>
Date: Thu, 18 Jan 2024 09:44:29 -0700
Subject: [PATCH] Intrepid2: remove Experimental namespace and fix warnings
 (#12676)

* Intrepid2: fix compiler warnings (no return statement, and defined but not used)

* Intrepid2: finally remove Experimental namespace for projections
---
 .../Discretization/Basis/Intrepid2_HGRAD_HEX_C2_FEM.hpp   | 5 +----
 .../Discretization/Basis/Intrepid2_HGRAD_QUAD_C2_FEM.hpp  | 5 +----
 .../Discretization/Basis/Intrepid2_HGRAD_WEDGE_C2_FEM.hpp | 5 +----
 .../src/Projection/Intrepid2_LagrangianInterpolation.hpp  | 8 +-------
 .../src/Projection/Intrepid2_ProjectionStruct.hpp         | 6 ------
 .../src/Projection/Intrepid2_ProjectionTools.hpp          | 6 ------
 .../src/Shared/Intrepid2_ArrayToolsDefTensor.hpp          | 4 ----
 7 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_HEX_C2_FEM.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_HEX_C2_FEM.hpp
index 68b0c23ea35f..199371e9c771 100644
--- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_HEX_C2_FEM.hpp
+++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_HEX_C2_FEM.hpp
@@ -305,10 +305,7 @@ namespace Intrepid2 {
     virtual
     const char*
     getName() const override {
-      if constexpr (serendipity)
-        return "Intrepid2_HGRAD_HEX_I2_FEM";
-      else
-        return "Intrepid2_HGRAD_HEX_C2_FEM";
+      return serendipity ? "Intrepid2_HGRAD_HEX_I2_FEM" : "Intrepid2_HGRAD_HEX_C2_FEM";
     }
 
     /** \brief returns the basis associated to a subCell.
diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_QUAD_C2_FEM.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_QUAD_C2_FEM.hpp
index dde16813ba56..285558110b19 100644
--- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_QUAD_C2_FEM.hpp
+++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_QUAD_C2_FEM.hpp
@@ -261,10 +261,7 @@ namespace Intrepid2 {
     virtual
     const char*
     getName() const override {
-      if constexpr (serendipity)
-        return "Intrepid2_HGRAD_QUAD_I2_FEM";
-      else
-        return "Intrepid2_HGRAD_QUAD_C2_FEM";
+      return serendipity ? "Intrepid2_HGRAD_QUAD_I2_FEM" : "Intrepid2_HGRAD_QUAD_C2_FEM";
     }
 
     /** \brief returns the basis associated to a subCell.
diff --git a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_WEDGE_C2_FEM.hpp b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_WEDGE_C2_FEM.hpp
index 2232303172b8..17c724e987a7 100644
--- a/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_WEDGE_C2_FEM.hpp
+++ b/packages/intrepid2/src/Discretization/Basis/Intrepid2_HGRAD_WEDGE_C2_FEM.hpp
@@ -282,10 +282,7 @@ namespace Intrepid2 {
     virtual
     const char*
     getName() const override {
-      if constexpr (serendipity)
-        return "Intrepid2_HGRAD_WEDGE_I2_FEM";
-      else
-        return "Intrepid2_HGRAD_WEDGE_C2_FEM";
+      return serendipity ? "Intrepid2_HGRAD_WEDGE_I2_FEM" : "Intrepid2_HGRAD_WEDGE_C2_FEM";
     }
 
     /** \brief returns the basis associated to a subCell.
diff --git a/packages/intrepid2/src/Projection/Intrepid2_LagrangianInterpolation.hpp b/packages/intrepid2/src/Projection/Intrepid2_LagrangianInterpolation.hpp
index f0983390e90d..f087ebd104fc 100644
--- a/packages/intrepid2/src/Projection/Intrepid2_LagrangianInterpolation.hpp
+++ b/packages/intrepid2/src/Projection/Intrepid2_LagrangianInterpolation.hpp
@@ -225,13 +225,7 @@ class LagrangianTools {
   );
 };
 
-// temporary fix to allow applications keep using the Experimental namespace. It will be removed soon.
-namespace Experimental {
-template<typename DeviceType>
-class LagrangianInterpolation: public Intrepid2::LagrangianInterpolation<DeviceType>{};
-}
-
-}
+} // Intrepid2 namespace
 
 // include templated function definitions
 #include "Intrepid2_LagrangianInterpolationDef.hpp"
diff --git a/packages/intrepid2/src/Projection/Intrepid2_ProjectionStruct.hpp b/packages/intrepid2/src/Projection/Intrepid2_ProjectionStruct.hpp
index ff49021b10a8..969c89a6f452 100644
--- a/packages/intrepid2/src/Projection/Intrepid2_ProjectionStruct.hpp
+++ b/packages/intrepid2/src/Projection/Intrepid2_ProjectionStruct.hpp
@@ -526,12 +526,6 @@ class ProjectionStruct {
   ordinal_type maxNumTargetDerivEvalPoints;
 };
 
-//Temporary fix, to allow application keep using the Experimental namespace. It will be removed soon.
-namespace Experimental {
-template<typename DeviceType, typename ValueType>
-class ProjectionStruct: public Intrepid2::ProjectionStruct<DeviceType, ValueType>{};
-}
-
 } // Intrepid2 namespace
 #include "Intrepid2_ProjectionStructDef.hpp"
 #endif
diff --git a/packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp b/packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp
index 5ec9a4aec588..26f5d9b1d58f 100644
--- a/packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp
+++ b/packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp
@@ -802,12 +802,6 @@ class ProjectionTools {
   
 };
 
-//Temporary fix to allow application keep using the Experimental namespace. It will be removed soon.
-namespace Experimental {
-template<typename DeviceType>
-class ProjectionTools: public Intrepid2::ProjectionTools<DeviceType>{};
-}
-
 } //Intrepid2
 
 
diff --git a/packages/intrepid2/src/Shared/Intrepid2_ArrayToolsDefTensor.hpp b/packages/intrepid2/src/Shared/Intrepid2_ArrayToolsDefTensor.hpp
index 26d88ce23bcb..eff53e119ebf 100644
--- a/packages/intrepid2/src/Shared/Intrepid2_ArrayToolsDefTensor.hpp
+++ b/packages/intrepid2/src/Shared/Intrepid2_ArrayToolsDefTensor.hpp
@@ -943,10 +943,6 @@ namespace Intrepid2 {
     using FT23FF = FunctorArrayTools::F_matvecProduct<Output,Left,Right,2,3, false, false>;
     using FT22FF = FunctorArrayTools::F_matvecProduct<Output,Left,Right,2,2, false, false>;
 
-    typedef       Kokkos::DynRankView<outputValueType,    outputProperties...>      OutputViewType;
-    typedef const Kokkos::DynRankView<leftInputValueType, leftInputProperties...>   leftInputViewType;
-    typedef const Kokkos::DynRankView<rightInputValueType,rightInputProperties...>  rightInputViewType;
-    
     const ordinal_type l = leftInput.rank();
     const ordinal_type r = rightInput.rank();