From: Matthias Maier Date: Wed, 27 May 2015 12:37:28 +0000 (+0200) Subject: Rename header guards from __deal2__ to dealii__ X-Git-Tag: v8.3.0-rc1~151^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9216b821e6c926614e662c9e527b95651f5d6dce;p=dealii.git Rename header guards from __deal2__ to dealii__ --- diff --git a/include/deal.II/algorithms/any_data.h b/include/deal.II/algorithms/any_data.h index 69e3d24094..b33f3926d6 100644 --- a/include/deal.II/algorithms/any_data.h +++ b/include/deal.II/algorithms/any_data.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__any_data_h -#define __deal2__any_data_h +#ifndef dealii__any_data_h +#define dealii__any_data_h #include #include diff --git a/include/deal.II/algorithms/named_selection.h b/include/deal.II/algorithms/named_selection.h index 514d8083b8..c5b26cde72 100644 --- a/include/deal.II/algorithms/named_selection.h +++ b/include/deal.II/algorithms/named_selection.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__named_selection_h -#define __deal2__named_selection_h +#ifndef dealii__named_selection_h +#define dealii__named_selection_h #include #include diff --git a/include/deal.II/algorithms/newton.h b/include/deal.II/algorithms/newton.h index 53835d9137..2e2fb3cd71 100644 --- a/include/deal.II/algorithms/newton.h +++ b/include/deal.II/algorithms/newton.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__newton_h -#define __deal2__newton_h +#ifndef dealii__newton_h +#define dealii__newton_h #include #include diff --git a/include/deal.II/algorithms/operator.h b/include/deal.II/algorithms/operator.h index 1902dd392b..c4077bd053 100644 --- a/include/deal.II/algorithms/operator.h +++ b/include/deal.II/algorithms/operator.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__operator_h -#define __deal2__operator_h +#ifndef dealii__operator_h +#define dealii__operator_h #include #include diff --git a/include/deal.II/algorithms/theta_timestepping.h b/include/deal.II/algorithms/theta_timestepping.h index 1b44354813..3009b0b538 100644 --- a/include/deal.II/algorithms/theta_timestepping.h +++ b/include/deal.II/algorithms/theta_timestepping.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__theta_timestepping_h -#define __deal2__theta_timestepping_h +#ifndef dealii__theta_timestepping_h +#define dealii__theta_timestepping_h #include #include diff --git a/include/deal.II/algorithms/timestep_control.h b/include/deal.II/algorithms/timestep_control.h index 531b634b10..419c34e26f 100644 --- a/include/deal.II/algorithms/timestep_control.h +++ b/include/deal.II/algorithms/timestep_control.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__time_step_control_h -#define __deal2__time_step_control_h +#ifndef dealii__time_step_control_h +#define dealii__time_step_control_h #include #include diff --git a/include/deal.II/base/aligned_vector.h b/include/deal.II/base/aligned_vector.h index ed1dcc97bd..6935823d66 100644 --- a/include/deal.II/base/aligned_vector.h +++ b/include/deal.II/base/aligned_vector.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__aligned_vector_h -#define __deal2__aligned_vector_h +#ifndef dealii__aligned_vector_h +#define dealii__aligned_vector_h #include #include diff --git a/include/deal.II/base/auto_derivative_function.h b/include/deal.II/base/auto_derivative_function.h index db70acd178..78b3ba1cd8 100644 --- a/include/deal.II/base/auto_derivative_function.h +++ b/include/deal.II/base/auto_derivative_function.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__auto_derivative_function_h -#define __deal2__auto_derivative_function_h +#ifndef dealii__auto_derivative_function_h +#define dealii__auto_derivative_function_h #include diff --git a/include/deal.II/base/conditional_ostream.h b/include/deal.II/base/conditional_ostream.h index 6082e4f725..61a5023c35 100644 --- a/include/deal.II/base/conditional_ostream.h +++ b/include/deal.II/base/conditional_ostream.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__conditional_ostream_h -#define __deal2__conditional_ostream_h +#ifndef dealii__conditional_ostream_h +#define dealii__conditional_ostream_h #include diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 5f765645ca..551dd41b40 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__config_h -#define __deal2__config_h +#ifndef dealii___config_h +#define dealii___config_h /*********************************************************************** diff --git a/include/deal.II/base/convergence_table.h b/include/deal.II/base/convergence_table.h index 034a99e7ad..740f0a8854 100644 --- a/include/deal.II/base/convergence_table.h +++ b/include/deal.II/base/convergence_table.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__convergence_table_h -#define __deal2__convergence_table_h +#ifndef dealii__convergence_table_h +#define dealii__convergence_table_h #include diff --git a/include/deal.II/base/data_out_base.h b/include/deal.II/base/data_out_base.h index 5cf8e18bcb..5aed2aff43 100644 --- a/include/deal.II/base/data_out_base.h +++ b/include/deal.II/base/data_out_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__data_out_base_h -#define __deal2__data_out_base_h +#ifndef dealii__data_out_base_h +#define dealii__data_out_base_h #include diff --git a/include/deal.II/base/derivative_form.h b/include/deal.II/base/derivative_form.h index 69d3820fab..a70813f57f 100644 --- a/include/deal.II/base/derivative_form.h +++ b/include/deal.II/base/derivative_form.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__derivative_form_h -#define __deal2__derivative_form_h +#ifndef dealii__derivative_form_h +#define dealii__derivative_form_h #include diff --git a/include/deal.II/base/event.h b/include/deal.II/base/event.h index a1fa0e2f13..3f76ed6789 100644 --- a/include/deal.II/base/event.h +++ b/include/deal.II/base/event.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__event_h -#define __deal2__event_h +#ifndef dealii__event_h +#define dealii__event_h #include diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h index 4989bfc938..d86c350501 100644 --- a/include/deal.II/base/exceptions.h +++ b/include/deal.II/base/exceptions.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__exceptions_h -#define __deal2__exceptions_h +#ifndef dealii__exceptions_h +#define dealii__exceptions_h #include diff --git a/include/deal.II/base/flow_function.h b/include/deal.II/base/flow_function.h index 61a5c1894b..e3033bc0b6 100644 --- a/include/deal.II/base/flow_function.h +++ b/include/deal.II/base/flow_function.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__flow_function_h -#define __deal2__flow_function_h +#ifndef dealii__flow_function_h +#define dealii__flow_function_h #include diff --git a/include/deal.II/base/function.h b/include/deal.II/base/function.h index 76d320d1fc..42c38e0bf8 100644 --- a/include/deal.II/base/function.h +++ b/include/deal.II/base/function.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__function_h -#define __deal2__function_h +#ifndef dealii__function_h +#define dealii__function_h #include diff --git a/include/deal.II/base/function_bessel.h b/include/deal.II/base/function_bessel.h index 5b63f7502e..9972169143 100644 --- a/include/deal.II/base/function_bessel.h +++ b/include/deal.II/base/function_bessel.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__function_bessel_h -#define __deal2__function_bessel_h +#ifndef dealii__function_bessel_h +#define dealii__function_bessel_h #include diff --git a/include/deal.II/base/function_derivative.h b/include/deal.II/base/function_derivative.h index 3b831d720c..56e259f120 100644 --- a/include/deal.II/base/function_derivative.h +++ b/include/deal.II/base/function_derivative.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__function_derivative_h -#define __deal2__function_derivative_h +#ifndef dealii__function_derivative_h +#define dealii__function_derivative_h #include #include diff --git a/include/deal.II/base/function_lib.h b/include/deal.II/base/function_lib.h index 62122dc30a..985d892c24 100644 --- a/include/deal.II/base/function_lib.h +++ b/include/deal.II/base/function_lib.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__function_lib_h -#define __deal2__function_lib_h +#ifndef dealii__function_lib_h +#define dealii__function_lib_h #include diff --git a/include/deal.II/base/function_parser.h b/include/deal.II/base/function_parser.h index ce4e518609..5ae72919df 100644 --- a/include/deal.II/base/function_parser.h +++ b/include/deal.II/base/function_parser.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__function_parser_h -#define __deal2__function_parser_h +#ifndef dealii__function_parser_h +#define dealii__function_parser_h #include diff --git a/include/deal.II/base/function_time.h b/include/deal.II/base/function_time.h index 6e3aa4c459..6923f16b8d 100644 --- a/include/deal.II/base/function_time.h +++ b/include/deal.II/base/function_time.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__function_time_h -#define __deal2__function_time_h +#ifndef dealii__function_time_h +#define dealii__function_time_h #include diff --git a/include/deal.II/base/geometry_info.h b/include/deal.II/base/geometry_info.h index ed8687f451..4f3d8fac25 100644 --- a/include/deal.II/base/geometry_info.h +++ b/include/deal.II/base/geometry_info.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__geometry_info_h -#define __deal2__geometry_info_h +#ifndef dealii__geometry_info_h +#define dealii__geometry_info_h #include diff --git a/include/deal.II/base/graph_coloring.h b/include/deal.II/base/graph_coloring.h index 79e79b5897..3f9772dc5c 100644 --- a/include/deal.II/base/graph_coloring.h +++ b/include/deal.II/base/graph_coloring.h @@ -14,8 +14,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__graph_coloring_h -#define __deal2__graph_coloring_h +#ifndef dealii__graph_coloring_h +#define dealii__graph_coloring_h #include @@ -548,6 +548,6 @@ DEAL_II_NAMESPACE_CLOSE //---------------------------- graph_coloring.h --------------------------- -// end of #ifndef __deal2__graph_coloring_h +// end of #ifndef dealii__graph_coloring_h #endif //---------------------------- graph_coloring.h --------------------------- diff --git a/include/deal.II/base/index_set.h b/include/deal.II/base/index_set.h index cfbb631b94..b8dd4bd236 100644 --- a/include/deal.II/base/index_set.h +++ b/include/deal.II/base/index_set.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__index_set_h -#define __deal2__index_set_h +#ifndef dealii__index_set_h +#define dealii__index_set_h #include #include diff --git a/include/deal.II/base/iterator_range.h b/include/deal.II/base/iterator_range.h index c84295409e..86e6134443 100644 --- a/include/deal.II/base/iterator_range.h +++ b/include/deal.II/base/iterator_range.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__iterator_range_h -#define __deal2__iterator_range_h +#ifndef dealii__iterator_range_h +#define dealii__iterator_range_h #include diff --git a/include/deal.II/base/job_identifier.h b/include/deal.II/base/job_identifier.h index dbba79d144..daad1803b8 100644 --- a/include/deal.II/base/job_identifier.h +++ b/include/deal.II/base/job_identifier.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__job_identifier_h -#define __deal2__job_identifier_h +#ifndef dealii__job_identifier_h +#define dealii__job_identifier_h #include diff --git a/include/deal.II/base/logstream.h b/include/deal.II/base/logstream.h index 0845ba74e4..6d6720ffad 100644 --- a/include/deal.II/base/logstream.h +++ b/include/deal.II/base/logstream.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__logstream_h -#define __deal2__logstream_h +#ifndef dealii__logstream_h +#define dealii__logstream_h #include #include diff --git a/include/deal.II/base/memory_consumption.h b/include/deal.II/base/memory_consumption.h index f369663138..1185c11b97 100644 --- a/include/deal.II/base/memory_consumption.h +++ b/include/deal.II/base/memory_consumption.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__memory_consumption_h -#define __deal2__memory_consumption_h +#ifndef dealii__memory_consumption_h +#define dealii__memory_consumption_h #include diff --git a/include/deal.II/base/mg_level_object.h b/include/deal.II/base/mg_level_object.h index 5de31f42e6..3d797e33cc 100644 --- a/include/deal.II/base/mg_level_object.h +++ b/include/deal.II/base/mg_level_object.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_level_object_h -#define __deal2__mg_level_object_h +#ifndef dealii__mg_level_object_h +#define dealii__mg_level_object_h #include #include diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h index c32f501f0c..54ed4017cf 100644 --- a/include/deal.II/base/mpi.h +++ b/include/deal.II/base/mpi.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mpi_h -#define __deal2__mpi_h +#ifndef dealii__mpi_h +#define dealii__mpi_h #include #include diff --git a/include/deal.II/base/multithread_info.h b/include/deal.II/base/multithread_info.h index c8b5a47916..df8d71f1bd 100644 --- a/include/deal.II/base/multithread_info.h +++ b/include/deal.II/base/multithread_info.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__multithread_info_h -#define __deal2__multithread_info_h +#ifndef dealii__multithread_info_h +#define dealii__multithread_info_h //--------------------------------------------------------------------------- @@ -148,6 +148,6 @@ extern MultithreadInfo multithread_info DEAL_II_DEPRECATED; //--------------------------------------------------------------------------- DEAL_II_NAMESPACE_CLOSE -// end of #ifndef __deal2__multithread_info_h +// end of #ifndef dealii__multithread_info_h #endif //--------------------------------------------------------------------------- diff --git a/include/deal.II/base/numbers.h b/include/deal.II/base/numbers.h index 52d9aa761a..ae134e637a 100644 --- a/include/deal.II/base/numbers.h +++ b/include/deal.II/base/numbers.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__numbers_h -#define __deal2__numbers_h +#ifndef dealii__numbers_h +#define dealii__numbers_h #include diff --git a/include/deal.II/base/parallel.h b/include/deal.II/base/parallel.h index 67edaf695e..80aff32359 100644 --- a/include/deal.II/base/parallel.h +++ b/include/deal.II/base/parallel.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__parallel_h -#define __deal2__parallel_h +#ifndef dealii__parallel_h +#define dealii__parallel_h #include diff --git a/include/deal.II/base/parameter_handler.h b/include/deal.II/base/parameter_handler.h index 7ce6ff7deb..3de60c39d2 100644 --- a/include/deal.II/base/parameter_handler.h +++ b/include/deal.II/base/parameter_handler.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__parameter_handler_h -#define __deal2__parameter_handler_h +#ifndef dealii__parameter_handler_h +#define dealii__parameter_handler_h #include diff --git a/include/deal.II/base/parsed_function.h b/include/deal.II/base/parsed_function.h index 0c4478991e..858ff90983 100644 --- a/include/deal.II/base/parsed_function.h +++ b/include/deal.II/base/parsed_function.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__parsed_function_h -#define __deal2__parsed_function_h +#ifndef dealii__parsed_function_h +#define dealii__parsed_function_h #include #include diff --git a/include/deal.II/base/partitioner.h b/include/deal.II/base/partitioner.h index e4150951ea..25239333d8 100644 --- a/include/deal.II/base/partitioner.h +++ b/include/deal.II/base/partitioner.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__partitioner_h -#define __deal2__partitioner_h +#ifndef dealii__partitioner_h +#define dealii__partitioner_h #include #include diff --git a/include/deal.II/base/path_search.h b/include/deal.II/base/path_search.h index 90829869a6..435a49eb8d 100644 --- a/include/deal.II/base/path_search.h +++ b/include/deal.II/base/path_search.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__path_search_h -#define __deal2__path_search_h +#ifndef dealii__path_search_h +#define dealii__path_search_h #include diff --git a/include/deal.II/base/point.h b/include/deal.II/base/point.h index 8d9af919a7..2a102430c4 100644 --- a/include/deal.II/base/point.h +++ b/include/deal.II/base/point.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__point_h -#define __deal2__point_h +#ifndef dealii__point_h +#define dealii__point_h #include diff --git a/include/deal.II/base/polynomial.h b/include/deal.II/base/polynomial.h index 18757eb13e..8d85bd596b 100644 --- a/include/deal.II/base/polynomial.h +++ b/include/deal.II/base/polynomial.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__polynomial_h -#define __deal2__polynomial_h +#ifndef dealii__polynomial_h +#define dealii__polynomial_h diff --git a/include/deal.II/base/polynomial_space.h b/include/deal.II/base/polynomial_space.h index 00c73c83bf..e8e3f989ab 100644 --- a/include/deal.II/base/polynomial_space.h +++ b/include/deal.II/base/polynomial_space.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__polynomial_space_h -#define __deal2__polynomial_space_h +#ifndef dealii__polynomial_space_h +#define dealii__polynomial_space_h #include diff --git a/include/deal.II/base/polynomials_abf.h b/include/deal.II/base/polynomials_abf.h index 1b32b55ceb..8e782293eb 100644 --- a/include/deal.II/base/polynomials_abf.h +++ b/include/deal.II/base/polynomials_abf.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__polynomials_abf_h -#define __deal2__polynomials_abf_h +#ifndef dealii__polynomials_abf_h +#define dealii__polynomials_abf_h #include diff --git a/include/deal.II/base/polynomials_adini.h b/include/deal.II/base/polynomials_adini.h index acbb581eae..8870ba3221 100644 --- a/include/deal.II/base/polynomials_adini.h +++ b/include/deal.II/base/polynomials_adini.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__polynomials_adini_h -#define __deal2__polynomials_adini_h +#ifndef dealii__polynomials_adini_h +#define dealii__polynomials_adini_h #include #include diff --git a/include/deal.II/base/polynomials_bdm.h b/include/deal.II/base/polynomials_bdm.h index f657758e85..eb3184b2a6 100644 --- a/include/deal.II/base/polynomials_bdm.h +++ b/include/deal.II/base/polynomials_bdm.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__polynomials_BDM_h -#define __deal2__polynomials_BDM_h +#ifndef dealii__polynomials_BDM_h +#define dealii__polynomials_BDM_h #include diff --git a/include/deal.II/base/polynomials_bernstein.h b/include/deal.II/base/polynomials_bernstein.h index c60bc987f5..013def14ca 100644 --- a/include/deal.II/base/polynomials_bernstein.h +++ b/include/deal.II/base/polynomials_bernstein.h @@ -2,8 +2,8 @@ #include #include -#ifndef __deal2_polynomials_bernstein_h -#define __deal2_polynomials_bernstein_h +#ifndef dealii__polynomials_bernstein_h +#define dealii__polynomials_bernstein_h DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/base/polynomials_nedelec.h b/include/deal.II/base/polynomials_nedelec.h index 9ea6906197..9a3955eab6 100644 --- a/include/deal.II/base/polynomials_nedelec.h +++ b/include/deal.II/base/polynomials_nedelec.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__polynomials_nedelec_h -#define __deal2__polynomials_nedelec_h +#ifndef dealii__polynomials_nedelec_h +#define dealii__polynomials_nedelec_h #include diff --git a/include/deal.II/base/polynomials_p.h b/include/deal.II/base/polynomials_p.h index 18bf726c2b..feedcc97f7 100644 --- a/include/deal.II/base/polynomials_p.h +++ b/include/deal.II/base/polynomials_p.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__polynomials_P_h -#define __deal2__polynomials_P_h +#ifndef dealii__polynomials_P_h +#define dealii__polynomials_P_h #include diff --git a/include/deal.II/base/polynomials_piecewise.h b/include/deal.II/base/polynomials_piecewise.h index 8f8701e3df..20bfc1a354 100644 --- a/include/deal.II/base/polynomials_piecewise.h +++ b/include/deal.II/base/polynomials_piecewise.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__polynomials_piecewise_h -#define __deal2__polynomials_piecewise_h +#ifndef dealii__polynomials_piecewise_h +#define dealii__polynomials_piecewise_h diff --git a/include/deal.II/base/polynomials_raviart_thomas.h b/include/deal.II/base/polynomials_raviart_thomas.h index 135b19abff..d0c8ca8da7 100644 --- a/include/deal.II/base/polynomials_raviart_thomas.h +++ b/include/deal.II/base/polynomials_raviart_thomas.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__polynomials_raviart_thomas_h -#define __deal2__polynomials_raviart_thomas_h +#ifndef dealii__polynomials_raviart_thomas_h +#define dealii__polynomials_raviart_thomas_h #include diff --git a/include/deal.II/base/qprojector.h b/include/deal.II/base/qprojector.h index ad9bc650fd..538bb46864 100644 --- a/include/deal.II/base/qprojector.h +++ b/include/deal.II/base/qprojector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__qprojector_h -#define __deal2__qprojector_h +#ifndef dealii__qprojector_h +#define dealii__qprojector_h #include diff --git a/include/deal.II/base/quadrature.h b/include/deal.II/base/quadrature.h index 69b76bf04c..227fb4f75c 100644 --- a/include/deal.II/base/quadrature.h +++ b/include/deal.II/base/quadrature.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__quadrature_h -#define __deal2__quadrature_h +#ifndef dealii__quadrature_h +#define dealii__quadrature_h #include diff --git a/include/deal.II/base/quadrature_lib.h b/include/deal.II/base/quadrature_lib.h index 30ffcca402..9485b05176 100644 --- a/include/deal.II/base/quadrature_lib.h +++ b/include/deal.II/base/quadrature_lib.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__quadrature_lib_h -#define __deal2__quadrature_lib_h +#ifndef dealii__quadrature_lib_h +#define dealii__quadrature_lib_h #include diff --git a/include/deal.II/base/quadrature_selector.h b/include/deal.II/base/quadrature_selector.h index 40a491609a..025dc07f14 100644 --- a/include/deal.II/base/quadrature_selector.h +++ b/include/deal.II/base/quadrature_selector.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__quadrature_selector_h -#define __deal2__quadrature_selector_h +#ifndef dealii__quadrature_selector_h +#define dealii__quadrature_selector_h #include diff --git a/include/deal.II/base/revision.h.in b/include/deal.II/base/revision.h.in index 20614483ed..6206295609 100644 --- a/include/deal.II/base/revision.h.in +++ b/include/deal.II/base/revision.h.in @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__revision_h -#define __deal2__revision_h +#ifndef dealii___revision_h +#define dealii___revision_h /** * Name of the local git branch of the source directory. diff --git a/include/deal.II/base/smartpointer.h b/include/deal.II/base/smartpointer.h index 9ca3e30384..0f42cad2fc 100644 --- a/include/deal.II/base/smartpointer.h +++ b/include/deal.II/base/smartpointer.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__smartpointer_h -#define __deal2__smartpointer_h +#ifndef dealii__smartpointer_h +#define dealii__smartpointer_h #include diff --git a/include/deal.II/base/std_cxx11/array.h b/include/deal.II/base/std_cxx11/array.h index 17917662ac..4590660e1e 100644 --- a/include/deal.II/base/std_cxx11/array.h +++ b/include/deal.II/base/std_cxx11/array.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_array_h -#define __deal2__std_cxx11_array_h +#ifndef dealii__std_cxx11_array_h +#define dealii__std_cxx11_array_h #include diff --git a/include/deal.II/base/std_cxx11/bind.h b/include/deal.II/base/std_cxx11/bind.h index fc64ac1ece..505023d3fd 100644 --- a/include/deal.II/base/std_cxx11/bind.h +++ b/include/deal.II/base/std_cxx11/bind.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_bind_h -#define __deal2__std_cxx11_bind_h +#ifndef dealii__std_cxx11_bind_h +#define dealii__std_cxx11_bind_h #include diff --git a/include/deal.II/base/std_cxx11/condition_variable.h b/include/deal.II/base/std_cxx11/condition_variable.h index fadd3d7a76..1c1f4be132 100644 --- a/include/deal.II/base/std_cxx11/condition_variable.h +++ b/include/deal.II/base/std_cxx11/condition_variable.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_condition_variable_h -#define __deal2__std_cxx11_condition_variable_h +#ifndef dealii__std_cxx11_condition_variable_h +#define dealii__std_cxx11_condition_variable_h #include diff --git a/include/deal.II/base/std_cxx11/function.h b/include/deal.II/base/std_cxx11/function.h index a7b4592269..ec61d05b11 100644 --- a/include/deal.II/base/std_cxx11/function.h +++ b/include/deal.II/base/std_cxx11/function.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_function_h -#define __deal2__std_cxx11_function_h +#ifndef dealii__std_cxx11_function_h +#define dealii__std_cxx11_function_h #include diff --git a/include/deal.II/base/std_cxx11/mutex.h b/include/deal.II/base/std_cxx11/mutex.h index 7cd0be4a5a..a8f8142600 100644 --- a/include/deal.II/base/std_cxx11/mutex.h +++ b/include/deal.II/base/std_cxx11/mutex.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_mutex_h -#define __deal2__std_cxx11_mutex_h +#ifndef dealii__std_cxx11_mutex_h +#define dealii__std_cxx11_mutex_h #include diff --git a/include/deal.II/base/std_cxx11/shared_ptr.h b/include/deal.II/base/std_cxx11/shared_ptr.h index 25fb3438b7..4c90c75221 100644 --- a/include/deal.II/base/std_cxx11/shared_ptr.h +++ b/include/deal.II/base/std_cxx11/shared_ptr.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_shared_ptr_h -#define __deal2__std_cxx11_shared_ptr_h +#ifndef dealii__std_cxx11_shared_ptr_h +#define dealii__std_cxx11_shared_ptr_h #include diff --git a/include/deal.II/base/std_cxx11/thread.h b/include/deal.II/base/std_cxx11/thread.h index 61324320f8..29a8278149 100644 --- a/include/deal.II/base/std_cxx11/thread.h +++ b/include/deal.II/base/std_cxx11/thread.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_thread_h -#define __deal2__std_cxx11_thread_h +#ifndef dealii__std_cxx11_thread_h +#define dealii__std_cxx11_thread_h #include diff --git a/include/deal.II/base/std_cxx11/tuple.h b/include/deal.II/base/std_cxx11/tuple.h index 2851703c7d..89831a7ca3 100644 --- a/include/deal.II/base/std_cxx11/tuple.h +++ b/include/deal.II/base/std_cxx11/tuple.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_tuple_h -#define __deal2__std_cxx11_tuple_h +#ifndef dealii__std_cxx11_tuple_h +#define dealii__std_cxx11_tuple_h #include diff --git a/include/deal.II/base/std_cxx11/type_traits.h b/include/deal.II/base/std_cxx11/type_traits.h index e35ac4b2f8..ccb215d3f3 100644 --- a/include/deal.II/base/std_cxx11/type_traits.h +++ b/include/deal.II/base/std_cxx11/type_traits.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_type_traits_h -#define __deal2__std_cxx11_type_traits_h +#ifndef dealii__std_cxx11_type_traits_h +#define dealii__std_cxx11_type_traits_h #include diff --git a/include/deal.II/base/std_cxx11/unique_ptr.h b/include/deal.II/base/std_cxx11/unique_ptr.h index 11e226d9fd..a3cb3e3347 100644 --- a/include/deal.II/base/std_cxx11/unique_ptr.h +++ b/include/deal.II/base/std_cxx11/unique_ptr.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__std_cxx11_unique_ptr_h -#define __deal2__std_cxx11_unique_ptr_h +#ifndef dealii__std_cxx11_unique_ptr_h +#define dealii__std_cxx11_unique_ptr_h #include diff --git a/include/deal.II/base/subscriptor.h b/include/deal.II/base/subscriptor.h index 27944ec816..97266bc9f7 100644 --- a/include/deal.II/base/subscriptor.h +++ b/include/deal.II/base/subscriptor.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__subscriptor_h -#define __deal2__subscriptor_h +#ifndef dealii__subscriptor_h +#define dealii__subscriptor_h #include diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h index 669239b3f4..1ddd65ec56 100644 --- a/include/deal.II/base/symmetric_tensor.h +++ b/include/deal.II/base/symmetric_tensor.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__symmetric_tensor_h -#define __deal2__symmetric_tensor_h +#ifndef dealii__symmetric_tensor_h +#define dealii__symmetric_tensor_h #include diff --git a/include/deal.II/base/synchronous_iterator.h b/include/deal.II/base/synchronous_iterator.h index 3b7256f537..32f44865fc 100644 --- a/include/deal.II/base/synchronous_iterator.h +++ b/include/deal.II/base/synchronous_iterator.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__synchronous_iterator_h -#define __deal2__synchronous_iterator_h +#ifndef dealii__synchronous_iterator_h +#define dealii__synchronous_iterator_h #include diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h index 01a173337a..50301c7c3d 100644 --- a/include/deal.II/base/table.h +++ b/include/deal.II/base/table.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__table_h -#define __deal2__table_h +#ifndef dealii__table_h +#define dealii__table_h #include #include diff --git a/include/deal.II/base/table_handler.h b/include/deal.II/base/table_handler.h index 2595131e79..95f48d7f53 100644 --- a/include/deal.II/base/table_handler.h +++ b/include/deal.II/base/table_handler.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__table_handler_h -#define __deal2__table_handler_h +#ifndef dealii__table_handler_h +#define dealii__table_handler_h #include diff --git a/include/deal.II/base/table_indices.h b/include/deal.II/base/table_indices.h index 055061e53a..744451ab35 100644 --- a/include/deal.II/base/table_indices.h +++ b/include/deal.II/base/table_indices.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__table_indices_h -#define __deal2__table_indices_h +#ifndef dealii__table_indices_h +#define dealii__table_indices_h #include diff --git a/include/deal.II/base/template_constraints.h b/include/deal.II/base/template_constraints.h index d2b0cbc04a..5123f89618 100644 --- a/include/deal.II/base/template_constraints.h +++ b/include/deal.II/base/template_constraints.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__template_constraints_h -#define __deal2__template_constraints_h +#ifndef dealii__template_constraints_h +#define dealii__template_constraints_h #include diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index 5a6076d69f..fd2cfe4253 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tensor_h -#define __deal2__tensor_h +#ifndef dealii__tensor_h +#define dealii__tensor_h #include diff --git a/include/deal.II/base/tensor_base.h b/include/deal.II/base/tensor_base.h index 2ce8f72bb0..fd21f8dfdd 100644 --- a/include/deal.II/base/tensor_base.h +++ b/include/deal.II/base/tensor_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tensor_base_h -#define __deal2__tensor_base_h +#ifndef dealii__tensor_base_h +#define dealii__tensor_base_h // single this file out from tensor.h, since we want to derive diff --git a/include/deal.II/base/tensor_function.h b/include/deal.II/base/tensor_function.h index f7196f00da..1b926f5b0f 100644 --- a/include/deal.II/base/tensor_function.h +++ b/include/deal.II/base/tensor_function.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tensor_function_h -#define __deal2__tensor_function_h +#ifndef dealii__tensor_function_h +#define dealii__tensor_function_h #include diff --git a/include/deal.II/base/tensor_product_polynomials.h b/include/deal.II/base/tensor_product_polynomials.h index 21ab37046f..2b45e77ce6 100644 --- a/include/deal.II/base/tensor_product_polynomials.h +++ b/include/deal.II/base/tensor_product_polynomials.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tensor_product_polynomials_h -#define __deal2__tensor_product_polynomials_h +#ifndef dealii__tensor_product_polynomials_h +#define dealii__tensor_product_polynomials_h #include diff --git a/include/deal.II/base/tensor_product_polynomials_const.h b/include/deal.II/base/tensor_product_polynomials_const.h index 2c5fef01db..323f423cea 100644 --- a/include/deal.II/base/tensor_product_polynomials_const.h +++ b/include/deal.II/base/tensor_product_polynomials_const.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tensor_product_polynomials_const_h -#define __deal2__tensor_product_polynomials_const_h +#ifndef dealii__tensor_product_polynomials_const_h +#define dealii__tensor_product_polynomials_const_h #include diff --git a/include/deal.II/base/thread_local_storage.h b/include/deal.II/base/thread_local_storage.h index 96e456de0e..79ba3b91b1 100644 --- a/include/deal.II/base/thread_local_storage.h +++ b/include/deal.II/base/thread_local_storage.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__thread_local_storage_h -#define __deal2__thread_local_storage_h +#ifndef dealii__thread_local_storage_h +#define dealii__thread_local_storage_h #include @@ -278,6 +278,6 @@ namespace Threads //--------------------------------------------------------------------------- DEAL_II_NAMESPACE_CLOSE -// end of #ifndef __deal2__thread_local_storage_h +// end of #ifndef dealii__thread_local_storage_h #endif //--------------------------------------------------------------------------- diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h index 9c73e1820f..748df38afc 100644 --- a/include/deal.II/base/thread_management.h +++ b/include/deal.II/base/thread_management.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__thread_management_h -#define __deal2__thread_management_h +#ifndef dealii__thread_management_h +#define dealii__thread_management_h #include @@ -4027,6 +4027,6 @@ namespace Threads //--------------------------------------------------------------------------- DEAL_II_NAMESPACE_CLOSE -// end of #ifndef __deal2__thread_management_h +// end of #ifndef dealii__thread_management_h #endif //--------------------------------------------------------------------------- diff --git a/include/deal.II/base/time_stepping.h b/include/deal.II/base/time_stepping.h index ded4f87cfc..5fd03bd1cd 100644 --- a/include/deal.II/base/time_stepping.h +++ b/include/deal.II/base/time_stepping.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__time_stepping_h -#define __deal2__time_stepping_h +#ifndef dealii__time_stepping_h +#define dealii__time_stepping_h #include diff --git a/include/deal.II/base/time_stepping.templates.h b/include/deal.II/base/time_stepping.templates.h index f4db414740..647dcdd749 100644 --- a/include/deal.II/base/time_stepping.templates.h +++ b/include/deal.II/base/time_stepping.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__time_stepping_templates_h -#define __deal2__time_stepping_templates_h +#ifndef dealii__time_stepping_templates_h +#define dealii__time_stepping_templates_h #include #include diff --git a/include/deal.II/base/timer.h b/include/deal.II/base/timer.h index ff8917d575..5c8988c90d 100644 --- a/include/deal.II/base/timer.h +++ b/include/deal.II/base/timer.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__timer_h -#define __deal2__timer_h +#ifndef dealii__timer_h +#define dealii__timer_h #include #include diff --git a/include/deal.II/base/types.h b/include/deal.II/base/types.h index 9408ef3904..bc65b57477 100644 --- a/include/deal.II/base/types.h +++ b/include/deal.II/base/types.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__types_h -#define __deal2__types_h +#ifndef dealii__types_h +#define dealii__types_h #include diff --git a/include/deal.II/base/utilities.h b/include/deal.II/base/utilities.h index 739fb61d8a..f73a4566ef 100644 --- a/include/deal.II/base/utilities.h +++ b/include/deal.II/base/utilities.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__utilities_h -#define __deal2__utilities_h +#ifndef dealii__utilities_h +#define dealii__utilities_h #include #include diff --git a/include/deal.II/base/vector_slice.h b/include/deal.II/base/vector_slice.h index eba972f084..bb0e13f638 100644 --- a/include/deal.II/base/vector_slice.h +++ b/include/deal.II/base/vector_slice.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__vector_slice_h -#define __deal2__vector_slice_h +#ifndef dealii__vector_slice_h +#define dealii__vector_slice_h #include #include diff --git a/include/deal.II/base/vectorization.h b/include/deal.II/base/vectorization.h index 81563340e9..dd36d3e310 100644 --- a/include/deal.II/base/vectorization.h +++ b/include/deal.II/base/vectorization.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__vectorization_h -#define __deal2__vectorization_h +#ifndef dealii__vectorization_h +#define dealii__vectorization_h #include #include diff --git a/include/deal.II/base/work_stream.h b/include/deal.II/base/work_stream.h index 6d2b5bdc38..b8f41a33c8 100644 --- a/include/deal.II/base/work_stream.h +++ b/include/deal.II/base/work_stream.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__work_stream_h -#define __deal2__work_stream_h +#ifndef dealii__work_stream_h +#define dealii__work_stream_h #include @@ -1264,6 +1264,6 @@ DEAL_II_NAMESPACE_CLOSE //---------------------------- work_stream.h --------------------------- -// end of #ifndef __deal2__work_stream_h +// end of #ifndef dealii__work_stream_h #endif //---------------------------- work_stream.h --------------------------- diff --git a/include/deal.II/distributed/grid_refinement.h b/include/deal.II/distributed/grid_refinement.h index 7c378e7c7c..42e82af1a1 100644 --- a/include/deal.II/distributed/grid_refinement.h +++ b/include/deal.II/distributed/grid_refinement.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__distribute_grid_refinement_h -#define __deal2__distribute_grid_refinement_h +#ifndef dealii__distribute_grid_refinement_h +#define dealii__distribute_grid_refinement_h #include @@ -107,4 +107,4 @@ namespace parallel DEAL_II_NAMESPACE_CLOSE -#endif //__deal2__distributed_grid_refinement_h +#endif //dealii__distributed_grid_refinement_h diff --git a/include/deal.II/distributed/solution_transfer.h b/include/deal.II/distributed/solution_transfer.h index 14db87e84b..e35bb14665 100644 --- a/include/deal.II/distributed/solution_transfer.h +++ b/include/deal.II/distributed/solution_transfer.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__distributed_solution_transfer_h -#define __deal2__distributed_solution_transfer_h +#ifndef dealii__distributed_solution_transfer_h +#define dealii__distributed_solution_transfer_h #include #include diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h index 381ae00fa4..33d3137cda 100644 --- a/include/deal.II/distributed/tria.h +++ b/include/deal.II/distributed/tria.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__distributed_tria_h -#define __deal2__distributed_tria_h +#ifndef dealii__distributed_tria_h +#define dealii__distributed_tria_h #include diff --git a/include/deal.II/dofs/block_info.h b/include/deal.II/dofs/block_info.h index de0d53408f..dc2142be77 100644 --- a/include/deal.II/dofs/block_info.h +++ b/include/deal.II/dofs/block_info.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_info_h -#define __deal2__block_info_h +#ifndef dealii__block_info_h +#define dealii__block_info_h #include #include diff --git a/include/deal.II/dofs/dof_accessor.h b/include/deal.II/dofs/dof_accessor.h index 70e91715a0..89b7cf4e28 100644 --- a/include/deal.II/dofs/dof_accessor.h +++ b/include/deal.II/dofs/dof_accessor.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_accessor_h -#define __deal2__dof_accessor_h +#ifndef dealii__dof_accessor_h +#define dealii__dof_accessor_h #include diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h index a5a97b19f3..0585f22126 100644 --- a/include/deal.II/dofs/dof_accessor.templates.h +++ b/include/deal.II/dofs/dof_accessor.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_accessor_templates_h -#define __deal2__dof_accessor_templates_h +#ifndef dealii__dof_accessor_templates_h +#define dealii__dof_accessor_templates_h #include diff --git a/include/deal.II/dofs/dof_faces.h b/include/deal.II/dofs/dof_faces.h index c425982287..a18d53338b 100644 --- a/include/deal.II/dofs/dof_faces.h +++ b/include/deal.II/dofs/dof_faces.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_faces_h -#define __deal2__dof_faces_h +#ifndef dealii__dof_faces_h +#define dealii__dof_faces_h #include diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index b515a91899..4cddb81326 100644 --- a/include/deal.II/dofs/dof_handler.h +++ b/include/deal.II/dofs/dof_handler.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_handler_h -#define __deal2__dof_handler_h +#ifndef dealii__dof_handler_h +#define dealii__dof_handler_h diff --git a/include/deal.II/dofs/dof_handler_policy.h b/include/deal.II/dofs/dof_handler_policy.h index 9d02c7709b..22943f336b 100644 --- a/include/deal.II/dofs/dof_handler_policy.h +++ b/include/deal.II/dofs/dof_handler_policy.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_handler_policy_h -#define __deal2__dof_handler_policy_h +#ifndef dealii__dof_handler_policy_h +#define dealii__dof_handler_policy_h diff --git a/include/deal.II/dofs/dof_iterator_selector.h b/include/deal.II/dofs/dof_iterator_selector.h index 5d5db1a379..5cbc80f95c 100644 --- a/include/deal.II/dofs/dof_iterator_selector.h +++ b/include/deal.II/dofs/dof_iterator_selector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_iterators_h -#define __deal2__dof_iterators_h +#ifndef dealii__dof_iterators_h +#define dealii__dof_iterators_h #include @@ -172,4 +172,4 @@ namespace internal DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__dof_iterator_selector_h +#endif // dealii__dof_iterator_selector_h diff --git a/include/deal.II/dofs/dof_levels.h b/include/deal.II/dofs/dof_levels.h index 32ac4b7180..21828e480a 100644 --- a/include/deal.II/dofs/dof_levels.h +++ b/include/deal.II/dofs/dof_levels.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_levels_h -#define __deal2__dof_levels_h +#ifndef dealii__dof_levels_h +#define dealii__dof_levels_h #include diff --git a/include/deal.II/dofs/dof_objects.h b/include/deal.II/dofs/dof_objects.h index e64297f019..8975902b30 100644 --- a/include/deal.II/dofs/dof_objects.h +++ b/include/deal.II/dofs/dof_objects.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_objects_h -#define __deal2__dof_objects_h +#ifndef dealii__dof_objects_h +#define dealii__dof_objects_h #include diff --git a/include/deal.II/dofs/dof_renumbering.h b/include/deal.II/dofs/dof_renumbering.h index 396f4d15e0..96170f8a58 100644 --- a/include/deal.II/dofs/dof_renumbering.h +++ b/include/deal.II/dofs/dof_renumbering.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_renumbering_h -#define __deal2__dof_renumbering_h +#ifndef dealii__dof_renumbering_h +#define dealii__dof_renumbering_h #include diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h index ddf74145ea..57ecea2e64 100644 --- a/include/deal.II/dofs/dof_tools.h +++ b/include/deal.II/dofs/dof_tools.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_tools_h -#define __deal2__dof_tools_h +#ifndef dealii__dof_tools_h +#define dealii__dof_tools_h #include diff --git a/include/deal.II/dofs/function_map.h b/include/deal.II/dofs/function_map.h index 14481720b8..38ccc45a6a 100644 --- a/include/deal.II/dofs/function_map.h +++ b/include/deal.II/dofs/function_map.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__function_map_h -#define __deal2__function_map_h +#ifndef dealii__function_map_h +#define dealii__function_map_h #include #include diff --git a/include/deal.II/dofs/number_cache.h b/include/deal.II/dofs/number_cache.h index ef47baf855..14b0b142a8 100644 --- a/include/deal.II/dofs/number_cache.h +++ b/include/deal.II/dofs/number_cache.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__number_cache_h -#define __deal2__number_cache_h +#ifndef dealii__number_cache_h +#define dealii__number_cache_h #include #include @@ -110,4 +110,4 @@ namespace internal DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__dof_iterator_selector_h +#endif // dealii__dof_iterator_selector_h diff --git a/include/deal.II/fe/block_mask.h b/include/deal.II/fe/block_mask.h index f85650d792..a2d4172c11 100644 --- a/include/deal.II/fe/block_mask.h +++ b/include/deal.II/fe/block_mask.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_block_mask_h -#define __deal2__fe_block_mask_h +#ifndef dealii__fe_block_mask_h +#define dealii__fe_block_mask_h #include #include diff --git a/include/deal.II/fe/component_mask.h b/include/deal.II/fe/component_mask.h index 64bf6ceee6..5665f4d6ff 100644 --- a/include/deal.II/fe/component_mask.h +++ b/include/deal.II/fe/component_mask.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_component_mask_h -#define __deal2__fe_component_mask_h +#ifndef dealii__fe_component_mask_h +#define dealii__fe_component_mask_h #include #include diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h index 1a10880f6e..85993bc30c 100644 --- a/include/deal.II/fe/fe.h +++ b/include/deal.II/fe/fe.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_h -#define __deal2__fe_h +#ifndef dealii__fe_h +#define dealii__fe_h #include #include diff --git a/include/deal.II/fe/fe_abf.h b/include/deal.II/fe/fe_abf.h index 2dd123b770..075a9a04d0 100644 --- a/include/deal.II/fe/fe_abf.h +++ b/include/deal.II/fe/fe_abf.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_abf_h -#define __deal2__fe_abf_h +#ifndef dealii__fe_abf_h +#define dealii__fe_abf_h #include #include diff --git a/include/deal.II/fe/fe_base.h b/include/deal.II/fe/fe_base.h index e0fc80d606..5341bb1884 100644 --- a/include/deal.II/fe/fe_base.h +++ b/include/deal.II/fe/fe_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_base_h -#define __deal2__fe_base_h +#ifndef dealii__fe_base_h +#define dealii__fe_base_h #include #include diff --git a/include/deal.II/fe/fe_bdm.h b/include/deal.II/fe/fe_bdm.h index f8001d8ede..5a21cdbc82 100644 --- a/include/deal.II/fe/fe_bdm.h +++ b/include/deal.II/fe/fe_bdm.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_bdm_h -#define __deal2__fe_bdm_h +#ifndef dealii__fe_bdm_h +#define dealii__fe_bdm_h #include #include diff --git a/include/deal.II/fe/fe_bernstein.h b/include/deal.II/fe/fe_bernstein.h index 551268cad2..fc6db35b3c 100644 --- a/include/deal.II/fe/fe_bernstein.h +++ b/include/deal.II/fe/fe_bernstein.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_bernstein_h -#define __deal2__fe_bernstein_h +#ifndef dealii__fe_bernstein_h +#define dealii__fe_bernstein_h #include #include diff --git a/include/deal.II/fe/fe_dg_vector.h b/include/deal.II/fe/fe_dg_vector.h index 306651448a..fe2277d375 100644 --- a/include/deal.II/fe/fe_dg_vector.h +++ b/include/deal.II/fe/fe_dg_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_dg_vector_h -#define __deal2__fe_dg_vector_h +#ifndef dealii__fe_dg_vector_h +#define dealii__fe_dg_vector_h #include #include diff --git a/include/deal.II/fe/fe_dgp.h b/include/deal.II/fe/fe_dgp.h index b6b35ef169..1a9fae4f54 100644 --- a/include/deal.II/fe/fe_dgp.h +++ b/include/deal.II/fe/fe_dgp.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_dgp_h -#define __deal2__fe_dgp_h +#ifndef dealii__fe_dgp_h +#define dealii__fe_dgp_h #include #include diff --git a/include/deal.II/fe/fe_dgp_monomial.h b/include/deal.II/fe/fe_dgp_monomial.h index a21d3e7c39..b8f222ee12 100644 --- a/include/deal.II/fe/fe_dgp_monomial.h +++ b/include/deal.II/fe/fe_dgp_monomial.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_dgp_monomial_h -#define __deal2__fe_dgp_monomial_h +#ifndef dealii__fe_dgp_monomial_h +#define dealii__fe_dgp_monomial_h #include #include diff --git a/include/deal.II/fe/fe_dgp_nonparametric.h b/include/deal.II/fe/fe_dgp_nonparametric.h index b5258327bb..d8fd5fcff7 100644 --- a/include/deal.II/fe/fe_dgp_nonparametric.h +++ b/include/deal.II/fe/fe_dgp_nonparametric.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_dgp_nonparametric_h -#define __deal2__fe_dgp_nonparametric_h +#ifndef dealii__fe_dgp_nonparametric_h +#define dealii__fe_dgp_nonparametric_h #include #include diff --git a/include/deal.II/fe/fe_dgq.h b/include/deal.II/fe/fe_dgq.h index 82c0d42b21..2c44352cae 100644 --- a/include/deal.II/fe/fe_dgq.h +++ b/include/deal.II/fe/fe_dgq.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_dgq_h -#define __deal2__fe_dgq_h +#ifndef dealii__fe_dgq_h +#define dealii__fe_dgq_h #include #include diff --git a/include/deal.II/fe/fe_face.h b/include/deal.II/fe/fe_face.h index 21d231b404..98ad241755 100644 --- a/include/deal.II/fe/fe_face.h +++ b/include/deal.II/fe/fe_face.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_face_h -#define __deal2__fe_face_h +#ifndef dealii__fe_face_h +#define dealii__fe_face_h #include #include diff --git a/include/deal.II/fe/fe_nedelec.h b/include/deal.II/fe/fe_nedelec.h index 9793360b07..c5014c6782 100644 --- a/include/deal.II/fe/fe_nedelec.h +++ b/include/deal.II/fe/fe_nedelec.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_nedelec_h -#define __deal2__fe_nedelec_h +#ifndef dealii__fe_nedelec_h +#define dealii__fe_nedelec_h #include #include diff --git a/include/deal.II/fe/fe_nothing.h b/include/deal.II/fe/fe_nothing.h index 6f117c7e32..b419e6aafb 100644 --- a/include/deal.II/fe/fe_nothing.h +++ b/include/deal.II/fe/fe_nothing.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_nothing_h -#define __deal2__fe_nothing_h +#ifndef dealii__fe_nothing_h +#define dealii__fe_nothing_h #include #include diff --git a/include/deal.II/fe/fe_poly.h b/include/deal.II/fe/fe_poly.h index a751e30c40..c09f3f0205 100644 --- a/include/deal.II/fe/fe_poly.h +++ b/include/deal.II/fe/fe_poly.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_poly_h -#define __deal2__fe_poly_h +#ifndef dealii__fe_poly_h +#define dealii__fe_poly_h #include diff --git a/include/deal.II/fe/fe_poly_face.h b/include/deal.II/fe/fe_poly_face.h index 45793f02fa..abf05e4243 100644 --- a/include/deal.II/fe/fe_poly_face.h +++ b/include/deal.II/fe/fe_poly_face.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_poly_face_h -#define __deal2__fe_poly_face_h +#ifndef dealii__fe_poly_face_h +#define dealii__fe_poly_face_h #include diff --git a/include/deal.II/fe/fe_poly_tensor.h b/include/deal.II/fe/fe_poly_tensor.h index bdbeabad08..7dea6327f2 100644 --- a/include/deal.II/fe/fe_poly_tensor.h +++ b/include/deal.II/fe/fe_poly_tensor.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_poly_tensor_h -#define __deal2__fe_poly_tensor_h +#ifndef dealii__fe_poly_tensor_h +#define dealii__fe_poly_tensor_h #include diff --git a/include/deal.II/fe/fe_q.h b/include/deal.II/fe/fe_q.h index 25516094cb..43ff1a9f2d 100644 --- a/include/deal.II/fe/fe_q.h +++ b/include/deal.II/fe/fe_q.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_q_h -#define __deal2__fe_q_h +#ifndef dealii__fe_q_h +#define dealii__fe_q_h #include #include diff --git a/include/deal.II/fe/fe_q_base.h b/include/deal.II/fe/fe_q_base.h index 09bd02da31..e92ef6dc8f 100644 --- a/include/deal.II/fe/fe_q_base.h +++ b/include/deal.II/fe/fe_q_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_q_base_h -#define __deal2__fe_q_base_h +#ifndef dealii__fe_q_base_h +#define dealii__fe_q_base_h #include #include diff --git a/include/deal.II/fe/fe_q_dg0.h b/include/deal.II/fe/fe_q_dg0.h index fe5014e47b..a35fa3569b 100644 --- a/include/deal.II/fe/fe_q_dg0.h +++ b/include/deal.II/fe/fe_q_dg0.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__fe_q_dg0_h -#define __deal2__fe_q_dg0_h +#ifndef dealii__fe_q_dg0_h +#define dealii__fe_q_dg0_h #include #include diff --git a/include/deal.II/fe/fe_q_hierarchical.h b/include/deal.II/fe/fe_q_hierarchical.h index 4cb4cd508b..4b7feab423 100644 --- a/include/deal.II/fe/fe_q_hierarchical.h +++ b/include/deal.II/fe/fe_q_hierarchical.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_q_hierarchical_h -#define __deal2__fe_q_hierarchical_h +#ifndef dealii__fe_q_hierarchical_h +#define dealii__fe_q_hierarchical_h #include #include diff --git a/include/deal.II/fe/fe_q_iso_q1.h b/include/deal.II/fe/fe_q_iso_q1.h index 7b9bfe07a8..d31689c6a5 100644 --- a/include/deal.II/fe/fe_q_iso_q1.h +++ b/include/deal.II/fe/fe_q_iso_q1.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_q_iso_q1_h -#define __deal2__fe_q_iso_q1_h +#ifndef dealii__fe_q_iso_q1_h +#define dealii__fe_q_iso_q1_h #include #include diff --git a/include/deal.II/fe/fe_raviart_thomas.h b/include/deal.II/fe/fe_raviart_thomas.h index 6cd75e990a..643578400c 100644 --- a/include/deal.II/fe/fe_raviart_thomas.h +++ b/include/deal.II/fe/fe_raviart_thomas.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_raviart_thomas_h -#define __deal2__fe_raviart_thomas_h +#ifndef dealii__fe_raviart_thomas_h +#define dealii__fe_raviart_thomas_h #include #include diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h index c7d3ec2800..7919bcf2f4 100644 --- a/include/deal.II/fe/fe_system.h +++ b/include/deal.II/fe/fe_system.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_system_h -#define __deal2__fe_system_h +#ifndef dealii__fe_system_h +#define dealii__fe_system_h /*---------------------------- fe_system.h ---------------------------*/ diff --git a/include/deal.II/fe/fe_tools.h b/include/deal.II/fe/fe_tools.h index 66f18854ba..ce26780d52 100644 --- a/include/deal.II/fe/fe_tools.h +++ b/include/deal.II/fe/fe_tools.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_tools_H -#define __deal2__fe_tools_H +#ifndef dealii__fe_tools_H +#define dealii__fe_tools_H @@ -1047,6 +1047,6 @@ namespace FETools DEAL_II_NAMESPACE_CLOSE /*---------------------------- fe_tools.h ---------------------------*/ -/* end of #ifndef __deal2__fe_tools_H */ +/* end of #ifndef dealii__fe_tools_H */ #endif /*---------------------------- fe_tools.h ---------------------------*/ diff --git a/include/deal.II/fe/fe_trace.h b/include/deal.II/fe/fe_trace.h index 757d30a6e8..3998f7566d 100644 --- a/include/deal.II/fe/fe_trace.h +++ b/include/deal.II/fe/fe_trace.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_trace_h -#define __deal2__fe_trace_h +#ifndef dealii__fe_trace_h +#define dealii__fe_trace_h #include #include diff --git a/include/deal.II/fe/fe_update_flags.h b/include/deal.II/fe/fe_update_flags.h index 3230a6ecae..28e268b15a 100644 --- a/include/deal.II/fe/fe_update_flags.h +++ b/include/deal.II/fe/fe_update_flags.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_update_flags_h -#define __deal2__fe_update_flags_h +#ifndef dealii__fe_update_flags_h +#define dealii__fe_update_flags_h #include diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h index d839e4b7c3..c880b747a6 100644 --- a/include/deal.II/fe/fe_values.h +++ b/include/deal.II/fe/fe_values.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_values_h -#define __deal2__fe_values_h +#ifndef dealii__fe_values_h +#define dealii__fe_values_h #include diff --git a/include/deal.II/fe/fe_values_extractors.h b/include/deal.II/fe/fe_values_extractors.h index d3a71e2d30..51b66bdbd6 100644 --- a/include/deal.II/fe/fe_values_extractors.h +++ b/include/deal.II/fe/fe_values_extractors.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_values_extractors_h -#define __deal2__fe_values_extractors_h +#ifndef dealii__fe_values_extractors_h +#define dealii__fe_values_extractors_h #include diff --git a/include/deal.II/fe/mapping.h b/include/deal.II/fe/mapping.h index aa2bcba1bb..a67bf38057 100644 --- a/include/deal.II/fe/mapping.h +++ b/include/deal.II/fe/mapping.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mapping_h -#define __deal2__mapping_h +#ifndef dealii__mapping_h +#define dealii__mapping_h #include diff --git a/include/deal.II/fe/mapping_c1.h b/include/deal.II/fe/mapping_c1.h index b932decc64..3631fd28c9 100644 --- a/include/deal.II/fe/mapping_c1.h +++ b/include/deal.II/fe/mapping_c1.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mapping_c1_h -#define __deal2__mapping_c1_h +#ifndef dealii__mapping_c1_h +#define dealii__mapping_c1_h #include diff --git a/include/deal.II/fe/mapping_cartesian.h b/include/deal.II/fe/mapping_cartesian.h index dc7b3baa83..b0c2dabe70 100644 --- a/include/deal.II/fe/mapping_cartesian.h +++ b/include/deal.II/fe/mapping_cartesian.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mapping_cartesian_h -#define __deal2__mapping_cartesian_h +#ifndef dealii__mapping_cartesian_h +#define dealii__mapping_cartesian_h #include diff --git a/include/deal.II/fe/mapping_fe_field.h b/include/deal.II/fe/mapping_fe_field.h index e1c5c45354..f37648afa9 100644 --- a/include/deal.II/fe/mapping_fe_field.h +++ b/include/deal.II/fe/mapping_fe_field.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mapping_fe_h -#define __deal2__mapping_fe_h +#ifndef dealii__mapping_fe_h +#define dealii__mapping_fe_h #include diff --git a/include/deal.II/fe/mapping_q.h b/include/deal.II/fe/mapping_q.h index 9f8957068b..2c12c675f4 100644 --- a/include/deal.II/fe/mapping_q.h +++ b/include/deal.II/fe/mapping_q.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mapping_q_h -#define __deal2__mapping_q_h +#ifndef dealii__mapping_q_h +#define dealii__mapping_q_h #include diff --git a/include/deal.II/fe/mapping_q1.h b/include/deal.II/fe/mapping_q1.h index 856864c407..5389bf1978 100644 --- a/include/deal.II/fe/mapping_q1.h +++ b/include/deal.II/fe/mapping_q1.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mapping_q1_h -#define __deal2__mapping_q1_h +#ifndef dealii__mapping_q1_h +#define dealii__mapping_q1_h #include diff --git a/include/deal.II/fe/mapping_q1_eulerian.h b/include/deal.II/fe/mapping_q1_eulerian.h index 84f3a857a0..2c5f9bb957 100644 --- a/include/deal.II/fe/mapping_q1_eulerian.h +++ b/include/deal.II/fe/mapping_q1_eulerian.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mapping_q1_eulerian_h -#define __deal2__mapping_q1_eulerian_h +#ifndef dealii__mapping_q1_eulerian_h +#define dealii__mapping_q1_eulerian_h #include #include diff --git a/include/deal.II/fe/mapping_q_eulerian.h b/include/deal.II/fe/mapping_q_eulerian.h index 3881b292ad..54138e986e 100644 --- a/include/deal.II/fe/mapping_q_eulerian.h +++ b/include/deal.II/fe/mapping_q_eulerian.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mapping_q_eulerian_h -#define __deal2__mapping_q_eulerian_h +#ifndef dealii__mapping_q_eulerian_h +#define dealii__mapping_q_eulerian_h #include #include @@ -234,5 +234,5 @@ MappingQEulerian::preserves_vertex_locations () const DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__mapping_q_eulerian_h +#endif // dealii__mapping_q_eulerian_h diff --git a/include/deal.II/grid/cell_id.h b/include/deal.II/grid/cell_id.h index 7a971bc5e9..be973786de 100644 --- a/include/deal.II/grid/cell_id.h +++ b/include/deal.II/grid/cell_id.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__cell_id_h -#define __deal2__cell_id_h +#ifndef dealii__cell_id_h +#define dealii__cell_id_h #include #include diff --git a/include/deal.II/grid/filtered_iterator.h b/include/deal.II/grid/filtered_iterator.h index db3344c678..dd8e913821 100644 --- a/include/deal.II/grid/filtered_iterator.h +++ b/include/deal.II/grid/filtered_iterator.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__filtered_iterator_h -#define __deal2__filtered_iterator_h +#ifndef dealii__filtered_iterator_h +#define dealii__filtered_iterator_h #include diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h index 0fbc8f959f..e5e877e968 100644 --- a/include/deal.II/grid/grid_generator.h +++ b/include/deal.II/grid/grid_generator.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__grid_generator_h -#define __deal2__grid_generator_h +#ifndef dealii__grid_generator_h +#define dealii__grid_generator_h #include diff --git a/include/deal.II/grid/grid_in.h b/include/deal.II/grid/grid_in.h index b6c3b28ddb..c919473ba0 100644 --- a/include/deal.II/grid/grid_in.h +++ b/include/deal.II/grid/grid_in.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__grid_in_h -#define __deal2__grid_in_h +#ifndef dealii__grid_in_h +#define dealii__grid_in_h #include diff --git a/include/deal.II/grid/grid_out.h b/include/deal.II/grid/grid_out.h index b40c0659d2..859e35b9c6 100644 --- a/include/deal.II/grid/grid_out.h +++ b/include/deal.II/grid/grid_out.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__grid_out_h -#define __deal2__grid_out_h +#ifndef dealii__grid_out_h +#define dealii__grid_out_h diff --git a/include/deal.II/grid/grid_refinement.h b/include/deal.II/grid/grid_refinement.h index d4d98d3925..cb49c85184 100644 --- a/include/deal.II/grid/grid_refinement.h +++ b/include/deal.II/grid/grid_refinement.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__grid_refinement_h -#define __deal2__grid_refinement_h +#ifndef dealii__grid_refinement_h +#define dealii__grid_refinement_h #include @@ -315,4 +315,4 @@ namespace GridRefinement DEAL_II_NAMESPACE_CLOSE -#endif //__deal2__grid_refinement_h +#endif //dealii__grid_refinement_h diff --git a/include/deal.II/grid/grid_reordering.h b/include/deal.II/grid/grid_reordering.h index e1891410b9..7e5d958158 100644 --- a/include/deal.II/grid/grid_reordering.h +++ b/include/deal.II/grid/grid_reordering.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__grid_reordering_h -#define __deal2__grid_reordering_h +#ifndef dealii__grid_reordering_h +#define dealii__grid_reordering_h #include diff --git a/include/deal.II/grid/grid_reordering_internal.h b/include/deal.II/grid/grid_reordering_internal.h index 4482789382..77f978501a 100644 --- a/include/deal.II/grid/grid_reordering_internal.h +++ b/include/deal.II/grid/grid_reordering_internal.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__grid_reordering_internal_h -#define __deal2__grid_reordering_internal_h +#ifndef dealii__grid_reordering_internal_h +#define dealii__grid_reordering_internal_h #include diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h index a51822ebaf..97faef1ab7 100644 --- a/include/deal.II/grid/grid_tools.h +++ b/include/deal.II/grid/grid_tools.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__grid_tools_H -#define __deal2__grid_tools_H +#ifndef dealii__grid_tools_H +#define dealii__grid_tools_H #include @@ -1459,6 +1459,6 @@ namespace GridTools DEAL_II_NAMESPACE_CLOSE /*---------------------------- grid_tools.h ---------------------------*/ -/* end of #ifndef __deal2__grid_tools_H */ +/* end of #ifndef dealii__grid_tools_H */ #endif /*---------------------------- grid_tools.h ---------------------------*/ diff --git a/include/deal.II/grid/intergrid_map.h b/include/deal.II/grid/intergrid_map.h index 80d637d1ab..d28e03e058 100644 --- a/include/deal.II/grid/intergrid_map.h +++ b/include/deal.II/grid/intergrid_map.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__intergrid_map_h -#define __deal2__intergrid_map_h +#ifndef dealii__intergrid_map_h +#define dealii__intergrid_map_h #include #include diff --git a/include/deal.II/grid/magic_numbers.h b/include/deal.II/grid/magic_numbers.h index 99db86d592..caa73ab3b2 100644 --- a/include/deal.II/grid/magic_numbers.h +++ b/include/deal.II/grid/magic_numbers.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__magic_numbers_h -#define __deal2__magic_numbers_h +#ifndef dealii__magic_numbers_h +#define dealii__magic_numbers_h #include diff --git a/include/deal.II/grid/manifold.h b/include/deal.II/grid/manifold.h index e66fbac26f..b31b1e87b0 100644 --- a/include/deal.II/grid/manifold.h +++ b/include/deal.II/grid/manifold.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_manifold_h -#define __deal2__tria_manifold_h +#ifndef dealii__tria_manifold_h +#define dealii__tria_manifold_h /*---------------------------- manifold.h ---------------------------*/ diff --git a/include/deal.II/grid/manifold_lib.h b/include/deal.II/grid/manifold_lib.h index 9e791b67ed..99e4583258 100644 --- a/include/deal.II/grid/manifold_lib.h +++ b/include/deal.II/grid/manifold_lib.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__manifold_lib_h -#define __deal2__manifold_lib_h +#ifndef dealii__manifold_lib_h +#define dealii__manifold_lib_h #include diff --git a/include/deal.II/grid/persistent_tria.h b/include/deal.II/grid/persistent_tria.h index 8b0d86a0a8..f70f14fc95 100644 --- a/include/deal.II/grid/persistent_tria.h +++ b/include/deal.II/grid/persistent_tria.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__persistent_tria_h -#define __deal2__persistent_tria_h +#ifndef dealii__persistent_tria_h +#define dealii__persistent_tria_h #include diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index f35d4aa0d8..9fa2af0650 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_h -#define __deal2__tria_h +#ifndef dealii__tria_h +#define dealii__tria_h #include diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h index 97cc0aec6a..299ecec436 100644 --- a/include/deal.II/grid/tria_accessor.h +++ b/include/deal.II/grid/tria_accessor.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_accessor_h -#define __deal2__tria_accessor_h +#ifndef dealii__tria_accessor_h +#define dealii__tria_accessor_h #include diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h index 9cabf95e3e..e9c88eb62b 100644 --- a/include/deal.II/grid/tria_accessor.templates.h +++ b/include/deal.II/grid/tria_accessor.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_accessor_templates_h -#define __deal2__tria_accessor_templates_h +#ifndef dealii__tria_accessor_templates_h +#define dealii__tria_accessor_templates_h #include diff --git a/include/deal.II/grid/tria_boundary.h b/include/deal.II/grid/tria_boundary.h index 145d69461d..ba605c20ac 100644 --- a/include/deal.II/grid/tria_boundary.h +++ b/include/deal.II/grid/tria_boundary.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_boundary_h -#define __deal2__tria_boundary_h +#ifndef dealii__tria_boundary_h +#define dealii__tria_boundary_h /*---------------------------- boundary-function.h ---------------------------*/ diff --git a/include/deal.II/grid/tria_boundary_lib.h b/include/deal.II/grid/tria_boundary_lib.h index ae3c64ce77..1ec0c6c898 100644 --- a/include/deal.II/grid/tria_boundary_lib.h +++ b/include/deal.II/grid/tria_boundary_lib.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_boundary_lib_h -#define __deal2__tria_boundary_lib_h +#ifndef dealii__tria_boundary_lib_h +#define dealii__tria_boundary_lib_h #include diff --git a/include/deal.II/grid/tria_faces.h b/include/deal.II/grid/tria_faces.h index 621241a2de..72820606ff 100644 --- a/include/deal.II/grid/tria_faces.h +++ b/include/deal.II/grid/tria_faces.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_faces_h -#define __deal2__tria_faces_h +#ifndef dealii__tria_faces_h +#define dealii__tria_faces_h #include #include diff --git a/include/deal.II/grid/tria_iterator.h b/include/deal.II/grid/tria_iterator.h index ae61e087ae..c1d72e9ba6 100644 --- a/include/deal.II/grid/tria_iterator.h +++ b/include/deal.II/grid/tria_iterator.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_iterator_h -#define __deal2__tria_iterator_h +#ifndef dealii__tria_iterator_h +#define dealii__tria_iterator_h /*---------------------------- tria-iterator.h ---------------------------*/ diff --git a/include/deal.II/grid/tria_iterator.templates.h b/include/deal.II/grid/tria_iterator.templates.h index f822de9e2b..92e9562d67 100644 --- a/include/deal.II/grid/tria_iterator.templates.h +++ b/include/deal.II/grid/tria_iterator.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_iterator_templates_h -#define __deal2__tria_iterator_templates_h +#ifndef dealii__tria_iterator_templates_h +#define dealii__tria_iterator_templates_h #include diff --git a/include/deal.II/grid/tria_iterator_base.h b/include/deal.II/grid/tria_iterator_base.h index 9ea5480639..d2554f98e7 100644 --- a/include/deal.II/grid/tria_iterator_base.h +++ b/include/deal.II/grid/tria_iterator_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_iterator_base_h -#define __deal2__tria_iterator_base_h +#ifndef dealii__tria_iterator_base_h +#define dealii__tria_iterator_base_h #include diff --git a/include/deal.II/grid/tria_iterator_selector.h b/include/deal.II/grid/tria_iterator_selector.h index 1d64bac51f..359dc1038d 100644 --- a/include/deal.II/grid/tria_iterator_selector.h +++ b/include/deal.II/grid/tria_iterator_selector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_iterator_selector_h -#define __deal2__tria_iterator_selector_h +#ifndef dealii__tria_iterator_selector_h +#define dealii__tria_iterator_selector_h #include @@ -187,4 +187,4 @@ namespace internal DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__tria_iterator_selector_h +#endif // dealii__tria_iterator_selector_h diff --git a/include/deal.II/grid/tria_levels.h b/include/deal.II/grid/tria_levels.h index e95cf64e1c..f8502d0388 100644 --- a/include/deal.II/grid/tria_levels.h +++ b/include/deal.II/grid/tria_levels.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_levels_h -#define __deal2__tria_levels_h +#ifndef dealii__tria_levels_h +#define dealii__tria_levels_h #include diff --git a/include/deal.II/grid/tria_object.h b/include/deal.II/grid/tria_object.h index 4aaeb0700f..3cafa2a148 100644 --- a/include/deal.II/grid/tria_object.h +++ b/include/deal.II/grid/tria_object.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_object_h -#define __deal2__tria_object_h +#ifndef dealii__tria_object_h +#define dealii__tria_object_h #include diff --git a/include/deal.II/grid/tria_objects.h b/include/deal.II/grid/tria_objects.h index a3f0fbc7da..4d9d7ffdef 100644 --- a/include/deal.II/grid/tria_objects.h +++ b/include/deal.II/grid/tria_objects.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tria_objects_h -#define __deal2__tria_objects_h +#ifndef dealii__tria_objects_h +#define dealii__tria_objects_h #include #include diff --git a/include/deal.II/hp/dof_faces.h b/include/deal.II/hp/dof_faces.h index ebbbd0de25..68e822e164 100644 --- a/include/deal.II/hp/dof_faces.h +++ b/include/deal.II/hp/dof_faces.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__hp_dof_faces_h -#define __deal2__hp_dof_faces_h +#ifndef dealii__hp_dof_faces_h +#define dealii__hp_dof_faces_h #include diff --git a/include/deal.II/hp/dof_handler.h b/include/deal.II/hp/dof_handler.h index 6c6a0de394..0140965132 100644 --- a/include/deal.II/hp/dof_handler.h +++ b/include/deal.II/hp/dof_handler.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__hp_dof_handler_h -#define __deal2__hp_dof_handler_h +#ifndef dealii__hp_dof_handler_h +#define dealii__hp_dof_handler_h diff --git a/include/deal.II/hp/dof_level.h b/include/deal.II/hp/dof_level.h index c7d6f2ffb1..cd6a5bbe86 100644 --- a/include/deal.II/hp/dof_level.h +++ b/include/deal.II/hp/dof_level.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__hp_dof_level_h -#define __deal2__hp_dof_level_h +#ifndef dealii__hp_dof_level_h +#define dealii__hp_dof_level_h #include diff --git a/include/deal.II/hp/fe_collection.h b/include/deal.II/hp/fe_collection.h index 7d19ec97fb..76886df0f3 100644 --- a/include/deal.II/hp/fe_collection.h +++ b/include/deal.II/hp/fe_collection.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_collection_h -#define __deal2__fe_collection_h +#ifndef dealii__fe_collection_h +#define dealii__fe_collection_h #include #include diff --git a/include/deal.II/hp/fe_values.h b/include/deal.II/hp/fe_values.h index d8f45c0653..18d83deadc 100644 --- a/include/deal.II/hp/fe_values.h +++ b/include/deal.II/hp/fe_values.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__hp_fe_values_h -#define __deal2__hp_fe_values_h +#ifndef dealii__hp_fe_values_h +#define dealii__hp_fe_values_h #include #include diff --git a/include/deal.II/hp/mapping_collection.h b/include/deal.II/hp/mapping_collection.h index ed72927677..cc1d48116c 100644 --- a/include/deal.II/hp/mapping_collection.h +++ b/include/deal.II/hp/mapping_collection.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mapping_collection_h -#define __deal2__mapping_collection_h +#ifndef dealii__mapping_collection_h +#define dealii__mapping_collection_h #include #include diff --git a/include/deal.II/hp/q_collection.h b/include/deal.II/hp/q_collection.h index e37854e9fe..3047fd05d6 100644 --- a/include/deal.II/hp/q_collection.h +++ b/include/deal.II/hp/q_collection.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__q_collection_h -#define __deal2__q_collection_h +#ifndef dealii__q_collection_h +#define dealii__q_collection_h #include #include diff --git a/include/deal.II/integrators/advection.h b/include/deal.II/integrators/advection.h index d3cfc18d6f..e35514c6b7 100644 --- a/include/deal.II/integrators/advection.h +++ b/include/deal.II/integrators/advection.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__integrators_advection_h -#define __deal2__integrators_advection_h +#ifndef dealii__integrators_advection_h +#define dealii__integrators_advection_h #include diff --git a/include/deal.II/integrators/divergence.h b/include/deal.II/integrators/divergence.h index afa2cd13ff..b2560571d4 100644 --- a/include/deal.II/integrators/divergence.h +++ b/include/deal.II/integrators/divergence.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__integrators_divergence_h -#define __deal2__integrators_divergence_h +#ifndef dealii__integrators_divergence_h +#define dealii__integrators_divergence_h #include diff --git a/include/deal.II/integrators/elasticity.h b/include/deal.II/integrators/elasticity.h index d74e35d25b..db75f1c124 100644 --- a/include/deal.II/integrators/elasticity.h +++ b/include/deal.II/integrators/elasticity.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__integrators_elasticity_h -#define __deal2__integrators_elasticity_h +#ifndef dealii__integrators_elasticity_h +#define dealii__integrators_elasticity_h #include diff --git a/include/deal.II/integrators/l2.h b/include/deal.II/integrators/l2.h index 24320a8004..baadc9cbab 100644 --- a/include/deal.II/integrators/l2.h +++ b/include/deal.II/integrators/l2.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__integrators_l2_h -#define __deal2__integrators_l2_h +#ifndef dealii__integrators_l2_h +#define dealii__integrators_l2_h #include diff --git a/include/deal.II/integrators/laplace.h b/include/deal.II/integrators/laplace.h index e84b384001..bf294d6e3a 100644 --- a/include/deal.II/integrators/laplace.h +++ b/include/deal.II/integrators/laplace.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__integrators_laplace_h -#define __deal2__integrators_laplace_h +#ifndef dealii__integrators_laplace_h +#define dealii__integrators_laplace_h #include diff --git a/include/deal.II/integrators/local_integrators.h b/include/deal.II/integrators/local_integrators.h index 328df58be0..b99612ba4a 100644 --- a/include/deal.II/integrators/local_integrators.h +++ b/include/deal.II/integrators/local_integrators.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__integrators_local_integrators_h -#define __deal2__integrators_local_integrators_h +#ifndef dealii__integrators_local_integrators_h +#define dealii__integrators_local_integrators_h // This file only provides definition and documentation of the // namespace LocalIntegrators. There is no necessity to include it diff --git a/include/deal.II/integrators/maxwell.h b/include/deal.II/integrators/maxwell.h index e6734686c0..c8dc4d66c9 100644 --- a/include/deal.II/integrators/maxwell.h +++ b/include/deal.II/integrators/maxwell.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__integrators_maxwell_h -#define __deal2__integrators_maxwell_h +#ifndef dealii__integrators_maxwell_h +#define dealii__integrators_maxwell_h #include diff --git a/include/deal.II/integrators/patches.h b/include/deal.II/integrators/patches.h index 46be2c1a04..d5f875c4e6 100644 --- a/include/deal.II/integrators/patches.h +++ b/include/deal.II/integrators/patches.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__integrators_patches_h -#define __deal2__integrators_patches_h +#ifndef dealii__integrators_patches_h +#define dealii__integrators_patches_h #include diff --git a/include/deal.II/lac/arpack_solver.h b/include/deal.II/lac/arpack_solver.h index 3900e1cdf9..d3a4d888f7 100644 --- a/include/deal.II/lac/arpack_solver.h +++ b/include/deal.II/lac/arpack_solver.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__arpack_solver_h -#define __deal2__arpack_solver_h +#ifndef dealii__arpack_solver_h +#define dealii__arpack_solver_h #include #include diff --git a/include/deal.II/lac/block_indices.h b/include/deal.II/lac/block_indices.h index 6713fb44f7..41fafc8acf 100644 --- a/include/deal.II/lac/block_indices.h +++ b/include/deal.II/lac/block_indices.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_indices_h -#define __deal2__block_indices_h +#ifndef dealii__block_indices_h +#define dealii__block_indices_h #include diff --git a/include/deal.II/lac/block_matrix.h b/include/deal.II/lac/block_matrix.h index 60788236b4..c5c0ce33d1 100644 --- a/include/deal.II/lac/block_matrix.h +++ b/include/deal.II/lac/block_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_matrix_h -#define __deal2__block_matrix_h +#ifndef dealii__block_matrix_h +#define dealii__block_matrix_h #include diff --git a/include/deal.II/lac/block_matrix_array.h b/include/deal.II/lac/block_matrix_array.h index d317b0b7ae..9cdc19c497 100644 --- a/include/deal.II/lac/block_matrix_array.h +++ b/include/deal.II/lac/block_matrix_array.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_matrix_array_h -#define __deal2__block_matrix_array_h +#ifndef dealii__block_matrix_array_h +#define dealii__block_matrix_array_h #include #include diff --git a/include/deal.II/lac/block_matrix_base.h b/include/deal.II/lac/block_matrix_base.h index 4916dbc8f6..3239df5e68 100644 --- a/include/deal.II/lac/block_matrix_base.h +++ b/include/deal.II/lac/block_matrix_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_matrix_base_h -#define __deal2__block_matrix_base_h +#ifndef dealii__block_matrix_base_h +#define dealii__block_matrix_base_h #include @@ -2667,4 +2667,4 @@ BlockMatrixBase::prepare_set_operation () DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__block_matrix_base_h +#endif // dealii__block_matrix_base_h diff --git a/include/deal.II/lac/block_sparse_matrix.h b/include/deal.II/lac/block_sparse_matrix.h index a09753ffd6..bd83040ddc 100644 --- a/include/deal.II/lac/block_sparse_matrix.h +++ b/include/deal.II/lac/block_sparse_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_sparse_matrix_h -#define __deal2__block_sparse_matrix_h +#ifndef dealii__block_sparse_matrix_h +#define dealii__block_sparse_matrix_h #include @@ -529,4 +529,4 @@ precondition_Jacobi (Vector &dst, DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__block_sparse_matrix_h +#endif // dealii__block_sparse_matrix_h diff --git a/include/deal.II/lac/block_sparse_matrix.templates.h b/include/deal.II/lac/block_sparse_matrix.templates.h index 1d99d1b27d..2fe8d5a79d 100644 --- a/include/deal.II/lac/block_sparse_matrix.templates.h +++ b/include/deal.II/lac/block_sparse_matrix.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_sparse_matrix_templates_h -#define __deal2__block_sparse_matrix_templates_h +#ifndef dealii__block_sparse_matrix_templates_h +#define dealii__block_sparse_matrix_templates_h #include diff --git a/include/deal.II/lac/block_sparse_matrix_ez.h b/include/deal.II/lac/block_sparse_matrix_ez.h index 472ea1aa55..27e7ff8b25 100644 --- a/include/deal.II/lac/block_sparse_matrix_ez.h +++ b/include/deal.II/lac/block_sparse_matrix_ez.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_sparse_matrix_ez_h -#define __deal2__block_sparse_matrix_ez_h +#ifndef dealii__block_sparse_matrix_ez_h +#define dealii__block_sparse_matrix_ez_h //TODO: Derive BlockSparseMatrixEZ from BlockMatrixBase, like all the other block matrices as well; this would allow to instantiate a few functions with this template argument as well (in particular ConstraintMatrix::distribute_local_to_global) @@ -538,4 +538,4 @@ BlockSparseMatrixEZ::print_statistics (STREAM &out, bool full) DEAL_II_NAMESPACE_CLOSE -#endif //__deal2__block_sparse_matrix_ez_h +#endif //dealii__block_sparse_matrix_ez_h diff --git a/include/deal.II/lac/block_sparse_matrix_ez.templates.h b/include/deal.II/lac/block_sparse_matrix_ez.templates.h index 3abff0b4dd..e72f133707 100644 --- a/include/deal.II/lac/block_sparse_matrix_ez.templates.h +++ b/include/deal.II/lac/block_sparse_matrix_ez.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_sparse_matrix_ez_templates_h -#define __deal2__block_sparse_matrix_ez_templates_h +#ifndef dealii__block_sparse_matrix_ez_templates_h +#define dealii__block_sparse_matrix_ez_templates_h #include diff --git a/include/deal.II/lac/block_sparsity_pattern.h b/include/deal.II/lac/block_sparsity_pattern.h index 4de671698d..fefee68d7b 100644 --- a/include/deal.II/lac/block_sparsity_pattern.h +++ b/include/deal.II/lac/block_sparsity_pattern.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_sparsity_pattern_h -#define __deal2__block_sparsity_pattern_h +#ifndef dealii__block_sparsity_pattern_h +#define dealii__block_sparsity_pattern_h #include diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h index a1a9eaac36..ea59aa8f2c 100644 --- a/include/deal.II/lac/block_vector.h +++ b/include/deal.II/lac/block_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_vector_h -#define __deal2__block_vector_h +#ifndef dealii__block_vector_h +#define dealii__block_vector_h #include diff --git a/include/deal.II/lac/block_vector.templates.h b/include/deal.II/lac/block_vector.templates.h index d873067e55..f0e245bde2 100644 --- a/include/deal.II/lac/block_vector.templates.h +++ b/include/deal.II/lac/block_vector.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_vector_templates_h -#define __deal2__block_vector_templates_h +#ifndef dealii__block_vector_templates_h +#define dealii__block_vector_templates_h #include diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h index c7efb88bbe..7c2a73de9e 100644 --- a/include/deal.II/lac/block_vector_base.h +++ b/include/deal.II/lac/block_vector_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__block_vector_base_h -#define __deal2__block_vector_base_h +#ifndef dealii__block_vector_base_h +#define dealii__block_vector_base_h #include diff --git a/include/deal.II/lac/chunk_sparse_matrix.h b/include/deal.II/lac/chunk_sparse_matrix.h index 44606bc371..7c3c0b6903 100644 --- a/include/deal.II/lac/chunk_sparse_matrix.h +++ b/include/deal.II/lac/chunk_sparse_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__chunk_sparse_matrix_h -#define __deal2__chunk_sparse_matrix_h +#ifndef dealii__chunk_sparse_matrix_h +#define dealii__chunk_sparse_matrix_h #include diff --git a/include/deal.II/lac/chunk_sparse_matrix.templates.h b/include/deal.II/lac/chunk_sparse_matrix.templates.h index ff49f65b7b..af7a8ce686 100644 --- a/include/deal.II/lac/chunk_sparse_matrix.templates.h +++ b/include/deal.II/lac/chunk_sparse_matrix.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__chunk_sparse_matrix_templates_h -#define __deal2__chunk_sparse_matrix_templates_h +#ifndef dealii__chunk_sparse_matrix_templates_h +#define dealii__chunk_sparse_matrix_templates_h #include diff --git a/include/deal.II/lac/chunk_sparsity_pattern.h b/include/deal.II/lac/chunk_sparsity_pattern.h index 28923bb2f1..c30c2dc306 100644 --- a/include/deal.II/lac/chunk_sparsity_pattern.h +++ b/include/deal.II/lac/chunk_sparsity_pattern.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__chunk_sparsity_pattern_h -#define __deal2__chunk_sparsity_pattern_h +#ifndef dealii__chunk_sparsity_pattern_h +#define dealii__chunk_sparsity_pattern_h #include diff --git a/include/deal.II/lac/compressed_set_sparsity_pattern.h b/include/deal.II/lac/compressed_set_sparsity_pattern.h index 7a7aa12ce1..e6a8b69f95 100644 --- a/include/deal.II/lac/compressed_set_sparsity_pattern.h +++ b/include/deal.II/lac/compressed_set_sparsity_pattern.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__compressed_set_sparsity_pattern_h -#define __deal2__compressed_set_sparsity_pattern_h +#ifndef dealii__compressed_set_sparsity_pattern_h +#define dealii__compressed_set_sparsity_pattern_h #include diff --git a/include/deal.II/lac/compressed_simple_sparsity_pattern.h b/include/deal.II/lac/compressed_simple_sparsity_pattern.h index fb846cf20c..500bc4f88e 100644 --- a/include/deal.II/lac/compressed_simple_sparsity_pattern.h +++ b/include/deal.II/lac/compressed_simple_sparsity_pattern.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__compressed_simple_sparsity_pattern_h -#define __deal2__compressed_simple_sparsity_pattern_h +#ifndef dealii__compressed_simple_sparsity_pattern_h +#define dealii__compressed_simple_sparsity_pattern_h #include diff --git a/include/deal.II/lac/compressed_sparsity_pattern.h b/include/deal.II/lac/compressed_sparsity_pattern.h index b98d4c0d42..26e531b2ad 100644 --- a/include/deal.II/lac/compressed_sparsity_pattern.h +++ b/include/deal.II/lac/compressed_sparsity_pattern.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__compressed_sparsity_pattern_h -#define __deal2__compressed_sparsity_pattern_h +#ifndef dealii__compressed_sparsity_pattern_h +#define dealii__compressed_sparsity_pattern_h #include diff --git a/include/deal.II/lac/constraint_matrix.h b/include/deal.II/lac/constraint_matrix.h index 773fda0ad6..9ebe629e3e 100644 --- a/include/deal.II/lac/constraint_matrix.h +++ b/include/deal.II/lac/constraint_matrix.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__constraint_matrix_h -#define __deal2__constraint_matrix_h +#ifndef dealii__constraint_matrix_h +#define dealii__constraint_matrix_h #include #include diff --git a/include/deal.II/lac/constraint_matrix.templates.h b/include/deal.II/lac/constraint_matrix.templates.h index 696e9a3afb..dad4ca4144 100644 --- a/include/deal.II/lac/constraint_matrix.templates.h +++ b/include/deal.II/lac/constraint_matrix.templates.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__constraint_matrix_templates_h -#define __deal2__constraint_matrix_templates_h +#ifndef dealii__constraint_matrix_templates_h +#define dealii__constraint_matrix_templates_h #include diff --git a/include/deal.II/lac/dynamic_sparsity_pattern.h b/include/deal.II/lac/dynamic_sparsity_pattern.h index f52cc102c5..977d369a19 100644 --- a/include/deal.II/lac/dynamic_sparsity_pattern.h +++ b/include/deal.II/lac/dynamic_sparsity_pattern.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dynamic_sparsity_pattern_h -#define __deal2__dynamic_sparsity_pattern_h +#ifndef dealii__dynamic_sparsity_pattern_h +#define dealii__dynamic_sparsity_pattern_h #include diff --git a/include/deal.II/lac/eigen.h b/include/deal.II/lac/eigen.h index 608715e662..63211a2048 100644 --- a/include/deal.II/lac/eigen.h +++ b/include/deal.II/lac/eigen.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__eigen_h -#define __deal2__eigen_h +#ifndef dealii__eigen_h +#define dealii__eigen_h #include diff --git a/include/deal.II/lac/exceptions.h b/include/deal.II/lac/exceptions.h index 54d2f954e8..11461d0956 100644 --- a/include/deal.II/lac/exceptions.h +++ b/include/deal.II/lac/exceptions.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__lac_exceptions_h -#define __deal2__lac_exceptions_h +#ifndef dealii__lac_exceptions_h +#define dealii__lac_exceptions_h #include diff --git a/include/deal.II/lac/filtered_matrix.h b/include/deal.II/lac/filtered_matrix.h index ef90138ba3..b0f3792ef0 100644 --- a/include/deal.II/lac/filtered_matrix.h +++ b/include/deal.II/lac/filtered_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__filtered_matrix_h -#define __deal2__filtered_matrix_h +#ifndef dealii__filtered_matrix_h +#define dealii__filtered_matrix_h diff --git a/include/deal.II/lac/full_matrix.h b/include/deal.II/lac/full_matrix.h index 7e93ea5b23..19808539c1 100644 --- a/include/deal.II/lac/full_matrix.h +++ b/include/deal.II/lac/full_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__full_matrix_h -#define __deal2__full_matrix_h +#ifndef dealii__full_matrix_h +#define dealii__full_matrix_h #include diff --git a/include/deal.II/lac/full_matrix.templates.h b/include/deal.II/lac/full_matrix.templates.h index a03c01200e..80abb76e53 100644 --- a/include/deal.II/lac/full_matrix.templates.h +++ b/include/deal.II/lac/full_matrix.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__full_matrix_templates_h -#define __deal2__full_matrix_templates_h +#ifndef dealii__full_matrix_templates_h +#define dealii__full_matrix_templates_h // TODO: this file has a lot of operations between matrices and matrices or diff --git a/include/deal.II/lac/generic_linear_algebra.h b/include/deal.II/lac/generic_linear_algebra.h index bd02fe38e6..151dc1581c 100644 --- a/include/deal.II/lac/generic_linear_algebra.h +++ b/include/deal.II/lac/generic_linear_algebra.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__generic_linear_algebra_h -#define __deal2__generic_linear_algebra_h +#ifndef dealii__generic_linear_algebra_h +#define dealii__generic_linear_algebra_h #include diff --git a/include/deal.II/lac/householder.h b/include/deal.II/lac/householder.h index ad6c7a5ea6..a82b061c56 100644 --- a/include/deal.II/lac/householder.h +++ b/include/deal.II/lac/householder.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__householder_h -#define __deal2__householder_h +#ifndef dealii__householder_h +#define dealii__householder_h #include diff --git a/include/deal.II/lac/identity_matrix.h b/include/deal.II/lac/identity_matrix.h index c239549727..03e34d2969 100644 --- a/include/deal.II/lac/identity_matrix.h +++ b/include/deal.II/lac/identity_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__identity_matrix_h -#define __deal2__identity_matrix_h +#ifndef dealii__identity_matrix_h +#define dealii__identity_matrix_h #include diff --git a/include/deal.II/lac/iterative_inverse.h b/include/deal.II/lac/iterative_inverse.h index f47ca91a11..ec705018d4 100644 --- a/include/deal.II/lac/iterative_inverse.h +++ b/include/deal.II/lac/iterative_inverse.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__iterative_inverse_h -#define __deal2__iterative_inverse_h +#ifndef dealii__iterative_inverse_h +#define dealii__iterative_inverse_h #include #include diff --git a/include/deal.II/lac/lapack_full_matrix.h b/include/deal.II/lac/lapack_full_matrix.h index e8eabb0b1d..6ea65d8d13 100644 --- a/include/deal.II/lac/lapack_full_matrix.h +++ b/include/deal.II/lac/lapack_full_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__lapack_full_matrix_h -#define __deal2__lapack_full_matrix_h +#ifndef dealii__lapack_full_matrix_h +#define dealii__lapack_full_matrix_h #include diff --git a/include/deal.II/lac/lapack_support.h b/include/deal.II/lac/lapack_support.h index e3a0e822a5..22c7815e14 100644 --- a/include/deal.II/lac/lapack_support.h +++ b/include/deal.II/lac/lapack_support.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__lapack_support_h -#define __deal2__lapack_support_h +#ifndef dealii__lapack_support_h +#define dealii__lapack_support_h #include diff --git a/include/deal.II/lac/linear_operator.h b/include/deal.II/lac/linear_operator.h index dc54741dea..834f7934de 100644 --- a/include/deal.II/lac/linear_operator.h +++ b/include/deal.II/lac/linear_operator.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__linear_operator_h -#define __deal2__linear_operator_h +#ifndef dealii__linear_operator_h +#define dealii__linear_operator_h #include #include diff --git a/include/deal.II/lac/matrix_block.h b/include/deal.II/lac/matrix_block.h index 5f83be762d..0c76be50ed 100644 --- a/include/deal.II/lac/matrix_block.h +++ b/include/deal.II/lac/matrix_block.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__matrix_block_h -#define __deal2__matrix_block_h +#ifndef dealii__matrix_block_h +#define dealii__matrix_block_h #include #include diff --git a/include/deal.II/lac/matrix_iterator.h b/include/deal.II/lac/matrix_iterator.h index aee7c2bbeb..a3997cb8f4 100644 --- a/include/deal.II/lac/matrix_iterator.h +++ b/include/deal.II/lac/matrix_iterator.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__matrix_iterator_h -#define __deal2__matrix_iterator_h +#ifndef dealii__matrix_iterator_h +#define dealii__matrix_iterator_h #include diff --git a/include/deal.II/lac/matrix_lib.h b/include/deal.II/lac/matrix_lib.h index a776be95d7..8a88317bd4 100644 --- a/include/deal.II/lac/matrix_lib.h +++ b/include/deal.II/lac/matrix_lib.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__matrix_lib_h -#define __deal2__matrix_lib_h +#ifndef dealii__matrix_lib_h +#define dealii__matrix_lib_h #include #include diff --git a/include/deal.II/lac/matrix_lib.templates.h b/include/deal.II/lac/matrix_lib.templates.h index 160a6211c5..5b676006d2 100644 --- a/include/deal.II/lac/matrix_lib.templates.h +++ b/include/deal.II/lac/matrix_lib.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__matrix_lib_templates_h -#define __deal2__matrix_lib_templates_h +#ifndef dealii__matrix_lib_templates_h +#define dealii__matrix_lib_templates_h #include #include diff --git a/include/deal.II/lac/matrix_out.h b/include/deal.II/lac/matrix_out.h index 920013505c..874a2d632c 100644 --- a/include/deal.II/lac/matrix_out.h +++ b/include/deal.II/lac/matrix_out.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__matrix_out_h -#define __deal2__matrix_out_h +#ifndef dealii__matrix_out_h +#define dealii__matrix_out_h #include #include diff --git a/include/deal.II/lac/parallel_block_vector.h b/include/deal.II/lac/parallel_block_vector.h index b56eb2da07..9b62c3d1fe 100644 --- a/include/deal.II/lac/parallel_block_vector.h +++ b/include/deal.II/lac/parallel_block_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__parallel_block_vector_h -#define __deal2__parallel_block_vector_h +#ifndef dealii__parallel_block_vector_h +#define dealii__parallel_block_vector_h #include diff --git a/include/deal.II/lac/parallel_vector.h b/include/deal.II/lac/parallel_vector.h index 16165db2e9..7acb9378de 100644 --- a/include/deal.II/lac/parallel_vector.h +++ b/include/deal.II/lac/parallel_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__parallel_vector_h -#define __deal2__parallel_vector_h +#ifndef dealii__parallel_vector_h +#define dealii__parallel_vector_h #include #include diff --git a/include/deal.II/lac/parallel_vector.templates.h b/include/deal.II/lac/parallel_vector.templates.h index 1511dd8985..5e7ab011a9 100644 --- a/include/deal.II/lac/parallel_vector.templates.h +++ b/include/deal.II/lac/parallel_vector.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__parallel_vector_templates_h -#define __deal2__parallel_vector_templates_h +#ifndef dealii__parallel_vector_templates_h +#define dealii__parallel_vector_templates_h #include diff --git a/include/deal.II/lac/petsc_block_sparse_matrix.h b/include/deal.II/lac/petsc_block_sparse_matrix.h index 011ab5ada9..761006e27a 100644 --- a/include/deal.II/lac/petsc_block_sparse_matrix.h +++ b/include/deal.II/lac/petsc_block_sparse_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_block_sparse_matrix_h -#define __deal2__petsc_block_sparse_matrix_h +#ifndef dealii__petsc_block_sparse_matrix_h +#define dealii__petsc_block_sparse_matrix_h #include @@ -338,4 +338,4 @@ DEAL_II_NAMESPACE_CLOSE #endif // DEAL_II_WITH_PETSC -#endif // __deal2__petsc_block_sparse_matrix_h +#endif // dealii__petsc_block_sparse_matrix_h diff --git a/include/deal.II/lac/petsc_block_vector.h b/include/deal.II/lac/petsc_block_vector.h index 084218813f..15366ed328 100644 --- a/include/deal.II/lac/petsc_block_vector.h +++ b/include/deal.II/lac/petsc_block_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_block_vector_h -#define __deal2__petsc_block_vector_h +#ifndef dealii__petsc_block_vector_h +#define dealii__petsc_block_vector_h #include diff --git a/include/deal.II/lac/petsc_full_matrix.h b/include/deal.II/lac/petsc_full_matrix.h index 8902fb9961..1bf0c17eb5 100644 --- a/include/deal.II/lac/petsc_full_matrix.h +++ b/include/deal.II/lac/petsc_full_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_full_matrix_h -#define __deal2__petsc_full_matrix_h +#ifndef dealii__petsc_full_matrix_h +#define dealii__petsc_full_matrix_h #include diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h index eb1a3d01be..61552360bb 100644 --- a/include/deal.II/lac/petsc_matrix_base.h +++ b/include/deal.II/lac/petsc_matrix_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_matrix_base_h -#define __deal2__petsc_matrix_base_h +#ifndef dealii__petsc_matrix_base_h +#define dealii__petsc_matrix_base_h #include diff --git a/include/deal.II/lac/petsc_matrix_free.h b/include/deal.II/lac/petsc_matrix_free.h index a09674ce22..c1cc4b1342 100644 --- a/include/deal.II/lac/petsc_matrix_free.h +++ b/include/deal.II/lac/petsc_matrix_free.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_matrix_free_h -#define __deal2__petsc_matrix_free_h +#ifndef dealii__petsc_matrix_free_h +#define dealii__petsc_matrix_free_h #include diff --git a/include/deal.II/lac/petsc_parallel_block_sparse_matrix.h b/include/deal.II/lac/petsc_parallel_block_sparse_matrix.h index 33a5991e2a..cecca04c38 100644 --- a/include/deal.II/lac/petsc_parallel_block_sparse_matrix.h +++ b/include/deal.II/lac/petsc_parallel_block_sparse_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_parallel_block_sparse_matrix_h -#define __deal2__petsc_parallel_block_sparse_matrix_h +#ifndef dealii__petsc_parallel_block_sparse_matrix_h +#define dealii__petsc_parallel_block_sparse_matrix_h #include @@ -355,4 +355,4 @@ DEAL_II_NAMESPACE_CLOSE #endif // DEAL_II_WITH_PETSC -#endif // __deal2__petsc_parallel_block_sparse_matrix_h +#endif // dealii__petsc_parallel_block_sparse_matrix_h diff --git a/include/deal.II/lac/petsc_parallel_block_vector.h b/include/deal.II/lac/petsc_parallel_block_vector.h index 92524109a5..8044208117 100644 --- a/include/deal.II/lac/petsc_parallel_block_vector.h +++ b/include/deal.II/lac/petsc_parallel_block_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_parallel_block_vector_h -#define __deal2__petsc_parallel_block_vector_h +#ifndef dealii__petsc_parallel_block_vector_h +#define dealii__petsc_parallel_block_vector_h #include diff --git a/include/deal.II/lac/petsc_parallel_sparse_matrix.h b/include/deal.II/lac/petsc_parallel_sparse_matrix.h index 2496226b8e..13499cbf3a 100644 --- a/include/deal.II/lac/petsc_parallel_sparse_matrix.h +++ b/include/deal.II/lac/petsc_parallel_sparse_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_parallel_sparse_matrix_h -#define __deal2__petsc_parallel_sparse_matrix_h +#ifndef dealii__petsc_parallel_sparse_matrix_h +#define dealii__petsc_parallel_sparse_matrix_h #include diff --git a/include/deal.II/lac/petsc_parallel_vector.h b/include/deal.II/lac/petsc_parallel_vector.h index ca7a3449db..6aadcafef0 100644 --- a/include/deal.II/lac/petsc_parallel_vector.h +++ b/include/deal.II/lac/petsc_parallel_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_parallel_vector_h -#define __deal2__petsc_parallel_vector_h +#ifndef dealii__petsc_parallel_vector_h +#define dealii__petsc_parallel_vector_h #include diff --git a/include/deal.II/lac/petsc_precondition.h b/include/deal.II/lac/petsc_precondition.h index f96c2b50a3..6c5687b64c 100644 --- a/include/deal.II/lac/petsc_precondition.h +++ b/include/deal.II/lac/petsc_precondition.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_precondition_h -#define __deal2__petsc_precondition_h +#ifndef dealii__petsc_precondition_h +#define dealii__petsc_precondition_h #include diff --git a/include/deal.II/lac/petsc_solver.h b/include/deal.II/lac/petsc_solver.h index 82629b3236..1912fcb4a4 100644 --- a/include/deal.II/lac/petsc_solver.h +++ b/include/deal.II/lac/petsc_solver.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_solver_h -#define __deal2__petsc_solver_h +#ifndef dealii__petsc_solver_h +#define dealii__petsc_solver_h #include diff --git a/include/deal.II/lac/petsc_sparse_matrix.h b/include/deal.II/lac/petsc_sparse_matrix.h index e4c547c807..62826a959d 100644 --- a/include/deal.II/lac/petsc_sparse_matrix.h +++ b/include/deal.II/lac/petsc_sparse_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_sparse_matrix_h -#define __deal2__petsc_sparse_matrix_h +#ifndef dealii__petsc_sparse_matrix_h +#define dealii__petsc_sparse_matrix_h #include diff --git a/include/deal.II/lac/petsc_vector.h b/include/deal.II/lac/petsc_vector.h index 5c907f0f83..3a7be757c1 100644 --- a/include/deal.II/lac/petsc_vector.h +++ b/include/deal.II/lac/petsc_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_vector_h -#define __deal2__petsc_vector_h +#ifndef dealii__petsc_vector_h +#define dealii__petsc_vector_h #include diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index e17617ef06..65b741f887 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__petsc_vector_base_h -#define __deal2__petsc_vector_base_h +#ifndef dealii__petsc_vector_base_h +#define dealii__petsc_vector_base_h #include diff --git a/include/deal.II/lac/pointer_matrix.h b/include/deal.II/lac/pointer_matrix.h index e05cb07bf1..f4a5bac95c 100644 --- a/include/deal.II/lac/pointer_matrix.h +++ b/include/deal.II/lac/pointer_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__pointer_matrix_h -#define __deal2__pointer_matrix_h +#ifndef dealii__pointer_matrix_h +#define dealii__pointer_matrix_h #include #include diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h index d3c2af77db..3e2e003fa2 100644 --- a/include/deal.II/lac/precondition.h +++ b/include/deal.II/lac/precondition.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__precondition_h -#define __deal2__precondition_h +#ifndef dealii__precondition_h +#define dealii__precondition_h // This file contains simple preconditioners. diff --git a/include/deal.II/lac/precondition_block.h b/include/deal.II/lac/precondition_block.h index 67062fb29f..550af09479 100644 --- a/include/deal.II/lac/precondition_block.h +++ b/include/deal.II/lac/precondition_block.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__precondition_block_h -#define __deal2__precondition_block_h +#ifndef dealii__precondition_block_h +#define dealii__precondition_block_h #include diff --git a/include/deal.II/lac/precondition_block.templates.h b/include/deal.II/lac/precondition_block.templates.h index 88acf00aa2..1eb4e3827b 100644 --- a/include/deal.II/lac/precondition_block.templates.h +++ b/include/deal.II/lac/precondition_block.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__precondition_block_templates_h -#define __deal2__precondition_block_templates_h +#ifndef dealii__precondition_block_templates_h +#define dealii__precondition_block_templates_h #include diff --git a/include/deal.II/lac/precondition_block_base.h b/include/deal.II/lac/precondition_block_base.h index 3c974caa72..6aad63eb4f 100644 --- a/include/deal.II/lac/precondition_block_base.h +++ b/include/deal.II/lac/precondition_block_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__precondition_block_base_h -#define __deal2__precondition_block_base_h +#ifndef dealii__precondition_block_base_h +#define dealii__precondition_block_base_h #include diff --git a/include/deal.II/lac/precondition_selector.h b/include/deal.II/lac/precondition_selector.h index 1478382432..2bf5da272f 100644 --- a/include/deal.II/lac/precondition_selector.h +++ b/include/deal.II/lac/precondition_selector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__precondition_selector_h -#define __deal2__precondition_selector_h +#ifndef dealii__precondition_selector_h +#define dealii__precondition_selector_h #include diff --git a/include/deal.II/lac/relaxation_block.h b/include/deal.II/lac/relaxation_block.h index b2a2c071f6..dea9131db4 100644 --- a/include/deal.II/lac/relaxation_block.h +++ b/include/deal.II/lac/relaxation_block.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__relaxation_block_h -#define __deal2__relaxation_block_h +#ifndef dealii__relaxation_block_h +#define dealii__relaxation_block_h #include #include diff --git a/include/deal.II/lac/relaxation_block.templates.h b/include/deal.II/lac/relaxation_block.templates.h index 2049dc6463..4b2a74d02b 100644 --- a/include/deal.II/lac/relaxation_block.templates.h +++ b/include/deal.II/lac/relaxation_block.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__relaxation_block_templates_h -#define __deal2__relaxation_block_templates_h +#ifndef dealii__relaxation_block_templates_h +#define dealii__relaxation_block_templates_h #include #include diff --git a/include/deal.II/lac/schur_matrix.h b/include/deal.II/lac/schur_matrix.h index 01201eb300..8f098284ed 100644 --- a/include/deal.II/lac/schur_matrix.h +++ b/include/deal.II/lac/schur_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__schur_matrix_h -#define __deal2__schur_matrix_h +#ifndef dealii__schur_matrix_h +#define dealii__schur_matrix_h #include #include diff --git a/include/deal.II/lac/shifted_matrix.h b/include/deal.II/lac/shifted_matrix.h index 0eb4259dd3..321ad9f461 100644 --- a/include/deal.II/lac/shifted_matrix.h +++ b/include/deal.II/lac/shifted_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__shifted_matrix_h -#define __deal2__shifted_matrix_h +#ifndef dealii__shifted_matrix_h +#define dealii__shifted_matrix_h #include diff --git a/include/deal.II/lac/slepc_solver.h b/include/deal.II/lac/slepc_solver.h index 2e45438a49..e3349184d9 100644 --- a/include/deal.II/lac/slepc_solver.h +++ b/include/deal.II/lac/slepc_solver.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__slepc_solver_h -#define __deal2__slepc_solver_h +#ifndef dealii__slepc_solver_h +#define dealii__slepc_solver_h #include diff --git a/include/deal.II/lac/slepc_spectral_transformation.h b/include/deal.II/lac/slepc_spectral_transformation.h index d8f6a7d214..a52628e7fe 100644 --- a/include/deal.II/lac/slepc_spectral_transformation.h +++ b/include/deal.II/lac/slepc_spectral_transformation.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__slepc_spectral_transformation_h -#define __deal2__slepc_spectral_transformation_h +#ifndef dealii__slepc_spectral_transformation_h +#define dealii__slepc_spectral_transformation_h #include diff --git a/include/deal.II/lac/solver.h b/include/deal.II/lac/solver.h index 9f36a760e9..ec1ba196e9 100644 --- a/include/deal.II/lac/solver.h +++ b/include/deal.II/lac/solver.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_h -#define __deal2__solver_h +#ifndef dealii__solver_h +#define dealii__solver_h #include #include diff --git a/include/deal.II/lac/solver_bicgstab.h b/include/deal.II/lac/solver_bicgstab.h index 9c9815adef..5c08b27705 100644 --- a/include/deal.II/lac/solver_bicgstab.h +++ b/include/deal.II/lac/solver_bicgstab.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_bicgstab_h -#define __deal2__solver_bicgstab_h +#ifndef dealii__solver_bicgstab_h +#define dealii__solver_bicgstab_h #include diff --git a/include/deal.II/lac/solver_cg.h b/include/deal.II/lac/solver_cg.h index 72455efcc5..75964426f2 100644 --- a/include/deal.II/lac/solver_cg.h +++ b/include/deal.II/lac/solver_cg.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_cg_h -#define __deal2__solver_cg_h +#ifndef dealii__solver_cg_h +#define dealii__solver_cg_h #include diff --git a/include/deal.II/lac/solver_control.h b/include/deal.II/lac/solver_control.h index f7be1988c9..7233a0645f 100644 --- a/include/deal.II/lac/solver_control.h +++ b/include/deal.II/lac/solver_control.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_control_h -#define __deal2__solver_control_h +#ifndef dealii__solver_control_h +#define dealii__solver_control_h #include diff --git a/include/deal.II/lac/solver_gmres.h b/include/deal.II/lac/solver_gmres.h index 93dcfa01a5..996f6894e7 100644 --- a/include/deal.II/lac/solver_gmres.h +++ b/include/deal.II/lac/solver_gmres.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_gmres_h -#define __deal2__solver_gmres_h +#ifndef dealii__solver_gmres_h +#define dealii__solver_gmres_h diff --git a/include/deal.II/lac/solver_minres.h b/include/deal.II/lac/solver_minres.h index 130be5c134..d364f1f296 100644 --- a/include/deal.II/lac/solver_minres.h +++ b/include/deal.II/lac/solver_minres.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_minres_h -#define __deal2__solver_minres_h +#ifndef dealii__solver_minres_h +#define dealii__solver_minres_h #include diff --git a/include/deal.II/lac/solver_qmrs.h b/include/deal.II/lac/solver_qmrs.h index 9b0c040a79..a2a5541268 100644 --- a/include/deal.II/lac/solver_qmrs.h +++ b/include/deal.II/lac/solver_qmrs.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_qmrs_h -#define __deal2__solver_qmrs_h +#ifndef dealii__solver_qmrs_h +#define dealii__solver_qmrs_h #include #include diff --git a/include/deal.II/lac/solver_relaxation.h b/include/deal.II/lac/solver_relaxation.h index 5b5b276a86..bf0b8bbad3 100644 --- a/include/deal.II/lac/solver_relaxation.h +++ b/include/deal.II/lac/solver_relaxation.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_relaxation_h -#define __deal2__solver_relaxation_h +#ifndef dealii__solver_relaxation_h +#define dealii__solver_relaxation_h #include diff --git a/include/deal.II/lac/solver_richardson.h b/include/deal.II/lac/solver_richardson.h index ec1040b096..7851aae13a 100644 --- a/include/deal.II/lac/solver_richardson.h +++ b/include/deal.II/lac/solver_richardson.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_richardson_h -#define __deal2__solver_richardson_h +#ifndef dealii__solver_richardson_h +#define dealii__solver_richardson_h #include diff --git a/include/deal.II/lac/solver_selector.h b/include/deal.II/lac/solver_selector.h index eea1d41927..264ee54b48 100644 --- a/include/deal.II/lac/solver_selector.h +++ b/include/deal.II/lac/solver_selector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solver_selector_h -#define __deal2__solver_selector_h +#ifndef dealii__solver_selector_h +#define dealii__solver_selector_h #include diff --git a/include/deal.II/lac/sparse_decomposition.h b/include/deal.II/lac/sparse_decomposition.h index c6f3ac6a31..93f945354d 100644 --- a/include/deal.II/lac/sparse_decomposition.h +++ b/include/deal.II/lac/sparse_decomposition.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_decomposition_h -#define __deal2__sparse_decomposition_h +#ifndef dealii__sparse_decomposition_h +#define dealii__sparse_decomposition_h #include #include @@ -337,4 +337,4 @@ SparseLUDecomposition::AdditionalData::AdditionalData ( DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__sparse_decomposition_h +#endif // dealii__sparse_decomposition_h diff --git a/include/deal.II/lac/sparse_decomposition.templates.h b/include/deal.II/lac/sparse_decomposition.templates.h index 7baefcc11f..665e9cb760 100644 --- a/include/deal.II/lac/sparse_decomposition.templates.h +++ b/include/deal.II/lac/sparse_decomposition.templates.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__sparse_decomposition_templates_h -#define __deal2__sparse_decomposition_templates_h +#ifndef dealii__sparse_decomposition_templates_h +#define dealii__sparse_decomposition_templates_h #include @@ -232,4 +232,4 @@ SparseLUDecomposition::memory_consumption () const DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__sparse_decomposition_templates_h +#endif // dealii__sparse_decomposition_templates_h diff --git a/include/deal.II/lac/sparse_direct.h b/include/deal.II/lac/sparse_direct.h index 1f455e0215..9cd143a4aa 100644 --- a/include/deal.II/lac/sparse_direct.h +++ b/include/deal.II/lac/sparse_direct.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_direct_h -#define __deal2__sparse_direct_h +#ifndef dealii__sparse_direct_h +#define dealii__sparse_direct_h #include @@ -326,4 +326,4 @@ private: DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__sparse_direct_h +#endif // dealii__sparse_direct_h diff --git a/include/deal.II/lac/sparse_ilu.h b/include/deal.II/lac/sparse_ilu.h index aca55bf088..9c7b68a6e8 100644 --- a/include/deal.II/lac/sparse_ilu.h +++ b/include/deal.II/lac/sparse_ilu.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__sparse_ilu_h -#define __deal2__sparse_ilu_h +#ifndef dealii__sparse_ilu_h +#define dealii__sparse_ilu_h #include @@ -162,4 +162,4 @@ public: DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__sparse_ilu_h +#endif // dealii__sparse_ilu_h diff --git a/include/deal.II/lac/sparse_ilu.templates.h b/include/deal.II/lac/sparse_ilu.templates.h index 97113152e8..53931fac33 100644 --- a/include/deal.II/lac/sparse_ilu.templates.h +++ b/include/deal.II/lac/sparse_ilu.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_ilu_templates_h -#define __deal2__sparse_ilu_templates_h +#ifndef dealii__sparse_ilu_templates_h +#define dealii__sparse_ilu_templates_h diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h index 9f200b0cd8..4ae6850bdb 100644 --- a/include/deal.II/lac/sparse_matrix.h +++ b/include/deal.II/lac/sparse_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_matrix_h -#define __deal2__sparse_matrix_h +#ifndef dealii__sparse_matrix_h +#define dealii__sparse_matrix_h #include diff --git a/include/deal.II/lac/sparse_matrix.templates.h b/include/deal.II/lac/sparse_matrix.templates.h index c013e05c8b..ee62ee33fc 100644 --- a/include/deal.II/lac/sparse_matrix.templates.h +++ b/include/deal.II/lac/sparse_matrix.templates.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__sparse_matrix_templates_h -#define __deal2__sparse_matrix_templates_h +#ifndef dealii__sparse_matrix_templates_h +#define dealii__sparse_matrix_templates_h #include diff --git a/include/deal.II/lac/sparse_matrix_ez.h b/include/deal.II/lac/sparse_matrix_ez.h index 964e490d57..51c4946e76 100644 --- a/include/deal.II/lac/sparse_matrix_ez.h +++ b/include/deal.II/lac/sparse_matrix_ez.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_matrix_ez_h -#define __deal2__sparse_matrix_ez_h +#ifndef dealii__sparse_matrix_ez_h +#define dealii__sparse_matrix_ez_h #include diff --git a/include/deal.II/lac/sparse_matrix_ez.templates.h b/include/deal.II/lac/sparse_matrix_ez.templates.h index 9580e77c54..b6c6f61471 100644 --- a/include/deal.II/lac/sparse_matrix_ez.templates.h +++ b/include/deal.II/lac/sparse_matrix_ez.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_matrix_ez_templates_h -#define __deal2__sparse_matrix_ez_templates_h +#ifndef dealii__sparse_matrix_ez_templates_h +#define dealii__sparse_matrix_ez_templates_h #include @@ -630,4 +630,4 @@ SparseMatrixEZ::block_read (std::istream &in) DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__sparse_matrix_ez_templates_h +#endif // dealii__sparse_matrix_ez_templates_h diff --git a/include/deal.II/lac/sparse_mic.h b/include/deal.II/lac/sparse_mic.h index fff293d7ca..4ecd6095e7 100644 --- a/include/deal.II/lac/sparse_mic.h +++ b/include/deal.II/lac/sparse_mic.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_mic_h -#define __deal2__sparse_mic_h +#ifndef dealii__sparse_mic_h +#define dealii__sparse_mic_h #include #include @@ -164,4 +164,4 @@ private: DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__ +#endif // dealii__ diff --git a/include/deal.II/lac/sparse_mic.templates.h b/include/deal.II/lac/sparse_mic.templates.h index 5a9e095e13..59b939405c 100644 --- a/include/deal.II/lac/sparse_mic.templates.h +++ b/include/deal.II/lac/sparse_mic.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_mic_templates_h -#define __deal2__sparse_mic_templates_h +#ifndef dealii__sparse_mic_templates_h +#define dealii__sparse_mic_templates_h #include @@ -202,4 +202,4 @@ SparseMIC::memory_consumption () const DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__sparse_mic_templates_h +#endif // dealii__sparse_mic_templates_h diff --git a/include/deal.II/lac/sparse_vanka.h b/include/deal.II/lac/sparse_vanka.h index 1a73611f4a..8f1a23d3a4 100644 --- a/include/deal.II/lac/sparse_vanka.h +++ b/include/deal.II/lac/sparse_vanka.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_vanka_h -#define __deal2__sparse_vanka_h +#ifndef dealii__sparse_vanka_h +#define dealii__sparse_vanka_h diff --git a/include/deal.II/lac/sparse_vanka.templates.h b/include/deal.II/lac/sparse_vanka.templates.h index 477a732d4f..9479680b74 100644 --- a/include/deal.II/lac/sparse_vanka.templates.h +++ b/include/deal.II/lac/sparse_vanka.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparse_vanka_templates_h -#define __deal2__sparse_vanka_templates_h +#ifndef dealii__sparse_vanka_templates_h +#define dealii__sparse_vanka_templates_h #include diff --git a/include/deal.II/lac/sparsity_pattern.h b/include/deal.II/lac/sparsity_pattern.h index bad861c4d5..8085d4eb3a 100644 --- a/include/deal.II/lac/sparsity_pattern.h +++ b/include/deal.II/lac/sparsity_pattern.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparsity_pattern_h -#define __deal2__sparsity_pattern_h +#ifndef dealii__sparsity_pattern_h +#define dealii__sparsity_pattern_h #include diff --git a/include/deal.II/lac/sparsity_tools.h b/include/deal.II/lac/sparsity_tools.h index d82e5ec8e7..8b0be1c222 100644 --- a/include/deal.II/lac/sparsity_tools.h +++ b/include/deal.II/lac/sparsity_tools.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__sparsity_tools_h -#define __deal2__sparsity_tools_h +#ifndef dealii__sparsity_tools_h +#define dealii__sparsity_tools_h #include diff --git a/include/deal.II/lac/swappable_vector.h b/include/deal.II/lac/swappable_vector.h index bd2734ac1d..26e7af1cc7 100644 --- a/include/deal.II/lac/swappable_vector.h +++ b/include/deal.II/lac/swappable_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__swappable_vector_h -#define __deal2__swappable_vector_h +#ifndef dealii__swappable_vector_h +#define dealii__swappable_vector_h #include @@ -211,7 +211,7 @@ private: /*@}*/ /*---------------------------- swappable_vector.h ---------------------------*/ -/* end of #ifndef __deal2__swappable_vector_h */ +/* end of #ifndef dealii__swappable_vector_h */ DEAL_II_NAMESPACE_CLOSE #endif diff --git a/include/deal.II/lac/swappable_vector.templates.h b/include/deal.II/lac/swappable_vector.templates.h index 4f48e92c9f..de3706ed4e 100644 --- a/include/deal.II/lac/swappable_vector.templates.h +++ b/include/deal.II/lac/swappable_vector.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__swappable_vector_templates_h -#define __deal2__swappable_vector_templates_h +#ifndef dealii__swappable_vector_templates_h +#define dealii__swappable_vector_templates_h #include @@ -255,4 +255,4 @@ SwappableVector::memory_consumption () const DEAL_II_NAMESPACE_CLOSE -#endif // __deal2__swappable_vector_templates_h +#endif // dealii__swappable_vector_templates_h diff --git a/include/deal.II/lac/transpose_matrix.h b/include/deal.II/lac/transpose_matrix.h index f018f9e028..c465c32934 100644 --- a/include/deal.II/lac/transpose_matrix.h +++ b/include/deal.II/lac/transpose_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__transpose_matrix_h -#define __deal2__transpose_matrix_h +#ifndef dealii__transpose_matrix_h +#define dealii__transpose_matrix_h #include diff --git a/include/deal.II/lac/tridiagonal_matrix.h b/include/deal.II/lac/tridiagonal_matrix.h index e21f49fa69..ddbda3db9b 100644 --- a/include/deal.II/lac/tridiagonal_matrix.h +++ b/include/deal.II/lac/tridiagonal_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__tridiagonal_matrix_h -#define __deal2__tridiagonal_matrix_h +#ifndef dealii__tridiagonal_matrix_h +#define dealii__tridiagonal_matrix_h #include #include diff --git a/include/deal.II/lac/trilinos_block_sparse_matrix.h b/include/deal.II/lac/trilinos_block_sparse_matrix.h index 5c055f17b4..dc908cabf8 100644 --- a/include/deal.II/lac/trilinos_block_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_block_sparse_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__trilinos_block_sparse_matrix_h -#define __deal2__trilinos_block_sparse_matrix_h +#ifndef dealii__trilinos_block_sparse_matrix_h +#define dealii__trilinos_block_sparse_matrix_h #include @@ -594,4 +594,4 @@ DEAL_II_NAMESPACE_CLOSE #endif // DEAL_II_WITH_TRILINOS -#endif // __deal2__trilinos_block_sparse_matrix_h +#endif // dealii__trilinos_block_sparse_matrix_h diff --git a/include/deal.II/lac/trilinos_block_vector.h b/include/deal.II/lac/trilinos_block_vector.h index dcda81f948..0ede0968ef 100644 --- a/include/deal.II/lac/trilinos_block_vector.h +++ b/include/deal.II/lac/trilinos_block_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__trilinos_block_vector_h -#define __deal2__trilinos_block_vector_h +#ifndef dealii__trilinos_block_vector_h +#define dealii__trilinos_block_vector_h #include diff --git a/include/deal.II/lac/trilinos_parallel_block_vector.h b/include/deal.II/lac/trilinos_parallel_block_vector.h index 9a443a5577..2333942883 100644 --- a/include/deal.II/lac/trilinos_parallel_block_vector.h +++ b/include/deal.II/lac/trilinos_parallel_block_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__trilinos_parallel_block_vector_h -#define __deal2__trilinos_parallel_block_vector_h +#ifndef dealii__trilinos_parallel_block_vector_h +#define dealii__trilinos_parallel_block_vector_h #include diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h index 4fce4157c2..c1a9765623 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__trilinos_precondition_h -#define __deal2__trilinos_precondition_h +#ifndef dealii__trilinos_precondition_h +#define dealii__trilinos_precondition_h #include diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h index 4167993ab4..fda44afe05 100644 --- a/include/deal.II/lac/trilinos_solver.h +++ b/include/deal.II/lac/trilinos_solver.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__trilinos_solver_h -#define __deal2__trilinos_solver_h +#ifndef dealii__trilinos_solver_h +#define dealii__trilinos_solver_h #include diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index e939697e16..4c705beb5e 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__trilinos_sparse_matrix_h -#define __deal2__trilinos_sparse_matrix_h +#ifndef dealii__trilinos_sparse_matrix_h +#define dealii__trilinos_sparse_matrix_h #include diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h index aadeadea85..377da8e29e 100644 --- a/include/deal.II/lac/trilinos_sparsity_pattern.h +++ b/include/deal.II/lac/trilinos_sparsity_pattern.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__trilinos_sparsity_pattern_h -#define __deal2__trilinos_sparsity_pattern_h +#ifndef dealii__trilinos_sparsity_pattern_h +#define dealii__trilinos_sparsity_pattern_h #include diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 9571613ddb..c4fa0aecc0 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__trilinos_vector_h -#define __deal2__trilinos_vector_h +#ifndef dealii__trilinos_vector_h +#define dealii__trilinos_vector_h #include diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h index ec2da796cc..d0e6d92390 100644 --- a/include/deal.II/lac/trilinos_vector_base.h +++ b/include/deal.II/lac/trilinos_vector_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__trilinos_vector_base_h -#define __deal2__trilinos_vector_base_h +#ifndef dealii__trilinos_vector_base_h +#define dealii__trilinos_vector_base_h #include diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h index df952f25fd..ffc8590ebe 100644 --- a/include/deal.II/lac/vector.h +++ b/include/deal.II/lac/vector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__vector_h -#define __deal2__vector_h +#ifndef dealii__vector_h +#define dealii__vector_h #include diff --git a/include/deal.II/lac/vector.templates.h b/include/deal.II/lac/vector.templates.h index bd05a4a061..31f6bc50e7 100644 --- a/include/deal.II/lac/vector.templates.h +++ b/include/deal.II/lac/vector.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__vector_templates_h -#define __deal2__vector_templates_h +#ifndef dealii__vector_templates_h +#define dealii__vector_templates_h #include diff --git a/include/deal.II/lac/vector_memory.h b/include/deal.II/lac/vector_memory.h index dfed862b64..e9075027de 100644 --- a/include/deal.II/lac/vector_memory.h +++ b/include/deal.II/lac/vector_memory.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__vector_memory_h -#define __deal2__vector_memory_h +#ifndef dealii__vector_memory_h +#define dealii__vector_memory_h #include diff --git a/include/deal.II/lac/vector_memory.templates.h b/include/deal.II/lac/vector_memory.templates.h index 2bc6391f11..e8d2934e55 100644 --- a/include/deal.II/lac/vector_memory.templates.h +++ b/include/deal.II/lac/vector_memory.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__vector_memory_templates_h -#define __deal2__vector_memory_templates_h +#ifndef dealii__vector_memory_templates_h +#define dealii__vector_memory_templates_h #include diff --git a/include/deal.II/matrix_free/dof_info.h b/include/deal.II/matrix_free/dof_info.h index 1bd8435f55..ae52cf4df0 100644 --- a/include/deal.II/matrix_free/dof_info.h +++ b/include/deal.II/matrix_free/dof_info.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__matrix_free_dof_info_h -#define __deal2__matrix_free_dof_info_h +#ifndef dealii__matrix_free_dof_info_h +#define dealii__matrix_free_dof_info_h #include diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index e3a7d16a6b..6460d8ad0b 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__matrix_free_fe_evaluation_h -#define __deal2__matrix_free_fe_evaluation_h +#ifndef dealii__matrix_free_fe_evaluation_h +#define dealii__matrix_free_fe_evaluation_h #include diff --git a/include/deal.II/matrix_free/helper_functions.h b/include/deal.II/matrix_free/helper_functions.h index 3d1c14d6d5..1d055dc8a8 100644 --- a/include/deal.II/matrix_free/helper_functions.h +++ b/include/deal.II/matrix_free/helper_functions.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__matrix_free_helper_functions_h -#define __deal2__matrix_free_helper_functions_h +#ifndef dealii__matrix_free_helper_functions_h +#define dealii__matrix_free_helper_functions_h #include diff --git a/include/deal.II/matrix_free/mapping_data_on_the_fly.h b/include/deal.II/matrix_free/mapping_data_on_the_fly.h index feaf34450b..12f1faec85 100644 --- a/include/deal.II/matrix_free/mapping_data_on_the_fly.h +++ b/include/deal.II/matrix_free/mapping_data_on_the_fly.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__matrix_free_mapping_data_on_the_fly_h -#define __deal2__matrix_free_mapping_data_on_the_fly_h +#ifndef dealii__matrix_free_mapping_data_on_the_fly_h +#define dealii__matrix_free_mapping_data_on_the_fly_h #include diff --git a/include/deal.II/matrix_free/mapping_info.h b/include/deal.II/matrix_free/mapping_info.h index 0b89cf63fc..e8b3e223b2 100644 --- a/include/deal.II/matrix_free/mapping_info.h +++ b/include/deal.II/matrix_free/mapping_info.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__matrix_free_mapping_info_h -#define __deal2__matrix_free_mapping_info_h +#ifndef dealii__matrix_free_mapping_info_h +#define dealii__matrix_free_mapping_info_h #include diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index 88c56e6da6..68508b8db1 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__matrix_free_h -#define __deal2__matrix_free_h +#ifndef dealii__matrix_free_h +#define dealii__matrix_free_h #include #include diff --git a/include/deal.II/matrix_free/operators.h b/include/deal.II/matrix_free/operators.h index dec85a1a6e..f8ede5bc8e 100644 --- a/include/deal.II/matrix_free/operators.h +++ b/include/deal.II/matrix_free/operators.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__matrix_free_operators_h -#define __deal2__matrix_free_operators_h +#ifndef dealii__matrix_free_operators_h +#define dealii__matrix_free_operators_h #include diff --git a/include/deal.II/matrix_free/shape_info.h b/include/deal.II/matrix_free/shape_info.h index 7d14d79fa1..324bb42384 100644 --- a/include/deal.II/matrix_free/shape_info.h +++ b/include/deal.II/matrix_free/shape_info.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__matrix_free_shape_info_h -#define __deal2__matrix_free_shape_info_h +#ifndef dealii__matrix_free_shape_info_h +#define dealii__matrix_free_shape_info_h #include diff --git a/include/deal.II/meshworker/assembler.h b/include/deal.II/meshworker/assembler.h index 10a4029a49..948e6bccaa 100644 --- a/include/deal.II/meshworker/assembler.h +++ b/include/deal.II/meshworker/assembler.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_assembler_h -#define __deal2__mesh_worker_assembler_h +#ifndef dealii__mesh_worker_assembler_h +#define dealii__mesh_worker_assembler_h #include #include diff --git a/include/deal.II/meshworker/dof_info.h b/include/deal.II/meshworker/dof_info.h index 02a9a7f193..cdfad1ec54 100644 --- a/include/deal.II/meshworker/dof_info.h +++ b/include/deal.II/meshworker/dof_info.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_dof_info_h -#define __deal2__mesh_worker_dof_info_h +#ifndef dealii__mesh_worker_dof_info_h +#define dealii__mesh_worker_dof_info_h #include #include diff --git a/include/deal.II/meshworker/functional.h b/include/deal.II/meshworker/functional.h index 6bd6c6c5b6..b2c4a78cf4 100644 --- a/include/deal.II/meshworker/functional.h +++ b/include/deal.II/meshworker/functional.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_functional_h -#define __deal2__mesh_worker_functional_h +#ifndef dealii__mesh_worker_functional_h +#define dealii__mesh_worker_functional_h #include #include diff --git a/include/deal.II/meshworker/integration_info.h b/include/deal.II/meshworker/integration_info.h index bd272a5eeb..cbb9f92ebe 100644 --- a/include/deal.II/meshworker/integration_info.h +++ b/include/deal.II/meshworker/integration_info.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_integration_info_h -#define __deal2__mesh_worker_integration_info_h +#ifndef dealii__mesh_worker_integration_info_h +#define dealii__mesh_worker_integration_info_h #include #include diff --git a/include/deal.II/meshworker/local_integrator.h b/include/deal.II/meshworker/local_integrator.h index 0e6bdee19f..09a8007f76 100644 --- a/include/deal.II/meshworker/local_integrator.h +++ b/include/deal.II/meshworker/local_integrator.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_local_integrator_h -#define __deal2__mesh_worker_local_integrator_h +#ifndef dealii__mesh_worker_local_integrator_h +#define dealii__mesh_worker_local_integrator_h #include #include diff --git a/include/deal.II/meshworker/local_results.h b/include/deal.II/meshworker/local_results.h index 4916e9afc6..d518774741 100644 --- a/include/deal.II/meshworker/local_results.h +++ b/include/deal.II/meshworker/local_results.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_local_results_h -#define __deal2__mesh_worker_local_results_h +#ifndef dealii__mesh_worker_local_results_h +#define dealii__mesh_worker_local_results_h #include #include diff --git a/include/deal.II/meshworker/loop.h b/include/deal.II/meshworker/loop.h index 0ff07b08de..f05cc9fec6 100644 --- a/include/deal.II/meshworker/loop.h +++ b/include/deal.II/meshworker/loop.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_loop_h -#define __deal2__mesh_worker_loop_h +#ifndef dealii__mesh_worker_loop_h +#define dealii__mesh_worker_loop_h #include #include diff --git a/include/deal.II/meshworker/output.h b/include/deal.II/meshworker/output.h index b5d7f8618c..ee3513df9b 100644 --- a/include/deal.II/meshworker/output.h +++ b/include/deal.II/meshworker/output.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_output_h -#define __deal2__mesh_worker_output_h +#ifndef dealii__mesh_worker_output_h +#define dealii__mesh_worker_output_h #include #include diff --git a/include/deal.II/meshworker/simple.h b/include/deal.II/meshworker/simple.h index ebf69c7149..2c17bb892f 100644 --- a/include/deal.II/meshworker/simple.h +++ b/include/deal.II/meshworker/simple.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_simple_h -#define __deal2__mesh_worker_simple_h +#ifndef dealii__mesh_worker_simple_h +#define dealii__mesh_worker_simple_h #include #include diff --git a/include/deal.II/meshworker/vector_selector.h b/include/deal.II/meshworker/vector_selector.h index 3fe4390b5e..802e6a02a5 100644 --- a/include/deal.II/meshworker/vector_selector.h +++ b/include/deal.II/meshworker/vector_selector.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mesh_worker_vector_selector_h -#define __deal2__mesh_worker_vector_selector_h +#ifndef dealii__mesh_worker_vector_selector_h +#define dealii__mesh_worker_vector_selector_h #include #include diff --git a/include/deal.II/multigrid/mg_base.h b/include/deal.II/multigrid/mg_base.h index 539633e173..1a9264e40a 100644 --- a/include/deal.II/multigrid/mg_base.h +++ b/include/deal.II/multigrid/mg_base.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_base_h -#define __deal2__mg_base_h +#ifndef dealii__mg_base_h +#define dealii__mg_base_h /* * This file contains MGLevelObject and some abstract base classes diff --git a/include/deal.II/multigrid/mg_block_smoother.h b/include/deal.II/multigrid/mg_block_smoother.h index 1403b56090..8fcfb39e73 100644 --- a/include/deal.II/multigrid/mg_block_smoother.h +++ b/include/deal.II/multigrid/mg_block_smoother.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_block_smoother_h -#define __deal2__mg_block_smoother_h +#ifndef dealii__mg_block_smoother_h +#define dealii__mg_block_smoother_h #include diff --git a/include/deal.II/multigrid/mg_coarse.h b/include/deal.II/multigrid/mg_coarse.h index 1ff7872b6f..b3ec345764 100644 --- a/include/deal.II/multigrid/mg_coarse.h +++ b/include/deal.II/multigrid/mg_coarse.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_coarse_h -#define __deal2__mg_coarse_h +#ifndef dealii__mg_coarse_h +#define dealii__mg_coarse_h #include diff --git a/include/deal.II/multigrid/mg_constrained_dofs.h b/include/deal.II/multigrid/mg_constrained_dofs.h index 538ea6a4cf..2efadac9b4 100644 --- a/include/deal.II/multigrid/mg_constrained_dofs.h +++ b/include/deal.II/multigrid/mg_constrained_dofs.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_constraints_h -#define __deal2__mg_constraints_h +#ifndef dealii__mg_constraints_h +#define dealii__mg_constraints_h #include #include diff --git a/include/deal.II/multigrid/mg_dof_accessor.h b/include/deal.II/multigrid/mg_dof_accessor.h index 61ea5000fc..57d8d45c45 100644 --- a/include/deal.II/multigrid/mg_dof_accessor.h +++ b/include/deal.II/multigrid/mg_dof_accessor.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_dof_accessor_h -#define __deal2__mg_dof_accessor_h +#ifndef dealii__mg_dof_accessor_h +#define dealii__mg_dof_accessor_h #warning This file is deprecated. Use instead. #include diff --git a/include/deal.II/multigrid/mg_matrix.h b/include/deal.II/multigrid/mg_matrix.h index 85c98b6048..efb5207845 100644 --- a/include/deal.II/multigrid/mg_matrix.h +++ b/include/deal.II/multigrid/mg_matrix.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_matrix_h -#define __deal2__mg_matrix_h +#ifndef dealii__mg_matrix_h +#define dealii__mg_matrix_h #include #include diff --git a/include/deal.II/multigrid/mg_smoother.h b/include/deal.II/multigrid/mg_smoother.h index 4219ddfd18..f846daab11 100644 --- a/include/deal.II/multigrid/mg_smoother.h +++ b/include/deal.II/multigrid/mg_smoother.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_smoother_h -#define __deal2__mg_smoother_h +#ifndef dealii__mg_smoother_h +#define dealii__mg_smoother_h #include diff --git a/include/deal.II/multigrid/mg_tools.h b/include/deal.II/multigrid/mg_tools.h index 3430fd6bd6..0eb03c2f0b 100644 --- a/include/deal.II/multigrid/mg_tools.h +++ b/include/deal.II/multigrid/mg_tools.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_tools_h -#define __deal2__mg_tools_h +#ifndef dealii__mg_tools_h +#define dealii__mg_tools_h #include #include diff --git a/include/deal.II/multigrid/mg_transfer.h b/include/deal.II/multigrid/mg_transfer.h index 2d42751b9d..eea708f66a 100644 --- a/include/deal.II/multigrid/mg_transfer.h +++ b/include/deal.II/multigrid/mg_transfer.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_transfer_h -#define __deal2__mg_transfer_h +#ifndef dealii__mg_transfer_h +#define dealii__mg_transfer_h #include diff --git a/include/deal.II/multigrid/mg_transfer.templates.h b/include/deal.II/multigrid/mg_transfer.templates.h index 7243c8e252..7c2582a4df 100644 --- a/include/deal.II/multigrid/mg_transfer.templates.h +++ b/include/deal.II/multigrid/mg_transfer.templates.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mg_transfer_templates_h -#define __deal2__mg_transfer_templates_h +#ifndef dealii__mg_transfer_templates_h +#define dealii__mg_transfer_templates_h #include #include diff --git a/include/deal.II/multigrid/mg_transfer_block.h b/include/deal.II/multigrid/mg_transfer_block.h index 13e37c8813..44b31b8a2b 100644 --- a/include/deal.II/multigrid/mg_transfer_block.h +++ b/include/deal.II/multigrid/mg_transfer_block.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_transfer_block_h -#define __deal2__mg_transfer_block_h +#ifndef dealii__mg_transfer_block_h +#define dealii__mg_transfer_block_h #include diff --git a/include/deal.II/multigrid/mg_transfer_block.templates.h b/include/deal.II/multigrid/mg_transfer_block.templates.h index 6175394a33..16b76e7260 100644 --- a/include/deal.II/multigrid/mg_transfer_block.templates.h +++ b/include/deal.II/multigrid/mg_transfer_block.templates.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mg_transfer_block_templates_h -#define __deal2__mg_transfer_block_templates_h +#ifndef dealii__mg_transfer_block_templates_h +#define dealii__mg_transfer_block_templates_h #include #include diff --git a/include/deal.II/multigrid/mg_transfer_component.h b/include/deal.II/multigrid/mg_transfer_component.h index 9ec57830a7..3338a7acc5 100644 --- a/include/deal.II/multigrid/mg_transfer_component.h +++ b/include/deal.II/multigrid/mg_transfer_component.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_transfer_component_h -#define __deal2__mg_transfer_component_h +#ifndef dealii__mg_transfer_component_h +#define dealii__mg_transfer_component_h #include diff --git a/include/deal.II/multigrid/mg_transfer_component.templates.h b/include/deal.II/multigrid/mg_transfer_component.templates.h index 5d2a117e48..11457a8d54 100644 --- a/include/deal.II/multigrid/mg_transfer_component.templates.h +++ b/include/deal.II/multigrid/mg_transfer_component.templates.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__mg_transfer_component_templates_h -#define __deal2__mg_transfer_component_templates_h +#ifndef dealii__mg_transfer_component_templates_h +#define dealii__mg_transfer_component_templates_h #include #include diff --git a/include/deal.II/multigrid/multigrid.h b/include/deal.II/multigrid/multigrid.h index a6d89c5c4a..68e1154815 100644 --- a/include/deal.II/multigrid/multigrid.h +++ b/include/deal.II/multigrid/multigrid.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__multigrid_h -#define __deal2__multigrid_h +#ifndef dealii__multigrid_h +#define dealii__multigrid_h #include diff --git a/include/deal.II/multigrid/multigrid.templates.h b/include/deal.II/multigrid/multigrid.templates.h index 262b58c7ee..e365d7ac7b 100644 --- a/include/deal.II/multigrid/multigrid.templates.h +++ b/include/deal.II/multigrid/multigrid.templates.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__multigrid_templates_h -#define __deal2__multigrid_templates_h +#ifndef dealii__multigrid_templates_h +#define dealii__multigrid_templates_h #include #include diff --git a/include/deal.II/multigrid/sparse_matrix_collection.h b/include/deal.II/multigrid/sparse_matrix_collection.h index 0390e7b9e6..f70493fce5 100644 --- a/include/deal.II/multigrid/sparse_matrix_collection.h +++ b/include/deal.II/multigrid/sparse_matrix_collection.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__mg_sparse_matrix_collection_h -#define __deal2__mg_sparse_matrix_collection_h +#ifndef dealii__mg_sparse_matrix_collection_h +#define dealii__mg_sparse_matrix_collection_h #include #include diff --git a/include/deal.II/numerics/data_component_interpretation.h b/include/deal.II/numerics/data_component_interpretation.h index 8742b32834..2929d7ad58 100644 --- a/include/deal.II/numerics/data_component_interpretation.h +++ b/include/deal.II/numerics/data_component_interpretation.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__data_component_interpretation_h -#define __deal2__data_component_interpretation_h +#ifndef dealii__data_component_interpretation_h +#define dealii__data_component_interpretation_h diff --git a/include/deal.II/numerics/data_out.h b/include/deal.II/numerics/data_out.h index 12cf2850c5..ce3a039340 100644 --- a/include/deal.II/numerics/data_out.h +++ b/include/deal.II/numerics/data_out.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__data_out_h -#define __deal2__data_out_h +#ifndef dealii__data_out_h +#define dealii__data_out_h diff --git a/include/deal.II/numerics/data_out_dof_data.h b/include/deal.II/numerics/data_out_dof_data.h index 4fe7467cb5..08bf6caa45 100644 --- a/include/deal.II/numerics/data_out_dof_data.h +++ b/include/deal.II/numerics/data_out_dof_data.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__data_out_dof_data_h -#define __deal2__data_out_dof_data_h +#ifndef dealii__data_out_dof_data_h +#define dealii__data_out_dof_data_h diff --git a/include/deal.II/numerics/data_out_faces.h b/include/deal.II/numerics/data_out_faces.h index 97f0798edb..4cf2ad4a85 100644 --- a/include/deal.II/numerics/data_out_faces.h +++ b/include/deal.II/numerics/data_out_faces.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__data_out_faces_h -#define __deal2__data_out_faces_h +#ifndef dealii__data_out_faces_h +#define dealii__data_out_faces_h #include diff --git a/include/deal.II/numerics/data_out_rotation.h b/include/deal.II/numerics/data_out_rotation.h index 6cc30c08e2..edf6a500d9 100644 --- a/include/deal.II/numerics/data_out_rotation.h +++ b/include/deal.II/numerics/data_out_rotation.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__data_out_rotation_h -#define __deal2__data_out_rotation_h +#ifndef dealii__data_out_rotation_h +#define dealii__data_out_rotation_h #include diff --git a/include/deal.II/numerics/data_out_stack.h b/include/deal.II/numerics/data_out_stack.h index 8d8e0489ac..d244fb59b0 100644 --- a/include/deal.II/numerics/data_out_stack.h +++ b/include/deal.II/numerics/data_out_stack.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__data_out_stack_h -#define __deal2__data_out_stack_h +#ifndef dealii__data_out_stack_h +#define dealii__data_out_stack_h #include diff --git a/include/deal.II/numerics/data_postprocessor.h b/include/deal.II/numerics/data_postprocessor.h index 7a52721750..9167d859b0 100644 --- a/include/deal.II/numerics/data_postprocessor.h +++ b/include/deal.II/numerics/data_postprocessor.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__data_postprocessor_h -#define __deal2__data_postprocessor_h +#ifndef dealii__data_postprocessor_h +#define dealii__data_postprocessor_h diff --git a/include/deal.II/numerics/derivative_approximation.h b/include/deal.II/numerics/derivative_approximation.h index 9d3d33360d..c67daebfe6 100644 --- a/include/deal.II/numerics/derivative_approximation.h +++ b/include/deal.II/numerics/derivative_approximation.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__derivative_approximation_h -#define __deal2__derivative_approximation_h +#ifndef dealii__derivative_approximation_h +#define dealii__derivative_approximation_h #include #include diff --git a/include/deal.II/numerics/dof_output_operator.h b/include/deal.II/numerics/dof_output_operator.h index eeb51bd37d..74751a36d0 100644 --- a/include/deal.II/numerics/dof_output_operator.h +++ b/include/deal.II/numerics/dof_output_operator.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__dof_output_operator_h -#define __deal2__dof_output_operator_h +#ifndef dealii__dof_output_operator_h +#define dealii__dof_output_operator_h #include #include diff --git a/include/deal.II/numerics/dof_print_solver_step.h b/include/deal.II/numerics/dof_print_solver_step.h index bf3f54c095..b95522c75c 100644 --- a/include/deal.II/numerics/dof_print_solver_step.h +++ b/include/deal.II/numerics/dof_print_solver_step.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__dof_print_solver_step_h -#define __deal2__dof_print_solver_step_h +#ifndef dealii__dof_print_solver_step_h +#define dealii__dof_print_solver_step_h #include #include diff --git a/include/deal.II/numerics/error_estimator.h b/include/deal.II/numerics/error_estimator.h index b387238983..8d860b6d77 100644 --- a/include/deal.II/numerics/error_estimator.h +++ b/include/deal.II/numerics/error_estimator.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__error_estimator_h -#define __deal2__error_estimator_h +#ifndef dealii__error_estimator_h +#define dealii__error_estimator_h #include diff --git a/include/deal.II/numerics/fe_field_function.h b/include/deal.II/numerics/fe_field_function.h index f042766e43..6a49e40772 100644 --- a/include/deal.II/numerics/fe_field_function.h +++ b/include/deal.II/numerics/fe_field_function.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__fe_function_h -#define __deal2__fe_function_h +#ifndef dealii__fe_function_h +#define dealii__fe_function_h #include #include diff --git a/include/deal.II/numerics/histogram.h b/include/deal.II/numerics/histogram.h index 889d6253d2..d33ead0c99 100644 --- a/include/deal.II/numerics/histogram.h +++ b/include/deal.II/numerics/histogram.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__histogram_h -#define __deal2__histogram_h +#ifndef dealii__histogram_h +#define dealii__histogram_h #include diff --git a/include/deal.II/numerics/matrix_tools.h b/include/deal.II/numerics/matrix_tools.h index a4b8ed59a9..2ca5cc5545 100644 --- a/include/deal.II/numerics/matrix_tools.h +++ b/include/deal.II/numerics/matrix_tools.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__matrix_tools_h -#define __deal2__matrix_tools_h +#ifndef dealii__matrix_tools_h +#define dealii__matrix_tools_h #include diff --git a/include/deal.II/numerics/solution_transfer.h b/include/deal.II/numerics/solution_transfer.h index a1d3684c29..6e4bf87966 100644 --- a/include/deal.II/numerics/solution_transfer.h +++ b/include/deal.II/numerics/solution_transfer.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__solution_transfer_h -#define __deal2__solution_transfer_h +#ifndef dealii__solution_transfer_h +#define dealii__solution_transfer_h /*---------------------------- solutiontransfer.h ----------------------*/ diff --git a/include/deal.II/numerics/time_dependent.h b/include/deal.II/numerics/time_dependent.h index bf56248fa7..3fd97dfbf2 100644 --- a/include/deal.II/numerics/time_dependent.h +++ b/include/deal.II/numerics/time_dependent.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__time_dependent_h -#define __deal2__time_dependent_h +#ifndef dealii__time_dependent_h +#define dealii__time_dependent_h /*---------------------------- time-dependent.h ---------------------------*/ diff --git a/include/deal.II/numerics/vector_tools.h b/include/deal.II/numerics/vector_tools.h index 5d953427d5..37b4a7c69e 100644 --- a/include/deal.II/numerics/vector_tools.h +++ b/include/deal.II/numerics/vector_tools.h @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef __deal2__vector_tools_h -#define __deal2__vector_tools_h +#ifndef dealii__vector_tools_h +#define dealii__vector_tools_h #include diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h index c9b851f19c..60fbd05842 100644 --- a/include/deal.II/numerics/vector_tools.templates.h +++ b/include/deal.II/numerics/vector_tools.templates.h @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -#ifndef _deal2__vector_tools_templates_h -#define _deal2__vector_tools_templates_h +#ifndef dealii__vector_tools_templates_h +#define dealii__vector_tools_templates_h #include #include diff --git a/include/deal.II/opencascade/boundary_lib.h b/include/deal.II/opencascade/boundary_lib.h index 0a62904f63..7eab4e9213 100644 --- a/include/deal.II/opencascade/boundary_lib.h +++ b/include/deal.II/opencascade/boundary_lib.h @@ -15,8 +15,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__occ_boundary_lib_h -#define __deal2__occ_boundary_lib_h +#ifndef dealii__occ_boundary_lib_h +#define dealii__occ_boundary_lib_h #include diff --git a/include/deal.II/opencascade/utilities.h b/include/deal.II/opencascade/utilities.h index cc7b18e45d..efbd14f36a 100644 --- a/include/deal.II/opencascade/utilities.h +++ b/include/deal.II/opencascade/utilities.h @@ -15,8 +15,8 @@ // --------------------------------------------------------------------- -#ifndef __deal2__occ_utilities_h -#define __deal2__occ_utilities_h +#ifndef dealii__occ_utilities_h +#define dealii__occ_utilities_h #include diff --git a/tests/base/patches.h b/tests/base/patches.h index 5fa3e79bd8..305bb995e7 100644 --- a/tests/base/patches.h +++ b/tests/base/patches.h @@ -72,7 +72,7 @@ create_patches(std::vector > &patches) // Do this only if the necessary headers were included -#if defined(__deal2__quadrature_lib_h) && defined(__deal2__function_lib_h) +#if defined(dealii__quadrature_lib_h) && defined(dealii__function_lib_h) template void