fix step size in responses

src/observers/VertexCFD_Compute_ErrorNorms_impl.hpp

@@ -110,6 +110,7 @@ void ErrorNorms<Scalar>::ComputeNorms(
     in_args.ghostedContainer_ = _lof->buildGhostedLinearObjContainer();
     in_args.evaluate_transient_terms = false;
     in_args.time = working_state->getTime();
+    in_args.step_size = working_state->getTimeStep();
 
     _lof->initializeGhostedContainer(panzer::LinearObjContainer::X,
                                      *(in_args.ghostedContainer_));

src/observers/VertexCFD_Compute_Volume_impl.hpp

@@ -66,6 +66,8 @@ void Volume<Scalar>::ComputeVol()
     in_args.container_ = _lof->buildLinearObjContainer();
     in_args.ghostedContainer_ = _lof->buildGhostedLinearObjContainer();
     in_args.evaluate_transient_terms = false;
+    in_args.time = 0.0;
+    in_args.step_size = 0.0;
 
     _lof->initializeGhostedContainer(panzer::LinearObjContainer::X
                                          | panzer::LinearObjContainer::F

src/observers/VertexCFD_TempusObserver_ResponseOutput_impl.hpp

@@ -115,7 +115,8 @@ void ResponseOutput<Scalar>::outputResponses(
 
     // Evaluate responses.
     const auto state = integrator.getSolutionHistory()->getCurrentState();
-    _response_manager->evaluateResponses(state->getX(), state->getXDot());
+    _response_manager->evaluateResponses(state->getX(), state->getXDot(),
+                                         state->getTime(), state->getTimeStep());
 
     // Outupt the integrated values.
     _ostream << "Scalar Responses:\n";

src/observers/VertexCFD_TempusTimeStepControl_GlobalCFL_impl.hpp

@@ -82,7 +82,9 @@ void GlobalCFL<Scalar>::setNextTimeStep(
 
     // Get minimum time step that ensures CFL <= 1
     _response_manager.evaluateResponses(working_state->getX(),
-                                        working_state->getXDot());
+                                        working_state->getXDot(),
+                                        working_state->getTime(),
+                                        working_state->getTimeStep());
     const double dt_cfl1 = _response_manager.value();
 
     // Compute linear weight based on input parameters

src/observers/VertexCFD_TempusTimeStepControl_GlobalTimeStep_impl.hpp

@@ -43,7 +43,9 @@ void GlobalTimeStep<Scalar>::setNextTimeStep(
 
     // Get minimum time step that ensures CFL <= 1
     _response_manager.evaluateResponses(working_state->getX(),
-                                        working_state->getXDot());
+                                        working_state->getXDot(),
+                                        working_state->getTime(),
+                                        working_state->getTimeStep());
     const double dt_cfl1 = _response_manager.value();
 
     // Get time step index (1-based) and compute linear weight

src/responses/VertexCFD_ResponseManager.cpp

@@ -210,7 +210,9 @@ void ResponseManager::deactivateAll()
 //---------------------------------------------------------------------------//
 void ResponseManager::evaluateResponses(
     const Teuchos::RCP<Thyra::VectorBase<double>>& x,
-    const Teuchos::RCP<Thyra::VectorBase<double>>& x_dot)
+    const Teuchos::RCP<Thyra::VectorBase<double>>& x_dot,
+    const double t,
+    const double dt)
 {
     const int num_active
         = std::count(_is_active.begin(), _is_active.end(), true);
@@ -224,6 +226,8 @@ void ResponseManager::evaluateResponses(
     auto in_args = model_evaluator->createInArgs();
     auto out_args = model_evaluator->createOutArgs();
 
+    in_args.set_t(t);
+    in_args.set_step_size(dt);
     in_args.set_x(x);
     in_args.set_x_dot(x_dot);
 

src/responses/VertexCFD_ResponseManager.hpp

@@ -54,7 +54,9 @@ class ResponseManager
     void deactivateAll();
     void
     evaluateResponses(const Teuchos::RCP<Thyra::VectorBase<double>>& x,
-                      const Teuchos::RCP<Thyra::VectorBase<double>>& x_dot);
+                      const Teuchos::RCP<Thyra::VectorBase<double>>& x_dot,
+                      const double t,
+                      const double dt);
 
     int numResponses() const;
     int globalIndex(const int index = 0) const;

src/responses/unit_test/tstResponseManager.cpp

@@ -211,7 +211,7 @@ void testResponseManager(const int basis_order)
     testScalarParameters<panzer::Traits::Tangent>(true, physics_manager);
 
     auto [x, x_dot] = helper.getSolutionVectors();
-    response_manager.evaluateResponses(x, x_dot);
+    response_manager.evaluateResponses(x, x_dot, 0.0, 0.0);
 
     EXPECT_DOUBLE_EQ(4.0, response_manager.value(0));
     EXPECT_DOUBLE_EQ(6.0, response_manager.value(1));
@@ -282,8 +282,8 @@ TEST(MultipleResponseManagers, NameToIndexBug)
     EXPECT_EQ(1, v_index);
 
     auto [x, x_dot] = helper.getSolutionVectors();
-    rm1.evaluateResponses(x, x_dot);
-    rm2.evaluateResponses(x, x_dot);
+    rm1.evaluateResponses(x, x_dot, 0.0, 0.0);
+    rm2.evaluateResponses(x, x_dot, 0.0, 0.0);
 
     double u_integral = std::numeric_limits<double>::quiet_NaN();
     EXPECT_NO_THROW(u_integral = rm1.value("u integral"));
@@ -322,8 +322,8 @@ TEST(MultipleResponseManagers, NameLookupBug)
     // Evaluate both response managers, which will also set values in the
     // parameter library.
     auto [x, x_dot] = helper.getSolutionVectors();
-    rm1.evaluateResponses(x, x_dot);
-    rm2.evaluateResponses(x, x_dot);
+    rm1.evaluateResponses(x, x_dot, 0.0, 0.0);
+    rm2.evaluateResponses(x, x_dot, 0.0, 0.0);
 
     // With the bug, the "u_integral" parameter gets overwritten and
     // "v_integral" is never set.

src/utils/CMakeLists.txt

@@ -28,6 +28,7 @@ add_library(Utils ${UTILS_SOURCES})
 target_link_libraries(Utils PUBLIC
   MPI::MPI_CXX
   Kokkos::kokkos
+  Phalanx::phalanx
   )
 
 target_include_directories(Utils