Merge pull request #13365 from cgcgcg/silenceWarnings

Stratimikos, Piro, Panzer: Silence warnings
trilinos · Aug 19, 2024 · ec9e57a · ec9e57a
2 parents 3ef94db + fef0dc0
commit ec9e57a
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 31 deletions.
diff --git a/packages/panzer/adapters-stk/src/Panzer_STK_LocalMeshUtilities.cpp b/packages/panzer/adapters-stk/src/Panzer_STK_LocalMeshUtilities.cpp
@@ -57,7 +57,6 @@ buildGhostedNodes(const Tpetra::Import<int,panzer::GlobalOrdinal,panzer::TpetraN
   using Teuchos::rcp;
 
   typedef Tpetra::MultiVector<double,int,panzer::GlobalOrdinal,panzer::TpetraNodeType> mvec_type;
-  typedef typename mvec_type::dual_view_type dual_view_type;
 
   size_t owned_cell_cnt = importer.getSourceMap()->getLocalNumElements();
   size_t ghstd_cell_cnt = importer.getTargetMap()->getLocalNumElements();

diff --git a/packages/panzer/adapters-stk/src/stk_interface/Panzer_STK_Quad8ToQuad4MeshFactory.cpp b/packages/panzer/adapters-stk/src/stk_interface/Panzer_STK_Quad8ToQuad4MeshFactory.cpp
@@ -205,9 +205,9 @@ void Quad8ToQuad4MeshFactory::buildMetaData(stk::ParallelMachine /* parallelMach
 
   if(createEdgeBlocks_) {
     const CellTopologyData * edge_ctd = shards::CellTopology(ctd).getBaseCellTopologyData(1,0);
-    std::vector<std::string> element_block_names;
-    quad8Mesh_->getElementBlockNames(element_block_names);
-    for (const auto& block_name : element_block_names)
+    std::vector<std::string> element_block_names2;
+    quad8Mesh_->getElementBlockNames(element_block_names2);
+    for (const auto& block_name : element_block_names2)
       mesh.addEdgeBlock(block_name,edgeBlockName_,edge_ctd);
   }
 

diff --git a/packages/panzer/adapters-stk/src/stk_interface/Panzer_STK_QuadraticToLinearMeshFactory.cpp b/packages/panzer/adapters-stk/src/stk_interface/Panzer_STK_QuadraticToLinearMeshFactory.cpp
@@ -248,9 +248,9 @@ void QuadraticToLinearMeshFactory::buildMetaData(stk::ParallelMachine /* paralle
 
   if(createEdgeBlocks_) {
     const CellTopologyData * edge_ctd = shards::CellTopology(ctd).getBaseCellTopologyData(1,0);
-    std::vector<std::string> element_block_names;
-    quadMesh_->getElementBlockNames(element_block_names);
-    for (const auto& block_name : element_block_names)
+    std::vector<std::string> element_block_names2;
+    quadMesh_->getElementBlockNames(element_block_names2);
+    for (const auto& block_name : element_block_names2)
       mesh.addEdgeBlock(block_name,edgeBlockName_,edge_ctd);
   }
 

diff --git a/packages/panzer/disc-fe/src/Panzer_IntegrationValues2.cpp b/packages/panzer/disc-fe/src/Panzer_IntegrationValues2.cpp
@@ -1721,7 +1721,7 @@ getCubaturePointsRef(const bool cache,
     const int order = int_rule->getOrder();
 
     // Scratch space for storing the points for each side of the cell
-    auto side_cub_points = af.template buildStaticArray<Scalar,IP,Dim>("side_cub_points",num_points_on_face,cell_dim);
+    auto side_cub_points2 = af.template buildStaticArray<Scalar,IP,Dim>("side_cub_points",num_points_on_face,cell_dim);
 
     Intrepid2::DefaultCubatureFactory cubature_factory;
 
@@ -1733,9 +1733,9 @@ getCubaturePointsRef(const bool cache,
       // Get the cubature for the side
       if(cell_dim==1){
         // In 1D the surface point is either on the left side of the cell, or the right side
-        auto side_cub_points_host = Kokkos::create_mirror_view(side_cub_points.get_view());
+        auto side_cub_points_host = Kokkos::create_mirror_view(side_cub_points2.get_view());
         side_cub_points_host(0,0) = (side==0)? -1. : 1.;
-        Kokkos::deep_copy(side_cub_points.get_view(),side_cub_points_host);
+        Kokkos::deep_copy(side_cub_points2.get_view(),side_cub_points_host);
       } else {
 
         // Get the face topology from the cell topology
@@ -1750,15 +1750,15 @@ getCubaturePointsRef(const bool cache,
         ic->getCubature(tmp_side_cub_points, tmp_side_cub_weights);
 
         // Convert from reference face points to reference cell points
-        cell_tools.mapToReferenceSubcell(side_cub_points.get_view(), tmp_side_cub_points, subcell_dim, side, cell_topology);
+        cell_tools.mapToReferenceSubcell(side_cub_points2.get_view(), tmp_side_cub_points, subcell_dim, side, cell_topology);
       }
 
       PHX::Device::execution_space().fence();
 
       // Copy from the side allocation to the surface allocation
       Kokkos::MDRangePolicy<PHX::Device::execution_space,Kokkos::Rank<3>> policy({0,0,0},{num_evaluate_cells_,num_points_on_face, num_space_dim});
       Kokkos::parallel_for("copy values",policy,KOKKOS_LAMBDA (const int cell,const int point, const int dim) {
-        aux(cell,point_offset + point,dim) = side_cub_points(point,dim);
+        aux(cell,point_offset + point,dim) = side_cub_points2(point,dim);
       });
       PHX::Device::execution_space().fence();
     }
@@ -1770,11 +1770,11 @@ getCubaturePointsRef(const bool cache,
                                 "ERROR: 0-D quadrature rule infrastructure does not exist!!! Will not be able to do "
                                  << "non-natural integration rules.");
 
-    auto cub_points = getUniformCubaturePointsRef(false,force,false);
+    auto cub_points2 = getUniformCubaturePointsRef(false,force,false);
 
     Kokkos::MDRangePolicy<PHX::Device,Kokkos::Rank<3>> policy({0,0,0},{num_evaluate_cells_,num_ip,num_space_dim});
     Kokkos::parallel_for(policy, KOKKOS_LAMBDA(const int & cell, const int & ip, const int & dim){
-      aux(cell,ip,dim) = cub_points(ip,dim);
+      aux(cell,ip,dim) = cub_points2(ip,dim);
     });
   }
 

diff --git a/packages/panzer/disc-fe/src/Panzer_LocalPartitioningUtilities.cpp b/packages/panzer/disc-fe/src/Panzer_LocalPartitioningUtilities.cpp
@@ -353,8 +353,8 @@ buildGhostedCellOneRing(const Teuchos::RCP<const Teuchos::Comm<int> > & comm,
     // Copy the row for a global node index into a local vector
     node_to_cell->getGlobalRowCopy(global_node_index,indices,values,numEntries);
 
-    for(size_t i=0; i<indices.extent(0); ++i) {
-      auto index = indices(i);
+    for(size_t j=0; j<indices.extent(0); ++j) {
+      auto index = indices(j);
       // if this is a new index (not owned, not previously found ghstd index
       // add it to the list of ghstd cells
       if(unique_cells.find(index)==unique_cells.end()) {

diff --git a/packages/panzer/disc-fe/src/Panzer_TpetraVector_ReadOnly_GlobalEvaluationData_impl.hpp b/packages/panzer/disc-fe/src/Panzer_TpetraVector_ReadOnly_GlobalEvaluationData_impl.hpp
@@ -103,7 +103,6 @@ initializeData()
    ghostedVector_->putScalar(0.0);
    PHX::ExecSpace().fence();
 
-   typedef typename VectorType::dual_view_type::t_dev::memory_space DMS;
    auto values = ghostedVector_->getLocalViewHost(Tpetra::Access::OverwriteAll);
 
    // initialize some ghosted values to the user specified values

diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_Integrator_DivBasisTimesScalar.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_Integrator_DivBasisTimesScalar.hpp
@@ -317,11 +317,6 @@ namespace panzer
        */
       PHX::MDField<double, panzer::Cell, panzer::BASIS, panzer::IP> basis_;
 
-      /**
-       * \brief If set to true, device shared memory will be used.
-       */
-      bool use_shared_memory;
-
     /// Temporary for non-shared calculations
     PHX::View<ScalarT*> tmp_;
 

diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_Integrator_DivBasisTimesScalar_impl.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_Integrator_DivBasisTimesScalar_impl.hpp
@@ -50,8 +50,7 @@ namespace panzer
     :
     evalStyle_(evalStyle),
     multiplier_(multiplier),
-    basisName_(basis.name()),
-    use_shared_memory(false)
+    basisName_(basis.name())
   {
     using PHX::View;
     using panzer::BASIS;
@@ -368,7 +367,7 @@ namespace panzer
     // Grab the basis information.
     basis_ = this->wda(workset).bases[basisIndex_]->weighted_div_basis;
 
-    use_shared_memory = panzer::HP::inst().useSharedMemory<ScalarT>();
+    bool use_shared_memory = panzer::HP::inst().useSharedMemory<ScalarT>();
 
     if (use_shared_memory) {
       int bytes;

diff --git a/packages/panzer/mini-em/src/solvers/MiniEM_FullDarcyPreconditionerFactory.cpp b/packages/panzer/mini-em/src/solvers/MiniEM_FullDarcyPreconditionerFactory.cpp
@@ -156,10 +156,6 @@ Teko::LinearOp FullDarcyPreconditionerFactory::buildPreconditionerOperator(Teko:
        Teko::LinearOp diffK;
 
        if (useTpetra) {
-         typedef panzer::TpetraNodeType Node;
-         typedef int LocalOrdinal;
-         typedef panzer::GlobalOrdinal GlobalOrdinal;
-
          RCP<const Thyra::TpetraLinearOp<Scalar,LocalOrdinal,GlobalOrdinal,Node> > tOp = rcp_dynamic_cast<const Thyra::TpetraLinearOp<Scalar,LocalOrdinal,GlobalOrdinal,Node> >(K2,true);
          RCP<Thyra::TpetraLinearOp<Scalar,LocalOrdinal,GlobalOrdinal,Node> > tOp2 = Teuchos::rcp_const_cast<Thyra::TpetraLinearOp<Scalar,LocalOrdinal,GlobalOrdinal,Node>>(tOp);
          RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsOp = rcp_dynamic_cast<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> >(tOp2->getTpetraOperator(),true);

diff --git a/packages/piro/src/Piro_ThyraProductME_Constraint_SimOpt.hpp b/packages/piro/src/Piro_ThyraProductME_Constraint_SimOpt.hpp
@@ -207,7 +207,6 @@ class ThyraProductME_Constraint_SimOpt : public ROL::Constraint_SimOpt<Real> {
       }
     }
     else {
-      Thyra::ModelEvaluatorBase::Derivative<Real> dfdp_dv = outArgs.get_DfDp(0);
       auto dfdp_op = dfdp_dv.getLinearOp();
       auto dfdp = dfdp_dv.getMultiVector();
 

diff --git a/packages/stratimikos/src/Stratimikos_LinearSolverBuilder_def.hpp b/packages/stratimikos/src/Stratimikos_LinearSolverBuilder_def.hpp
@@ -88,7 +88,7 @@ LinearSolverBuilder<Scalar>::LinearSolverBuilder(
 
 
 template<class Scalar>
-LinearSolverBuilder<Scalar>::~LinearSolverBuilder<Scalar>()
+LinearSolverBuilder<Scalar>::~LinearSolverBuilder()
 {
 #ifdef TEUCHOS_DEBUG
   // Validate that we read the parameters correctly!