From 42be199a9b5353bbb84322f4ccc9faa225610177 Mon Sep 17 00:00:00 2001
From: Luca Bertagna <lbertag@sandia.gov>
Date: Tue, 8 Oct 2024 11:33:16 -0600
Subject: [PATCH] Fix compilation warnings in demoPDEs

---
 .../evaluators/PHAL_AdvDiffResid_Def.hpp      | 104 +++++++++---------
 .../evaluators/PHAL_AdvectionResid_Def.hpp    |   2 +-
 .../evaluators/PHAL_HelmholtzResid.hpp        |   2 +-
 .../evaluators/PHAL_HelmholtzResid_Def.hpp    |   4 +-
 .../evaluators/PHAL_JouleHeating_Def.hpp      |   4 +-
 .../evaluators/PHAL_NSBodyForce_Def.hpp       |   2 +-
 .../evaluators/PHAL_NSContinuityResid_Def.hpp |   2 +-
 .../PHAL_NSContravarientMetricTensor_Def.hpp  |   2 +-
 .../evaluators/PHAL_NSForchheimerTerm_Def.hpp |   2 +-
 .../PHAL_NSMaterialProperty_Def.hpp           |   2 +-
 .../evaluators/PHAL_NSMomentumResid_Def.hpp   |   2 +-
 .../evaluators/PHAL_NSNeutronEqResid_Def.hpp  |   2 +-
 .../PHAL_NSPermeabilityTerm_Def.hpp           |   2 +-
 src/demoPDEs/evaluators/PHAL_NSRm_Def.hpp     |   2 +-
 src/demoPDEs/evaluators/PHAL_NSTauM_Def.hpp   |   2 +-
 src/demoPDEs/evaluators/PHAL_NSTauT_Def.hpp   |   2 +-
 .../evaluators/PHAL_NSThermalEqResid_Def.hpp  |   2 +-
 src/demoPDEs/evaluators/PHAL_ODEResid_Def.hpp |   2 +-
 .../evaluators/PHAL_PoissonResid_Def.hpp      |   4 +-
 .../PHAL_ReactDiffSystemResid_Def.hpp         |   4 +-
 src/demoPDEs/evaluators/PHAL_TEProp_Def.hpp   |   2 +-
 .../evaluators/PHAL_ThermalResid_Def.hpp      |   2 +-
 .../problems/Albany_AdvDiffProblem.hpp        |   2 +-
 .../problems/Albany_Helmholtz2DProblem.hpp    |   2 +-
 src/demoPDEs/problems/Albany_NavierStokes.hpp |   2 +-
 src/demoPDEs/problems/Albany_ODEProblem.hpp   |   2 +-
 .../problems/Albany_ReactDiffSystem.hpp       |   2 +-
 .../Albany_ThermoElectrostaticsProblem.hpp    |   2 +-
 28 files changed, 81 insertions(+), 85 deletions(-)

diff --git a/src/demoPDEs/evaluators/PHAL_AdvDiffResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_AdvDiffResid_Def.hpp
index 507f982a1e..26ef9199fb 100644
--- a/src/demoPDEs/evaluators/PHAL_AdvDiffResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_AdvDiffResid_Def.hpp
@@ -28,7 +28,7 @@ AdvDiffResid(const Teuchos::ParameterList& p) :
   UDot       (p.get<std::string>                   ("QP Time Derivative Variable Name"),
 	       p.get<Teuchos::RCP<PHX::DataLayout> >("QP Vector Data Layout") ),
   Residual   (p.get<std::string>                   ("Residual Name"),
-              p.get<Teuchos::RCP<PHX::DataLayout> >("Node Vector Data Layout") ) 
+              p.get<Teuchos::RCP<PHX::DataLayout> >("Node Vector Data Layout") )
 {
 
 
@@ -59,26 +59,26 @@ AdvDiffResid(const Teuchos::ParameterList& p) :
   vecDim  = dims[2];
 
 
-  a = bf_list->get("Advection a", 1.0); 
-  b = bf_list->get("Advection b", 1.0); 
-  mu = bf_list->get("Viscosity mu", 0.1); 
-  useAugForm = bf_list->get("Use Augmented Form", false); 
+  a = bf_list->get("Advection a", 1.0);
+  b = bf_list->get("Advection b", 1.0);
+  mu = bf_list->get("Viscosity mu", 0.1);
+  useAugForm = bf_list->get("Use Augmented Form", false);
   formType = bf_list->get("Augmented Form Type", 1);
 
-  bool error = true; 
-  if (formType == 1 || formType == 2) 
-    error = false;  
+  bool error = true;
+  if (formType == 1 || formType == 2)
+    error = false;
 
   TEUCHOS_TEST_FOR_EXCEPTION(error, std::logic_error,
        "Invalid Augmented Form Type: " << formType << "; valid options are 1 and 2");
- 
 
-  std::cout << "a, b, mu: " << a << ", " << b << ", " << mu << std::endl; 
+
+  std::cout << "a, b, mu: " << a << ", " << b << ", " << mu << std::endl;
   std::cout << " vecDim = " << vecDim << std::endl;
   std::cout << " numDims = " << numDims << std::endl;
-  std::cout << "Augmented Form? " << useAugForm << std::endl; 
-  if (useAugForm == true) 
-    std::cout << "  Augmented form type: " << formType << std::endl; 
+  std::cout << "Augmented Form? " << useAugForm << std::endl;
+  if (useAugForm == true)
+    std::cout << "  Augmented form type: " << formType << std::endl;
 
 
 }
@@ -86,7 +86,7 @@ AdvDiffResid(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void AdvDiffResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(U,fm);
@@ -103,64 +103,62 @@ template<typename EvalT, typename Traits>
 void AdvDiffResid<EvalT, Traits>::
 evaluateFields(typename Traits::EvalData workset)
 {
-  typedef Intrepid2::FunctionSpaceTools<PHX::Device> FST;
-
   if (useAugForm == false) { //standard form of advection-diffusion equation
     for (std::size_t cell=0; cell < workset.numCells; ++cell) {
       for (std::size_t node=0; node < numNodes; ++node) {
-        for (std::size_t i=0; i<vecDim; i++)  
+        for (std::size_t i=0; i<vecDim; i++)
           Residual(cell,node,i) = 0.0;
-          for (std::size_t qp=0; qp < numQPs; ++qp) {
-            //du/dt + a*du/dx + b*du/dy - mu*delta(u) = 0
-            Residual(cell,node,0) += UDot(cell,qp,0)*wBF(cell,node,qp) + 
-                                     a*UGrad(cell,qp,0,0)*wBF(cell,node,qp) +
-                                     b*UGrad(cell,qp,0,1)*wBF(cell,node,qp) +  
-                                     mu*UGrad(cell,qp,0,0)*wGradBF(cell,node,qp,0) + 
-                                     mu*UGrad(cell,qp,0,1)*wGradBF(cell,node,qp,1); 
-          }
-       }        
+        for (std::size_t qp=0; qp < numQPs; ++qp) {
+          //du/dt + a*du/dx + b*du/dy - mu*delta(u) = 0
+          Residual(cell,node,0) += UDot(cell,qp,0)*wBF(cell,node,qp) +
+                                   a*UGrad(cell,qp,0,0)*wBF(cell,node,qp) +
+                                   b*UGrad(cell,qp,0,1)*wBF(cell,node,qp) +
+                                   mu*UGrad(cell,qp,0,0)*wGradBF(cell,node,qp,0) +
+                                   mu*UGrad(cell,qp,0,1)*wGradBF(cell,node,qp,1);
+        }
+       }
     }
   }
   else { //augmented form of advection diffusion equation
     if (formType == 1) {
       for (std::size_t cell=0; cell < workset.numCells; ++cell) {
         for (std::size_t node=0; node < numNodes; ++node) {
-          for (std::size_t i=0; i<vecDim; i++)  
+          for (std::size_t i=0; i<vecDim; i++)
             Residual(cell,node,i) = 0.0;
-            for (std::size_t qp=0; qp < numQPs; ++qp) {
-              //du/dt + (a,b).q - mu*div(q) = 0
-              Residual(cell,node,0) += UDot(cell,qp,0)*wBF(cell,node,qp) + 
-                                       a*U(cell,qp,1)*wBF(cell,node,qp) +
-                                       b*U(cell,qp,2)*wBF(cell,node,qp) +  
-                                       mu*U(cell,qp,1)*wGradBF(cell,node,qp,0) + 
-                                       mu*U(cell,qp,2)*wGradBF(cell,node,qp,1);
-              //q - grad(u) = 0 
-              Residual(cell,node,1) += U(cell,qp,1)*wBF(cell,node,qp) - UGrad(cell,qp,0,0)*wBF(cell,node,qp); 
-              Residual(cell,node,2) += U(cell,qp,2)*wBF(cell,node,qp) - UGrad(cell,qp,0,1)*wBF(cell,node,qp); 
-            }
-          }        
+          for (std::size_t qp=0; qp < numQPs; ++qp) {
+            //du/dt + (a,b).q - mu*div(q) = 0
+            Residual(cell,node,0) += UDot(cell,qp,0)*wBF(cell,node,qp) +
+                                     a*U(cell,qp,1)*wBF(cell,node,qp) +
+                                     b*U(cell,qp,2)*wBF(cell,node,qp) +
+                                     mu*U(cell,qp,1)*wGradBF(cell,node,qp,0) +
+                                     mu*U(cell,qp,2)*wGradBF(cell,node,qp,1);
+            //q - grad(u) = 0
+            Residual(cell,node,1) += U(cell,qp,1)*wBF(cell,node,qp) - UGrad(cell,qp,0,0)*wBF(cell,node,qp);
+            Residual(cell,node,2) += U(cell,qp,2)*wBF(cell,node,qp) - UGrad(cell,qp,0,1)*wBF(cell,node,qp);
+          }
+          }
        }
     }
-    else if (formType == 2) { 
+    else if (formType == 2) {
       for (std::size_t cell=0; cell < workset.numCells; ++cell) {
         for (std::size_t node=0; node < numNodes; ++node) {
-          for (std::size_t i=0; i<vecDim; i++)  
+          for (std::size_t i=0; i<vecDim; i++)
             Residual(cell,node,i) = 0.0;
-            for (std::size_t qp=0; qp < numQPs; ++qp) {
-              //du/dt + q = 0
-              Residual(cell,node,0) += UDot(cell,qp,0)*wBF(cell,node,qp) + 
-                                       U(cell,qp,1)*wBF(cell,node,qp) +
-                                       U(cell,qp,2)*wBF(cell,node,qp);
-              //q - (a,b).grad(u) + mu*delta(u) = 0
-              Residual(cell,node,1) += U(cell,qp,1)*wBF(cell,node,qp) - a*UGrad(cell,qp,0,0)*wBF(cell,node,qp) 
-                                    -  mu*UGrad(cell,qp,0,0)*wGradBF(cell,node,qp,0); 
-              Residual(cell,node,2) += U(cell,qp,2)*wBF(cell,node,qp) - b*UGrad(cell,qp,0,1)*wBF(cell,node,qp) 
-                                    -  mu*UGrad(cell,qp,0,1)*wGradBF(cell,node,qp,1);
-            }
-          }        
+          for (std::size_t qp=0; qp < numQPs; ++qp) {
+            //du/dt + q = 0
+            Residual(cell,node,0) += UDot(cell,qp,0)*wBF(cell,node,qp) +
+                                     U(cell,qp,1)*wBF(cell,node,qp) +
+                                     U(cell,qp,2)*wBF(cell,node,qp);
+            //q - (a,b).grad(u) + mu*delta(u) = 0
+            Residual(cell,node,1) += U(cell,qp,1)*wBF(cell,node,qp) - a*UGrad(cell,qp,0,0)*wBF(cell,node,qp)
+                                  -  mu*UGrad(cell,qp,0,0)*wGradBF(cell,node,qp,0);
+            Residual(cell,node,2) += U(cell,qp,2)*wBF(cell,node,qp) - b*UGrad(cell,qp,0,1)*wBF(cell,node,qp)
+                                  -  mu*UGrad(cell,qp,0,1)*wGradBF(cell,node,qp,1);
+          }
         }
       }
     }
+  }
 }
 
 //**********************************************************************
diff --git a/src/demoPDEs/evaluators/PHAL_AdvectionResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_AdvectionResid_Def.hpp
index e1b35f633c..2d8ac4ee56 100644
--- a/src/demoPDEs/evaluators/PHAL_AdvectionResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_AdvectionResid_Def.hpp
@@ -100,7 +100,7 @@ AdvectionResid(const Teuchos::ParameterList& p,
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void AdvectionResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(wBF, fm);
diff --git a/src/demoPDEs/evaluators/PHAL_HelmholtzResid.hpp b/src/demoPDEs/evaluators/PHAL_HelmholtzResid.hpp
index 57efb0a0ad..aef6ff2a3e 100644
--- a/src/demoPDEs/evaluators/PHAL_HelmholtzResid.hpp
+++ b/src/demoPDEs/evaluators/PHAL_HelmholtzResid.hpp
@@ -38,7 +38,7 @@ class HelmholtzResid : public PHX::EvaluatorWithBaseImpl<Traits>,
 
   void evaluateFields(typename Traits::EvalData d);
 
-  virtual ScalarT& getValue(const std::string &n) {return ksqr;};
+  virtual ScalarT& getValue(const std::string &/* n */) {return ksqr;};
 
 private:
 
diff --git a/src/demoPDEs/evaluators/PHAL_HelmholtzResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_HelmholtzResid_Def.hpp
index adf3d6565e..28e82730aa 100644
--- a/src/demoPDEs/evaluators/PHAL_HelmholtzResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_HelmholtzResid_Def.hpp
@@ -66,7 +66,7 @@ HelmholtzResid(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void HelmholtzResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(wBF,fm);
@@ -86,7 +86,7 @@ postRegistrationSetup(typename Traits::SetupData d,
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void HelmholtzResid<EvalT, Traits>::
-evaluateFields(typename Traits::EvalData workset)
+evaluateFields(typename Traits::EvalData /* workset */)
 {
   typedef Intrepid2::FunctionSpaceTools<PHX::Device> FST;
   typedef Intrepid2::RealSpaceTools<PHX::Device> RST;
diff --git a/src/demoPDEs/evaluators/PHAL_JouleHeating_Def.hpp b/src/demoPDEs/evaluators/PHAL_JouleHeating_Def.hpp
index a5354b91c9..5f74b39093 100644
--- a/src/demoPDEs/evaluators/PHAL_JouleHeating_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_JouleHeating_Def.hpp
@@ -38,7 +38,7 @@ JouleHeating(Teuchos::ParameterList& p) :
 // **********************************************************************
 template<typename EvalT, typename Traits>
 void JouleHeating<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(jouleHeating,fm);
@@ -49,7 +49,7 @@ postRegistrationSetup(typename Traits::SetupData d,
 // **********************************************************************
 template<typename EvalT, typename Traits>
 void JouleHeating<EvalT, Traits>::
-evaluateFields(typename Traits::EvalData workset)
+evaluateFields(typename Traits::EvalData /* workset */)
 {
   Intrepid2::FunctionSpaceTools<PHX::Device>::dotMultiplyDataData
     (jouleHeating.get_view(), potentialFlux.get_view(), potentialGrad.get_view());
diff --git a/src/demoPDEs/evaluators/PHAL_NSBodyForce_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSBodyForce_Def.hpp
index ae10118ea0..532cd1eb41 100644
--- a/src/demoPDEs/evaluators/PHAL_NSBodyForce_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSBodyForce_Def.hpp
@@ -78,7 +78,7 @@ NSBodyForce(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSBodyForce<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   if (bf_type == CONSTANT) {
diff --git a/src/demoPDEs/evaluators/PHAL_NSContinuityResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSContinuityResid_Def.hpp
index 6c98920b89..8a54747016 100644
--- a/src/demoPDEs/evaluators/PHAL_NSContinuityResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSContinuityResid_Def.hpp
@@ -61,7 +61,7 @@ NSContinuityResid(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSContinuityResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(wBF,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSContravarientMetricTensor_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSContravarientMetricTensor_Def.hpp
index 97ac69e546..82ccdb0e2f 100644
--- a/src/demoPDEs/evaluators/PHAL_NSContravarientMetricTensor_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSContravarientMetricTensor_Def.hpp
@@ -39,7 +39,7 @@ NSContravarientMetricTensor(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSContravarientMetricTensor<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(coordVec,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSForchheimerTerm_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSForchheimerTerm_Def.hpp
index 7fe5aaef6b..fb3c700d6f 100644
--- a/src/demoPDEs/evaluators/PHAL_NSForchheimerTerm_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSForchheimerTerm_Def.hpp
@@ -56,7 +56,7 @@ NSForchheimerTerm(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSForchheimerTerm<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(V,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSMaterialProperty_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSMaterialProperty_Def.hpp
index 6a0fd4d0a2..70621b74b8 100644
--- a/src/demoPDEs/evaluators/PHAL_NSMaterialProperty_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSMaterialProperty_Def.hpp
@@ -158,7 +158,7 @@ NSMaterialProperty(Teuchos::ParameterList& p) :
 // **********************************************************************
 template<typename EvalT, typename Traits>
 void NSMaterialProperty<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(matprop,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSMomentumResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSMomentumResid_Def.hpp
index dc06c0ad6e..d55f2aecac 100644
--- a/src/demoPDEs/evaluators/PHAL_NSMomentumResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSMomentumResid_Def.hpp
@@ -76,7 +76,7 @@ NSMomentumResid(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSMomentumResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(wBF,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSNeutronEqResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSNeutronEqResid_Def.hpp
index 28320e2c3e..339d4d44ba 100644
--- a/src/demoPDEs/evaluators/PHAL_NSNeutronEqResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSNeutronEqResid_Def.hpp
@@ -68,7 +68,7 @@ NSNeutronEqResid(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSNeutronEqResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(wBF,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSPermeabilityTerm_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSPermeabilityTerm_Def.hpp
index 295e03a16a..02ab6756a2 100644
--- a/src/demoPDEs/evaluators/PHAL_NSPermeabilityTerm_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSPermeabilityTerm_Def.hpp
@@ -52,7 +52,7 @@ NSPermeabilityTerm(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSPermeabilityTerm<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(V,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSRm_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSRm_Def.hpp
index ae9666a27f..90ce038e15 100644
--- a/src/demoPDEs/evaluators/PHAL_NSRm_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSRm_Def.hpp
@@ -69,7 +69,7 @@ NSRm(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSRm<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(pGrad,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSTauM_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSTauM_Def.hpp
index bcd336a5d1..4fc5575941 100644
--- a/src/demoPDEs/evaluators/PHAL_NSTauM_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSTauM_Def.hpp
@@ -48,7 +48,7 @@ NSTauM(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSTauM<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(V,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSTauT_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSTauT_Def.hpp
index 6b603153a9..e600341990 100644
--- a/src/demoPDEs/evaluators/PHAL_NSTauT_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSTauT_Def.hpp
@@ -51,7 +51,7 @@ NSTauT(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSTauT<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(V,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_NSThermalEqResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_NSThermalEqResid_Def.hpp
index 9dc2318d85..b04cbd6daf 100644
--- a/src/demoPDEs/evaluators/PHAL_NSThermalEqResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_NSThermalEqResid_Def.hpp
@@ -94,7 +94,7 @@ NSThermalEqResid(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void NSThermalEqResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(wBF,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_ODEResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_ODEResid_Def.hpp
index c537aabec6..426141ff9a 100644
--- a/src/demoPDEs/evaluators/PHAL_ODEResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_ODEResid_Def.hpp
@@ -36,7 +36,7 @@ ODEResid<EvalT, Traits>::ODEResid(Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void ODEResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& vm)
 {
   this->utils.setFieldData(X,vm);
diff --git a/src/demoPDEs/evaluators/PHAL_PoissonResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_PoissonResid_Def.hpp
index 13b58c3941..f33ffb4bc5 100644
--- a/src/demoPDEs/evaluators/PHAL_PoissonResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_PoissonResid_Def.hpp
@@ -41,7 +41,7 @@ PoissonResid(const Teuchos::ParameterList& p,
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void PHAL::PoissonResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(wBF,fm);
@@ -58,7 +58,7 @@ postRegistrationSetup(typename Traits::SetupData d,
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void PHAL::PoissonResid<EvalT, Traits>::
-evaluateFields(typename Traits::EvalData workset)
+evaluateFields(typename Traits::EvalData /* workset */)
 {
   typedef Intrepid2::FunctionSpaceTools<PHX::Device> FST;
 
diff --git a/src/demoPDEs/evaluators/PHAL_ReactDiffSystemResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_ReactDiffSystemResid_Def.hpp
index b895675f9e..56ea458d4c 100644
--- a/src/demoPDEs/evaluators/PHAL_ReactDiffSystemResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_ReactDiffSystemResid_Def.hpp
@@ -107,7 +107,7 @@ ReactDiffSystemResid(const Teuchos::ParameterList& p) :
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void ReactDiffSystemResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(U,fm);
@@ -123,8 +123,6 @@ template<typename EvalT, typename Traits>
 void ReactDiffSystemResid<EvalT, Traits>::
 evaluateFields(typename Traits::EvalData workset)
 {
-  typedef Intrepid2::FunctionSpaceTools<PHX::Device> FST;
-
   for (std::size_t cell=0; cell < workset.numCells; ++cell) {
     for (std::size_t node=0; node < numNodes; ++node) {
       for (std::size_t i=0; i<vecDim; i++)  Residual(cell,node,i) = 0.0;
diff --git a/src/demoPDEs/evaluators/PHAL_TEProp_Def.hpp b/src/demoPDEs/evaluators/PHAL_TEProp_Def.hpp
index 84f40c4deb..f5d4679486 100644
--- a/src/demoPDEs/evaluators/PHAL_TEProp_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_TEProp_Def.hpp
@@ -73,7 +73,7 @@ TEProp(Teuchos::ParameterList& p) :
 // **********************************************************************
 template<typename EvalT, typename Traits>
 void PHAL::TEProp<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(permittivity,fm);
diff --git a/src/demoPDEs/evaluators/PHAL_ThermalResid_Def.hpp b/src/demoPDEs/evaluators/PHAL_ThermalResid_Def.hpp
index db7de74751..d00606309c 100644
--- a/src/demoPDEs/evaluators/PHAL_ThermalResid_Def.hpp
+++ b/src/demoPDEs/evaluators/PHAL_ThermalResid_Def.hpp
@@ -115,7 +115,7 @@ ThermalResid(const Teuchos::ParameterList& p,
 //**********************************************************************
 template<typename EvalT, typename Traits>
 void ThermalResid<EvalT, Traits>::
-postRegistrationSetup(typename Traits::SetupData d,
+postRegistrationSetup(typename Traits::SetupData /* d */,
                       PHX::FieldManager<Traits>& fm)
 {
   this->utils.setFieldData(wBF, fm);
diff --git a/src/demoPDEs/problems/Albany_AdvDiffProblem.hpp b/src/demoPDEs/problems/Albany_AdvDiffProblem.hpp
index 50fc23b09e..98f4f9ab06 100644
--- a/src/demoPDEs/problems/Albany_AdvDiffProblem.hpp
+++ b/src/demoPDEs/problems/Albany_AdvDiffProblem.hpp
@@ -105,7 +105,7 @@ Teuchos::RCP<const PHX::FieldTag>
 Albany::AdvDiffProblem::constructEvaluators(
   PHX::FieldManager<PHAL::AlbanyTraits>& fm0,
   const Albany::MeshSpecsStruct& meshSpecs,
-  Albany::StateManager& stateMgr,
+  Albany::StateManager& /* stateMgr */,
   Albany::FieldManagerChoice fieldManagerChoice,
   const Teuchos::RCP<Teuchos::ParameterList>& responseList)
 {
diff --git a/src/demoPDEs/problems/Albany_Helmholtz2DProblem.hpp b/src/demoPDEs/problems/Albany_Helmholtz2DProblem.hpp
index 95e744599d..3033549388 100644
--- a/src/demoPDEs/problems/Albany_Helmholtz2DProblem.hpp
+++ b/src/demoPDEs/problems/Albany_Helmholtz2DProblem.hpp
@@ -101,7 +101,7 @@ Teuchos::RCP<const PHX::FieldTag>
 Albany::Helmholtz2DProblem::constructEvaluators(
   PHX::FieldManager<PHAL::AlbanyTraits>& fm0,
   const Albany::MeshSpecsStruct& meshSpecs,
-  Albany::StateManager& stateMgr,
+  Albany::StateManager& /* stateMgr */,
   Albany::FieldManagerChoice fieldManagerChoice,
   const Teuchos::RCP<Teuchos::ParameterList>& responseList)
 {
diff --git a/src/demoPDEs/problems/Albany_NavierStokes.hpp b/src/demoPDEs/problems/Albany_NavierStokes.hpp
index 8352855a18..466e6b0b69 100644
--- a/src/demoPDEs/problems/Albany_NavierStokes.hpp
+++ b/src/demoPDEs/problems/Albany_NavierStokes.hpp
@@ -155,7 +155,7 @@ Teuchos::RCP<const PHX::FieldTag>
 Albany::NavierStokes::constructEvaluators(
   PHX::FieldManager<PHAL::AlbanyTraits>& fm0,
   const Albany::MeshSpecsStruct& meshSpecs,
-  Albany::StateManager& stateMgr,
+  Albany::StateManager& /* stateMgr */,
   Albany::FieldManagerChoice fieldManagerChoice,
   const Teuchos::RCP<Teuchos::ParameterList>& responseList)
 {
diff --git a/src/demoPDEs/problems/Albany_ODEProblem.hpp b/src/demoPDEs/problems/Albany_ODEProblem.hpp
index 371d0172e1..6832b95d0c 100644
--- a/src/demoPDEs/problems/Albany_ODEProblem.hpp
+++ b/src/demoPDEs/problems/Albany_ODEProblem.hpp
@@ -98,7 +98,7 @@ Teuchos::RCP<const PHX::FieldTag>
 Albany::ODEProblem::constructEvaluators(
   PHX::FieldManager<PHAL::AlbanyTraits>& fm0,
   const Albany::MeshSpecsStruct& meshSpecs,
-  Albany::StateManager& stateMgr,
+  Albany::StateManager& /* stateMgr */,
   Albany::FieldManagerChoice fieldManagerChoice,
   const Teuchos::RCP<Teuchos::ParameterList>& responseList)
 {
diff --git a/src/demoPDEs/problems/Albany_ReactDiffSystem.hpp b/src/demoPDEs/problems/Albany_ReactDiffSystem.hpp
index bd08a14870..8b203c1b02 100644
--- a/src/demoPDEs/problems/Albany_ReactDiffSystem.hpp
+++ b/src/demoPDEs/problems/Albany_ReactDiffSystem.hpp
@@ -105,7 +105,7 @@ Teuchos::RCP<const PHX::FieldTag>
 Albany::ReactDiffSystem::constructEvaluators(
   PHX::FieldManager<PHAL::AlbanyTraits>& fm0,
   const Albany::MeshSpecsStruct& meshSpecs,
-  Albany::StateManager& stateMgr,
+  Albany::StateManager& /* stateMgr */,
   Albany::FieldManagerChoice fieldManagerChoice,
   const Teuchos::RCP<Teuchos::ParameterList>& responseList)
 {
diff --git a/src/demoPDEs/problems/Albany_ThermoElectrostaticsProblem.hpp b/src/demoPDEs/problems/Albany_ThermoElectrostaticsProblem.hpp
index f5bd518596..363e81b7bb 100644
--- a/src/demoPDEs/problems/Albany_ThermoElectrostaticsProblem.hpp
+++ b/src/demoPDEs/problems/Albany_ThermoElectrostaticsProblem.hpp
@@ -107,7 +107,7 @@ Teuchos::RCP<const PHX::FieldTag>
 Albany::ThermoElectrostaticsProblem::constructEvaluators(
   PHX::FieldManager<PHAL::AlbanyTraits>& fm0,
   const Albany::MeshSpecsStruct& meshSpecs,
-  Albany::StateManager& stateMgr,
+  Albany::StateManager& /* stateMgr */,
   Albany::FieldManagerChoice fieldManagerChoice,
   const Teuchos::RCP<Teuchos::ParameterList>& responseList)
 {