From: Peter Munch Date: Wed, 21 Aug 2024 21:01:00 +0000 (+0200) Subject: Remove deprecated entries in OutputStyle X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F17591%2Fhead;p=dealii.git Remove deprecated entries in OutputStyle --- diff --git a/doc/news/changes/incompatibilities/20240821Munch b/doc/news/changes/incompatibilities/20240821Munch new file mode 100644 index 0000000000..638698f616 --- /dev/null +++ b/doc/news/changes/incompatibilities/20240821Munch @@ -0,0 +1,4 @@ +Changed: The deprecated entries Text and ShortText in OutputStyle +have been removed. +
+(Peter Munch, 2024/08/21) diff --git a/examples/step-32/step-32.cc b/examples/step-32/step-32.cc index 9a2da2758a..1d536f50fb 100644 --- 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 da96122d98..11f3835fc5 100644 --- 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 f6cd947fff..f71635cf4b 100644 --- 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 32f14ef0e9..390694cab7 100644 --- 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 189910f9fe..a6011e79a5 100644 --- 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 d1f8adc5c6..08e6c1f188 100644 --- 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 93dc767ac0..5e2f055af2 100644 --- 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 c2db519d2f..2b93ad7463 100644 --- 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 f4f28935ab..7d2d596b2f 100644 --- 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 @@ -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 ee4063eeb7..94db0ba2b7 100644 --- 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 979648e3c4..6784367b3e 100644 --- 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 3e27c85556..0be35a1552 100644 --- 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 6b878524f9..767a1aba4e 100644 --- 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 25704d1fb8..2936345f7f 100644 --- 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 76575f9a37..9b0905cf98 100644 --- 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 060453c024..88470918a4 100644 --- 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 49300e4c08..59ddc70978 100644 --- 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 @@ -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 22003e9c01..c73c3c5441 100644 --- 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 4c4a21a9bc..8b53339435 100644 --- 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 @@ -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 ed555865d8..b9ffe06645 100644 --- 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 diff --git a/tests/parameter_handler/parameter_handler_subsection_exists.cc b/tests/parameter_handler/parameter_handler_subsection_exists.cc index 167a616963..517875733a 100644 --- 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 d689a3311a..7b4252a3c2 100644 --- 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 43e3c65c8b..3b3f373692 100644 --- 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 56165a34b1..0e782b1945 100644 --- 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 0ce69a644b..f1027748dd 100644 --- 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 8e34ab0505..469fcfdbc2 100644 --- 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 705488f23b..e34a5d2411 100644 --- 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 de570c3ff6..cbf39f5d75 100644 --- 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 8071d3ef62..5cc89451ca 100644 --- 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 6669b9a968..2c6b2d1a3b 100644 --- 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 97b082a4b6..302a119525 100644 --- 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 42a5f986f5..e641e1ae8d 100644 --- 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 a60edb1271..804db9f3ef 100644 --- 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 8f88e46ac4..d6eccd08f4 100644 --- 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 805d0e9d61..2bb19292b7 100644 --- 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 4c650e8f68..4557567d04 100644 --- 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 612c442fd1..cefb789f34 100644 --- 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 888d0ac3ca..ae3aad5ea0 100644 --- 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 0a44486bf1..4a2324ee88 100644 --- 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 7c95c7b0ec..79e4c1f3f4 100644 --- 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 8c491d7ae8..6dfa9dee00 100644 --- 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");