diff --git a/packages/tempus/src/Tempus_IntegratorBasic_impl.hpp b/packages/tempus/src/Tempus_IntegratorBasic_impl.hpp index 2dad5a730973..16ab605dfb3f 100644 --- a/packages/tempus/src/Tempus_IntegratorBasic_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorBasic_impl.hpp @@ -551,11 +551,6 @@ void IntegratorBasic::acceptTimeStep() csmd->setNFailures(std::max(csmd->getNFailures()-1,0)); csmd->setNConsecutiveFailures(0); - if ((csmd->getOutputScreen() == true) or - (csmd->getOutput() == true) or - (csmd->getTime() == timeStepControl_->getFinalTime())) { - } - // Output and screen output if (csmd->getOutput() == true) { // Dump solution! diff --git a/packages/tempus/src/Tempus_IntegratorObserverBasic_impl.hpp b/packages/tempus/src/Tempus_IntegratorObserverBasic_impl.hpp index 59cf7199bd02..67c8ff66c99e 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverBasic_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverBasic_impl.hpp @@ -62,21 +62,27 @@ observeAcceptedTimeStep(const Integrator& integrator){ RCP > csmd = integrator.getSolutionHistory()->getCurrentState()->getMetaData(); - const Scalar steppertime = integrator.getStepperTimer()->totalElapsedTime(); - const Teuchos::RCP out = integrator.getOStream(); - Teuchos::OSTab ostab(out,0,"ScreenOutput"); - *out<getIStep() - <getTime() - <getDt() - <getErrorAbs() - <getErrorRel() - <getOrder() - <getNFailures() - <reset(); + if ((csmd->getOutputScreen() == true) or + (csmd->getOutput() == true) or + (csmd->getTime() == integrator.getTimeStepControl()->getFinalTime())) { + + const Scalar steppertime = integrator.getStepperTimer()->totalElapsedTime(); + // reset the stepper timer + integrator.getStepperTimer()->reset(); + + const Teuchos::RCP out = integrator.getOStream(); + Teuchos::OSTab ostab(out,0,"ScreenOutput"); + *out<getIStep() + <getTime() + <getDt() + <getErrorAbs() + <getErrorRel() + <getOrder() + <getNFailures() + <