From: Wolfgang Bangerth Date: Mon, 24 Apr 2017 17:20:27 +0000 (-0600) Subject: Convert tests to use ParameterHandler::parse_input(). X-Git-Tag: v9.0.0-rc1~1657^2~3 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed79fd93906818dd9d810257d279a8b458e51626;p=dealii.git Convert tests to use ParameterHandler::parse_input(). --- diff --git a/tests/parameter_handler/multiple_parameter_loop_01.cc b/tests/parameter_handler/multiple_parameter_loop_01.cc index 2ad44a5f16..5f73d2c390 100644 --- a/tests/parameter_handler/multiple_parameter_loop_01.cc +++ b/tests/parameter_handler/multiple_parameter_loop_01.cc @@ -73,7 +73,7 @@ void check () HelperClass h; h.declare_parameters (prm); - prm.read_input (SOURCE_DIR "/prm/multiple_parameter_loop_01.prm"); + prm.parse_input (SOURCE_DIR "/prm/multiple_parameter_loop_01.prm"); prm.loop (h); } diff --git a/tests/parameter_handler/multiple_parameter_loop_02.cc b/tests/parameter_handler/multiple_parameter_loop_02.cc index 87796cbf38..2fbda8771e 100644 --- a/tests/parameter_handler/multiple_parameter_loop_02.cc +++ b/tests/parameter_handler/multiple_parameter_loop_02.cc @@ -73,7 +73,7 @@ void check (const char *p) HelperClass h; h.declare_parameters (prm); - prm.read_input (p); + prm.parse_input (p); prm.loop (h); } diff --git a/tests/parameter_handler/parameter_handler_1.cc b/tests/parameter_handler/parameter_handler_1.cc index b4645b3d34..4dbcda412e 100644 --- a/tests/parameter_handler/parameter_handler_1.cc +++ b/tests/parameter_handler/parameter_handler_1.cc @@ -29,7 +29,7 @@ void check (const char *p) Patterns::List(Patterns::Integer(-1,1),2,3)); std::ifstream in(p); - prm.read_input (in); + prm.parse_input (in); deallog << "test_1=" << prm.get ("test_1") << std::endl; } diff --git a/tests/parameter_handler/parameter_handler_13.cc b/tests/parameter_handler/parameter_handler_13.cc index 994fd4af3e..116084b678 100644 --- a/tests/parameter_handler/parameter_handler_13.cc +++ b/tests/parameter_handler/parameter_handler_13.cc @@ -31,7 +31,7 @@ void check (const char *p) 2,3)); std::ifstream in(p); - prm.read_input (in); + prm.parse_input (in); deallog << "test_13=" << prm.get ("test_13") << std::endl; diff --git a/tests/parameter_handler/parameter_handler_13a.cc b/tests/parameter_handler/parameter_handler_13a.cc index 8609e0c490..8c24a851ec 100644 --- a/tests/parameter_handler/parameter_handler_13a.cc +++ b/tests/parameter_handler/parameter_handler_13a.cc @@ -31,7 +31,7 @@ void check (const char *p) 2,3, "xyz")); std::ifstream in(p); - prm.read_input (in); + prm.parse_input (in); deallog << "test_13=" << prm.get ("test_13") << std::endl; } diff --git a/tests/parameter_handler/parameter_handler_14.cc b/tests/parameter_handler/parameter_handler_14.cc index b97f93c27c..1b82b82253 100644 --- a/tests/parameter_handler/parameter_handler_14.cc +++ b/tests/parameter_handler/parameter_handler_14.cc @@ -33,7 +33,7 @@ void check () try { - foo.read_input("tmp.prm"); + foo.parse_input("tmp.prm"); } catch (...) { diff --git a/tests/parameter_handler/parameter_handler_15.cc b/tests/parameter_handler/parameter_handler_15.cc index 27cba0b7aa..e12be8baeb 100644 --- a/tests/parameter_handler/parameter_handler_15.cc +++ b/tests/parameter_handler/parameter_handler_15.cc @@ -34,7 +34,7 @@ void check (const char *content, double &v1, double &v2) std::stringstream ss(content); - foo.read_input(ss); + foo.parse_input(ss); diff --git a/tests/parameter_handler/parameter_handler_16.cc b/tests/parameter_handler/parameter_handler_16.cc index 54a1d8abdf..f5438cd9e7 100644 --- a/tests/parameter_handler/parameter_handler_16.cc +++ b/tests/parameter_handler/parameter_handler_16.cc @@ -35,7 +35,7 @@ void test () foo.leave_subsection(); foo.declare_entry("val2", "2.0", dealii::Patterns::Double(), ""); - foo.read_input(SOURCE_DIR "/parameter_handler_16.prm"); + foo.parse_input(SOURCE_DIR "/parameter_handler_16.prm"); diff --git a/tests/parameter_handler/parameter_handler_1_exception.cc b/tests/parameter_handler/parameter_handler_1_exception.cc index 8c95b9cc2f..68987ec6ad 100644 --- a/tests/parameter_handler/parameter_handler_1_exception.cc +++ b/tests/parameter_handler/parameter_handler_1_exception.cc @@ -38,7 +38,7 @@ void check (const char *p) } std::ifstream in(p); - prm.read_input (in); + prm.parse_input (in); deallog << "test_1=" << prm.get ("test_1") << std::endl; } diff --git a/tests/parameter_handler/parameter_handler_1_include.cc b/tests/parameter_handler/parameter_handler_1_include.cc index b8bd80368a..a1816d3b9c 100644 --- a/tests/parameter_handler/parameter_handler_1_include.cc +++ b/tests/parameter_handler/parameter_handler_1_include.cc @@ -29,7 +29,7 @@ void check (const char *p) Patterns::List(Patterns::Integer(-1,1),2,3)); std::ifstream in(p); - prm.read_input (in); + prm.parse_input (in); deallog << "test_1=" << prm.get ("test_1") << std::endl; } diff --git a/tests/parameter_handler/parameter_handler_1a.cc b/tests/parameter_handler/parameter_handler_1a.cc index ce540d9923..3a1fc9f275 100644 --- a/tests/parameter_handler/parameter_handler_1a.cc +++ b/tests/parameter_handler/parameter_handler_1a.cc @@ -30,7 +30,7 @@ void check (const char *p) Patterns::List(Patterns::Integer(-1,1),2,3,"xyz")); std::ifstream in(p); - prm.read_input (in); + prm.parse_input (in); deallog << "test_1=" << prm.get ("test_1") << std::endl; } diff --git a/tests/parameter_handler/parameter_handler_2.cc b/tests/parameter_handler/parameter_handler_2.cc index 9a47a4cf97..f89b1bfae5 100644 --- a/tests/parameter_handler/parameter_handler_2.cc +++ b/tests/parameter_handler/parameter_handler_2.cc @@ -37,7 +37,7 @@ int main () Patterns::List(Patterns::Selection("a|b|c|d|e|f|g|h"))); prm.leave_subsection (); - prm.read_input(SOURCE_DIR "/prm/parameter_handler_2.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_2.prm"); std::string list; prm.enter_subsection ("Testing"); diff --git a/tests/parameter_handler/parameter_handler_21.cc b/tests/parameter_handler/parameter_handler_21.cc index d4d4633a99..74c98b94c1 100644 --- a/tests/parameter_handler/parameter_handler_21.cc +++ b/tests/parameter_handler/parameter_handler_21.cc @@ -29,7 +29,7 @@ void check (const char *defaults, const char *defined, const char *input) prm.declare_entry ("v", defaults, Patterns::MultipleSelection(defined), ""); std::stringstream in(input); - prm.read_input (in); + prm.parse_input (in); deallog << "defaults='" << defaults << "' defined='" << defined diff --git a/tests/parameter_handler/parameter_handler_2_read_from_string.cc b/tests/parameter_handler/parameter_handler_2_read_from_string.cc index f0e1156913..28320110bd 100644 --- a/tests/parameter_handler/parameter_handler_2_read_from_string.cc +++ b/tests/parameter_handler/parameter_handler_2_read_from_string.cc @@ -15,7 +15,7 @@ -// like _02, but use the read_input_from_string function +// like _02, but use the parse_input_from_string function #include "../tests.h" #include @@ -45,7 +45,7 @@ int main () input += s; input += '\n'; } - prm.read_input_from_string(input.c_str()); + prm.parse_input_from_string(input.c_str()); std::string list; prm.enter_subsection ("Testing"); diff --git a/tests/parameter_handler/parameter_handler_3.cc b/tests/parameter_handler/parameter_handler_3.cc index 75e878fe84..8814146704 100644 --- a/tests/parameter_handler/parameter_handler_3.cc +++ b/tests/parameter_handler/parameter_handler_3.cc @@ -48,7 +48,7 @@ int main () prm.leave_subsection (); // read and then write parameters - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); prm.print_parameters (logfile, ParameterHandler::Text); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_3_with_alias_01.cc b/tests/parameter_handler/parameter_handler_3_with_alias_01.cc index 471c90fc38..41a782b49e 100644 --- a/tests/parameter_handler/parameter_handler_3_with_alias_01.cc +++ b/tests/parameter_handler/parameter_handler_3_with_alias_01.cc @@ -53,7 +53,7 @@ int main () prm.leave_subsection (); // read and then write parameters - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); prm.print_parameters (logfile, ParameterHandler::Text); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_3_with_alias_02.cc b/tests/parameter_handler/parameter_handler_3_with_alias_02.cc index 47f7a16e31..b58a0fb5f5 100644 --- a/tests/parameter_handler/parameter_handler_3_with_alias_02.cc +++ b/tests/parameter_handler/parameter_handler_3_with_alias_02.cc @@ -53,7 +53,7 @@ int main () prm.leave_subsection (); // read and then write parameters - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); prm.print_parameters (logfile, ParameterHandler::Text); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_3_with_alias_03.cc b/tests/parameter_handler/parameter_handler_3_with_alias_03.cc index 6f535686c2..eb96ec2e84 100644 --- a/tests/parameter_handler/parameter_handler_3_with_alias_03.cc +++ b/tests/parameter_handler/parameter_handler_3_with_alias_03.cc @@ -51,7 +51,7 @@ int main () prm.leave_subsection (); // read and then write parameters - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3_with_alias_03.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3_with_alias_03.prm"); prm.print_parameters (logfile, ParameterHandler::Text); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_3_with_alias_04.cc b/tests/parameter_handler/parameter_handler_3_with_alias_04.cc index 1979a11ab3..b2ac2e70e7 100644 --- a/tests/parameter_handler/parameter_handler_3_with_alias_04.cc +++ b/tests/parameter_handler/parameter_handler_3_with_alias_04.cc @@ -51,7 +51,7 @@ int main () prm.leave_subsection (); // read and then write parameters - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3_with_alias_04.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3_with_alias_04.prm"); prm.print_parameters (logfile, ParameterHandler::Text); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_3_with_space.cc b/tests/parameter_handler/parameter_handler_3_with_space.cc index 0e9b9ee67c..f203d096eb 100644 --- a/tests/parameter_handler/parameter_handler_3_with_space.cc +++ b/tests/parameter_handler/parameter_handler_3_with_space.cc @@ -52,7 +52,7 @@ int main () prm.leave_subsection (); // read and then write parameters - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3_with_space.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3_with_space.prm"); prm.print_parameters (logfile, ParameterHandler::Text); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_4.cc b/tests/parameter_handler/parameter_handler_4.cc index 0955bb1045..e97b913a30 100644 --- a/tests/parameter_handler/parameter_handler_4.cc +++ b/tests/parameter_handler/parameter_handler_4.cc @@ -51,7 +51,7 @@ int main () // parameters. take same input file // as for parameter_handler_3, but // use different output format - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); prm.print_parameters (logfile, ParameterHandler::LaTeX); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_4a.cc b/tests/parameter_handler/parameter_handler_4a.cc index 1db417ab6a..b4f2bc64d8 100644 --- a/tests/parameter_handler/parameter_handler_4a.cc +++ b/tests/parameter_handler/parameter_handler_4a.cc @@ -71,7 +71,7 @@ int main () // parameters. take same input file // as for parameter_handler_3, but // use different output format - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); prm.print_parameters (logfile, ParameterHandler::LaTeX); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_4a_with_alias.cc b/tests/parameter_handler/parameter_handler_4a_with_alias.cc index e15818e0f9..7f8414ba1a 100644 --- a/tests/parameter_handler/parameter_handler_4a_with_alias.cc +++ b/tests/parameter_handler/parameter_handler_4a_with_alias.cc @@ -75,7 +75,7 @@ int main () // parameters. take same input file // as for parameter_handler_3, but // use different output format - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); prm.print_parameters (logfile, ParameterHandler::LaTeX); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.cc b/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.cc index 75d8a550b8..bd3eded98b 100644 --- a/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.cc +++ b/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.cc @@ -76,7 +76,7 @@ int main () // parameters. take same input file // as for parameter_handler_3, but // use different output format - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); prm.print_parameters (logfile, ParameterHandler::LaTeX); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_6.cc b/tests/parameter_handler/parameter_handler_6.cc index e7cf28d971..5eb86298c7 100644 --- a/tests/parameter_handler/parameter_handler_6.cc +++ b/tests/parameter_handler/parameter_handler_6.cc @@ -48,7 +48,7 @@ int main () "docs 3"); prm.leave_subsection (); - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); // now set some of the entries to // different values diff --git a/tests/parameter_handler/parameter_handler_6_bool.cc b/tests/parameter_handler/parameter_handler_6_bool.cc index a9864bf49b..391402901b 100644 --- a/tests/parameter_handler/parameter_handler_6_bool.cc +++ b/tests/parameter_handler/parameter_handler_6_bool.cc @@ -41,7 +41,7 @@ int main () "docs 1"); prm.leave_subsection (); - prm.read_input(SOURCE_DIR "/prm/parameter_handler_6_bool.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_6_bool.prm"); // now set the parameter to a different // value diff --git a/tests/parameter_handler/parameter_handler_7.cc b/tests/parameter_handler/parameter_handler_7.cc index 6a996cd961..f53d244785 100644 --- a/tests/parameter_handler/parameter_handler_7.cc +++ b/tests/parameter_handler/parameter_handler_7.cc @@ -51,7 +51,7 @@ int main () // parameters. take same input file // as for parameter_handler_3, but // use different output format - prm.read_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm"); prm.print_parameters (logfile, ParameterHandler::Description); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_8.cc b/tests/parameter_handler/parameter_handler_8.cc index 00294343ec..8b13259264 100644 --- a/tests/parameter_handler/parameter_handler_8.cc +++ b/tests/parameter_handler/parameter_handler_8.cc @@ -71,7 +71,7 @@ int main () // parameters. take same input file // as for parameter_handler_3, but // use different output format - prm.read_input(SOURCE_DIR "/prm/parameter_handler_8.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_8.prm"); prm.print_parameters (logfile, ParameterHandler::Text); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_9.cc b/tests/parameter_handler/parameter_handler_9.cc index 769911f8a3..35607cb694 100644 --- a/tests/parameter_handler/parameter_handler_9.cc +++ b/tests/parameter_handler/parameter_handler_9.cc @@ -69,7 +69,7 @@ int main () // parameters. take same input file // as for parameter_handler_3, but // use different output format - prm.read_input(SOURCE_DIR "/prm/parameter_handler_8.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_8.prm"); prm.log_parameters (deallog); } catch (std::exception &exc) diff --git a/tests/parameter_handler/parameter_handler_action_01.cc b/tests/parameter_handler/parameter_handler_action_01.cc index c961a1b71d..2e8dd838fd 100644 --- a/tests/parameter_handler/parameter_handler_action_01.cc +++ b/tests/parameter_handler/parameter_handler_action_01.cc @@ -43,7 +43,7 @@ void check (const char *p) std::ifstream in(p); deallog << "Reading parameters" << std::endl; - prm.read_input (in); + prm.parse_input (in); deallog << "test_1=" << prm.get ("test_1") << std::endl; deallog << "Saved parameter: " << parameter_set_by_action << std::endl; diff --git a/tests/parameter_handler/parameter_handler_action_02.cc b/tests/parameter_handler/parameter_handler_action_02.cc index d432c02a22..0b52e13ca9 100644 --- a/tests/parameter_handler/parameter_handler_action_02.cc +++ b/tests/parameter_handler/parameter_handler_action_02.cc @@ -51,7 +51,7 @@ void check (const char *p) std::ifstream in(p); deallog << "Reading parameters" << std::endl; - prm.read_input (in); + prm.parse_input (in); deallog << "test_1=" << prm.get ("test_1") << std::endl; deallog << "Saved parameter: " << parameter_set_by_action << std::endl; diff --git a/tests/parameter_handler/parameter_handler_backslash_01.cc b/tests/parameter_handler/parameter_handler_backslash_01.cc index d0496c713e..f09a96b6bc 100644 --- a/tests/parameter_handler/parameter_handler_backslash_01.cc +++ b/tests/parameter_handler/parameter_handler_backslash_01.cc @@ -45,16 +45,16 @@ int main () Patterns::List(Patterns::Selection("a|b|c|d|e|f|g|h"))); prm.leave_subsection (); - // test both relevant read_input functions + // test both relevant parse_input functions if (i == 0) { - prm.read_input(SOURCE_DIR "/prm/parameter_handler_backslash_01.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_backslash_01.prm"); } else { std::ifstream input_stream (SOURCE_DIR "/prm/parameter_handler_backslash_01.prm"); - prm.read_input(input_stream); + prm.parse_input(input_stream); } std::string list; diff --git a/tests/parameter_handler/parameter_handler_backslash_02.cc b/tests/parameter_handler/parameter_handler_backslash_02.cc index ffc273a636..aea69d994d 100644 --- a/tests/parameter_handler/parameter_handler_backslash_02.cc +++ b/tests/parameter_handler/parameter_handler_backslash_02.cc @@ -47,16 +47,16 @@ int main () Patterns::List(Patterns::Selection("a|b|c|d|e|f|g|h"))); prm.leave_subsection (); - // test both relevant read_input functions + // test both relevant parse_input functions if (i == 0) { - prm.read_input(SOURCE_DIR "/prm/parameter_handler_backslash_02.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_backslash_02.prm"); } else { std::ifstream input_stream (SOURCE_DIR "/prm/parameter_handler_backslash_02.prm"); - prm.read_input(input_stream); + prm.parse_input(input_stream); } std::string list; diff --git a/tests/parameter_handler/parameter_handler_backslash_06.cc b/tests/parameter_handler/parameter_handler_backslash_06.cc index a584306cf6..342332723c 100644 --- a/tests/parameter_handler/parameter_handler_backslash_06.cc +++ b/tests/parameter_handler/parameter_handler_backslash_06.cc @@ -40,16 +40,16 @@ int main () Patterns::List(Patterns::Selection("a|b|c|d|e|f|g|h"))); prm.leave_subsection (); - // test both relevant read_input functions + // test both relevant parse_input functions if (i == 0) { - prm.read_input(SOURCE_DIR "/prm/parameter_handler_backslash_06.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_backslash_06.prm"); } else { std::ifstream input_stream (SOURCE_DIR "/prm/parameter_handler_backslash_06.prm"); - prm.read_input(input_stream); + prm.parse_input(input_stream); } std::string list; diff --git a/tests/parameter_handler/parameter_handler_backslash_07.cc b/tests/parameter_handler/parameter_handler_backslash_07.cc index d9f16c6f2d..6afa951e5f 100644 --- a/tests/parameter_handler/parameter_handler_backslash_07.cc +++ b/tests/parameter_handler/parameter_handler_backslash_07.cc @@ -45,16 +45,16 @@ int main () prm.declare_entry ("value", "value", Patterns::Anything()); prm.leave_subsection (); - // test both relevant read_input functions + // test both relevant parse_input functions if (i == 0) { - prm.read_input(SOURCE_DIR "/prm/parameter_handler_backslash_07.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_backslash_07.prm"); } else { std::ifstream input_stream (SOURCE_DIR "/prm/parameter_handler_backslash_07.prm"); - prm.read_input(input_stream); + prm.parse_input(input_stream); } std::string list; diff --git a/tests/parameter_handler/parameter_handler_backslash_08.cc b/tests/parameter_handler/parameter_handler_backslash_08.cc index 34dbeae514..8f017158ee 100644 --- a/tests/parameter_handler/parameter_handler_backslash_08.cc +++ b/tests/parameter_handler/parameter_handler_backslash_08.cc @@ -38,16 +38,16 @@ int main () prm.declare_entry ("value", "value", Patterns::Anything()); prm.leave_subsection (); - // test both relevant read_input functions + // test both relevant parse_input functions if (i == 0) { - prm.read_input(SOURCE_DIR "/prm/parameter_handler_backslash_08.prm"); + prm.parse_input(SOURCE_DIR "/prm/parameter_handler_backslash_08.prm"); } else { std::ifstream input_stream (SOURCE_DIR "/prm/parameter_handler_backslash_08.prm"); - prm.read_input(input_stream); + prm.parse_input(input_stream); } std::string list; diff --git a/tests/parameter_handler/parameter_handler_read_xml_error_03.cc b/tests/parameter_handler/parameter_handler_read_xml_error_03.cc index e793f6ce2a..6e4ab73ab4 100644 --- a/tests/parameter_handler/parameter_handler_read_xml_error_03.cc +++ b/tests/parameter_handler/parameter_handler_read_xml_error_03.cc @@ -15,7 +15,7 @@ -// check ParameterHandler::read_input_from_xml. try to read a file that is not +// check ParameterHandler::parse_input_from_xml. try to read a file that is not // valid XML (there is more than one top-level element) #include "../tests.h" diff --git a/tests/physics/step-44-standard_tensors-material_push_forward.cc b/tests/physics/step-44-standard_tensors-material_push_forward.cc index dcfe7a469f..739737839e 100644 --- a/tests/physics/step-44-standard_tensors-material_push_forward.cc +++ b/tests/physics/step-44-standard_tensors-material_push_forward.cc @@ -301,7 +301,7 @@ namespace Step44 { ParameterHandler prm; declare_parameters(prm); - prm.read_input(input_file); + prm.parse_input(input_file); parse_parameters(prm); } void AllParameters::declare_parameters(ParameterHandler &prm) diff --git a/tests/physics/step-44-standard_tensors-spatial.cc b/tests/physics/step-44-standard_tensors-spatial.cc index bce610dae3..71460d593b 100644 --- a/tests/physics/step-44-standard_tensors-spatial.cc +++ b/tests/physics/step-44-standard_tensors-spatial.cc @@ -299,7 +299,7 @@ namespace Step44 { ParameterHandler prm; declare_parameters(prm); - prm.read_input(input_file); + prm.parse_input(input_file); parse_parameters(prm); } void AllParameters::declare_parameters(ParameterHandler &prm) diff --git a/tests/physics/step-44.cc b/tests/physics/step-44.cc index b187c89887..a1d721b971 100644 --- a/tests/physics/step-44.cc +++ b/tests/physics/step-44.cc @@ -294,7 +294,7 @@ namespace Step44 { ParameterHandler prm; declare_parameters(prm); - prm.read_input(input_file); + prm.parse_input(input_file); parse_parameters(prm); } void AllParameters::declare_parameters(ParameterHandler &prm)