From 098b7b9c709522775a02eb5a760112bb7c997661 Mon Sep 17 00:00:00 2001 From: Matt Williamson <87771120+mattw-nws@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:06:25 +0000 Subject: [PATCH] Added two dozen more missed `std::` qualifiers... ..that were missing somehow? Did these get dropped somehow when I rebased on master? Squash these with the `Abominate...` commit?? --- src/NGen.cpp | 32 +++++++++---------- .../catchment/Bmi_Multi_Formulation.cpp | 30 ++++++++--------- .../catchments/Bmi_Cpp_Formulation_Test.cpp | 2 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/NGen.cpp b/src/NGen.cpp index a2cd220b02..0b50127ce0 100644 --- a/src/NGen.cpp +++ b/src/NGen.cpp @@ -79,8 +79,8 @@ int main(int argc, char *argv[]) { //arg 7 is the partition file path //arg 8 is an optional flag that driver should, if not already preprocessed this way, subdivided the hydrofabric - std::vector catchment_subset_ids; - std::vector nexus_subset_ids; + std::vector catchment_subset_ids; + std::vector nexus_subset_ids; if( argc < 2) { // Usage @@ -91,8 +91,8 @@ int main(int argc, char *argv[]) { << "Use \"all\" as explicit argument when no subset is needed." << std::endl; // Build and environment information - cout<getDiscoveredVenvPath()<getDiscoveredVenvPath()<getSystemPath(); - cout<<" System paths:"<(paths)){ - cout<<" "<(r); + auto r_c = std::dynamic_pointer_cast(r); double response = r_c->get_response(output_time_index, 3600.0); std::string output = std::to_string(output_time_index)+","+current_timestamp+","+ r_c->get_output_line_for_timestep(output_time_index)+"\n"; diff --git a/src/realizations/catchment/Bmi_Multi_Formulation.cpp b/src/realizations/catchment/Bmi_Multi_Formulation.cpp index 5992c1807a..7574c22d12 100644 --- a/src/realizations/catchment/Bmi_Multi_Formulation.cpp +++ b/src/realizations/catchment/Bmi_Multi_Formulation.cpp @@ -74,12 +74,12 @@ void Bmi_Multi_Formulation::create_multi_formulation(geojson::PropertyMap proper #endif // ACTIVATE_PYTHON } if (inactive_type_requested) { - throw runtime_error( + throw std::runtime_error( get_formulation_type() + " could not initialize sub formulation of type " + type_name + " due to support for this type not being activated."); } if (module == nullptr) { - throw runtime_error(get_formulation_type() + " received unexpected subtype formulation " + type_name); + throw std::runtime_error(get_formulation_type() + " received unexpected subtype formulation " + type_name); } modules[i] = module; @@ -177,7 +177,7 @@ const bool &Bmi_Multi_Formulation::get_allow_model_exceed_end_time() const { * @see ForcingProvider */ //const vector &Bmi_Multi_Formulation::get_available_forcing_outputs() { -const vector &Bmi_Multi_Formulation::get_available_variable_names() { +const std::vector &Bmi_Multi_Formulation::get_available_variable_names() { if (is_model_initialized() && available_forcings.empty()) { for (const nested_module_ptr &module: modules) { for (const std::string &out_var_name: module->get_bmi_output_variables()) { @@ -210,17 +210,17 @@ const time_t &Bmi_Multi_Formulation::get_bmi_model_start_time_forcing_offset_s() * @return Either the translated equivalent variable name, or the provided name if there is not a mapping entry. * @see get_config_mapped_variable_name(string, shared_ptr, shared_ptr) */ -const string &Bmi_Multi_Formulation::get_config_mapped_variable_name(const string &model_var_name) { +const std::string &Bmi_Multi_Formulation::get_config_mapped_variable_name(const std::string &model_var_name) { return get_config_mapped_variable_name(model_var_name, true, true); } -const string &Bmi_Multi_Formulation::get_config_mapped_variable_name(const string &model_var_name, bool check_first, +const std::string &Bmi_Multi_Formulation::get_config_mapped_variable_name(const std::string &model_var_name, bool check_first, bool check_last) { if (check_first) { // If an input var in first module, see if we get back a mapping (i.e., not the same thing), and return if so if (modules[0]->is_bmi_input_variable(model_var_name)) { - const string &mapped_name = modules[0]->get_config_mapped_variable_name(model_var_name); + const std::string &mapped_name = modules[0]->get_config_mapped_variable_name(model_var_name); if (mapped_name != model_var_name) return mapped_name; } @@ -258,19 +258,19 @@ const string &Bmi_Multi_Formulation::get_config_mapped_variable_name(const strin * @param in_module The module needing a translation of ``output_var_name`` to one of its input variable names. * @return Either the translated equivalent variable name, or the provided name if there is not a mapping entry. */ -const string &Bmi_Multi_Formulation::get_config_mapped_variable_name(const string &output_var_name, +const std::string &Bmi_Multi_Formulation::get_config_mapped_variable_name(const std::string &output_var_name, const shared_ptr& out_module, const shared_ptr& in_module) { if (!out_module->is_bmi_output_variable(output_var_name)) return output_var_name; - const string &mapped_output = out_module->get_config_mapped_variable_name(output_var_name); + const std::string &mapped_output = out_module->get_config_mapped_variable_name(output_var_name); if (in_module->is_bmi_input_variable(mapped_output)) return mapped_output; - for (const string &s : in_module->get_bmi_input_variables()) { - const string &mapped_s = in_module->get_config_mapped_variable_name(s); + for (const std::string &s : in_module->get_bmi_input_variables()) { + const std::string &mapped_s = in_module->get_config_mapped_variable_name(s); if (mapped_s == output_var_name || mapped_s == mapped_output) return mapped_s; } @@ -278,11 +278,11 @@ const string &Bmi_Multi_Formulation::get_config_mapped_variable_name(const strin } // TODO: remove from this level - it belongs (perhaps) as part of the ForcingProvider interface, but is general to it -const string &Bmi_Multi_Formulation::get_forcing_file_path() const { +const std::string &Bmi_Multi_Formulation::get_forcing_file_path() const { return modules[0]->get_forcing_file_path(); } -string Bmi_Multi_Formulation::get_output_line_for_timestep(int timestep, std::string delimiter) { +std::string Bmi_Multi_Formulation::get_output_line_for_timestep(int timestep, std::string delimiter) { // TODO: have to do some figuring out to make sure this isn't ambiguous (i.e., same output var name from two modules) // TODO: need to verify that output variable names are valid, or else warn and return default @@ -409,11 +409,11 @@ double Bmi_Multi_Formulation::get_response(time_step_t t_index, time_step_t t_de return get_module_var_value_as_double(get_bmi_main_output_var(), modules[index]); } #endif // ACTIVATE_PYTHON - throw runtime_error(get_formulation_type() + " unimplemented type " + module_types[index] + + throw std::runtime_error(get_formulation_type() + " unimplemented type " + module_types[index] + " in get_response for main return value"); } -bool Bmi_Multi_Formulation::is_bmi_input_variable(const string &var_name) { +bool Bmi_Multi_Formulation::is_bmi_input_variable(const std::string &var_name) { return modules[0]->is_bmi_input_variable(var_name); } @@ -422,7 +422,7 @@ bool Bmi_Multi_Formulation::is_bmi_model_time_step_fixed() { [](const std::shared_ptr& m) { return m->is_bmi_model_time_step_fixed(); }); } -bool Bmi_Multi_Formulation::is_bmi_output_variable(const string &var_name) { +bool Bmi_Multi_Formulation::is_bmi_output_variable(const std::string &var_name) { return modules.back()->is_bmi_output_variable(var_name); } diff --git a/test/realizations/catchments/Bmi_Cpp_Formulation_Test.cpp b/test/realizations/catchments/Bmi_Cpp_Formulation_Test.cpp index 1e262d70c7..8f8edb4261 100644 --- a/test/realizations/catchments/Bmi_Cpp_Formulation_Test.cpp +++ b/test/realizations/catchments/Bmi_Cpp_Formulation_Test.cpp @@ -71,7 +71,7 @@ class Bmi_Cpp_Formulation_Test : public ::testing::Test { return formulation.get_model_type_name(); } - static double get_friend_var_value_as_double(Bmi_Cpp_Formulation& formulation, const string& var_name) { + static double get_friend_var_value_as_double(Bmi_Cpp_Formulation& formulation, const std::string& var_name) { return formulation.get_var_value_as_double(var_name); }