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 69e3d2409446f22b277a4885ab330f718a731b09..b33f3926d6b26b3281cefc0e6172819a03d1e3ce 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/algorithms/named_selection.h b/include/deal.II/algorithms/named_selection.h
index 514d8083b89808916dd5ccc664f9753a28d10862..c5b26cde72dc004ea488114aca23192c5652d728 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/algorithms/any_data.h>

diff --git a/include/deal.II/algorithms/newton.h b/include/deal.II/algorithms/newton.h
index 53835d9137026c1d612a98ec98b4cad42f7ba0f9..2e2fb3cd716cd88ef3892c38af3d6cf17dcb5e95 100644 (file)
--- 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 <deal.II/base/smartpointer.h>
 #include <deal.II/lac/solver_control.h>

diff --git a/include/deal.II/algorithms/operator.h b/include/deal.II/algorithms/operator.h
index 1902dd392b19aa0de7621e727b157b612ce68983..c4077bd05370197a665ae2444aebfe58ce41e22c 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/algorithms/any_data.h>

diff --git a/include/deal.II/algorithms/theta_timestepping.h b/include/deal.II/algorithms/theta_timestepping.h
index 1b44354813cfc270b91c991c86d82bfa56277d56..3009b0b5382e020aba6f0e6945d0fa7f9dfb922c 100644 (file)
--- 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 <deal.II/base/smartpointer.h>
 #include <deal.II/algorithms/operator.h>

diff --git a/include/deal.II/algorithms/timestep_control.h b/include/deal.II/algorithms/timestep_control.h
index 531b634b10f8de1e8c7cf7c948a2265ed80a6fc7..419c34e26f436d839c55b39b7fe75852c5c9b94e 100644 (file)
--- 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 <deal.II/base/subscriptor.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/base/aligned_vector.h b/include/deal.II/base/aligned_vector.h
index ed1dcc97bd4f247de6693964eaab985078b8c044..6935823d66ec07ac1bce553c25b1089058755997 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/std_cxx11/type_traits.h>

diff --git a/include/deal.II/base/auto_derivative_function.h b/include/deal.II/base/auto_derivative_function.h
index db70acd178b135eebf4f0a9ac3e9bc7f3cc4b7e5..78b3ba1cd83f54312f3e8d56bdd012110c608046 100644 (file)
--- 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 <deal.II/base/exceptions.h>

diff --git a/include/deal.II/base/conditional_ostream.h b/include/deal.II/base/conditional_ostream.h
index 6082e4f725bf7a717978b11614aa3c3c11e8b4f7..61a5023c35536f3071b6a10d6dbe59221020d357 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index 5f765645ca9e1a64ef1587add2367cb5037e666a..551dd41b40671d42cd1a33bd87493723bd439b24 100644 (file)
--- 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 034a99e7ad58ffcc3466ec8d491af06a2c980c3f..740f0a88545a37b38a0237c9a8a7c60396f8eb6b 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/data_out_base.h b/include/deal.II/base/data_out_base.h
index 5cf8e18bcbdfd10a34f277adabab7b67a7633ffb..5aed2aff433e36a0bc951c5566ffe6bb99518691 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/derivative_form.h b/include/deal.II/base/derivative_form.h
index 69d3820fabb33abe99a1f05988474968704b9fe0..a70813f57fe68f7d40eb1a3740682e657db660dc 100644 (file)
--- 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 <deal.II/base/tensor.h>
 

diff --git a/include/deal.II/base/event.h b/include/deal.II/base/event.h
index a1fa0e2f1312ffadc9bdee80a5427aa0c2481917..3f76ed67891fb253d062c0adc0321f0b44b6e161 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h
index 4989bfc9386ac389d18944f6185cc8056baeae61..d86c3505019ba6d14bd77c061be1dc776de01a2a 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/base/flow_function.h b/include/deal.II/base/flow_function.h
index 61a5c1894b2a8f9abc1d83563bab86e581d8cd31..e3033bc0b67a66b95ded8aa17eb160ae6280a618 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/function.h b/include/deal.II/base/function.h
index 76d320d1fc603b4def3664ad48b21e45cc8681ba..42c38e0bf82b28d405bbe8ad25b3de3885ff5c52 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/function_bessel.h b/include/deal.II/base/function_bessel.h
index 5b63f7502ede38476344bfd41b46df56855725dd..997216914385005c1663e2911f4a4be5154f1178 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/function_derivative.h b/include/deal.II/base/function_derivative.h
index 3b831d720ce38745cee4007ee3f31eaf0c5cc606..56e259f1209b4f93c51f1995e921202b07e5375e 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/base/function_lib.h b/include/deal.II/base/function_lib.h
index 62122dc30a356cbc297038056458fc45096c1b75..985d892c24719fff697252c96a6629277e0ccfc5 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/function_parser.h b/include/deal.II/base/function_parser.h
index ce4e51860936d7f3f285fe2165e24a99df18068d..5ae72919dfc04c3cd63d35df93364d7858f766ee 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/function_time.h b/include/deal.II/base/function_time.h
index 6e3aa4c459266703d76ccd7ba81d754c5717c388..6923f16b8de783c50b25e388c8f25830bb95a9b2 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/geometry_info.h b/include/deal.II/base/geometry_info.h
index ed8687f451db3b8fae11e515ac00b6183f1016a8..4f3d8fac257a855c21b5ea7253a64f80a3241254 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/graph_coloring.h b/include/deal.II/base/graph_coloring.h
index 79e79b5897b7edda9b1992ea4076cf86131e5e05..3f9772dc5c65d8c8a057f611005d4cf0a22e7214 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 cfbb631b949f8871d102993b2337fba87d3de008..b8dd4bd2362669cd007c7ebd10fb12cc4b0f9da5 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/utilities.h>

diff --git a/include/deal.II/base/iterator_range.h b/include/deal.II/base/iterator_range.h
index c84295409e799a433e83b38cf90a39e68387d166..86e6134443686fcfbb68a2aeff8590b5ed4d8498 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/job_identifier.h b/include/deal.II/base/job_identifier.h
index dbba79d14432b1d610570a5150202e1a5feb1d29..daad1803b84c950f1321028a8e597e72dc3c4e95 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/logstream.h b/include/deal.II/base/logstream.h
index 0845ba74e405924cd3dc7763da340a322fbd00cc..6d6720ffad8bb04d4b46db2c9d7cbee3d7222e65 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/base/memory_consumption.h b/include/deal.II/base/memory_consumption.h
index f3696631387cc8d91df1d59143e4af376b269c75..1185c11b975b84939a9f5904f25f667a237f39d2 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/mg_level_object.h b/include/deal.II/base/mg_level_object.h
index 5de31f42e6265aab6b4690a6a15798fe8502215d..3d797e33ccff58fc29db8b7be480b23a6fc8915a 100644 (file)
--- 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 <deal.II/base/subscriptor.h>
 #include <vector>

diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h
index c32f501f0cab5b650544476b3e2a1b6ba7d5f564..54ed4017cf38a819741bf7f08100b96c174db9c2 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <vector>

diff --git a/include/deal.II/base/multithread_info.h b/include/deal.II/base/multithread_info.h
index c8b5a4791643858ad17497c863ed933ba8b7d601..df8d71f1bd3d13d8223d8e513ee67cd56aea643f 100644 (file)
--- 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 52d9aa761ae35ff3b1a1d3c0eec583132a3309c8..ae134e637a2b16a539c6f2a293b5e57c8b908c1f 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/parallel.h b/include/deal.II/base/parallel.h
index 67edaf695e924a8818cbce3f4adc00e3f85081f4..80aff32359e063e4eb3d0df1747137121787b6e1 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/parameter_handler.h b/include/deal.II/base/parameter_handler.h
index 7ce6ff7debbc1add12f610e269b1091777f165d0..3de60c39d2f3548a2f13db4821195ef270fad5e3 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/parsed_function.h b/include/deal.II/base/parsed_function.h
index 0c4478991e47da655f71d4058ed3f90a77e33097..858ff909830a018b75ac15a36c765fb7667379ef 100644 (file)
--- 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 <deal.II/base/auto_derivative_function.h>
 #include <deal.II/base/function_parser.h>

diff --git a/include/deal.II/base/partitioner.h b/include/deal.II/base/partitioner.h
index e4150951ea57ede53d46e9518a500807ff845aaa..25239333d85ed10f5b182a0bc22afb8b69d98c26 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/index_set.h>

diff --git a/include/deal.II/base/path_search.h b/include/deal.II/base/path_search.h
index 90829869a6d188120c4adb85c0d1d84dcde7fa03..435a49eb8d9d2ad94b61ee92e488fcc54969ad51 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/point.h b/include/deal.II/base/point.h
index 8d9af919a7d719fc723043161c8a8bf7f77ba0f9..2a102430c4e4bf3a27c6f3badf4d20499d4fc35c 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/polynomial.h b/include/deal.II/base/polynomial.h
index 18757eb13ea045ae8de71bc729311aaf8c62c71e..8d85bd596b77dd29a7c4f9128af9ffd3d925642a 100644 (file)
--- 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 00c73c83bfb6ac7cf83458a8514b2a0085994374..e8e3f989ab42613859c1e5029d23d8501afb1ce2 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/polynomials_abf.h b/include/deal.II/base/polynomials_abf.h
index 1b32b55ceb4a303c55e8f3806a5bf5eb8961ba29..8e782293eb28015746361b8a1df2c452f3fda10f 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/polynomials_adini.h b/include/deal.II/base/polynomials_adini.h
index acbb581eaea50cb109241050aebe3c56a95c908d..8870ba3221275c98b84e7d130c856523bcf14370 100644 (file)
--- 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 <deal.II/base/point.h>
 #include <deal.II/base/tensor.h>

diff --git a/include/deal.II/base/polynomials_bdm.h b/include/deal.II/base/polynomials_bdm.h
index f657758e852096ce026b80f0ce26ddda6f0af981..eb3184b2a6b86d04219380b3de853f84bd747b20 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/polynomials_bernstein.h b/include/deal.II/base/polynomials_bernstein.h
index c60bc987f5e641dba0becf6ea1b2230817060dd9..013def14ca62d8ca936da5e615d4e2f3dade2dac 100644 (file)
--- a/include/deal.II/base/polynomials_bernstein.h
+++ b/include/deal.II/base/polynomials_bernstein.h
@@ -2,8 +2,8 @@
 #include <fstream>
 #include <iostream>
 
-#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 9ea6906197c1083abd5acfa84e75ab30b5e3ef45..9a3955eab629ec21e6ca9ad3f3d2547b62ab3944 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/polynomials_p.h b/include/deal.II/base/polynomials_p.h
index 18bf726c2be0f7e055ff6dda07af0091c995b854..feedcc97f71a0203a0ebcd67a367586a123c5f23 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/polynomials_piecewise.h b/include/deal.II/base/polynomials_piecewise.h
index 8f8701e3df25a9e040d20b7b6baeb7c22ac66385..20bfc1a3540d2479f8f53f2fd1d3eaf8f5be3d99 100644 (file)
--- 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 135b19abff453e9d0a3d3b5bfc0a2c1cf02b02d4..d0c8ca8da72edcf5650115b6fa7ca09043d96d5d 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/qprojector.h b/include/deal.II/base/qprojector.h
index ad9bc650fd0253f8a042b4e317f96ebef3898d25..538bb46864d9351382e4a8757a8f4481f1378215 100644 (file)
--- 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 <deal.II/base/quadrature.h>

diff --git a/include/deal.II/base/quadrature.h b/include/deal.II/base/quadrature.h
index 69b76bf04ce778546db7ab1f775872835fb1e4a6..227fb4f75c638ed1f34212ac61b6b85e78c0a146 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/quadrature_lib.h b/include/deal.II/base/quadrature_lib.h
index 30ffcca402ad7129771843267e697b44d5162a8f..9485b051766dc8d93f595a970c257648c8c6a305 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/quadrature_selector.h b/include/deal.II/base/quadrature_selector.h
index 40a491609aaaf3140a06dc50541303119871daa1..025dc07f146c02e7179b0a5f3178bfc0ee8583dc 100644 (file)
--- 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 <deal.II/base/quadrature.h>

diff --git a/include/deal.II/base/revision.h.in b/include/deal.II/base/revision.h.in
index 20614483ed5e4f26d3f0ae177b5bb4b8ec716091..6206295609137c94feb8dd0d5f953dfd7e1b2743 100644 (file)
--- 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 9ca3e3038410222a8c13e2368e73144a6e393782..0f42cad2fc14a592ec3639a2160d229657b56a21 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/array.h b/include/deal.II/base/std_cxx11/array.h
index 17917662ac36660d37def9578d34a22ca7f46092..4590660e1e13726e57c898ef0fbf5c0eaac16c85 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/bind.h b/include/deal.II/base/std_cxx11/bind.h
index fc64ac1ece3cc383a79fb6d21e0f05e78a72a143..505023d3fd7e1387cfbf81758341fd1fecec6697 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/condition_variable.h b/include/deal.II/base/std_cxx11/condition_variable.h
index fadd3d7a76c2f7aa5bc4962355840bfaaf07dfa1..1c1f4be1327624f078a4001e96e946c0edb0e80b 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/function.h b/include/deal.II/base/std_cxx11/function.h
index a7b4592269e6ae8bf6f1bbbc3126097b06f7f820..ec61d05b11e3b92d3f842305a7ff057d59d8ad17 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/mutex.h b/include/deal.II/base/std_cxx11/mutex.h
index 7cd0be4a5ab9f987a3cc519fad28bd8a26ef06ab..a8f814260004417ca453aaece653c53fde0a501e 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/shared_ptr.h b/include/deal.II/base/std_cxx11/shared_ptr.h
index 25fb3438b7a3d4403584e7f9924624d6389f3d56..4c90c75221ae0ff09fa1326c3fc7ad053873b4a9 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/thread.h b/include/deal.II/base/std_cxx11/thread.h
index 61324320f86c1396238a8375e2394462c8864058..29a82781494c4bd6ada2c1c9d679ea6ce8ad5d39 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/tuple.h b/include/deal.II/base/std_cxx11/tuple.h
index 2851703c7dfb055397ec574f595a66513f456a3d..89831a7ca3a2f2fb9f20c6a964c9e61ff61a5135 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/type_traits.h b/include/deal.II/base/std_cxx11/type_traits.h
index e35ac4b2f8bf7411b42902f775be6f59a63a8766..ccb215d3f3b786244a1cce0719392be1e40c1844 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/std_cxx11/unique_ptr.h b/include/deal.II/base/std_cxx11/unique_ptr.h
index 11e226d9fd589ba045b82ec29eb60924496912bf..a3cb3e33475de184f4718389304a00e76e9ffcc4 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/subscriptor.h b/include/deal.II/base/subscriptor.h
index 27944ec816655b680ae2d3bf9f8fd162f64b13c5..97266bc9f709caefa158bae70f2b8f5311d4cce4 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h
index 669239b3f491a8d3861bc7bf5b9df2f5b33aca59..1ddd65ec5648562d1b3d14ab377ce12a1594037b 100644 (file)
--- 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 <deal.II/base/tensor.h>

diff --git a/include/deal.II/base/synchronous_iterator.h b/include/deal.II/base/synchronous_iterator.h
index 3b7256f537c772a160bf2de28ce6d976946b6b45..32f44865fc00372c8eecd438190f73994721f1f0 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h
index 01a173337a0eaaee8f1a3684c9537c5c44ecc108..50301c7c3d9055cfb07e0170534b3d87c145da28 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/base/table_handler.h b/include/deal.II/base/table_handler.h
index 2595131e7932e7eb655da400625ff2383dff676d..95f48d7f53b392203265f5d18860e487e140df09 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/table_indices.h b/include/deal.II/base/table_indices.h
index 055061e53a2686073a6c5a40ae6e4b8a199ed0d6..744451ab35836e9209a3d994f9e0968bfafd5b27 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/template_constraints.h b/include/deal.II/base/template_constraints.h
index d2b0cbc04a43d1bfbfa8aa09599c0b39d7c69d2d..5123f89618bc8cc3457216308eeb79a22471cdef 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 5a6076d69f8093ae1205d91f2067a6955408075a..fd2cfe4253f76e0bdd9031dfdd74d0b014f446ec 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/tensor_base.h b/include/deal.II/base/tensor_base.h
index 2ce8f72bb0d364b5823c8df9be9d59f927e97aeb..fd21f8dfddc69206cca51d9e63e86255e8f3e5ed 100644 (file)
--- 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 f7196f00dac94bfcd42de5122e2f97368e18cc73..1b926f5b0fac1e5b7bf8c7fc533be3e562ff8ebb 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/tensor_product_polynomials.h b/include/deal.II/base/tensor_product_polynomials.h
index 21ab37046f06fe002c7cba28759297ea09350d31..2b45e77ce6520140cd39ec625e1795157ad8413f 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/tensor_product_polynomials_const.h b/include/deal.II/base/tensor_product_polynomials_const.h
index 2c5fef01dbdc116b6fbf6adf3efb38a2df30bea6..323f423ceac4d9501b70e102904b2d5c48fceb6a 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/thread_local_storage.h b/include/deal.II/base/thread_local_storage.h
index 96e456de0e037d63b93718389184357864be0855..79ba3b91b11a708ce3278e049ee41b6d53849c09 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 9c73e1820f8160f04dd8a7a8e13859fb38db177d..748df38afc03419aec7a3f291a58fd642a9e3bbf 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 ded4f87cfc7d229846328335af260c430e65ea82..5fd03bd1cd0e696a6dfc3ddb6897cf1cce58e76c 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/time_stepping.templates.h b/include/deal.II/base/time_stepping.templates.h
index f4db4147404183de8afe73963df1b7529657de0e..647dcdd749d21b0e46c22b6da0f735e0b27bdf93 100644 (file)
--- 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 <deal.II/base/std_cxx11/bind.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/base/timer.h b/include/deal.II/base/timer.h
index ff8917d5750572cec88d172c3f034dae1f288ea1..5c8988c90d9f2aef9c3522f72db3fed38f92cb1a 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/conditional_ostream.h>

diff --git a/include/deal.II/base/types.h b/include/deal.II/base/types.h
index 9408ef390434d9c0fe7830d54db6747188e40286..bc65b57477bbee933463f3522faaf198589995c5 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/base/utilities.h b/include/deal.II/base/utilities.h
index 739fb61d8a79cf74eeaaec62b82e780d133e09c8..f73a4566efaff4d4d659b2ee0cd749e1574722f9 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/base/vector_slice.h b/include/deal.II/base/vector_slice.h
index eba972f0845ac9ac3fe2d69d8aba5291ac9bfeb1..bb0e13f638ad92f968edc6bcf19fde736b7cc5dc 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/base/vectorization.h b/include/deal.II/base/vectorization.h
index 81563340e9a49141adb1188dd4a0b2be140b1686..dd36d3e31027bf5170bbc1fa732abbc13bac03e6 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/base/work_stream.h b/include/deal.II/base/work_stream.h
index 6d2b5bdc382119e461cfb8c9afc1ac8f4e2b6bee..b8f41a33c84083a43737c5bb6e41e61aa3319d1a 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 7c378e7c7c7fcc714c9c4278686784dc6a48563d..42e82af1a12b4424da9e83cebe05d965891b53f8 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 14db87e84ba74ce9d4fa52cc285d9df421d6720e..e35bb146652b6c9e6815da4c914b841e61c4efa6 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/distributed/tria.h>

diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h
index 381ae00fa4663866092961db2d90e84b8b1676e7..33d3137cda2e79ff987cc722c1de89e03c4ac743 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/dofs/block_info.h b/include/deal.II/dofs/block_info.h
index de0d53408f64cd492120f7ce25e9c3d68625ef3f..dc2142be772b02c8896a32f0e19f4ca7a2603338 100644 (file)
--- 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 <deal.II/base/subscriptor.h>
 #include <deal.II/base/memory_consumption.h>

diff --git a/include/deal.II/dofs/dof_accessor.h b/include/deal.II/dofs/dof_accessor.h
index 70e91715a0b648685a7d5734858412d29df5e607..89b7cf4e288ae501491fac9bcd55c9ede0e7df2f 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h
index a5a97b19f37aa53d41f85af95f278be3df9e1ac3..0585f22126d9563016a9434d31350424e0a6a383 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/dofs/dof_faces.h b/include/deal.II/dofs/dof_faces.h
index c4259822879af893087af304040321eeeac4f63b..a18d53338b913d87f3f3624d6e2b408bbeee6d47 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h
index b515a9189980e3a2a1e1b1a914bb4b70f196bc67..4cddb81326be0617a6482dbdc7d3e3a7bbe3999a 100644 (file)
--- 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 9d02c7709bef01e4963bbb1391e32da75421e22f..22943f336b555b3610c81dd7815a071b39c85fcc 100644 (file)
--- 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 5d5db1a379b13de568a4517b91374bc4f7992e88..5cbc80f95ceef8336ecc1ee0bd46e8ad816c364c 100644 (file)
--- 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 <deal.II/base/config.h>
 
@@ -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 32ac4b7180492913e4b36be3e6956d0cd811cdcb..21828e480ab7f8bc9f39d3631a487976db21dbd7 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/dofs/dof_objects.h b/include/deal.II/dofs/dof_objects.h
index e64297f01990b2410ed0b123aef984553a9913d1..8975902b30750b43b6729a06b7e65f7b007c19f9 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/dofs/dof_renumbering.h b/include/deal.II/dofs/dof_renumbering.h
index 396f4d15e06efaae5f9ef9269d1591490ac79154..96170f8a58d9b48845e60b939f41dd92ab82a489 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h
index ddf74145ea42b19a9386a1c905f8d066b24589cf..57ecea2e6456591285cbecdfd212de012d611642 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/dofs/function_map.h b/include/deal.II/dofs/function_map.h
index 14481720b8c9b5d2968f360348b31065aa0750fd..38ccc45a6a5dc91944d78731989aaae10299bf20 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <map>

diff --git a/include/deal.II/dofs/number_cache.h b/include/deal.II/dofs/number_cache.h
index ef47baf855636fa1b07690b18a40d7597ffebefe..14b0b142a836f90cc8d7c1c3459c83d7781698bf 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/index_set.h>
@@ -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 f85650d79240e2c7c31b047635701056dc226a84..a2d4172c116c8647e760b2fcf97c08cbb91a5186 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/fe/component_mask.h b/include/deal.II/fe/component_mask.h
index 64bf6ceee6fd64cf4681a14d5e934cff7e829a7f..5665f4d6ff6ef6a0183d5bd290656ce14c9d8eeb 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h
index 1a10880f6ed24ff24529d291103f4b0649bb23e7..85993bc30c9954990faa029f34d3ecab4517e6b9 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/geometry_info.h>

diff --git a/include/deal.II/fe/fe_abf.h b/include/deal.II/fe/fe_abf.h
index 2dd123b77020a1bbaa967d3daa9a1a04cc7881f4..075a9a04d03b48a1663f253abf51a6df9b637540 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/table.h>

diff --git a/include/deal.II/fe/fe_base.h b/include/deal.II/fe/fe_base.h
index e0fc80d60684ffca9765f775af01a597c16581ca..5341bb18847eb467864663daae308db641b5d13b 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/fe/fe_bdm.h b/include/deal.II/fe/fe_bdm.h
index f8001d8edee234e965ea9771843ba2e7b242b2b9..5a21cdbc823d372bf8c72521b72d5b0f6c7f6b88 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/table.h>

diff --git a/include/deal.II/fe/fe_bernstein.h b/include/deal.II/fe/fe_bernstein.h
index 551268cad214f985d841188ae39bc6f10efb20a6..fc6db35b3ce1f446e82f80756a868cd567917864 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/tensor_product_polynomials.h>

diff --git a/include/deal.II/fe/fe_dg_vector.h b/include/deal.II/fe/fe_dg_vector.h
index 306651448a5ac981e41e5c5ab576b66218b64b9c..fe2277d375b848792105026cf1924bfe43bc7103 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/table.h>

diff --git a/include/deal.II/fe/fe_dgp.h b/include/deal.II/fe/fe_dgp.h
index b6b35ef1694098b431d587c7d36c22512634fc46..1a9fae4f544e1aa268f36ff7d7aa383b49523c15 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/polynomial_space.h>

diff --git a/include/deal.II/fe/fe_dgp_monomial.h b/include/deal.II/fe/fe_dgp_monomial.h
index a21d3e7c39ba7d473f3c46feb87c30fa02fe5c51..b8f222ee12e36b5b33f0806b9b0e730106266e3d 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/polynomials_p.h>

diff --git a/include/deal.II/fe/fe_dgp_nonparametric.h b/include/deal.II/fe/fe_dgp_nonparametric.h
index b5258327bb7179b6f497ad926db6b9bacceafd8c..d8fd5fcff72c44a68e0125854ee464a0c0ace4ec 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/polynomial.h>

diff --git a/include/deal.II/fe/fe_dgq.h b/include/deal.II/fe/fe_dgq.h
index 82c0d42b218b7ca6586284803be6256713314706..2c44352caec415f1e7261dc3f231ecd77fdf3ad7 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/tensor_product_polynomials.h>

diff --git a/include/deal.II/fe/fe_face.h b/include/deal.II/fe/fe_face.h
index 21d231b4049214268d81cc5031f528b4ab7ffc55..98ad2417554e65829a08aa53abf958742144c4ef 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/tensor_product_polynomials.h>

diff --git a/include/deal.II/fe/fe_nedelec.h b/include/deal.II/fe/fe_nedelec.h
index 9793360b07b9cda6aef542eb07f8447abc7319f1..c5014c67821cc8de0d615161b07b5581d0e31bba 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/table.h>

diff --git a/include/deal.II/fe/fe_nothing.h b/include/deal.II/fe/fe_nothing.h
index 6f117c7e320c8e37168973371ce3c44fcabf3349..b419e6aafb533437de3089b7a906c2bbced8a128 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/fe/fe.h>

diff --git a/include/deal.II/fe/fe_poly.h b/include/deal.II/fe/fe_poly.h
index a751e30c40855a9050eb64c714ebd3f88e517586..c09f3f0205ce7f3706345e70e786ee5f6a55b82b 100644 (file)
--- 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 <deal.II/fe/fe.h>

diff --git a/include/deal.II/fe/fe_poly_face.h b/include/deal.II/fe/fe_poly_face.h
index 45793f02fa487812e65ae09e4bc43cb582b89efd..abf05e424307c49e04bcc55381c481f61c63a9d6 100644 (file)
--- 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 <deal.II/fe/fe.h>

diff --git a/include/deal.II/fe/fe_poly_tensor.h b/include/deal.II/fe/fe_poly_tensor.h
index bdbeabad08f055c9a1617f4cff2f6cdd1bbe4e10..7dea6327f2d6384391b028a9bd9ad4e8ded79ac2 100644 (file)
--- 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 <deal.II/lac/full_matrix.h>

diff --git a/include/deal.II/fe/fe_q.h b/include/deal.II/fe/fe_q.h
index 25516094cb090e6e92016b79421dcf8ee83dc0a9..43ff1a9f2dbd031f4ec2ddec9677f3b8d2f989af 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/tensor_product_polynomials.h>

diff --git a/include/deal.II/fe/fe_q_base.h b/include/deal.II/fe/fe_q_base.h
index 09bd02da314335f21e4c7d379c1071b91eacb94e..e92ef6dc8f5b3e01ab15b6d6cc0d942135d7e438 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/fe/fe_poly.h>

diff --git a/include/deal.II/fe/fe_q_dg0.h b/include/deal.II/fe/fe_q_dg0.h
index fe5014e47b0e223064a7b85baefba401c4215850..a35fa3569b906bc7f4f456da99edc7e91163c599 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/tensor_product_polynomials_const.h>

diff --git a/include/deal.II/fe/fe_q_hierarchical.h b/include/deal.II/fe/fe_q_hierarchical.h
index 4cb4cd508b93bb59f3d165d4b27a5803b3691511..4b7feab423ff2edae1a6d16819ba45cff7b11599 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/tensor_product_polynomials.h>

diff --git a/include/deal.II/fe/fe_q_iso_q1.h b/include/deal.II/fe/fe_q_iso_q1.h
index 7b9bfe07a8aa1106095a6539fcd966a5fa8353db..d31689c6a54dca96d874e3b3cf24ee0bfbb43f53 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/tensor_product_polynomials.h>

diff --git a/include/deal.II/fe/fe_raviart_thomas.h b/include/deal.II/fe/fe_raviart_thomas.h
index 6cd75e990aa9830858e58774ff146159c5391007..643578400c42f86b69f9b594298ecdc7628a2ddf 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/table.h>

diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h
index c7d3ec2800958c37c15989a6caee7a5ebfa48ef9..7919bcf2f4642591e84b18e6f4b5bdb724cda529 100644 (file)
--- 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 66f18854babfd8853a66e534b969502767761b8e..ce26780d52146c0cf01a7f5af09e93a7a59d46a8 100644 (file)
--- 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 757d30a6e898b254e8607f0e1243e7140b9091dd..3998f7566d5a47770667675a90c45e7a21b63266 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/tensor_product_polynomials.h>

diff --git a/include/deal.II/fe/fe_update_flags.h b/include/deal.II/fe/fe_update_flags.h
index 3230a6ecae7d951729b61a52ac5e7823536cb799..28e268b15a7f4eb5483a1c862458fc3c35948d11 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h
index d839e4b7c3900923d821c86f11e1b0f286c4c8b0..c880b747a640d299427433be3dd7907afd08e52e 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/fe/fe_values_extractors.h b/include/deal.II/fe/fe_values_extractors.h
index d3a71e2d30520f40386639a475e55d6f78f9d4cf..51b66bdbd69709744c2f226f3cf05ec97236a7d1 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/fe/mapping.h b/include/deal.II/fe/mapping.h
index aa2bcba1bb1b8e1d8e0688c874cf22502573cd6c..a67bf380575ea7df9b4e1922a37ce62d8e434c1d 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/fe/mapping_c1.h b/include/deal.II/fe/mapping_c1.h
index b932decc6402a10dd8fc09f2b842882bd9be4881..3631fd28c93b3a5c6687daf9944e1ee94c4793f9 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/fe/mapping_cartesian.h b/include/deal.II/fe/mapping_cartesian.h
index dc7b3baa83b0b9b0fde5705eeb5c730a0d918ef8..b0c2dabe70d2e501310720107bd9ef9fc19826c4 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/fe/mapping_fe_field.h b/include/deal.II/fe/mapping_fe_field.h
index e1c5c453543348aff320dd600bb9ab65cb1d5a43..f37648afa985cf3abd58f9628a3e7c04a74c89e7 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/fe/mapping_q.h b/include/deal.II/fe/mapping_q.h
index 9f8957068b84aec830d92caed8e857521f46f966..2c12c675f440dfd6dfcfcca46343ca71f3e958c2 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/fe/mapping_q1.h b/include/deal.II/fe/mapping_q1.h
index 856864c4071e3f79a5fc371dac42c60643cb8abf..5389bf197873811e64652afe4a0c21d310d7734d 100644 (file)
--- 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 <deal.II/base/derivative_form.h>

diff --git a/include/deal.II/fe/mapping_q1_eulerian.h b/include/deal.II/fe/mapping_q1_eulerian.h
index 84f3a857a0322bac0721b0e178c71cc9a8286ad6..2c5f9bb957d7d680bd45636298febc63ebf99872 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/fe/mapping_q_eulerian.h b/include/deal.II/fe/mapping_q_eulerian.h
index 3881b292ade1b06e9ff7787a7bc8bd1c43adbc41..54138e986e688af4420d0cc30d8f33a6a44c586f 100644 (file)
--- 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 <deal.II/base/smartpointer.h>
 #include <deal.II/base/thread_management.h>
@@ -234,5 +234,5 @@ MappingQEulerian<dim,VECTOR,spacedim>::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 7a971bc5e9aaea3bcbc8a33ff840b3c6330fd147..be973786de42ed8f8952cbb205aa089b919ee68b 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/grid/filtered_iterator.h b/include/deal.II/grid/filtered_iterator.h
index db3344c6787ff4c182c22401966d5e575385d2f2..dd8e9138213e9d32f1a37a66f0e467d5acffca1f 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h
index 0fbc8f959fdbc51736d81ac77fdfa571adcc8506..e5e877e968705c4adcf1a477dfde200ec30ab561 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/grid_in.h b/include/deal.II/grid/grid_in.h
index b6c3b28ddb8155aa6cec3d337a0199c2ef750f18..c919473ba0e869903f5df3232c93e4563c47e509 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/grid_out.h b/include/deal.II/grid/grid_out.h
index b40c0659d2c03db5e7c218ebb23a4b37149ef16a..859e35b9c6636f314c0108876f85b22cc12f05e7 100644 (file)
--- 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 d4d98d39254ccb232f0543a497cae30e246c97a0..cb49c851848e5c9f06a6d5d3d191bc9730991078 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 e1891410b96a91631b886c2d884d4d8344f33438..7e5d958158e1bd9b521ad7fb05ed599116da9029 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/grid_reordering_internal.h b/include/deal.II/grid/grid_reordering_internal.h
index 4482789382d211c70ae205279289710a490073f3..77f978501ab5b63f7f4bcc51c392549fbb2498f1 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index a51822ebafc23526fe14889069194fa03f0c4caa..97faef1ab7835b7ba781954a861cad807a2bb2c7 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 80d637d1ab38d4567d999e28cfe3180c142325ed..d28e03e058d6944cc48b77309818ee4af88864fb 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/grid/magic_numbers.h b/include/deal.II/grid/magic_numbers.h
index 99db86d592a813d73e075247006593bb829af91e..caa73ab3b2898b80ec4f7e902a2cf2c69156ba27 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/grid/manifold.h b/include/deal.II/grid/manifold.h
index e66fbac26ff494243b1177e7e44389fb58982cfc..b31b1e87b096819b6b88d2a196199cba5af02677 100644 (file)
--- 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 9e791b67ed77cd84f18bcfdc8293329b875ea601..99e4583258a6d3838704803b868d2868d39cbc28 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/persistent_tria.h b/include/deal.II/grid/persistent_tria.h
index 8b0d86a0a8ed97c0e89500701aa1cbaf068316bf..f70f14fc9557dce149d0638b0ac7ce38108e669d 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index f35d4aa0d82102efd8334cbe092b49a5a6414784..9fa2af06504b9a9ce9ba4059bb8735b3f8120932 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h
index 97cc0aec6a00eb2201d73573d8bb690200145477..299ecec4364f7eb94f915e0b642566b5796e4764 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h
index 9cabf95e3ed40fd299059cc50e2bb9ee77fdf24a..e9c88eb62b8da7a54e98ecb997d63b4bf49f6767 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/tria_boundary.h b/include/deal.II/grid/tria_boundary.h
index 145d69461d2fd88cd7625bbc693f9f2623b3794b..ba605c20ac24402f629fdd1dd6f12814a6632226 100644 (file)
--- 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 ae3c64ce77470ebc90f6aced622b27906f1628c2..1ec0c6c898315a82ca7bbaff4a2b20b6d159c494 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/tria_faces.h b/include/deal.II/grid/tria_faces.h
index 621241a2de86fe41fd683aad525ec9da1b0c9d6a..72820606ffa29755c7e1f87e370f20b68201beeb 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/grid/tria_object.h>

diff --git a/include/deal.II/grid/tria_iterator.h b/include/deal.II/grid/tria_iterator.h
index ae61e087ae8da2ad8cb1ae69191c8b711d17df70..c1d72e9ba69725efcbcb99cb8781b58bc39278ad 100644 (file)
--- 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 f822de9e2bf2fc5568e71ed85420c613823e2a0e..92e9562d67ff22e6beb0374f9f255a8a1ce4a585 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/tria_iterator_base.h b/include/deal.II/grid/tria_iterator_base.h
index 9ea54806398c5364be33c6b10d8cbe957326aabb..d2554f98e7614b489d04af4a54ec94f62540f47c 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/tria_iterator_selector.h b/include/deal.II/grid/tria_iterator_selector.h
index 1d64bac51f8ce5925268b6108bcd29810767efa4..359dc1038d50ff498d536a8dabb3daaf3e45cfb0 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 e95cf64e1cf2aa3391c3361715fbfab4abc1a488..f8502d03881bc227d8f58976dcccfec0100cecad 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/tria_object.h b/include/deal.II/grid/tria_object.h
index 4aaeb0700f66d2419e764889648d95505d67b3b0..3cafa2a148eb47d558d9a28fd6bfeeb802144c49 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/grid/tria_objects.h b/include/deal.II/grid/tria_objects.h
index a3f0fbc7dabfc5c4805b12dc4b7de05972ddf4b6..4d9d7ffdefdd000378063bf4eea621ef9ec79e5c 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/hp/dof_faces.h b/include/deal.II/hp/dof_faces.h
index ebbbd0de25ab55e6800de0d6895e35598e0613b2..68e822e16405c54ff1100273af78ea8979113d61 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/hp/dof_handler.h b/include/deal.II/hp/dof_handler.h
index 6c6a0de3949b6a380887b3a08ae9c98003f14d4d..0140965132fac2d267bf945e348431093aaa1efc 100644 (file)
--- 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 c7d6f2ffb1b1314bccbcdaadb41a71945f09859a..cd6a5bbe864887dcfdd6a5816c5fb7070fb2c186 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/hp/fe_collection.h b/include/deal.II/hp/fe_collection.h
index 7d19ec97fb6258a5630c6c87cfdd75f41f2a37c6..76886df0f3af470e3f494c7f83cfe5a92b6d001f 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/std_cxx11/shared_ptr.h>

diff --git a/include/deal.II/hp/fe_values.h b/include/deal.II/hp/fe_values.h
index d8f45c065345a1333f431eff8f7f9313d244e239..18d83deadce37ee7a48bb447609b9474a907c9e4 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/fe/fe.h>

diff --git a/include/deal.II/hp/mapping_collection.h b/include/deal.II/hp/mapping_collection.h
index ed729276773af33d435752dd07a6108c994fa1de..cc1d48116c21be624116875b0b15f10deaac0bb4 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/subscriptor.h>

diff --git a/include/deal.II/hp/q_collection.h b/include/deal.II/hp/q_collection.h
index e37854e9fe9b756c948ba1100dbf562661b7705f..3047fd05d667c4341aed63170cae890d046336f4 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/subscriptor.h>

diff --git a/include/deal.II/integrators/advection.h b/include/deal.II/integrators/advection.h
index d3cfc18d6f2c505f33cccbcc20f7c026a857e69f..e35514c6b76c4f88954951ca0885a89f38cbc426 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/integrators/divergence.h b/include/deal.II/integrators/divergence.h
index afa2cd13ffe06fbadafbb0498754614a4b8b77a6..b2560571d4298ca7bec95551a6a95644e09eb2f1 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/integrators/elasticity.h b/include/deal.II/integrators/elasticity.h
index d74e35d25b1b4a5645ac3342b5fdfe7d2479f903..db75f1c124995b4c18d90daa8dc900d83d0c62fe 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/integrators/l2.h b/include/deal.II/integrators/l2.h
index 24320a8004997faa64b4f09eae520e0b9f9429dd..baadc9cbabb2c4bac07c7ba7bcfcad5060753af0 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/integrators/laplace.h b/include/deal.II/integrators/laplace.h
index e84b384001301ee4a5c37afd7ecbd9c037f2d59d..bf294d6e3a2e02f10e2d0d93dc0d98fbc0269f62 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/integrators/local_integrators.h b/include/deal.II/integrators/local_integrators.h
index 328df58be0b30e65c56ebccb80825851ddc9ab2d..b99612ba4a8b70f345a7ccf48ec4a4f7342a8b3f 100644 (file)
--- 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 e6734686c099441ba1d5220083097d79555ab78b..c8dc4d66c994e9963836764c3c59fd2c6b932bbe 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/integrators/patches.h b/include/deal.II/integrators/patches.h
index 46be2c1a0425c90b8573e7e24bd63726779dd20a..d5f875c4e62e072cdcb5040596149cb7268079a2 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/arpack_solver.h b/include/deal.II/lac/arpack_solver.h
index 3900e1cdf9b21456b31912fc6112c0db3b29d4e6..d3a4d888f75ea1a0f3083b85c97191ad4552b110 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/lac/block_indices.h b/include/deal.II/lac/block_indices.h
index 6713fb44f7baba6a09d26e3ac3f8fe33d29ee5d1..41fafc8acf2c913285fda4f47085e2db361d16b9 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/block_matrix.h b/include/deal.II/lac/block_matrix.h
index 60788236b4ca358e6e8aa3a96d331cb54f507c02..c5c0ce33d18a184241a1290991341a08e8a0237b 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/block_matrix_array.h b/include/deal.II/lac/block_matrix_array.h
index d317b0b7ae771481fddb65c457e457d3e38b07f1..9cdc19c4974ede5e2aa32e1e87d65ec586da2a5c 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/subscriptor.h>

diff --git a/include/deal.II/lac/block_matrix_base.h b/include/deal.II/lac/block_matrix_base.h
index 4916dbc8f6d71f25ac67264afd78139f49bfa9d9..3239df5e686021d94fa591ed0a007fffd5e3c31a 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -2667,4 +2667,4 @@ BlockMatrixBase<MatrixType>::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 a09753ffd64b475249c26794e3fb25a1f6207376..bd83040ddc4a11e075ddc2403aeb79452fff36b3 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -529,4 +529,4 @@ precondition_Jacobi (Vector<number2>       &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 1d99d1b27d109a61e0803accb2b906e88c4636ba..2fe8d5a79d8427d4797931cc35048eef9042d865 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/block_sparse_matrix_ez.h b/include/deal.II/lac/block_sparse_matrix_ez.h
index 472ea1aa55ae421e8e708602a04e3260f6173110..27e7ff8b2565853f983c6cd5c273cd525aa987d4 100644 (file)
--- 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<number>::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 3abff0b4dd2de52565bc8f10b590e8cb0dfe91aa..e72f133707744876fa6569ce01162738e9031ea9 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/block_sparsity_pattern.h b/include/deal.II/lac/block_sparsity_pattern.h
index 4de671698d33a52894cece0cbec6f3f9d8512ed4..fefee68d7bada8e657db7f41b0bc1955f1737f6b 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h
index a1a9eaac36c89b5380db4f63d00cfe5e7c9eef52..ea59aa8f2c1afcc5a70461a818e67b7c170fbf54 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/block_vector.templates.h b/include/deal.II/lac/block_vector.templates.h
index d873067e551e448326743c66fb2684b397793e76..f0e245bde20396410cd220bd779100ab84026ca3 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h
index c7efb88bbe8989538c6229f3ebf33bb752258461..7c2a73de9e59b2b773cec05265f8b0dd46f4cace 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/chunk_sparse_matrix.h b/include/deal.II/lac/chunk_sparse_matrix.h
index 44606bc371f77b05d397c3ea73560e0fb7468bd4..7c3c0b69032f4abde2c2fcce17a6f106ff4d331e 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/chunk_sparse_matrix.templates.h b/include/deal.II/lac/chunk_sparse_matrix.templates.h
index ff49f65b7b1c5d3742c76d06b607a99404843eb7..af7a8ce686b3571d5db47147a3cbc0da028afd7e 100644 (file)
--- 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 <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/lac/chunk_sparsity_pattern.h b/include/deal.II/lac/chunk_sparsity_pattern.h
index 28923bb2f1654e85f5e111cb5766e31bb3feaa21..c30c2dc30610c372928db7a31689ea5774baa8ba 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/compressed_set_sparsity_pattern.h b/include/deal.II/lac/compressed_set_sparsity_pattern.h
index 7a7aa12ce13e4ce6358f9624631cc0d7e5e765f1..e6a8b69f95b6653e91c09bdc7934803e5d624cab 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/compressed_simple_sparsity_pattern.h b/include/deal.II/lac/compressed_simple_sparsity_pattern.h
index fb846cf20c5a3d91ca77acede7f51e7ab666c004..500bc4f88e7bb7c8eb378dc5600a1c239737c1a7 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/compressed_sparsity_pattern.h b/include/deal.II/lac/compressed_sparsity_pattern.h
index b98d4c0d42f1a239607193bcd9d90615ee688332..26e531b2ad248c83550b5c1c1b9303c27778bb6b 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/constraint_matrix.h b/include/deal.II/lac/constraint_matrix.h
index 773fda0ad6bec31348897849c6e8c978563e1e9d..9ebe629e3ebe8bb0a3734e2cad7a8fdf6495ae70 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/lac/constraint_matrix.templates.h b/include/deal.II/lac/constraint_matrix.templates.h
index 696e9a3afb5589dddb3d8daa97ab42544b29c262..dad4ca41444b4676694ac76c60a73b25110c7b8e 100644 (file)
--- 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 <deal.II/lac/constraint_matrix.h>

diff --git a/include/deal.II/lac/dynamic_sparsity_pattern.h b/include/deal.II/lac/dynamic_sparsity_pattern.h
index f52cc102c51a2637a9167dfb10a140d734955fb7..977d369a19da4904564601760e1d419ebaf1ef71 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/eigen.h b/include/deal.II/lac/eigen.h
index 608715e662dadebf2fae58c5dc54402a18684be7..63211a2048fe10ee2e1bffcb837528d07c907495 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/exceptions.h b/include/deal.II/lac/exceptions.h
index 54d2f954e8cf85d43c0c731ebe527af69b501ad7..11461d09562c1c3d98684dce26a86a46062e7237 100644 (file)
--- 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 <deal.II/base/exceptions.h>
 

diff --git a/include/deal.II/lac/filtered_matrix.h b/include/deal.II/lac/filtered_matrix.h
index ef90138ba3e7197c6fb72ea6a67753b1f5da348f..b0f3792ef06a7b5a5a97190fd4bad6702cdf4311 100644 (file)
--- 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 7e93ea5b235cbb8955438efc9c0ea716edad4993..19808539c14276d3cc6018e4a23456111c2f2d3e 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/full_matrix.templates.h b/include/deal.II/lac/full_matrix.templates.h
index a03c01200ee3a4e8de7f4aeae2b863966c3e99ba..80abb76e5306a6e8e21ed034e28704ba5d92a6a1 100644 (file)
--- 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 bd02fe38e6d5c1d0f5b225fc5a58501f15591d57..151dc1581c6572f99bed99c71152de70851773a7 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/lac/householder.h b/include/deal.II/lac/householder.h
index ad6c7a5ea60be7abf7bedee68f31f81a77b67a79..a82b061c56e0efdf74e1dde3240a1d5e853c87e1 100644 (file)
--- 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 <cmath>

diff --git a/include/deal.II/lac/identity_matrix.h b/include/deal.II/lac/identity_matrix.h
index c239549727b4cac302fa9171dc33a0f50cd6b91a..03e34d29693cf22580b215c7cb85b9b5243a0c06 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/iterative_inverse.h b/include/deal.II/lac/iterative_inverse.h
index f47ca91a11fcffaae864c71fcbd411d7ffa9ed49..ec705018d428a5b3304bb4fc1b70cd61e571be10 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/lac/lapack_full_matrix.h b/include/deal.II/lac/lapack_full_matrix.h
index e8eabb0b1d7326cb78b87c9df70ec4c3d043c101..6ea65d8d132efe43e398ef88109c1a6b07082e58 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/lapack_support.h b/include/deal.II/lac/lapack_support.h
index e3a0e822a526201c3420630ec61f5472583c5e8a..22c7815e1466314ce641be9df5358c0c5988e1b2 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/linear_operator.h b/include/deal.II/lac/linear_operator.h
index dc54741dea6ff1f4af7e61f7d7eef2bae6a4a846..834f7934de8ed97b53a1e6bdfd42f3296bde2886 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/lac/matrix_block.h b/include/deal.II/lac/matrix_block.h
index 5f83be762dd5505c2308f65f3f04e103b08abb31..0c76be50ed0bb2781d6dbbce48d760a907e61e14 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/lac/matrix_iterator.h b/include/deal.II/lac/matrix_iterator.h
index aee7c2bbeb849a8e32dd201e1b47a06e7fdb53bb..a3997cb8f45640e21aafef2e16f9479d698dbf57 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/matrix_lib.h b/include/deal.II/lac/matrix_lib.h
index a776be95d71a1b8de889ce08c8430140cdb18c4f..8a88317bd4fec0461417c97978b01aa1e5c692c9 100644 (file)
--- 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 <deal.II/base/subscriptor.h>
 #include <deal.II/lac/vector_memory.h>

diff --git a/include/deal.II/lac/matrix_lib.templates.h b/include/deal.II/lac/matrix_lib.templates.h
index 160a6211c5e4ff8be905766ff8a78c274d34d01b..5b676006d2d2b389e5c4e326a607905378ae3f5a 100644 (file)
--- 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 <deal.II/lac/matrix_lib.h>
 #include <deal.II/lac/vector.h>

diff --git a/include/deal.II/lac/matrix_out.h b/include/deal.II/lac/matrix_out.h
index 920013505c3d559f8adea28ae18bb0fe2f2bf43f..874a2d632ce2b1a7b33454500afe6e1c78edf035 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/data_out_base.h>

diff --git a/include/deal.II/lac/parallel_block_vector.h b/include/deal.II/lac/parallel_block_vector.h
index b56eb2da07e6a74db9cf98c5f9afbe631306ff1e..9b62c3d1fe145bef1f90e1e8ab8f6062e135124d 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/parallel_vector.h b/include/deal.II/lac/parallel_vector.h
index 16165db2e906ecfc9f6c62dccc794d98e0953b9f..7acb9378de28b21f5666d68b84a5649eeffccc06 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/index_set.h>

diff --git a/include/deal.II/lac/parallel_vector.templates.h b/include/deal.II/lac/parallel_vector.templates.h
index 1511dd8985679b34cd09442b0469e27c6f5a4d51..5e7ab011a99e4781bc70922d49811d9827464ed2 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_block_sparse_matrix.h b/include/deal.II/lac/petsc_block_sparse_matrix.h
index 011ab5ada9595ba0cf564159d5331121ec6d8c2a..761006e27a6529a5abcca546f509481a63d7d2b7 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 084218813f31cccfc98132e031ad16f6179acb6e..15366ed328517931bd117def8137590a4739344e 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_full_matrix.h b/include/deal.II/lac/petsc_full_matrix.h
index 8902fb9961271da1735b50d80866c37e82418ba4..1bf0c17eb57c2ba228d8c050b20e1dcec010e36d 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h
index eb1a3d01be6fd89cc6f0c178fc3d0f564536702d..61552360bb684ca764de3da6ccfcc6a2f9b0ffde 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_matrix_free.h b/include/deal.II/lac/petsc_matrix_free.h
index a09674ce22c970cdfd68925cc82d8e1899d06fa7..c1cc4b13427569483c6d759ee4f1456ed2d5b4f8 100644 (file)
--- 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 <deal.II/base/config.h>

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 33a5991e2aaf453073d543c923736b13d2bc2f64..cecca04c3834b5b4acfa9d1b46ed60c9405eebc6 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 92524109a519e0382f251884415e6483d1f6b5f5..80442081170256f9005dd5a99e8452b68c4fa847 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_parallel_sparse_matrix.h b/include/deal.II/lac/petsc_parallel_sparse_matrix.h
index 2496226b8e69d783d4aacf51509907c198681c11..13499cbf3a51ad37b37dde23436728edfe56b38d 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/lac/petsc_parallel_vector.h b/include/deal.II/lac/petsc_parallel_vector.h
index ca7a3449dbcbf8e68a1cfce027b615bfe3441eac..6aadcafef067b708e47149bd3d12845521ed871d 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_precondition.h b/include/deal.II/lac/petsc_precondition.h
index f96c2b50a30d530b63112357c752d2aadaa8d6fc..6c5687b64cbe63df8b4ade7a3053b00902b2f9e8 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_solver.h b/include/deal.II/lac/petsc_solver.h
index 82629b3236248bd2b3782fcb9487b466987bec8b..1912fcb4a4d641e9a031a0d85518575248b520a6 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_sparse_matrix.h b/include/deal.II/lac/petsc_sparse_matrix.h
index e4c547c80779231c8c509298cf2e995af80a907e..62826a959dd00c29c8a4d921596adf5fea00e0cd 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_vector.h b/include/deal.II/lac/petsc_vector.h
index 5c907f0f83a596b0ec4c990a86daad9bea21c672..3a7be757c1e8bbbbf4d2916ccdc37aaab36dc58c 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h
index e17617ef06c257ee36f13e3970a5eb7a3f43f734..65b741f887246f0478ea480e4d70f3cdfd9b3cc0 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/pointer_matrix.h b/include/deal.II/lac/pointer_matrix.h
index e05cb07bf1bfc20cdea84ed737b073fd81a28d9b..f4a5bac95c843067b89e0be63aa1f81b4f3c5377 100644 (file)
--- 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 <deal.II/base/subscriptor.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h
index d3c2af77db2371c559b4c1baeede7a5f60654633..3e2e003fa2a771c34b3949d88f5261018dddbe4a 100644 (file)
--- 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 67062fb29f4e81578d8f513d362b57061cb90581..550af09479b040b72ece3e0930f171da088449ef 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/precondition_block.templates.h b/include/deal.II/lac/precondition_block.templates.h
index 88acf00aa2c5d571d25ed71b06739207fa644e8d..1eb4e3827bd808b7fe78455e284f9c4e82fb8979 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/precondition_block_base.h b/include/deal.II/lac/precondition_block_base.h
index 3c974caa728b23c57d4b5feb9f788198c7f083e5..6aad63eb4fe26c2cd1c6861e4301709418a4cbb9 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/precondition_selector.h b/include/deal.II/lac/precondition_selector.h
index 1478382432e4f59f85ab91a44aabb683d76a4aca..2bf5da272fd40162808faa2c39b9ef3d89488ef7 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/relaxation_block.h b/include/deal.II/lac/relaxation_block.h
index b2a2c071f6fcdb1b1231720fc25bcde2b9f19401..dea9131db4fddca3f6aa362c9beb11346594791b 100644 (file)
--- 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 <deal.II/base/subscriptor.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/lac/relaxation_block.templates.h b/include/deal.II/lac/relaxation_block.templates.h
index 2049dc646389037a2918b4162d2aad9bcd819f70..4b2a74d02ba3cf75cb7c40437e5eb863ad8b1d4a 100644 (file)
--- 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 <deal.II/lac/relaxation_block.h>
 #include <deal.II/lac/full_matrix.h>

diff --git a/include/deal.II/lac/schur_matrix.h b/include/deal.II/lac/schur_matrix.h
index 01201eb300b740f89c7936671d2532f63e30d8e4..8f098284edfbbd92ce6fcb546b412e8f222cac77 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/subscriptor.h>

diff --git a/include/deal.II/lac/shifted_matrix.h b/include/deal.II/lac/shifted_matrix.h
index 0eb4259dd360db78c95527c7705c974ee5874ae0..321ad9f461f65209102d135bb3598ae14ae5ebbb 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/slepc_solver.h b/include/deal.II/lac/slepc_solver.h
index 2e45438a494bf0a38cd4216b3d0b9fd2685cbb35..e3349184d92b3917bec0b3a6c0ebc69046416101 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/lac/slepc_spectral_transformation.h b/include/deal.II/lac/slepc_spectral_transformation.h
index d8f6a7d21485963b87d4e2b30a5665e758ad6963..a52628e7fe393dd4712405081991e9a28a3e0b1a 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/solver.h b/include/deal.II/lac/solver.h
index 9f36a760e92580f356012702f17a831bdfc4ffd2..ec1ba196e9c143142a758664ffe79914db604f19 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/subscriptor.h>

diff --git a/include/deal.II/lac/solver_bicgstab.h b/include/deal.II/lac/solver_bicgstab.h
index 9c9815adefe987495065c0e6d36f65f860684087..5c08b27705930259e3489355bdce4f2a2ad2a641 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/solver_cg.h b/include/deal.II/lac/solver_cg.h
index 72455efcc5635f33a22f4fcf736a3359939563a5..75964426f2e6dbe8f01ff590d93e0beaaf8b28db 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/solver_control.h b/include/deal.II/lac/solver_control.h
index f7be1988c91aa8870105cfbeaf7a6e5d58b06bb0..7233a0645f113f3563b9073524f658b38398e56d 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/solver_gmres.h b/include/deal.II/lac/solver_gmres.h
index 93dcfa01a500c9a4be42152f3e6aca2658c52502..996f6894e7c76effaa34c9f0fbaa291a9681fee3 100644 (file)
--- 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 130be5c134cbb14e05a17ed4c839e7464e3c8865..d364f1f2965c4431eb7c63b90e55f170b57414b0 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/solver_qmrs.h b/include/deal.II/lac/solver_qmrs.h
index 9b0c040a79298aaa72d75124eab43910b5182bd6..a2a5541268c97d24c4e004ef502c1dcc76165e0c 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/lac/solver.h>

diff --git a/include/deal.II/lac/solver_relaxation.h b/include/deal.II/lac/solver_relaxation.h
index 5b5b276a865f40d6003c828d839fe38e6de7ad2d..bf0b8bbad3000bc534f6578aeec53b77cdd3f297 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/solver_richardson.h b/include/deal.II/lac/solver_richardson.h
index ec1040b0964bc05d1a37f068e9121f5c8c0d321f..7851aae13a4c65e01a0e6c2a547ee8efa4ec86d5 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/solver_selector.h b/include/deal.II/lac/solver_selector.h
index eea1d419276f7b1fddf28ebc67918f254c0587ed..264ee54b48832fd00a717dca4c45e076c8ea9c23 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/sparse_decomposition.h b/include/deal.II/lac/sparse_decomposition.h
index c6f3ac6a3107d68d0f0c56ba8d81dfe4954b64aa..93f945354d3e206277beb2803cc6f4a8841b6150 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/lac/sparse_matrix.h>
@@ -337,4 +337,4 @@ SparseLUDecomposition<number>::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 7baefcc11f8314359856056cf63089af035dd67e..665e9cb760b5be963e0a06e57bb07a88d1b7fe4f 100644 (file)
--- 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 <deal.II/base/memory_consumption.h>
@@ -232,4 +232,4 @@ SparseLUDecomposition<number>::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 1f455e0215295ad4a0b14d3cadceeec048d44c3a..9cd143a4aaad99ec3e51da1d17183c0c341c5998 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 aca55bf088d5beec9c88b7391e42ba4ca8ed3ad7..9c7b68a6e8980fabda5a0c540c8d3ae97f39a5ef 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 97113152e8858b9a4539e987f295fc05da4cdcaf..53931fac33fc330f4d4524ad4a1ced2728f65612 100644 (file)
--- 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 9f200b0cd8a718df8a5a4d3ba934f9d0169c1322..4ae6850bdb54d2417c1d772be9a4e6b1a2697b2d 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/sparse_matrix.templates.h b/include/deal.II/lac/sparse_matrix.templates.h
index c013e05c8b7e49b0bb7ab2d7be02ac497de7471b..ee62ee33fc974e13376e651a926fb53e895db88b 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/sparse_matrix_ez.h b/include/deal.II/lac/sparse_matrix_ez.h
index 964e490d57ba40f023cc89f925d9d5e436a132ae..51c4946e7695de17a9e83d787127f8e85fb79215 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/sparse_matrix_ez.templates.h b/include/deal.II/lac/sparse_matrix_ez.templates.h
index 9580e77c54094848320f6ea0d68d2f30712309b1..b6c6f614711110db31f93763d3ff4c8f6fd7ba15 100644 (file)
--- 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 <deal.II/lac/sparse_matrix_ez.h>
@@ -630,4 +630,4 @@ SparseMatrixEZ<number>::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 fff293d7caf28b4b617f9ff3152c0fed67ec6b32..4ecd6095e7b22ff3c5aac2b05b20eca24a9acb2b 100644 (file)
--- 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 <deal.II/lac/sparse_matrix.h>
 #include <deal.II/lac/sparse_decomposition.h>
@@ -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 5a9e095e13bb17df54021679f8dc39980ff30971..59b939405c01d9a430ea0c7fb1a278f2e7a0c425 100644 (file)
--- 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 <deal.II/base/memory_consumption.h>
@@ -202,4 +202,4 @@ SparseMIC<number>::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 1a73611f4a8e8ff7b2e9f2a2131075d465c175ca..8f1a23d3a4db6dddf3f16337b4c725eb512699cb 100644 (file)
--- 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 477a732d4f7cfcfe2882bf6d6bb9b0d2e3ef3c0c..9479680b74e1281a9d8f4b1f83fef97d98df1576 100644 (file)
--- 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 <deal.II/base/memory_consumption.h>

diff --git a/include/deal.II/lac/sparsity_pattern.h b/include/deal.II/lac/sparsity_pattern.h
index bad861c4d5738b7294ca88ba61ac1ea2a0f814a9..8085d4eb3aac619603522df8a277a2e2a9e84b5d 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/sparsity_tools.h b/include/deal.II/lac/sparsity_tools.h
index d82e5ec8e771e91c2b37747b8f8e49fac5a964cc..8b0be1c2221d882a0aa1b59c7d2fe334aa234538 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/swappable_vector.h b/include/deal.II/lac/swappable_vector.h
index bd2734ac1d528073a2d15712e285a02a9c9430f9..26e7af1cc7f19ae7c8f2a616c5fe43f4128cb1a6 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 4f48e92c9f1c73c34d3d61516e138745fb97bb00..de3706ed4e9bb9411aa9e22aefc065a32c85647c 100644 (file)
--- 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 <deal.II/base/memory_consumption.h>
@@ -255,4 +255,4 @@ SwappableVector<number>::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 f018f9e028f062d0a46d6bc8b0947493c3b7b3cf..c465c329345083bc62865f0a4a020790f763d50e 100644 (file)
--- 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 <deal.II/base/subscriptor.h>

diff --git a/include/deal.II/lac/tridiagonal_matrix.h b/include/deal.II/lac/tridiagonal_matrix.h
index e21f49fa696e057a9ccfeff4ad59fc26286faf7e..ddbda3db9be4e576e62790435c883b0f86ba1341 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/subscriptor.h>

diff --git a/include/deal.II/lac/trilinos_block_sparse_matrix.h b/include/deal.II/lac/trilinos_block_sparse_matrix.h
index 5c055f17b41cd46ffcd3e0096044f70aaf8cb24d..dc908cabf8a6d115fd158ad683c49aab3cf83eae 100644 (file)
--- 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 <deal.II/base/config.h>
@@ -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 dcda81f948e50883e4311b11f53d9641ee228727..0ede0968efac3f684c23ba705537448bf85560b4 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/trilinos_parallel_block_vector.h b/include/deal.II/lac/trilinos_parallel_block_vector.h
index 9a443a557776862544159201919c775f683bbe2f..233394288338a40bd30c7b43ccdd75013dca9a39 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h
index 4fce4157c28ebf5fe070d25175cc965ec309766d..c1a9765623d8ae7d5a6c277fb4e9185598fe4674 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h
index 4167993ab42e1fdc0764d5f083e2e75abe7d4f61..fda44afe05c22facfc224332114d0d0104aad3f5 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
index e939697e16b9a167619eb82ae44af800d27d99c8..4c705beb5eb0c9d254661d2ed2663cadc9890c84 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h
index aadeadea8557e444c1fce2ed74beeae3b5e63a15..377da8e29e53b64ca29f69f9354cb34a16bcdc29 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
index 9571613ddb4a7c6326ab953be74afdbc3f1a0a10..c4fa0aecc05ec661d3427fdc4478d11fd2e22eca 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h
index ec2da796ccd4ae0ca86d1d34572bab7b7d9c272e..d0e6d923906676850350b2cf29aae136df584916 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h
index df952f25fdabaa75e198a3c5b5a9dddb7cb915c2..ffc8590ebe69a68d0703b38b3848f5e167a085b2 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/vector.templates.h b/include/deal.II/lac/vector.templates.h
index bd05a4a061ee93c4b42b059d700e77e5b1c4feca..31f6bc50e7a2f5c560d484354dbf3970d470745d 100644 (file)
--- 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 <deal.II/base/template_constraints.h>

diff --git a/include/deal.II/lac/vector_memory.h b/include/deal.II/lac/vector_memory.h
index dfed862b64a1b8448ef6df0b2ef26c37e2a3b1c0..e9075027deecbdfe1c3cdaf90b17e462f43a439b 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/lac/vector_memory.templates.h b/include/deal.II/lac/vector_memory.templates.h
index 2bc6391f117099dbe2fb116fb6a544d5aa695162..e8d2934e553d9ea1dbf34b96a532b612d42337cf 100644 (file)
--- 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 <deal.II/lac/vector_memory.h>

diff --git a/include/deal.II/matrix_free/dof_info.h b/include/deal.II/matrix_free/dof_info.h
index 1bd8435f55c50951ad0942729701a3ecd67e0eb0..ae52cf4df063e66a0e6a2efe9bcc373573e1bfe9 100644 (file)
--- 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 <deal.II/base/exceptions.h>

diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
index e3a7d16a6baa1a0ece97ad2734f29675cad64355..6460d8ad0b895b28be9f98986dbbf5bd3a92b473 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/matrix_free/helper_functions.h b/include/deal.II/matrix_free/helper_functions.h
index 3d1c14d6d55a289ad7b3e2ec484f97facda08dcf..1d055dc8a818dd4e92696cd3bd0c0640d9f3be16 100644 (file)
--- 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 <deal.II/base/exceptions.h>

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 feaf34450beea75a5dada9bb56ecd73bb05595b5..12f1faec856a76604228b964189db6bf020876cd 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/matrix_free/mapping_info.h b/include/deal.II/matrix_free/mapping_info.h
index 0b89cf63fcdf23e8492a7d35180546f849954118..e8b3e223b2f9d19cd2fda409fc424c625a34b2f3 100644 (file)
--- 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 <deal.II/base/exceptions.h>

diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h
index 88c56e6da6a1ba9d419e3dea353d44163639ca4d..68508b8db11ab9edd5185b70ed5b8aa390c936c6 100644 (file)
--- 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 <deal.II/base/exceptions.h>
 #include <deal.II/base/parallel.h>

diff --git a/include/deal.II/matrix_free/operators.h b/include/deal.II/matrix_free/operators.h
index dec85a1a6e08c8ad8909b8328381bb88b1750765..f8ede5bc8e916397f4b2cd798a100fd15341dff2 100644 (file)
--- 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 <deal.II/base/exceptions.h>

diff --git a/include/deal.II/matrix_free/shape_info.h b/include/deal.II/matrix_free/shape_info.h
index 7d14d79fa187e3679623326042bef89017d72a86..324bb42384eabda24942d820b4838b87370d0915 100644 (file)
--- 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 <deal.II/base/exceptions.h>

diff --git a/include/deal.II/meshworker/assembler.h b/include/deal.II/meshworker/assembler.h
index 10a4029a491e1028ca7d29af95eb7212e1245bb4..948e6bccaac688d3744d19ea132082479eafa5e9 100644 (file)
--- 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 <deal.II/base/smartpointer.h>
 #include <deal.II/base/mg_level_object.h>

diff --git a/include/deal.II/meshworker/dof_info.h b/include/deal.II/meshworker/dof_info.h
index 02a9a7f193b2f06912efb7dc369ea196b8a7204d..cdfad1ec546bb5116e4c605971c653fbddb6d603 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/quadrature_lib.h>

diff --git a/include/deal.II/meshworker/functional.h b/include/deal.II/meshworker/functional.h
index 6bd6c6c5b653a50bd45953661c27975be7041cb0..b2c4a78cf4c1b080abd18ca349014a4c73afbe31 100644 (file)
--- 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 <deal.II/algorithms/any_data.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/meshworker/integration_info.h b/include/deal.II/meshworker/integration_info.h
index bd272a5eebb74e6b30a7e8a0f9517d999cc46f60..cbb9f92ebed324fbf0e6e691c9df0bfd38d04b47 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/quadrature_lib.h>

diff --git a/include/deal.II/meshworker/local_integrator.h b/include/deal.II/meshworker/local_integrator.h
index 0e6bdee19f71b2eca4544ede229a43129c8e216b..09a8007f769d0c66e69ab16415c9e40d24e343da 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/subscriptor.h>

diff --git a/include/deal.II/meshworker/local_results.h b/include/deal.II/meshworker/local_results.h
index 4916e9afc648a9c08c93bf77643a7f08f12395f8..d5187747410391c4627d3b109683d4e5068e368c 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/std_cxx11/function.h>

diff --git a/include/deal.II/meshworker/loop.h b/include/deal.II/meshworker/loop.h
index 0ff07b08deb2b7199f11cdb7f9449b74e266b733..f05cc9fec67cc4d234cf19a48c0990054ab92ef7 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/std_cxx11/function.h>

diff --git a/include/deal.II/meshworker/output.h b/include/deal.II/meshworker/output.h
index b5d7f8618cc9fca34c0512644f2623a3cabbe768..ee3513df9b4a8685378d2fb063684b69a7272966 100644 (file)
--- 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 <deal.II/meshworker/dof_info.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/meshworker/simple.h b/include/deal.II/meshworker/simple.h
index ebf69c7149de2072c3adc19a2d9385f8d4fddc5e..2c17bb892f647ef56869dd00d2a08393e8ea82a2 100644 (file)
--- 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 <deal.II/algorithms/any_data.h>
 #include <deal.II/base/smartpointer.h>

diff --git a/include/deal.II/meshworker/vector_selector.h b/include/deal.II/meshworker/vector_selector.h
index 3fe4390b5ec1b272554d5cf5a5ebb8bff029b572..802e6a02a5f59ece158221f473badad287543d89 100644 (file)
--- 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 <deal.II/algorithms/any_data.h>
 #include <deal.II/algorithms/named_selection.h>

diff --git a/include/deal.II/multigrid/mg_base.h b/include/deal.II/multigrid/mg_base.h
index 539633e173573abf67d4a9d93dc8c6aa8856148e..1a9264e40a4e5db214f8151c39b12df4696070cc 100644 (file)
--- 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 1403b560904f3f6e1c62cc8d99238c9bd560c137..8fcfb39e73934cd6f5bdb257df1195efefe3e37c 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/multigrid/mg_coarse.h b/include/deal.II/multigrid/mg_coarse.h
index 1ff7872b6fd08bc73d57ebca0929ba03697f69a1..b3ec3457645b9f681fe0a7da29cf254d88dc1b6f 100644 (file)
--- 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 <deal.II/lac/full_matrix.h>

diff --git a/include/deal.II/multigrid/mg_constrained_dofs.h b/include/deal.II/multigrid/mg_constrained_dofs.h
index 538ea6a4cf920fb158194c7e76582c1719261112..2efadac9b48a3946858f10966651ced7d43e40fd 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/subscriptor.h>

diff --git a/include/deal.II/multigrid/mg_dof_accessor.h b/include/deal.II/multigrid/mg_dof_accessor.h
index 61ea5000fc67a3d560449bb7a00d25246da095ce..57d8d45c45bb6e62b29c43252e76adbca24470fe 100644 (file)
--- 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 <deal.II/dofs/dof_accessor.h> instead.
 #include <deal.II/dofs/dof_accessor.h>

diff --git a/include/deal.II/multigrid/mg_matrix.h b/include/deal.II/multigrid/mg_matrix.h
index 85c98b60489251335d71897751387f639ddf71f8..efb52078458e6961f4a27fa3e1bdfc8a24dfd493 100644 (file)
--- 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 <deal.II/lac/vector.h>
 #include <deal.II/lac/pointer_matrix.h>

diff --git a/include/deal.II/multigrid/mg_smoother.h b/include/deal.II/multigrid/mg_smoother.h
index 4219ddfd1855acf080a4b116656ac0be6e2d5436..f846daab11e9a01f1023347134d7fee98a67482f 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/multigrid/mg_tools.h b/include/deal.II/multigrid/mg_tools.h
index 3430fd6bd62c02be7485cc1ff3fa70264f96e685..0eb03c2f0babeaf5ec2b66e3a9f4dee9bda64ccd 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/index_set.h>

diff --git a/include/deal.II/multigrid/mg_transfer.h b/include/deal.II/multigrid/mg_transfer.h
index 2d42751b9d75c0c2d1757a37331119f9a30cb362..eea708f66afd6938c9a169848cf279a25d2eca82 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/multigrid/mg_transfer.templates.h b/include/deal.II/multigrid/mg_transfer.templates.h
index 7243c8e2522c61134ac0bc52420b04025048cbae..7c2582a4df5a34c1e38a2c5d77bb64ad74873224 100644 (file)
--- 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 <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/sparse_matrix.h>

diff --git a/include/deal.II/multigrid/mg_transfer_block.h b/include/deal.II/multigrid/mg_transfer_block.h
index 13e37c8813c01d718fecc3bbb1430b51b3b98c2f..44b31b8a2b944929e0cec939fa8314db331bd354 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/multigrid/mg_transfer_block.templates.h b/include/deal.II/multigrid/mg_transfer_block.templates.h
index 6175394a33263c2b8660f733e9ae794b88a7b974..16b76e7260a1f51a603f970f3486000a502bfd56 100644 (file)
--- 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 <deal.II/lac/sparse_matrix.h>
 #include <deal.II/lac/constraint_matrix.h>

diff --git a/include/deal.II/multigrid/mg_transfer_component.h b/include/deal.II/multigrid/mg_transfer_component.h
index 9ec57830a777a5e31517eba977ac49d496042759..3338a7acc535f9ca8135e432c16fc13843c5a57e 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/multigrid/mg_transfer_component.templates.h b/include/deal.II/multigrid/mg_transfer_component.templates.h
index 5d2a117e4885e85f2b02b74cbbf2c5efe808c1b8..11457a8d546137ce0e183fe3132e62638bac4638 100644 (file)
--- 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 <deal.II/lac/sparse_matrix.h>
 #include <deal.II/grid/tria_iterator.h>

diff --git a/include/deal.II/multigrid/multigrid.h b/include/deal.II/multigrid/multigrid.h
index a6d89c5c4a8338df8b0856c6f4f39f1cdb8392ee..68e1154815dfa3ecb48adb9dc344ba3762cb66b3 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/multigrid/multigrid.templates.h b/include/deal.II/multigrid/multigrid.templates.h
index 262b58c7ee40582cd3de67ad50fee3d8a33fb2b6..e365d7ac7b0d8d37cf57c88f6a00cf101e12512f 100644 (file)
--- 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 <deal.II/multigrid/multigrid.h>
 
 #include <deal.II/base/logstream.h>

diff --git a/include/deal.II/multigrid/sparse_matrix_collection.h b/include/deal.II/multigrid/sparse_matrix_collection.h
index 0390e7b9e6807c08541c3bb1a4a3bd210baabca3..f70493fce5d8b5265475171123f71aaa8a2989cc 100644 (file)
--- 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 <deal.II/lac/vector.h>
 #include <deal.II/lac/pointer_matrix.h>

diff --git a/include/deal.II/numerics/data_component_interpretation.h b/include/deal.II/numerics/data_component_interpretation.h
index 8742b3283469d8cd86171901fbc60b59cefa5ef4..2929d7ad58821e4541df13efbbf7ea2c9faf248d 100644 (file)
--- 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 12cf2850c5b679ae897ac41574c0a0f06ad224b7..ce3a03934098ff738a29e0620625c912e985a95e 100644 (file)
--- 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 4fe7467cb5086c15a0e45c7e4b1c8223721f8ac1..08bf6caa45d4837ec07cf68f7a56c227918be26d 100644 (file)
--- 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 97f0798edb134d618f3f2453ea98dfd11aa0eaeb..4cf2ad4a8589e9e70d43a44c7ffb13b938c3cb39 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/numerics/data_out_rotation.h b/include/deal.II/numerics/data_out_rotation.h
index 6cc30c08e2d5ecea818e1e4ff01c48133a7d35d9..edf6a500d9b6a42b6f46a819a5c7fc70942374a4 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/numerics/data_out_stack.h b/include/deal.II/numerics/data_out_stack.h
index 8d8e0489ac23e78b3c15e9dd30562198f32edcc1..d244fb59b08a1fa3f32f9887ac329c9ea2a48a5a 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/numerics/data_postprocessor.h b/include/deal.II/numerics/data_postprocessor.h
index 7a52721750fb6c8a3b2d673ac13041c23c9d2051..9167d859b07cec1dead8cdf031780afa2588c699 100644 (file)
--- 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 9d3d33360d9df6996946c5e358c66662089d6eb6..c67daebfe68f9475c96d4dab43ad5ac12586ba1a 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/exceptions.h>

diff --git a/include/deal.II/numerics/dof_output_operator.h b/include/deal.II/numerics/dof_output_operator.h
index eeb51bd37dd40251d01455fe9ec9dea8d7451c73..74751a36d091b1a9b32766bdb636e77e63147f40 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/parameter_handler.h>

diff --git a/include/deal.II/numerics/dof_print_solver_step.h b/include/deal.II/numerics/dof_print_solver_step.h
index bf3f54c095f43d711ca9c52e678b25859688e4d8..b95522c75c7cae6d45de499374f0118f6c827ea0 100644 (file)
--- 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 <deal.II/base/config.h>
 #include <deal.II/base/logstream.h>

diff --git a/include/deal.II/numerics/error_estimator.h b/include/deal.II/numerics/error_estimator.h
index b3872389838041ddcfe8f08e9194e0650620e85b..8d860b6d777bbeb97b7acfc1482c1ea287477297 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/numerics/fe_field_function.h b/include/deal.II/numerics/fe_field_function.h
index f042766e43fe1df33eb18bcc0da25db5c35f7f9d..6a49e407720522957f4221720a0e28a211b0b831 100644 (file)
--- 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 <deal.II/base/function.h>
 #include <deal.II/dofs/dof_handler.h>

diff --git a/include/deal.II/numerics/histogram.h b/include/deal.II/numerics/histogram.h
index 889d6253d2de441f5ace0e39279d020cdd6d8a11..d33ead0c9911343d32f54f5b634ac5c6a45a4e16 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/numerics/matrix_tools.h b/include/deal.II/numerics/matrix_tools.h
index a4b8ed59a9cd089dc19255fb308915e4143e32a4..2ca5cc554501bf353cc6555294d3571552bbc10b 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/numerics/solution_transfer.h b/include/deal.II/numerics/solution_transfer.h
index a1d3684c29011f9a8f3e1c2a5b15398351e8c874..6e4bf8796642edaa18715f28bcc862b86bb6778b 100644 (file)
--- 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 bf56248fa77b5650521d0188a744472f096f7c49..3fd97dfbf2d145465d5148446d19a16052f2fb39 100644 (file)
--- 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 5d953427d58d5f8ba2a24069f61b2b3fbecdeedb..37b4a7c69e336257f8f4f62e744f7ea49e891109 100644 (file)
--- 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 <deal.II/base/config.h>

diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h
index c9b851f19cf4275c51927271ff923df4f406d2f6..60fbd0584280d43832689467838a1e8b964b3ec2 100644 (file)
--- 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 <deal.II/base/derivative_form.h>
 #include <deal.II/base/function.h>

diff --git a/include/deal.II/opencascade/boundary_lib.h b/include/deal.II/opencascade/boundary_lib.h
index 0a62904f63d67ae3c3ddd57bad46ecab2b8c0fa3..7eab4e921337f5995165779d33c20d49593f3629 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/include/deal.II/opencascade/utilities.h b/include/deal.II/opencascade/utilities.h
index cc7b18e45da704fac0f0278d55b4a4fd004926e4..efbd14f36af1ec07ea8692d799a585491e7e7be1 100644 (file)
--- 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 <deal.II/base/config.h>
 

diff --git a/tests/base/patches.h b/tests/base/patches.h
index 5fa3e79bd86282489e2877619aa5a3c95d53790d..305bb995e7f564c089a0c6991a14efc9503edafd 100644 (file)
--- a/tests/base/patches.h
+++ b/tests/base/patches.h
@@ -72,7 +72,7 @@ create_patches(std::vector<DataOutBase::Patch<dim, spacedim> > &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 <int dim>
 void