From e3f120f9209599e2f315cbbaac067f63f927eb41 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 27 Apr 2019 10:02:39 -0400 Subject: [PATCH] Fix copyright notice --- .../deal.II/base/parsed_convergence_table.h | 96 ++++++++++--------- .../base/parsed_convergence_table_flags.h | 28 +++--- source/base/parsed_convergence_table.cc | 6 +- 3 files changed, 68 insertions(+), 62 deletions(-) diff --git a/include/deal.II/base/parsed_convergence_table.h b/include/deal.II/base/parsed_convergence_table.h index 669fd6ebb6..2ec1f233c1 100644 --- a/include/deal.II/base/parsed_convergence_table.h +++ b/include/deal.II/base/parsed_convergence_table.h @@ -1,17 +1,17 @@ -//----------------------------------------------------------- +// --------------------------------------------------------------------- // -// Copyright (C) 2019 by the deal.II authors +// Copyright (C) 2019 by the deal.II authors // -// This file is part of the deal.II library. +// This file is part of the deal.II library. // -// The deal2lkit library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal2lkit distribution. +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE.md at +// the top level directory of deal.II. // -//----------------------------------------------------------- +// --------------------------------------------------------------------- #ifndef dealii_base_parsed_convergence_table_h #define dealii_base_parsed_convergence_table_h @@ -55,10 +55,11 @@ DEAL_II_NAMESPACE_OPEN * ParameterHandler prm; * table.add_parameters(prm); * - * for(unsigned int i=0; i extra_columns; /** - * Wether or not to calculate the rates according to the given keys. + * Whether or not to calculate the rates according to the given keys. */ ParsedConvergenceTableFlags::ExtraColumns rate_key; @@ -444,7 +449,7 @@ private: #ifndef DOXYGEN // ============================================================ -// Template instantiations +// Template functions // ============================================================ template void @@ -706,7 +711,6 @@ ParsedConvergenceTable::custom_error( if (compute_error) { const unsigned int n_components = norms_per_unique_component.size(); - std::vector c_error(norms_per_unique_component.size()); const unsigned int n_active_cells = dh.get_triangulation().n_global_active_cells(); const unsigned int n_dofs = dh.n_dofs(); diff --git a/include/deal.II/base/parsed_convergence_table_flags.h b/include/deal.II/base/parsed_convergence_table_flags.h index 7ff300d104..8efd96705e 100644 --- a/include/deal.II/base/parsed_convergence_table_flags.h +++ b/include/deal.II/base/parsed_convergence_table_flags.h @@ -1,17 +1,17 @@ -//----------------------------------------------------------- +// --------------------------------------------------------------------- // -// Copyright (C) 2019 by the deal.II authors +// Copyright (C) 2019 by the deal.II authors // -// This file is part of the deal.II library. +// This file is part of the deal.II library. // -// The deal2lkit library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal2lkit distribution. +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE.md at +// the top level directory of deal.II. // -//----------------------------------------------------------- +// ------------------------------------------------------------------- #ifndef dealii_base_parsed_convergence_table_flags_h #define dealii_base_parsed_convergence_table_flags_h @@ -62,7 +62,7 @@ namespace Patterns static std::unique_ptr to_pattern() { - return std::make_unique( + return std_cxx14::make_unique( "none|Linfty|L2|W1infty|H1|custom"); } @@ -136,7 +136,7 @@ namespace Patterns } else { - AssertThrow(false, ExcMessage("Didn't recognize a norm type.")); + AssertThrow(false, ExcMessage("The norm type <" + norm_string + "> is not recognized.")); } return norm; @@ -154,7 +154,7 @@ namespace Patterns static std::unique_ptr to_pattern() { - return std::make_unique("none|cells|dofs|dt"); + return std_cxx14::make_unique("none|cells|dofs|dt"); } @@ -218,7 +218,7 @@ namespace Patterns else { AssertThrow(false, - ExcMessage("Didn't recognize an extra column type.")); + ExcMessage("The column type <" + column_string + "> is not recognized.")); } return column; diff --git a/source/base/parsed_convergence_table.cc b/source/base/parsed_convergence_table.cc index cda4afffb8..d955bb0b64 100644 --- a/source/base/parsed_convergence_table.cc +++ b/source/base/parsed_convergence_table.cc @@ -57,6 +57,8 @@ namespace } } // namespace + + ParsedConvergenceTable::ParsedConvergenceTable( const std::vector &solution_names, const std::vector> @@ -126,13 +128,13 @@ ParsedConvergenceTable::add_parameters(ParameterHandler &prm) prm.add_parameter( "List of error norms to compute", norms_per_unique_component, - "Each component is separated by a semicolon, " + "Each component is separated by a semicolon " "and each norm by a comma. Implemented norms are Linfty, L2, " "W1infty, H1, and custom. If you want to skip a component, use none."); prm.add_parameter("Extra columns", extra_columns, - "Extra columns to add to the table. Availabl options " + "Extra columns to add to the table. Available options " "are dofs, cells, and dt."); prm.add_parameter("Rate key", -- 2.39.5