Remove deprecated entries in OutputStyle

diff --git a/doc/news/changes/incompatibilities/20240821Munch b/doc/news/changes/incompatibilities/20240821Munch
new file mode 100644 (file)
index 0000000..638698f
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20240821Munch
@@ -0,0 +1,4 @@
+Changed: The deprecated entries Text and ShortText in OutputStyle 
+have been removed.
+<br>
+(Peter Munch, 2024/08/21)

diff --git a/examples/step-32/step-32.cc b/examples/step-32/step-32.cc
index 9a2da2758a2c69a743fea92b2d0be8f7efc82751..1d536f50fb90e98ec30e344b0a21f7a0f78f78e4 100644 (file)
--- a/examples/step-32/step-32.cc
+++ b/examples/step-32/step-32.cc
@@ -1000,7 +1000,7 @@ namespace Step32
         parameter_file.close();
 
         std::ofstream parameter_out(parameter_filename);
-        prm.print_parameters(parameter_out, ParameterHandler::Text);
+        prm.print_parameters(parameter_out, ParameterHandler::PRM);
 
         AssertThrow(
           false,

diff --git a/examples/step-50/step-50.cc b/examples/step-50/step-50.cc
index da96122d9812eb8728333eb3579c024545fd639f..11f3835fc575fd05ff44b1e60b49ceb21f4ecb68 100644 (file)
--- a/examples/step-50/step-50.cc
+++ b/examples/step-50/step-50.cc
@@ -335,7 +335,7 @@ namespace Step50
           << "****  directory, or use the following default values\n"
           << "****  to create an input file:\n";
         if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0)
-          prm.print_parameters(std::cout, ParameterHandler::Text);
+          prm.print_parameters(std::cout, ParameterHandler::PRM);
         return false;
       }
 

diff --git a/examples/step-63/step-63.cc b/examples/step-63/step-63.cc
index f6cd947fff48c8729a02dcb2ae933a4aa6d25123..f71635cf4b975a95eeeaef373396554005a0f646 100644 (file)
--- a/examples/step-63/step-63.cc
+++ b/examples/step-63/step-63.cc
@@ -194,7 +194,7 @@ namespace Step63
     /* ...and then try to read their values from the input file: */
     if (prm_filename.empty())
       {
-        prm.print_parameters(std::cout, ParameterHandler::Text);
+        prm.print_parameters(std::cout, ParameterHandler::PRM);
         AssertThrow(
           false, ExcMessage("Please pass a .prm file as the first argument!"));
       }

diff --git a/include/deal.II/base/parameter_handler.h b/include/deal.II/base/parameter_handler.h
index 32f14ef0e9ad216f67418dccac941abe958012ee..390694cab704ab90fb2a2f4e6ab542a0eea82784 100644 (file)
--- a/include/deal.II/base/parameter_handler.h
+++ b/include/deal.II/base/parameter_handler.h
@@ -894,14 +894,6 @@ public:
      */
     PRM = 0x0010,
 
-    /**
-     * Write human readable output suitable to be read by
-     * ParameterHandler::parse_input() again.
-     *
-     * @deprecated Use `PRM` instead of `Text`.
-     */
-    Text = PRM,
-
     /**
      * Write parameters as a LaTeX table.
      */
@@ -936,14 +928,6 @@ public:
      */
     ShortPRM = PRM | Short,
 
-    /**
-     * Write the content of ParameterHandler without comments or changed default
-     * values.
-     *
-     * @deprecated Use `ShortPRM` instead of `ShortText`.
-     */
-    ShortText = ShortPRM,
-
     /**
      * Write the content of ParameterHandler without comments or changed default
      * values as a XML file.

diff --git a/source/base/parameter_handler.cc b/source/base/parameter_handler.cc
index 189910f9fe086a5a3c2f0818f62bbf412b0f2066..a6011e79a5c2f3223756b3e53b80de48a221b273 100644 (file)
--- a/source/base/parameter_handler.cc
+++ b/source/base/parameter_handler.cc
@@ -1379,11 +1379,11 @@ ParameterHandler::print_parameters(std::ostream     &out,
     }
 
   // for all of the other formats, print a preamble:
-  if (((style & Short) != 0) && ((style & Text) != 0))
+  if (((style & Short) != 0) && ((style & PRM) != 0))
     {
       // nothing to do
     }
-  else if ((style & Text) != 0)
+  else if ((style & PRM) != 0)
     {
       out << "# Listing of Parameters" << std::endl
           << "# ---------------------" << std::endl;
@@ -1461,7 +1461,7 @@ ParameterHandler::recursively_print_parameters(
 
   const bool is_short = (style & Short) != 0;
 
-  if ((style & Text) != 0)
+  if ((style & PRM) != 0)
     {
       // first find out the longest entry name to be able to align the
       // equal signs to do this loop over all nodes of the current
@@ -1727,9 +1727,8 @@ ParameterHandler::recursively_print_parameters(
       else if (is_alias_node(p.second) == false)
         ++n_sections;
 
-    if (((style & Description) == 0) &&
-        (!(((style & Text) != 0) && is_short)) && (n_parameters != 0) &&
-        (n_sections != 0))
+    if (((style & Description) == 0) && (!(((style & PRM) != 0) && is_short)) &&
+        (n_parameters != 0) && (n_sections != 0))
       out << "\n\n";
   }
 
@@ -1739,7 +1738,7 @@ ParameterHandler::recursively_print_parameters(
         (is_alias_node(p.second) == false))
       {
         // first print the subsection header
-        if (((style & Text) != 0) || ((style & Description) != 0))
+        if (((style & PRM) != 0) || ((style & Description) != 0))
           {
             out << std::setw(overall_indent_level * 2) << ""
                 << "subsection " << demangle(p.first) << '\n';
@@ -1781,13 +1780,13 @@ ParameterHandler::recursively_print_parameters(
         recursively_print_parameters(
           tree, directory_path, style, overall_indent_level + 1, out);
 
-        if (is_short && ((style & Text) != 0))
+        if (is_short && ((style & PRM) != 0))
           {
             // write end of subsection.
             out << std::setw(overall_indent_level * 2) << ""
                 << "end" << '\n';
           }
-        else if ((style & Text) != 0)
+        else if ((style & PRM) != 0)
           {
             // write end of subsection. one blank line after each
             // subsection

diff --git a/tests/parameter_handler/multiple_parameter_loop_01.cc b/tests/parameter_handler/multiple_parameter_loop_01.cc
index d1f8adc5c6be478b0da61bc030467f340676b8eb..08e6c1f188e9bc6e2c876d9fb08a91ca3084188f 100644 (file)
--- a/tests/parameter_handler/multiple_parameter_loop_01.cc
+++ b/tests/parameter_handler/multiple_parameter_loop_01.cc
@@ -60,7 +60,7 @@ HelperClass::run(ParameterHandler &prm)
 {
   deallog << "Number of run: " << run_no << std::endl;
 
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
 }
 
 

diff --git a/tests/parameter_handler/multiple_parameter_loop_02.cc b/tests/parameter_handler/multiple_parameter_loop_02.cc
index 93dc767ac0594bf82114a5f32a8187641d459cf8..5e2f055af23ea21eb108de9e701d36af4c79cd77 100644 (file)
--- a/tests/parameter_handler/multiple_parameter_loop_02.cc
+++ b/tests/parameter_handler/multiple_parameter_loop_02.cc
@@ -60,7 +60,7 @@ HelperClass::run(ParameterHandler &prm)
 {
   deallog << "Number of run: " << run_no << std::endl;
 
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
 }
 
 

diff --git a/tests/parameter_handler/parameter_handler_24.cc b/tests/parameter_handler/parameter_handler_24.cc
index c2db519d2fa9d52b2fb33713d0f5ffcb70903e6b..2b93ad7463177bb043978b9194ae88e14227bac5 100644 (file)
--- a/tests/parameter_handler/parameter_handler_24.cc
+++ b/tests/parameter_handler/parameter_handler_24.cc
@@ -33,7 +33,7 @@ check()
   std::ifstream in(SOURCE_DIR "/parameter_handler_24_in.prm");
   prm.parse_input(in, "input file", "", true);
 
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
 }
 
 

diff --git a/tests/parameter_handler/parameter_handler_3.cc b/tests/parameter_handler/parameter_handler_3.cc
index f4f28935ab0ea2f4f9c23c6f56d1d26d6f16b89c..7d2d596b2fc4dcc4be04072f33c014940c61eb3d 100644 (file)
--- a/tests/parameter_handler/parameter_handler_3.cc
+++ b/tests/parameter_handler/parameter_handler_3.cc
@@ -14,7 +14,7 @@
 
 
 
-// test the output generated by ParameterHandler::print_parameters(Text)
+// test the output generated by ParameterHandler::print_parameters(PRM)
 
 #include <deal.II/base/parameter_handler.h>
 
@@ -40,7 +40,7 @@ main()
 
       // read and then write parameters
       prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm");
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const 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 ee4063eeb7bd17ff8bccb1f07c96422dee269916..94db0ba2b7ec9cce926df89af519f6502a68927f 100644 (file)
--- a/tests/parameter_handler/parameter_handler_3_with_alias_01.cc
+++ b/tests/parameter_handler/parameter_handler_3_with_alias_01.cc
@@ -44,7 +44,7 @@ main()
 
       // read and then write parameters
       prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm");
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const 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 979648e3c4abae03f247d349db7cf9c9647e46f2..6784367b3ec5cd100f0467f90204f2ecdff3c902 100644 (file)
--- a/tests/parameter_handler/parameter_handler_3_with_alias_02.cc
+++ b/tests/parameter_handler/parameter_handler_3_with_alias_02.cc
@@ -44,7 +44,7 @@ main()
 
       // read and then write parameters
       prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm");
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const 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 3e27c85556afc3006cf61a23f937453697178c19..0be35a155299a4d516e9558328a7b8477b745528 100644 (file)
--- a/tests/parameter_handler/parameter_handler_3_with_alias_03.cc
+++ b/tests/parameter_handler/parameter_handler_3_with_alias_03.cc
@@ -42,7 +42,7 @@ main()
 
       // read and then write parameters
       prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3_with_alias_03.prm");
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const 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 6b878524f96217b95b4d93244104a94a8a9f6254..767a1aba4e4899b374e5b5aeaf0065d68a8d060d 100644 (file)
--- a/tests/parameter_handler/parameter_handler_3_with_alias_04.cc
+++ b/tests/parameter_handler/parameter_handler_3_with_alias_04.cc
@@ -42,7 +42,7 @@ main()
 
       // read and then write parameters
       prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3_with_alias_04.prm");
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const std::exception &exc)
     {

diff --git a/tests/parameter_handler/parameter_handler_3_with_sorting_01.cc b/tests/parameter_handler/parameter_handler_3_with_sorting_01.cc
index 25704d1fb808e521c1a45f048890adce0a9bae6e..2936345f7f58a4a21696613e72e77d350178b069 100644 (file)
--- a/tests/parameter_handler/parameter_handler_3_with_sorting_01.cc
+++ b/tests/parameter_handler/parameter_handler_3_with_sorting_01.cc
@@ -42,7 +42,7 @@ main()
       // read and then write parameters
       prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3.prm");
       prm.print_parameters(deallog.get_file_stream(),
-                           ParameterHandler::Text |
+                           ParameterHandler::PRM |
                              ParameterHandler::KeepDeclarationOrder);
     }
   catch (const 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 76575f9a370647d1046b3e72e769d090432037fd..9b0905cf98375f4262d8ea68824a9add5f0e3119 100644 (file)
--- a/tests/parameter_handler/parameter_handler_3_with_space.cc
+++ b/tests/parameter_handler/parameter_handler_3_with_space.cc
@@ -45,7 +45,7 @@ main()
 
       // read and then write parameters
       prm.parse_input(SOURCE_DIR "/prm/parameter_handler_3_with_space.prm");
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const std::exception &exc)
     {

diff --git a/tests/parameter_handler/parameter_handler_5.cc b/tests/parameter_handler/parameter_handler_5.cc
index 060453c0243e4aa193493a80c60fa898d63d2ad7..88470918a40bbf6f2cad715df32c0d7639e0153a 100644 (file)
--- a/tests/parameter_handler/parameter_handler_5.cc
+++ b/tests/parameter_handler/parameter_handler_5.cc
@@ -33,7 +33,7 @@ main()
       prm.declare_entry("int", "1", Patterns::Integer());
       prm.declare_entry("int", "2", Patterns::Integer());
 
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const std::exception &exc)
     {

diff --git a/tests/parameter_handler/parameter_handler_6.cc b/tests/parameter_handler/parameter_handler_6.cc
index 49300e4c08a5565c55d8e4d131d6ed0e54e10cd7..59ddc709782beb5f885fe17afcb036854a399f21 100644 (file)
--- a/tests/parameter_handler/parameter_handler_6.cc
+++ b/tests/parameter_handler/parameter_handler_6.cc
@@ -14,7 +14,7 @@
 
 
 
-// test ParameterHandler::set(Text)
+// test ParameterHandler::set(PRM)
 
 #include <deal.II/base/parameter_handler.h>
 
@@ -50,7 +50,7 @@ main()
       prm.leave_subsection();
 
       // then write
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const std::exception &exc)
     {

diff --git a/tests/parameter_handler/parameter_handler_6_bool.cc b/tests/parameter_handler/parameter_handler_6_bool.cc
index 22003e9c01d090382a8ac920b1fc02892107fdd6..c73c3c54410816692fb4ecd56c3dcafe7c3ea5ea 100644 (file)
--- a/tests/parameter_handler/parameter_handler_6_bool.cc
+++ b/tests/parameter_handler/parameter_handler_6_bool.cc
@@ -43,7 +43,7 @@ main()
       prm.leave_subsection();
 
       // then write
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
 
       // and do it again with the opposite
       // value
@@ -52,7 +52,7 @@ main()
       prm.leave_subsection();
 
       // then write
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const std::exception &exc)
     {

diff --git a/tests/parameter_handler/parameter_handler_8.cc b/tests/parameter_handler/parameter_handler_8.cc
index 4c4a21a9bc57f8d76a876764e54010d80b44af2b..8b5333943583793f6eb25834818ccedf9f4c1b96 100644 (file)
--- a/tests/parameter_handler/parameter_handler_8.cc
+++ b/tests/parameter_handler/parameter_handler_8.cc
@@ -15,7 +15,7 @@
 
 
 // test the output generated by
-// ParameterHandler::print_parameters(Text) when there are spaces in
+// ParameterHandler::print_parameters(PRM) when there are spaces in
 // subsection and entry names
 
 #include <deal.II/base/parameter_handler.h>
@@ -66,7 +66,7 @@ main()
       // as for parameter_handler_3, but
       // use different output format
       prm.parse_input(SOURCE_DIR "/prm/parameter_handler_8.prm");
-      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);
+      prm.print_parameters(deallog.get_file_stream(), ParameterHandler::PRM);
     }
   catch (const std::exception &exc)
     {

diff --git a/tests/parameter_handler/parameter_handler_9.cc b/tests/parameter_handler/parameter_handler_9.cc
index ed555865d818045471f752b130d42e66864f23d9..b9ffe0664518865ba137a4c80b12b510b8647b74 100644 (file)
--- a/tests/parameter_handler/parameter_handler_9.cc
+++ b/tests/parameter_handler/parameter_handler_9.cc
@@ -14,7 +14,7 @@
 
 
 
-// test ParameterHandler::log_parameters(Text)
+// test ParameterHandler::log_parameters(PRM)
 
 #include <deal.II/base/parameter_handler.h>
 

diff --git a/tests/parameter_handler/parameter_handler_subsection_exists.cc b/tests/parameter_handler/parameter_handler_subsection_exists.cc
index 167a6169639f3706e3537c3e5c5ad3087ccec1e8..517875733a880b6e578a34ba223b33c27f3049b3 100644 (file)
--- a/tests/parameter_handler/parameter_handler_subsection_exists.cc
+++ b/tests/parameter_handler/parameter_handler_subsection_exists.cc
@@ -56,7 +56,7 @@ main()
   prm.leave_subsection();
 
   prm.print_parameters(deallog.get_file_stream(),
-                       ParameterHandler::Text |
+                       ParameterHandler::PRM |
                          ParameterHandler::KeepDeclarationOrder);
 
   deallog << std::boolalpha;

diff --git a/tests/petsc/petsc_snes_00.cc b/tests/petsc/petsc_snes_00.cc
index d689a3311aa64174466936a2b1ca6392c26b0a39..7b4252a3c2022069166911fc6b77649546009dc3 100644 (file)
--- a/tests/petsc/petsc_snes_00.cc
+++ b/tests/petsc/petsc_snes_00.cc
@@ -51,13 +51,13 @@ main(int argc, char **argv)
 
   data.add_parameters(prm);
   out << "# Default Parameters" << std::endl;
-  prm.print_parameters(out, ParameterHandler::ShortText);
+  prm.print_parameters(out, ParameterHandler::ShortPRM);
 
   std::ifstream ifile(SOURCE_DIR "/petsc_snes_00_in.prm");
   prm.parse_input(ifile);
 
   out << "# Testing Parameters" << std::endl;
-  prm.print_parameters(out, ParameterHandler::ShortText);
+  prm.print_parameters(out, ParameterHandler::ShortPRM);
 
   {
     out << "# Test PETSc interface (MFFD)" << std::endl;

diff --git a/tests/petsc/petsc_ts_00.cc b/tests/petsc/petsc_ts_00.cc
index 43e3c65c8ba67199a0c98309388dc16ed266971f..3b3f373692bbb4d51ecfe5f569b1ea418311da25 100644 (file)
--- a/tests/petsc/petsc_ts_00.cc
+++ b/tests/petsc/petsc_ts_00.cc
@@ -221,13 +221,13 @@ main(int argc, char **argv)
 
   data.add_parameters(prm);
   out << "# Default Parameters" << std::endl;
-  prm.print_parameters(out, ParameterHandler::ShortText);
+  prm.print_parameters(out, ParameterHandler::ShortPRM);
 
   std::ifstream ifile(SOURCE_DIR "/petsc_ts_00_in.prm");
   prm.parse_input(ifile);
 
   out << "# Testing Parameters" << std::endl;
-  prm.print_parameters(out, ParameterHandler::ShortText);
+  prm.print_parameters(out, ParameterHandler::ShortPRM);
 
   for (int setjaci = 0; setjaci < 2; setjaci++)
     {

diff --git a/tests/petsc/petsc_ts_03.cc b/tests/petsc/petsc_ts_03.cc
index 56165a34b16c2eb55145ecbf5e3360fb5ecadf79..0e782b1945a23ed6c72fc5c1292ae9e9f7dbd09a 100644 (file)
--- a/tests/petsc/petsc_ts_03.cc
+++ b/tests/petsc/petsc_ts_03.cc
@@ -233,13 +233,13 @@ main(int argc, char **argv)
 
   data.add_parameters(prm);
   deallog << "# Default Parameters" << std::endl;
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortText);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortPRM);
 
   std::ifstream ifile(SOURCE_DIR "/petsc_ts_03_in.prm");
   prm.parse_input(ifile);
 
   deallog << "# Testing Parameters" << std::endl;
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortText);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortPRM);
 
   for (int setjaci = 0; setjaci < 2; setjaci++)
     {

diff --git a/tests/petsc/petsc_ts_03_compat.cc b/tests/petsc/petsc_ts_03_compat.cc
index 0ce69a644b124b80bd3d5767395e82172ec34ddb..f1027748dd5bd6703395f74d32d6a8998831cd8a 100644 (file)
--- a/tests/petsc/petsc_ts_03_compat.cc
+++ b/tests/petsc/petsc_ts_03_compat.cc
@@ -237,13 +237,13 @@ main(int argc, char **argv)
 
   data.add_parameters(prm);
   deallog << "# Default Parameters" << std::endl;
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortText);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortPRM);
 
   std::ifstream ifile(SOURCE_DIR "/petsc_ts_03_in.prm");
   prm.parse_input(ifile);
 
   deallog << "# Testing Parameters" << std::endl;
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortText);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortPRM);
 
   for (int setjaci = 0; setjaci < 2; setjaci++)
     {

diff --git a/tests/petsc/petsc_ts_04.cc b/tests/petsc/petsc_ts_04.cc
index 8e34ab0505f8d041690b77664585b666105947fc..469fcfdbc20cf234232dd8b6f48a6b7b118ff8b0 100644 (file)
--- a/tests/petsc/petsc_ts_04.cc
+++ b/tests/petsc/petsc_ts_04.cc
@@ -222,13 +222,13 @@ main(int argc, char **argv)
 
   data.add_parameters(prm);
   deallog << "# Default Parameters" << std::endl;
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortText);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortPRM);
 
   std::ifstream ifile(SOURCE_DIR "/petsc_ts_03_in.prm");
   prm.parse_input(ifile);
 
   deallog << "# Testing Parameters" << std::endl;
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortText);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortPRM);
 
   // This test triggers false positives in FPE trapping for some versions of
   // PETSc

diff --git a/tests/petsc/petsc_ts_05.cc b/tests/petsc/petsc_ts_05.cc
index 705488f23b72026d0eef6e9ac26fc88c7138f300..e34a5d2411a7f800a469ba39dc8ca280e5875f5a 100644 (file)
--- a/tests/petsc/petsc_ts_05.cc
+++ b/tests/petsc/petsc_ts_05.cc
@@ -212,13 +212,13 @@ main(int argc, char **argv)
 
   data.add_parameters(prm);
   deallog << "# Default Parameters" << std::endl;
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortText);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortPRM);
 
   std::ifstream ifile(SOURCE_DIR "/petsc_ts_03_in.prm");
   prm.parse_input(ifile);
 
   deallog << "# Testing Parameters" << std::endl;
-  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortText);
+  prm.print_parameters(deallog.get_file_stream(), ParameterHandler::ShortPRM);
 
   // This test triggers false positives in FPE trapping for some versions of
   // PETSc

diff --git a/tests/sundials/arkode_01.cc b/tests/sundials/arkode_01.cc
index de570c3ff6f37f49a6a8b6c7a3432caa15430ca0..cbf39f5d75bd63d877bcc3560954baeb91cab8be 100644 (file)
--- a/tests/sundials/arkode_01.cc
+++ b/tests/sundials/arkode_01.cc
@@ -63,7 +63,7 @@ main()
   if (false)
     {
       std::ofstream ofile(SOURCE_DIR "/arkode_01_in.prm");
-      prm.print_parameters(ofile, ParameterHandler::ShortText);
+      prm.print_parameters(ofile, ParameterHandler::ShortPRM);
       ofile.close();
     }
 

diff --git a/tests/sundials/arkode_03.cc b/tests/sundials/arkode_03.cc
index 8071d3ef62c71265f1d443ff9760e5eb23388423..5cc89451ca115c8010685544978da7e4b864f46b 100644 (file)
--- a/tests/sundials/arkode_03.cc
+++ b/tests/sundials/arkode_03.cc
@@ -61,7 +61,7 @@ main()
   if (false)
     {
       std::ofstream ofile(SOURCE_DIR "/arkode_03_in.prm");
-      prm.print_parameters(ofile, ParameterHandler::ShortText);
+      prm.print_parameters(ofile, ParameterHandler::ShortPRM);
       ofile.close();
     }
 

diff --git a/tests/sundials/arkode_04.cc b/tests/sundials/arkode_04.cc
index 6669b9a96828584f7b6e8159d83d2f583f32b901..2c6b2d1a3b43e204ae39675fa2afb210eb019547 100644 (file)
--- a/tests/sundials/arkode_04.cc
+++ b/tests/sundials/arkode_04.cc
@@ -59,7 +59,7 @@ main()
   if (false)
     {
       std::ofstream ofile(SOURCE_DIR "/arkode_04_in.prm");
-      prm.print_parameters(ofile, ParameterHandler::ShortText);
+      prm.print_parameters(ofile, ParameterHandler::ShortPRM);
       ofile.close();
     }
 

diff --git a/tests/sundials/arkode_06.cc b/tests/sundials/arkode_06.cc
index 97b082a4b62b4a75e26b86b4be00295e02c4a47b..302a1195255a6b81548545b2d87aa4c3d9958e23 100644 (file)
--- a/tests/sundials/arkode_06.cc
+++ b/tests/sundials/arkode_06.cc
@@ -66,7 +66,7 @@ main()
   if (false)
     {
       std::ofstream ofile(SOURCE_DIR "/arkode_06_in.prm");
-      prm.print_parameters(ofile, ParameterHandler::ShortText);
+      prm.print_parameters(ofile, ParameterHandler::ShortPRM);
       ofile.close();
     }
 

diff --git a/tests/sundials/arkode_07.cc b/tests/sundials/arkode_07.cc
index 42a5f986f5664077cd745138ab8c6cce5103ef55..e641e1ae8dd214552dd0e3916bc60939f65d4de2 100644 (file)
--- a/tests/sundials/arkode_07.cc
+++ b/tests/sundials/arkode_07.cc
@@ -66,7 +66,7 @@ main()
   if (false)
     {
       std::ofstream ofile(SOURCE_DIR "/arkode_07_in.prm");
-      prm.print_parameters(ofile, ParameterHandler::ShortText);
+      prm.print_parameters(ofile, ParameterHandler::ShortPRM);
       ofile.close();
     }
 

diff --git a/tests/sundials/arkode_08.cc b/tests/sundials/arkode_08.cc
index a60edb12713ffb0be98af33221cf4a5b89057706..804db9f3efd9e72e3be13f39ffb013c106263826 100644 (file)
--- a/tests/sundials/arkode_08.cc
+++ b/tests/sundials/arkode_08.cc
@@ -59,7 +59,7 @@ main()
   if (false)
     {
       std::ofstream ofile(SOURCE_DIR "/arkode_08_in.prm");
-      prm.print_parameters(ofile, ParameterHandler::ShortText);
+      prm.print_parameters(ofile, ParameterHandler::ShortPRM);
       ofile.close();
     }
 

diff --git a/tests/sundials/arkode_09.cc b/tests/sundials/arkode_09.cc
index 8f88e46ac45f28d9c60067a20c3a4c19717bd3fd..d6eccd08f47b206ee3c4eaa04689c32f4288e12a 100644 (file)
--- a/tests/sundials/arkode_09.cc
+++ b/tests/sundials/arkode_09.cc
@@ -42,7 +42,7 @@ main()
   if (false)
     {
       std::ofstream ofile(SOURCE_DIR "/arkode_09_in.prm");
-      prm.print_parameters(ofile, ParameterHandler::ShortText);
+      prm.print_parameters(ofile, ParameterHandler::ShortPRM);
       ofile.close();
     }
 

diff --git a/tests/sundials/arkode_10.cc b/tests/sundials/arkode_10.cc
index 805d0e9d61afbb9b9a46de6c6ff30554555072a0..2bb19292b72826d6fe09b2602dfada7c41e3838f 100644 (file)
--- a/tests/sundials/arkode_10.cc
+++ b/tests/sundials/arkode_10.cc
@@ -44,7 +44,7 @@ main()
   if (false)
     {
       std::ofstream ofile(SOURCE_DIR "/arkode_10_in.prm");
-      prm.print_parameters(ofile, ParameterHandler::ShortText);
+      prm.print_parameters(ofile, ParameterHandler::ShortPRM);
       ofile.close();
     }
 

diff --git a/tests/sundials/arkode_11.cc b/tests/sundials/arkode_11.cc
index 4c650e8f6893993d4d7f2f9c2b7a0d2652dc3bc0..4557567d040bd354c17cd18cc17db139df955ebf 100644 (file)
--- a/tests/sundials/arkode_11.cc
+++ b/tests/sundials/arkode_11.cc
@@ -44,7 +44,7 @@ main()
   if (false)
     {
       std::ofstream ofile(SOURCE_DIR "/arkode_11_in.prm");
-      prm.print_parameters(ofile, ParameterHandler::ShortText);
+      prm.print_parameters(ofile, ParameterHandler::ShortPRM);
       ofile.close();
     }
 

diff --git a/tests/sundials/ida_01.cc b/tests/sundials/ida_01.cc
index 612c442fd1ac64e295fca53c1c52cbe2783c4b08..cefb789f34093755697ba3a76b22746ec1e12e58 100644 (file)
--- a/tests/sundials/ida_01.cc
+++ b/tests/sundials/ida_01.cc
@@ -147,7 +147,7 @@ main()
   data.add_parameters(prm);
 
   // std::ofstream ofile(SOURCE_DIR "/ida_01.prm");
-  // prm.print_parameters(ofile, ParameterHandler::ShortText);
+  // prm.print_parameters(ofile, ParameterHandler::ShortPRM);
   // ofile.close();
 
   std::ifstream ifile(SOURCE_DIR "/ida_01_in.prm");

diff --git a/tests/sundials/ida_02.cc b/tests/sundials/ida_02.cc
index 888d0ac3ca1ff8386749d8ffe9fb55ce4eabad60..ae3aad5ea0264ef4061ad1b83d4351135df719e3 100644 (file)
--- a/tests/sundials/ida_02.cc
+++ b/tests/sundials/ida_02.cc
@@ -142,7 +142,7 @@ main()
   data.add_parameters(prm);
 
   // std::ofstream ofile(SOURCE_DIR "/ida_01.prm");
-  // prm.print_parameters(ofile, ParameterHandler::ShortText);
+  // prm.print_parameters(ofile, ParameterHandler::ShortPRM);
   // ofile.close();
 
   std::ifstream ifile(SOURCE_DIR "/ida_01_in.prm");

diff --git a/tests/sundials/ida_03.cc b/tests/sundials/ida_03.cc
index 0a44486bf13dee13c0ab8e2bff87e9015d557877..4a2324ee887303f15fd2dd892a36d9f7d71bd585 100644 (file)
--- a/tests/sundials/ida_03.cc
+++ b/tests/sundials/ida_03.cc
@@ -120,7 +120,7 @@ main()
   data.add_parameters(prm);
 
   // std::ofstream ofile(SOURCE_DIR "/ida_03.prm");
-  // prm.print_parameters(ofile, ParameterHandler::ShortText);
+  // prm.print_parameters(ofile, ParameterHandler::ShortPRM);
   // ofile.close();
 
   std::ifstream ifile(SOURCE_DIR "/ida_03_in.prm");

diff --git a/tests/sundials/ida_04.cc b/tests/sundials/ida_04.cc
index 7c95c7b0ec5af8c6df8b39706aed5e25e10e19e7..79e4c1f3f452f3ec08558655da6bd904e94cc56a 100644 (file)
--- a/tests/sundials/ida_04.cc
+++ b/tests/sundials/ida_04.cc
@@ -146,7 +146,7 @@ main()
   data.add_parameters(prm);
 
   // std::ofstream ofile(SOURCE_DIR "/ida_04.prm");
-  // prm.print_parameters(ofile, ParameterHandler::ShortText);
+  // prm.print_parameters(ofile, ParameterHandler::ShortPRM);
   // ofile.close();
 
   std::ifstream ifile(SOURCE_DIR "/ida_04_in.prm");

diff --git a/tests/sundials/ida_05.cc b/tests/sundials/ida_05.cc
index 8c491d7ae8b8da256059e54677e5ac7c412761f2..6dfa9dee0093d3686b5dd41e1590bbce63b8ddb4 100644 (file)
--- a/tests/sundials/ida_05.cc
+++ b/tests/sundials/ida_05.cc
@@ -147,7 +147,7 @@ main()
   data.add_parameters(prm);
 
   // std::ofstream ofile(SOURCE_DIR "/ida_04.prm");
-  // prm.print_parameters(ofile, ParameterHandler::ShortText);
+  // prm.print_parameters(ofile, ParameterHandler::ShortPRM);
   // ofile.close();
 
   std::ifstream ifile(SOURCE_DIR "/ida_04_in.prm");