From 13cc64a3de700ce7324125230a0778ba68f5770d Mon Sep 17 00:00:00 2001 From: "Irina K. Tezaur" Date: Sat, 20 Jun 2020 14:47:28 -0700 Subject: [PATCH] Piro: a couple of cleanups to avoid warnings printed when running code. (#7567) --- ...iro_ObserverToTempusIntegrationObserverAdapter_Def.hpp | 8 ++++---- packages/piro/src/Piro_TransientSolver_Def.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/piro/src/Piro_ObserverToTempusIntegrationObserverAdapter_Def.hpp b/packages/piro/src/Piro_ObserverToTempusIntegrationObserverAdapter_Def.hpp index f38ef7e53990..e12d6110c248 100644 --- a/packages/piro/src/Piro_ObserverToTempusIntegrationObserverAdapter_Def.hpp +++ b/packages/piro/src/Piro_ObserverToTempusIntegrationObserverAdapter_Def.hpp @@ -204,16 +204,16 @@ void Piro::ObserverToTempusIntegrationObserverAdapter::observeTimeStep() { Scalar current_dt; - if (Teuchos::nonnull(solutionHistory_->getWorkingState())) { - current_dt = solutionHistory_->getWorkingState()->getTimeStep(); + if (Teuchos::nonnull(solutionHistory_->getCurrentState())) { + current_dt = solutionHistory_->getCurrentState()->getTimeStep(); } else { current_dt = solutionHistory_->getCurrentState()->getTimeStep(); } //Don't observe solution if step failed to converge - if ((solutionHistory_->getWorkingState() != Teuchos::null) && - (solutionHistory_->getWorkingState()->getSolutionStatus() == Tempus::Status::FAILED)) { + if ((solutionHistory_->getCurrentState() != Teuchos::null) && + (solutionHistory_->getCurrentState()->getSolutionStatus() == Tempus::Status::FAILED)) { Scalar min_dt = timeStepControl_->getMinTimeStep(); if ((previous_dt_ == current_dt) && (previous_dt_ == min_dt)) { TEUCHOS_TEST_FOR_EXCEPTION(true, Teuchos::Exceptions::InvalidParameter, diff --git a/packages/piro/src/Piro_TransientSolver_Def.hpp b/packages/piro/src/Piro_TransientSolver_Def.hpp index 18c393135d1f..2ad101e43ccd 100644 --- a/packages/piro/src/Piro_TransientSolver_Def.hpp +++ b/packages/piro/src/Piro_TransientSolver_Def.hpp @@ -290,7 +290,7 @@ Piro::TransientSolver::evalConvergedModelResponsesAndSensitivities( using Teuchos::RCP; using Teuchos::rcp; - *out_ << "\nE) Calculate responses ...\n"; + *out_ << "\nF) Calculate responses ...\n"; // Solution at convergence is the response at index num_g_ RCP > gx_out = outArgs.get_g(num_g_);