Resolving conflicts in rebasing

NOAA-OWP · Jan 11, 2024 · 562eb43 · 562eb43
2 parents 1699ac7 + a4d7e9e
commit 562eb43
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/include/realizations/catchment/Bmi_Multi_Formulation.hpp b/include/realizations/catchment/Bmi_Multi_Formulation.hpp
@@ -539,9 +539,6 @@ namespace realization {
         /**
          * Get value vector for some BMI model variable.
          */
-        double get_var_value_as_double(const int& index, const std::string& var_name) override {
-            return get_var_value_as_double(0, var_name);
-        }
 
         /**
          * Get value for some BMI model variable at a specific index.
@@ -567,7 +564,7 @@ namespace realization {
          * @param var_name
          * @return
          */
-        std::vector<double> get_var_vec_as_double(const int& index, const std::string& var_name) override {
+        std::vector<double> get_var_vec_as_double(const int& index, const std::string& var_name) {
             auto data_provider_iter = availableData.find(var_name);
             if (data_provider_iter == availableData.end()) {
                 throw external::ExternalIntegrationException(

diff --git a/src/realizations/catchment/Bmi_Py_Formulation.cpp b/src/realizations/catchment/Bmi_Py_Formulation.cpp
@@ -55,7 +55,7 @@ std::vector<int> Bmi_Py_Formulation::get_output_bbox_list() {
     return get_output_bbox();
 }
 
-string Bmi_Py_Formulation::get_output_line_for_timestep(int timestep, std::string delimiter) {
+std::string Bmi_Py_Formulation::get_output_line_for_timestep(int timestep, std::string delimiter) {
     std::cout << "timestep = " << timestep << std::endl;
     std::string output_header = get_output_header_line(",");
     // TODO: something must be added to store values if more than the current time step is wanted

diff --git a/test/realizations/catchments/Bmi_Py_Formulation_Test.cpp b/test/realizations/catchments/Bmi_Py_Formulation_Test.cpp
@@ -412,7 +412,7 @@ TEST_F(Bmi_Py_Formulation_Test, DISABLED_GetResponse_1_a) {
 /**
  * Simple test of output for scalar.
  */
-TEST_F(Bmi_Py_Formulation_Test, GetOutputLineForTimestep_0_a) {
+TEST_F(Bmi_Py_Formulation_Test, GetOutputLineForTimestep_1_a) {
     int ex_index = 0;
 
     double response = examples[ex_index].formulation->get_response(0, 3600);
@@ -429,7 +429,7 @@ TEST_F(Bmi_Py_Formulation_Test, GetOutputLineForTimestep_0_a) {
  * This test applies to the case of taking the first element in the vector in the
  * get_output_line_for_timestep() function
  */
-TEST_F(Bmi_Py_Formulation_Test, GetOutputLineForTimestep_0_b) {
+TEST_F(Bmi_Py_Formulation_Test, GetOutputLineForTimestep_1_b) {
     int ex_index = 0;
 
     int i = 0;