Merge Pull Request #8435 from trilinos/Trilinos/master_merge_20201208…

…_000559 Automatically Merged using Trilinos Master Merge AutoTester PR Title: Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20201208_000559 branch to master PR Author: trilinos-autotester
trilinos · Dec 8, 2020 · 07a6632 · 07a6632
2 parents 2492f4e + 11492aa
commit 07a6632
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/ifpack2/src/Ifpack2_Details_Chebyshev_def.hpp b/packages/ifpack2/src/Ifpack2_Details_Chebyshev_def.hpp
@@ -654,7 +654,7 @@ setParameters (Teuchos::ParameterList& plist)
   minDiagVal_ = minDiagVal;
   numIters_ = numIters;
   eigMaxIters_ = eigMaxIters;
-  eigNormalizationFreq_ = eigNormalizationFreq_;
+  eigNormalizationFreq_ = eigNormalizationFreq;
   zeroStartingSolution_ = zeroStartingSolution;
   assumeMatrixUnchanged_ = assumeMatrixUnchanged;
   textbookAlgorithm_ = textbookAlgorithm;

diff --git a/packages/piro/src/Piro_NOXSolver_Def.hpp b/packages/piro/src/Piro_NOXSolver_Def.hpp
@@ -202,7 +202,19 @@ void Piro::NOXSolver<Scalar>::evalModelImpl(
   modelInArgs.set_x(finalSolution);
 
   this->evalConvergedModelResponsesAndSensitivities(modelInArgs, outArgs);
-  this->evalReducedHessian(modelInArgs, outArgs);
+
+  bool computeReducedHessian = false;
+  for (int g_index=0; g_index<this->num_g(); ++g_index) {
+    for (int p_index=0; p_index<this->num_p(); ++p_index)
+      if (outArgs.supports(Thyra::ModelEvaluatorBase::OUT_ARG_hess_vec_prod_g_pp, g_index, p_index, p_index))
+        if(Teuchos::nonnull(outArgs.get_hess_vec_prod_g_pp(g_index, p_index, p_index))) {
+          computeReducedHessian = true;
+          break;
+        }
+  }
+
+  if(computeReducedHessian == true)   
+    this->evalReducedHessian(modelInArgs, outArgs);
 
   if (Teuchos::nonnull(this->observer) && observeFinalSolution) {
     this->observer->observeSolution(*finalSolution);