Merge pull request #686 from Pressio/issue_683

fixes 682 and 683
Pressio · Sep 25, 2024 · b38bb6a · b38bb6a
2 parents 123e052 + 3e0d967
commit b38bb6a
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 224 deletions.
diff --git a/include/pressio/ode/impl/ode_advance_n_steps.hpp b/include/pressio/ode/impl/ode_advance_n_steps.hpp
@@ -72,11 +72,6 @@ void advance_n_steps_with_dt_policy(StepperType & stepper,
 				    Args && ... args)
 {
 
-#ifdef PRESSIO_ENABLE_TEUCHOS_TIMERS
-  auto timer = Teuchos::TimeMonitor::getStackedTimer();
-  timer->start("time loop");
-#endif
-
   using step_t = typename ::pressio::ode::StepCount::value_type;
   IndVarType time = start_val;
   observer(StepCount{0}, start_val, odeState);
@@ -99,25 +94,14 @@ void advance_n_steps_with_dt_policy(StepperType & stepper,
       // which is the trivial case is a noop
       guesser(stepWrap, ::pressio::ode::StepStartAt<IndVarType>(time), odeState);
 
-#ifdef PRESSIO_ENABLE_TEUCHOS_TIMERS
-      timer->start("time step");
-#endif
       stepper(odeState,
 	      ::pressio::ode::StepStartAt<IndVarType>(time),
 	      stepWrap, dt,
 	      std::forward<Args>(args)...);
 
-#ifdef PRESSIO_ENABLE_TEUCHOS_TIMERS
-      timer->stop("time step");
-#endif
-
       time += dt.get();
       observer(::pressio::ode::StepCount(step), time, odeState);
     }
-
-#ifdef PRESSIO_ENABLE_TEUCHOS_TIMERS
-  timer->stop("time loop");
-#endif
 }
 
 

diff --git a/include/pressio/ode/impl/ode_advance_to_target_time.hpp b/include/pressio/ode/impl/ode_advance_to_target_time.hpp
@@ -106,11 +106,6 @@ void to_target_time_with_step_size_policy(StepperType & stepper,
     return;
   }
 
-#ifdef PRESSIO_ENABLE_TEUCHOS_TIMERS
-  auto timer = Teuchos::TimeMonitor::getStackedTimer();
-  timer->start("time loop");
-#endif
-
   using step_t = typename StepCount::value_type;
 
   IndVarType time  = start_time;
@@ -148,10 +143,6 @@ void to_target_time_with_step_size_policy(StepperType & stepper,
 
       print_step_and_current_time(step, time, dt.get());
 
-#ifdef PRESSIO_ENABLE_TEUCHOS_TIMERS
-      timer->start("time step");
-#endif
-
       if (enableTimeStepRecovery)
       {
 	bool needStop = false;
@@ -183,10 +174,6 @@ void to_target_time_with_step_size_policy(StepperType & stepper,
 		std::forward<Args>(args)...);
       }
 
-#ifdef PRESSIO_ENABLE_TEUCHOS_TIMERS
-      timer->stop("time step");
-#endif
-
       time += dt.get();
       observer(::pressio::ode::StepCount(step), time, odeState);
 
@@ -198,10 +185,6 @@ void to_target_time_with_step_size_policy(StepperType & stepper,
 
       step++;
     }
-
-#ifdef PRESSIO_ENABLE_TEUCHOS_TIMERS
-  timer->stop("time loop");
-#endif
 }
 
 }}}//end namespace pressio::ode::impl

diff --git a/include/pressio/rom/impl/lspg_unsteady_reconstructor.hpp b/include/pressio/rom/impl/lspg_unsteady_reconstructor.hpp
@@ -49,6 +49,8 @@
 #ifndef ROM_IMPL_LSPG_UNSTEADY_RECONSTRUCTOR_HPP_
 #define ROM_IMPL_LSPG_UNSTEADY_RECONSTRUCTOR_HPP_
 
+#include <fstream>
+
 namespace pressio{ namespace rom{ namespace impl{
 
 template<typename reduced_state_type>

diff --git a/include/pressio/rom/linear_rom.hpp b/include/pressio/rom/linear_rom.hpp
@@ -2,6 +2,8 @@
 #ifndef ROM_LINEAR_ROM_API_HPP_
 #define ROM_LINEAR_ROM_API_HPP_
 
+#include <fstream>
+
 namespace pressio{ namespace rom{ namespace linear{
 
 namespace impl{

diff --git a/include/pressio/utils.hpp b/include/pressio/utils.hpp
@@ -54,13 +54,8 @@
 
 #include "./utils/utils_static_constants.hpp"
 #include "./utils/utils_instance_or_reference_wrapper.hpp"
-#include "./utils/utils_read_ascii_matrix_std_vec_vec.hpp"
 #include "./utils/utils_noop.hpp"
 
-#ifdef PRESSIO_ENABLE_TEUCHOS_TIMERS
-#include "./utils/utils_teuchos_performance_monitor.hpp"
-#endif
-
 #include "./utils/logger/utils_logger.hpp"
 
 #endif
diff --git a/include/pressio/utils/utils_read_ascii_matrix_std_vec_vec.hpp b/include/pressio/utils/utils_read_ascii_matrix_std_vec_vec.hpp
diff --git a/include/pressio/utils/utils_teuchos_performance_monitor.hpp b/include/pressio/utils/utils_teuchos_performance_monitor.hpp