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 2ad44a5f160de43b94c366e56417c523daa6e111..5f73d2c390c2eba7c2f2fde8c30e919f65dd428c 100644 (file)
--- 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 87796cbf38a43340c3a180b26f11a0d029f80066..2fbda8771e7f3e469dcfc6454b6c2c08a86a974d 100644 (file)
--- 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 b4645b3d34760b0687c2f26d5b58c181d3b7097b..4dbcda412e71a87e443065e139aee21b81e74b41 100644 (file)
--- 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 994fd4af3eb1bbc2ed8d6247733cbc7023d32520..116084b678199ab9275b825b7dcb0555e54bba3d 100644 (file)
--- 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 8609e0c49062be6e6420a6962ec3293fd531836a..8c24a851ec961d45a5c84ce57e4313fca7fd61fb 100644 (file)
--- 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 b97f93c27c3e9b1a43fdf9bbb52af5acc769c3c4..1b82b822537e03ed967a0a013db124c922dd188b 100644 (file)
--- 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 27cba0b7aa15470ac74b3acf2cc04f98e3a1ef14..e12be8baeb7a56e374505833ead0cc702869a6b8 100644 (file)
--- 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 54a1d8abdf2a4f946d0aff7e38c69428971607ab..f5438cd9e776cb8fe0178544e1450914e35d936a 100644 (file)
--- 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 8c95b9cc2faa4b90c75923e92ec31a9a4cf2e46a..68987ec6adc0a670f806a494c855217bfd23f498 100644 (file)
--- 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 b8bd80368a88d8854069245ce30c44bd13d6a353..a1816d3b9c3d2fec0d0a79de37ff78ecd9b0b0b6 100644 (file)
--- 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 ce540d9923fd473a0569eea30ee1500fbaded7e5..3a1fc9f27543e0a50cd3cd8fc123d8121ff0126d 100644 (file)
--- 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 9a47a4cf97bd96d283e72d773bf4a56cfda87cb9..f89b1bfae5e43076fab9f45f46ce0fa066d0b481 100644 (file)
--- 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 d4d4633a9933a4fecd0d87716bb76230fadfe07e..74c98b94c1e682b7cc22ec24d83b6e0b2ea66d5b 100644 (file)
--- 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 f0e1156913539b1790b455794a251aef41a0b38b..28320110bdca0fe4671f143bdcf92c58e9941ff5 100644 (file)
--- 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 <deal.II/base/logstream.h>
@@ -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 75e878fe84b0f4c7a6befb83414d4b34d0877461..88141467049276442dbda75ff142a0e3c374b6f5 100644 (file)
--- 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 471c90fc388408cc82e436346ec1b2ef162b54b0..41a782b49e11779662c8a3b93bacb8aa5bf4d4c2 100644 (file)
--- 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 47f7a16e31e2de37e931885ef782d6497d578da4..b58a0fb5f57a439ad571290c6503490480a6a8f7 100644 (file)
--- 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 6f535686c2950b832e058e622752268e9b6aad87..eb96ec2e84a5accc2eb5ab0d0e8c7c87d2346e81 100644 (file)
--- 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 1979a11ab3a7f7ce5991b39b896c332a7e8c4e1e..b2ac2e70e7b62d0c2c210a2edc1dccb1611dd01d 100644 (file)
--- 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 0e9b9ee67cb27e8e9049b125a09f7e817a2d7106..f203d096ebad5f0e8b1f6df64a17e2c849324642 100644 (file)
--- 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 0955bb1045536602dc501f4608d1f2500aa4e8f0..e97b913a300dbadb029bb3a52d3bc5bf204b067b 100644 (file)
--- 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 1db417ab6a328ec3ff64236fff72ca570b5eb345..b4f2bc64d817182294dcf859d4a3685371003cff 100644 (file)
--- 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 e15818e0f9f403bd67528ea32ebd754487becb71..7f8414ba1a0f8e87f892f05cfc149fa28082998f 100644 (file)
--- 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 75d8a550b8ced38ed15b6cf8888defebae89a88e..bd3eded98b9dc054e08fbbd17bb81031481c1bc4 100644 (file)
--- 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 e7cf28d9717f05b44ced89d39901edcf9e1c8523..5eb86298c7a511d358cf24f3f7fc44e5b4b5025c 100644 (file)
--- 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 a9864bf49bf7d0a50473c854e142bd89ff1d5291..391402901bde55abd5a6d2e4753411f78cc7f3ea 100644 (file)
--- 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 6a996cd96109aefe1da5d23aad51e6ae0cf11fe0..f53d244785ff95fd1babeed002ae2b9b29e7e8a3 100644 (file)
--- 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 00294343ec5e40d78a290668d8e3474277e7b1d4..8b13259264971675132f0cbb8f0975f260bf6482 100644 (file)
--- 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 769911f8a31d1b47fcb7e78ee99e5e498b2b27f5..35607cb69463fb3adf9c4daa33f02e90103fcbe0 100644 (file)
--- 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 c961a1b71d74be37a2dee183a2444fe13ffb293c..2e8dd838fd3d94884e0681a309028c8df65980ed 100644 (file)
--- 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 d432c02a22eb493e1a187bd123a63fbb389370a9..0b52e13ca9771bb0ef628c167399706c510e6936 100644 (file)
--- 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 d0496c713e5eea054e2592a024066a50734dc86e..f09a96b6bc46578132ebaa704ace5b60ce911a5c 100644 (file)
--- 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 ffc273a636f01ada6c75e3fc7dde13c3b9fd8ab5..aea69d994d1ef4e340e67191a7c9b3eb8de50ea6 100644 (file)
--- 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 a584306cf66671a20758c9f581475d58fe9b2b18..342332723c18923ab46f3be097a5365faea495df 100644 (file)
--- 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 d9f16c6f2d307b01d5b9948afffd50663efdbf59..6afa951e5fa953527fa562c2446b0568aa57706b 100644 (file)
--- 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 34dbeae5141fb04f88a2e90c1838b49a5eb2aec1..8f017158eede1911ff3c5338a46ae9893bfea721 100644 (file)
--- 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 e793f6ce2a962ace345a757833d68a8fd35dd988..6e4ab73ab4a406405e275c6a1499c48de2d4a7ab 100644 (file)
--- 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 dcfe7a469fc3693c9e4751f4be036bf3e534b6e2..739737839e52b11fe34a5f846bfcaa6e9e37e738 100644 (file)
--- 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 bce610dae362ea7299848e640d33171a36249abe..71460d593bfe1400db906b5657be7b31af29cb96 100644 (file)
--- 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 b187c89887b08b16a395acea353823fb402edb02..a1d721b971d438cfd7b42f3a970a98f5e00c0229 100644 (file)
--- 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)