From e31b59009492c3e3248f4610801841871cb983bd Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 9 Dec 1999 14:50:14 +0000 Subject: [PATCH] Change many file names and the like, to adapt to the new directory structure. git-svn-id: https://svn.dealii.org/trunk@2023 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/Makefile | 9 +- deal.II/base/include/base/.cvsignore | 2 +- deal.II/base/include/base/data_out_base.h | 4 +- deal.II/base/include/base/function.h | 4 +- deal.II/base/include/base/tensor_function.h | 4 +- deal.II/base/source/function_time.cc | 2 +- deal.II/base/source/job_identifier.cc | 2 +- deal.II/base/source/log.cc | 2 +- deal.II/base/source/programid.cc | 2 +- deal.II/base/source/tensor_function.cc | 2 +- deal.II/common/Make.global_options | 2 +- deal.II/common/scripts/forward_declarations | 2 +- deal.II/deal.II/Makefile | 10 +- deal.II/deal.II/include/dofs/dof_accessor.h | 2 +- .../include/dofs/dof_accessor.templates.h | 10 +- .../deal.II/include/dofs/dof_constraints.h | 2 +- deal.II/deal.II/include/dofs/dof_handler.h | 6 +- deal.II/deal.II/include/dofs/dof_tools.h | 2 +- .../deal.II/include/dofs/mg_dof_accessor.h | 2 +- deal.II/deal.II/include/dofs/mg_dof_handler.h | 2 +- deal.II/deal.II/include/fe/fe.h | 4 +- deal.II/deal.II/include/fe/fe_values.h | 4 +- deal.II/deal.II/include/grid/.cvsignore | 1 + deal.II/deal.II/include/grid/grid_generator.h | 4 +- deal.II/deal.II/include/grid/grid_out.h | 2 +- deal.II/deal.II/include/grid/tria.h | 6 +- deal.II/deal.II/include/grid/tria_accessor.h | 4 +- deal.II/deal.II/include/grid/tria_boundary.h | 2 +- deal.II/deal.II/include/multigrid/mg_base.h | 5 +- .../include/multigrid/mg_dof_accessor.h | 2 +- .../include/multigrid/mg_dof_handler.h | 2 +- .../deal.II/include/multigrid/mg_smoother.h | 4 +- deal.II/deal.II/include/multigrid/multigrid.h | 6 +- .../include/multigrid/multigrid.templates.h | 2 +- deal.II/deal.II/include/numerics/assembler.h | 4 +- deal.II/deal.II/include/numerics/base.h | 4 +- deal.II/deal.II/include/numerics/data_io.h | 4 +- deal.II/deal.II/include/numerics/data_out.h | 4 +- .../deal.II/include/numerics/data_out_stack.h | 4 +- .../include/numerics/dof_renumbering.h | 2 +- .../include/numerics/error_estimator.h | 4 +- deal.II/deal.II/include/numerics/histogram.h | 2 +- .../deal.II/include/numerics/mg_smoother.h | 4 +- deal.II/deal.II/include/numerics/multigrid.h | 6 +- .../include/numerics/multigrid.templates.h | 2 +- .../include/numerics/solution_transfer.h | 4 +- .../deal.II/include/numerics/time_dependent.h | 4 +- deal.II/deal.II/include/numerics/vectors.h | 4 +- deal.II/deal.II/source/dofs/dof_accessor.cc | 12 +- .../deal.II/source/dofs/dof_constraints.cc | 6 +- deal.II/deal.II/source/dofs/dof_handler.cc | 10 +- .../deal.II/source/dofs/dof_renumbering.cc | 12 +- deal.II/deal.II/source/dofs/dof_tools.cc | 12 +- .../deal.II/source/dofs/mg_dof_accessor.cc | 10 +- deal.II/deal.II/source/dofs/mg_dof_handler.cc | 10 +- deal.II/deal.II/source/fe/fe.cc | 2 +- .../deal.II/source/fe/fe_lib.criss_cross.cc | 2 +- deal.II/deal.II/source/fe/fe_lib.cubic.cc | 2 +- .../deal.II/source/fe/fe_lib.dg.constant.cc | 2 +- deal.II/deal.II/source/fe/fe_lib.linear.cc | 2 +- deal.II/deal.II/source/fe/fe_lib.quadratic.cc | 2 +- deal.II/deal.II/source/fe/fe_lib.quartic.cc | 2 +- deal.II/deal.II/source/fe/fe_values.cc | 2 +- deal.II/deal.II/source/fe/q1_mapping.cc | 6 +- .../deal.II/source/fe/q1_mapping.jacobians.cc | 2 +- .../source/grid/grid_out.all_dimensions.cc | 2 +- deal.II/deal.II/source/grid/grid_out.cc | 2 +- deal.II/deal.II/source/grid/intergrid_map.cc | 8 +- .../deal.II/source/grid/persistent_tria.cc | 2 +- deal.II/deal.II/source/grid/tria.cc | 2 +- .../source/multigrid/mg_dof_accessor.cc | 10 +- .../source/multigrid/mg_dof_handler.cc | 10 +- .../deal.II/source/multigrid/mg_smoother.cc | 4 +- deal.II/deal.II/source/multigrid/multigrid.cc | 4 +- deal.II/deal.II/source/numerics/assembler.cc | 4 +- deal.II/deal.II/source/numerics/base.cc | 6 +- deal.II/deal.II/source/numerics/data_io.cc | 6 +- deal.II/deal.II/source/numerics/data_out.cc | 6 +- .../deal.II/source/numerics/data_out_stack.cc | 6 +- deal.II/deal.II/source/numerics/equation.cc | 4 +- .../source/numerics/error_estimator.cc | 4 +- deal.II/deal.II/source/numerics/histogram.cc | 2 +- deal.II/deal.II/source/numerics/matrices.cc | 6 +- .../deal.II/source/numerics/mg_smoother.cc | 4 +- deal.II/deal.II/source/numerics/multigrid.cc | 4 +- .../source/numerics/solution_transfer.cc | 6 +- .../deal.II/source/numerics/time_dependent.cc | 2 +- deal.II/deal.II/source/numerics/vectors.cc | 10 +- deal.II/lac/Makefile | 9 +- deal.II/lac/include/lac/.cvsignore | 2 +- .../lac/include/lac/full_matrix.templates.h | 2 +- deal.II/lac/include/lac/mgbase.h | 5 +- deal.II/lac/include/lac/precondition_block.h | 2 +- .../lac/precondition_block.templates.h | 4 +- deal.II/lac/include/lac/solver.h | 2 +- deal.II/lac/include/lac/solver_gmres.h | 2 +- deal.II/lac/include/lac/solver_selector.h | 2 +- deal.II/lac/include/lac/sparse_ilu.h | 2 +- .../lac/include/lac/sparse_matrix.templates.h | 2 +- deal.II/lac/include/lac/sparse_vanka.h | 2 +- .../lac/include/lac/sparse_vanka.templates.h | 4 +- deal.II/lac/source/full_matrix.double.cc | 2 +- deal.II/lac/source/full_matrix.float.cc | 2 +- deal.II/lac/source/sparse_matrix.cc | 2 +- deal.II/lac/source/sparse_matrix.double.cc | 8 +- deal.II/lac/source/sparse_matrix.float.cc | 8 +- .../lac/source/sparse_matrix.long_double.cc | 8 +- tests/base/Makefile | 2 +- tests/deal.II/Makefile | 2 +- tests/deal.II/constraints.cc | 8 +- tests/deal.II/dof_test.cc | 8 +- tests/deal.II/fe_tables.cc | 4 +- tests/deal.II/gradients.cc | 4 +- tests/deal.II/grid_test.cc | 2 +- tests/deal.II/mg.cc | 12 +- tests/deal.II/mglocal.cc | 14 +- tests/deal.II/second_derivatives.cc | 4 +- tests/deal.II/wave-test-3.cc | 122 +++++++++--------- tests/fe/show_shapes.cc | 2 +- tests/fe/show_transform.cc | 2 +- tests/lac/Makefile | 2 +- tests/lac/mg.cc | 2 +- tests/lac/solver.cc | 2 +- tests/lac/testmatrix.cc | 2 +- tests/lac/testmatrix.h | 2 +- 125 files changed, 325 insertions(+), 324 deletions(-) create mode 100644 deal.II/deal.II/include/grid/.cvsignore diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index 995627cc38..7e3e925f7e 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -22,7 +22,7 @@ o-files = $(o-files-base3) go-files = $(patsubst lib/o/%,lib/go/%,$(o-files-base3:.o=.go)) h-files = $(shell echo include/base/*.h) -forward-declarations = $D/base/include/base/forward-declarations.h +forward-declarations = $D/base/include/base/forward_declarations.h # get options which hold for all files of the project include $D/common/Make.global_options @@ -73,7 +73,8 @@ lib/libbase.g.a: $(forward-declarations) $(go-files) clean: - -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go include/base/forward-declarations.h* + -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go \ + include/base/forward_declarations.h* @@ -88,7 +89,7 @@ clean: #appended lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile @echo ============================ Remaking Makefile - @perl $D/common/scripts/Make_dep_2.pl $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \ | perl -p -e 's!(lib/g?o/data_out_base)(.g?o)!$$1_1d$$2 $$1_2d$$2 $$1_3d$$2 $$1_4d$$2!g;' \ > lib/Makefile.dep @@ -97,7 +98,7 @@ lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile include lib/Makefile.dep # include a rule which tells how to remake the forward declarations file -include $D/common/Makescripts/forward_declarations +include $D/common/scripts/forward_declarations .PHONY: clean diff --git a/deal.II/base/include/base/.cvsignore b/deal.II/base/include/base/.cvsignore index e6ca8c2e66..fa946188cb 100644 --- a/deal.II/base/include/base/.cvsignore +++ b/deal.II/base/include/base/.cvsignore @@ -1 +1 @@ -forward-declarations.h +forward_declarations.h diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h index 566796546f..3387b778a0 100644 --- a/deal.II/base/include/base/data_out_base.h +++ b/deal.II/base/include/base/data_out_base.h @@ -5,9 +5,9 @@ /*---------------------------- data_out_base.h ---------------------------*/ -#include +#include #include -#include +#include #include #include #include diff --git a/deal.II/base/include/base/function.h b/deal.II/base/include/base/function.h index 3b24e96c7a..d8696ec7fc 100644 --- a/deal.II/base/include/base/function.h +++ b/deal.II/base/include/base/function.h @@ -6,9 +6,9 @@ /*---------------------------- function.h ---------------------------*/ -#include +#include #include -#include +#include #include #include diff --git a/deal.II/base/include/base/tensor_function.h b/deal.II/base/include/base/tensor_function.h index 6d0cacbc78..18ea31e0dd 100644 --- a/deal.II/base/include/base/tensor_function.h +++ b/deal.II/base/include/base/tensor_function.h @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include diff --git a/deal.II/base/source/function_time.cc b/deal.II/base/source/function_time.cc index 0fa1f827c9..1701c85588 100644 --- a/deal.II/base/source/function_time.cc +++ b/deal.II/base/source/function_time.cc @@ -1,6 +1,6 @@ // $Id$ -#include +#include FunctionTime::FunctionTime(double initial_time) diff --git a/deal.II/base/source/job_identifier.cc b/deal.II/base/source/job_identifier.cc index 9c04be267d..f475d14ea9 100644 --- a/deal.II/base/source/job_identifier.cc +++ b/deal.II/base/source/job_identifier.cc @@ -1,6 +1,6 @@ // $Id$ -#include +#include #include diff --git a/deal.II/base/source/log.cc b/deal.II/base/source/log.cc index ce3d0d1ce5..02d70e7213 100644 --- a/deal.II/base/source/log.cc +++ b/deal.II/base/source/log.cc @@ -1,7 +1,7 @@ // $Id$ #include -#include +#include diff --git a/deal.II/base/source/programid.cc b/deal.II/base/source/programid.cc index 9ded9fe055..b5e64f6092 100644 --- a/deal.II/base/source/programid.cc +++ b/deal.II/base/source/programid.cc @@ -1,6 +1,6 @@ // $Id$ -#include +#include const char* JobIdentifier::program_id() diff --git a/deal.II/base/source/tensor_function.cc b/deal.II/base/source/tensor_function.cc index 34801c9c77..85ac7c405b 100644 --- a/deal.II/base/source/tensor_function.cc +++ b/deal.II/base/source/tensor_function.cc @@ -1,7 +1,7 @@ // $Id$ -#include +#include #include #include #include diff --git a/deal.II/common/Make.global_options b/deal.II/common/Make.global_options index c5473376a7..97a2ff1b74 100644 --- a/deal.II/common/Make.global_options +++ b/deal.II/common/Make.global_options @@ -30,7 +30,7 @@ CXXFLAGS.o= -O2 -Wuninitialized -ffast-math \ # DEAL_II_USE_MT=true ifeq ($(DEAL_II_USE_MT),true) - INCLUDE += -I $(ACE_ROOT) + INCLUDE += -I$(ACE_ROOT) CXXFLAGS.g += -DDEAL_II_USE_MT -threads CXXFLAGS.o += -DDEAL_II_USE_MT -threads diff --git a/deal.II/common/scripts/forward_declarations b/deal.II/common/scripts/forward_declarations index 5835842046..642afc41b6 100644 --- a/deal.II/common/scripts/forward_declarations +++ b/deal.II/common/scripts/forward_declarations @@ -21,7 +21,7 @@ $(forward-declarations): $(filter-out %forward-declarations%,$(h-files)) @echo ============================ Remaking $(@F) @touch $@.old @-cp $@ $@.old > /dev/null 2>&1 - @perl $D/common/scripts/Make_forward_declarations.pl \ + @perl $D/common/scripts/forward_declarations.pl \ $(filter-out %forward-declarations.h,$(h-files)) \ > $@.new @if test -n "`diff $(forward-declarations).old $(forward-declarations).new`" ; then \ diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index 519c95c663..febe1e3bee 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -23,7 +23,7 @@ default: 2dg 2d cc-files = $(shell echo source/*/*.cc) h-files = $(shell echo include/*/*.h) -forward-declarations = $D/deal.II/include/basic/forward-declarations.h +forward-declarations = $D/deal.II/include/grid/forward_declarations.h # strip subdirectories from cc file names, preprend a "lib/[g]o" @@ -72,7 +72,7 @@ lib/3d/o/%.o : @$(CXX) $(CXXFLAGS) $(CXXFLAGS.o) -Ddeal_II_dimension=3 -c $< -o $@ # special rules for exceptional files -lib/3d/o/q1_mapping_jacobians_3d.o: +lib/3d/o/q1_mapping.jacobians_3d.o: @echo =====deal.II====3d====opt==special== $(<:source/%=%) @$(CXX) $(CXXFLAGS) $(filter-out -O2 -Wuninitialized,$(CXXFLAGS.o)) -Ddeal_II_dimension=3 -c $< -o $@ @@ -108,7 +108,7 @@ lib/libdeal_II_3d.a: $(o-files-3d) #of this file. lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile @echo ============================ Remaking Makefile - @perl $D/common/scripts/Make_dep_2.pl $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \ | perl -p -e 's!^lib/(g?o/.*):!lib/DIM_PLACEHOLDER/$$1:!g;' \ | perl -pe 's!(\.g?o):!_DIM_PLACEHOLDER$$1:!g;' \ | perl -pe 's!^lib/DIM_PLACEHOLDER/(.*):!lib/1d/$$1 lib/2d/$$1 lib/3d/$$1:!g;'\ @@ -121,7 +121,7 @@ lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile include lib/Makefile.dep # include a rule which tells how to remake the forward declarations file -include $D/common/Makescripts/forward_declarations +include $D/common/scripts/forward_declarations @@ -138,7 +138,7 @@ examples: clean: examples-clean lib-clean lib-clean: - -rm -f *~ */*~ */*/*~ include/basic/forward-declarations.h* + -rm -f *~ */*~ */*/*~ include/grid/forward_declarations.h* cd lib ; $(MAKE) clean examples-clean: diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index f068cce28d..832b94d3d8 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -7,7 +7,7 @@ #include -#include +#include #include diff --git a/deal.II/deal.II/include/dofs/dof_accessor.templates.h b/deal.II/deal.II/include/dofs/dof_accessor.templates.h index 3142ec24cf..0ecbae29e5 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -5,16 +5,16 @@ /*---------------------------- dof_accessor.templates.h ---------------------------*/ -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include diff --git a/deal.II/deal.II/include/dofs/dof_constraints.h b/deal.II/deal.II/include/dofs/dof_constraints.h index a56fff95fd..ae3a955c9d 100644 --- a/deal.II/deal.II/include/dofs/dof_constraints.h +++ b/deal.II/deal.II/include/dofs/dof_constraints.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h index 533a502954..07c191c117 100644 --- a/deal.II/deal.II/include/dofs/dof_handler.h +++ b/deal.II/deal.II/include/dofs/dof_handler.h @@ -8,10 +8,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index be4db5aafc..5e7dc29925 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -6,7 +6,7 @@ // Copyright Wolfgang Bangerth, Guido Kanschat, and others 1999 -#include +#include #include diff --git a/deal.II/deal.II/include/dofs/mg_dof_accessor.h b/deal.II/deal.II/include/dofs/mg_dof_accessor.h index 6059b05f5c..7e94014b42 100644 --- a/deal.II/deal.II/include/dofs/mg_dof_accessor.h +++ b/deal.II/deal.II/include/dofs/mg_dof_accessor.h @@ -6,7 +6,7 @@ /*---------------------------- mg_dof_accessor.h ---------------------------*/ -#include +#include diff --git a/deal.II/deal.II/include/dofs/mg_dof_handler.h b/deal.II/deal.II/include/dofs/mg_dof_handler.h index 22705878e5..f27031aa0c 100644 --- a/deal.II/deal.II/include/dofs/mg_dof_handler.h +++ b/deal.II/deal.II/include/dofs/mg_dof_handler.h @@ -6,7 +6,7 @@ /*---------------------------- mg_dof.h ---------------------------*/ -#include +#include diff --git a/deal.II/deal.II/include/fe/fe.h b/deal.II/deal.II/include/fe/fe.h index a5a9e20896..f5f21be4cf 100644 --- a/deal.II/deal.II/include/fe/fe.h +++ b/deal.II/deal.II/include/fe/fe.h @@ -9,9 +9,9 @@ #include #include #include -#include +#include #include -#include +#include diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index 6803c8cd11..db369ffef5 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/include/grid/.cvsignore b/deal.II/deal.II/include/grid/.cvsignore new file mode 100644 index 0000000000..fa946188cb --- /dev/null +++ b/deal.II/deal.II/include/grid/.cvsignore @@ -0,0 +1 @@ +forward_declarations.h diff --git a/deal.II/deal.II/include/grid/grid_generator.h b/deal.II/deal.II/include/grid/grid_generator.h index f425ccc041..e1e22d34c0 100644 --- a/deal.II/deal.II/include/grid/grid_generator.h +++ b/deal.II/deal.II/include/grid/grid_generator.h @@ -5,8 +5,8 @@ /*---------------------------- grid_generator.h ---------------------------*/ -#include -#include +#include +#include #include diff --git a/deal.II/deal.II/include/grid/grid_out.h b/deal.II/deal.II/include/grid/grid_out.h index 197ba7a3d0..92cbafbadf 100644 --- a/deal.II/deal.II/include/grid/grid_out.h +++ b/deal.II/deal.II/include/grid/grid_out.h @@ -4,7 +4,7 @@ #define __grid_out_H /*---------------------------- grid_out.h ---------------------------*/ -#include +#include #include #include diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h index ad87613147..4afca25a99 100644 --- a/deal.II/deal.II/include/grid/tria.h +++ b/deal.II/deal.II/include/grid/tria.h @@ -6,9 +6,9 @@ /*---------------------------- tria.h ---------------------------*/ #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index 02fe5f494f..e3bf65f933 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -7,8 +7,8 @@ #include -#include -#include +#include +#include #include diff --git a/deal.II/deal.II/include/grid/tria_boundary.h b/deal.II/deal.II/include/grid/tria_boundary.h index 81ce9da8a0..233564c814 100644 --- a/deal.II/deal.II/include/grid/tria_boundary.h +++ b/deal.II/deal.II/include/grid/tria_boundary.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include diff --git a/deal.II/deal.II/include/multigrid/mg_base.h b/deal.II/deal.II/include/multigrid/mg_base.h index 319e51e17c..baea5b2fec 100644 --- a/deal.II/deal.II/include/multigrid/mg_base.h +++ b/deal.II/deal.II/include/multigrid/mg_base.h @@ -8,11 +8,10 @@ #include #include -#include +#include #include #include -#include @@ -258,7 +257,7 @@ class MGVector : public Subscriptor * with a subscriptor for smart pointers. * @author Guido Kanschat, 1999 */ -template > +template > class MGMatrix : public Subscriptor, public vector { diff --git a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h index 6059b05f5c..7e94014b42 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h @@ -6,7 +6,7 @@ /*---------------------------- mg_dof_accessor.h ---------------------------*/ -#include +#include diff --git a/deal.II/deal.II/include/multigrid/mg_dof_handler.h b/deal.II/deal.II/include/multigrid/mg_dof_handler.h index 22705878e5..f27031aa0c 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_handler.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_handler.h @@ -6,7 +6,7 @@ /*---------------------------- mg_dof.h ---------------------------*/ -#include +#include diff --git a/deal.II/deal.II/include/multigrid/mg_smoother.h b/deal.II/deal.II/include/multigrid/mg_smoother.h index 6b76df8894..0c73624f05 100644 --- a/deal.II/deal.II/include/multigrid/mg_smoother.h +++ b/deal.II/deal.II/include/multigrid/mg_smoother.h @@ -5,9 +5,9 @@ /*---------------------------- mg_smoother.h ---------------------------*/ -#include +#include #include -#include +#include #include #include diff --git a/deal.II/deal.II/include/multigrid/multigrid.h b/deal.II/deal.II/include/multigrid/multigrid.h index 1c0b779a78..bdac914ff0 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.h +++ b/deal.II/deal.II/include/multigrid/multigrid.h @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/deal.II/deal.II/include/multigrid/multigrid.templates.h b/deal.II/deal.II/include/multigrid/multigrid.templates.h index 9f908631be..b116393928 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.templates.h +++ b/deal.II/deal.II/include/multigrid/multigrid.templates.h @@ -5,7 +5,7 @@ /*---------------------------- multigrid.templates.h ---------------------------*/ -#include +#include #include #include #include diff --git a/deal.II/deal.II/include/numerics/assembler.h b/deal.II/deal.II/include/numerics/assembler.h index 1595292810..0386f7ff93 100644 --- a/deal.II/deal.II/include/numerics/assembler.h +++ b/deal.II/deal.II/include/numerics/assembler.h @@ -6,8 +6,8 @@ /*---------------------------- problem_assembler.h ---------------------------*/ #include -#include -#include +#include +#include #include #include diff --git a/deal.II/deal.II/include/numerics/base.h b/deal.II/deal.II/include/numerics/base.h index 0b6b71b5f9..1b0834b2c3 100644 --- a/deal.II/deal.II/include/numerics/base.h +++ b/deal.II/deal.II/include/numerics/base.h @@ -6,9 +6,9 @@ /*---------------------------- problem_base.h ---------------------------*/ -#include +#include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/include/numerics/data_io.h b/deal.II/deal.II/include/numerics/data_io.h index dcb3575b90..810217620c 100644 --- a/deal.II/deal.II/include/numerics/data_io.h +++ b/deal.II/deal.II/include/numerics/data_io.h @@ -6,8 +6,8 @@ /*---------------------------- data_io.h ---------------------------*/ #include -#include -#include +#include +#include #include #include diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index b3366ea63d..f4e3cb57a2 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -4,8 +4,8 @@ #define __data_out_H /*---------------------------- data_out.h ---------------------------*/ -#include -#include +#include +#include #include diff --git a/deal.II/deal.II/include/numerics/data_out_stack.h b/deal.II/deal.II/include/numerics/data_out_stack.h index 8e48fdd315..5e7c3b20c9 100644 --- a/deal.II/deal.II/include/numerics/data_out_stack.h +++ b/deal.II/deal.II/include/numerics/data_out_stack.h @@ -6,8 +6,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/deal.II/deal.II/include/numerics/dof_renumbering.h b/deal.II/deal.II/include/numerics/dof_renumbering.h index 4e8beacb87..33a2cf70b7 100644 --- a/deal.II/deal.II/include/numerics/dof_renumbering.h +++ b/deal.II/deal.II/include/numerics/dof_renumbering.h @@ -6,7 +6,7 @@ #include -#include +#include diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h index fb802549d5..69018e41e5 100644 --- a/deal.II/deal.II/include/numerics/error_estimator.h +++ b/deal.II/deal.II/include/numerics/error_estimator.h @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/deal.II/deal.II/include/numerics/histogram.h b/deal.II/deal.II/include/numerics/histogram.h index 14d9e46f40..8bdacaaf41 100644 --- a/deal.II/deal.II/include/numerics/histogram.h +++ b/deal.II/deal.II/include/numerics/histogram.h @@ -6,7 +6,7 @@ #include -#include +#include #include #include diff --git a/deal.II/deal.II/include/numerics/mg_smoother.h b/deal.II/deal.II/include/numerics/mg_smoother.h index 6b76df8894..0c73624f05 100644 --- a/deal.II/deal.II/include/numerics/mg_smoother.h +++ b/deal.II/deal.II/include/numerics/mg_smoother.h @@ -5,9 +5,9 @@ /*---------------------------- mg_smoother.h ---------------------------*/ -#include +#include #include -#include +#include #include #include diff --git a/deal.II/deal.II/include/numerics/multigrid.h b/deal.II/deal.II/include/numerics/multigrid.h index 1c0b779a78..bdac914ff0 100644 --- a/deal.II/deal.II/include/numerics/multigrid.h +++ b/deal.II/deal.II/include/numerics/multigrid.h @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/deal.II/deal.II/include/numerics/multigrid.templates.h b/deal.II/deal.II/include/numerics/multigrid.templates.h index 9f908631be..b116393928 100644 --- a/deal.II/deal.II/include/numerics/multigrid.templates.h +++ b/deal.II/deal.II/include/numerics/multigrid.templates.h @@ -5,7 +5,7 @@ /*---------------------------- multigrid.templates.h ---------------------------*/ -#include +#include #include #include #include diff --git a/deal.II/deal.II/include/numerics/solution_transfer.h b/deal.II/deal.II/include/numerics/solution_transfer.h index 36e5939550..4b9ba455b6 100644 --- a/deal.II/deal.II/include/numerics/solution_transfer.h +++ b/deal.II/deal.II/include/numerics/solution_transfer.h @@ -6,8 +6,8 @@ /*---------------------------- solutiontransfer.h ----------------------*/ -#include -#include +#include +#include #include #include diff --git a/deal.II/deal.II/include/numerics/time_dependent.h b/deal.II/deal.II/include/numerics/time_dependent.h index 008254309c..c3d0a35675 100644 --- a/deal.II/deal.II/include/numerics/time_dependent.h +++ b/deal.II/deal.II/include/numerics/time_dependent.h @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/deal.II/deal.II/include/numerics/vectors.h b/deal.II/deal.II/include/numerics/vectors.h index 22f9c72953..521261f480 100644 --- a/deal.II/deal.II/include/numerics/vectors.h +++ b/deal.II/deal.II/include/numerics/vectors.h @@ -6,9 +6,9 @@ /*---------------------------- vectors.h ---------------------------*/ -#include +#include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index 374e5de195..c980269fa5 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -3,17 +3,17 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index e66b41e8cf..ce0cd63e92 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -3,8 +3,8 @@ -#include -#include +#include +#include #include #include #include @@ -323,7 +323,7 @@ void ConstraintMatrix::print (ostream &out) const { AssertThrow (out, ExcIO()); }; -#include +#include #define number double template void ConstraintMatrix::condense(const SparseMatrix &uncondensed, diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index d574d5cf0d..1a2b242a79 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -2,17 +2,17 @@ /* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index 6261c537bc..97c537e6e7 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -1,14 +1,14 @@ /* $Id$ */ -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index a534d11259..13d44ab753 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -1,15 +1,15 @@ // $Id$ // Copyright Guido Kanschat, 1999 -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include diff --git a/deal.II/deal.II/source/dofs/mg_dof_accessor.cc b/deal.II/deal.II/source/dofs/mg_dof_accessor.cc index 0e72ae0e8f..96dab7eaa8 100644 --- a/deal.II/deal.II/source/dofs/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/mg_dof_accessor.cc @@ -3,16 +3,16 @@ -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include diff --git a/deal.II/deal.II/source/dofs/mg_dof_handler.cc b/deal.II/deal.II/source/dofs/mg_dof_handler.cc index 499d92e29e..87f8192c25 100644 --- a/deal.II/deal.II/source/dofs/mg_dof_handler.cc +++ b/deal.II/deal.II/source/dofs/mg_dof_handler.cc @@ -2,17 +2,17 @@ /* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index 9c76b0f53a..c924ad07f2 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include diff --git a/deal.II/deal.II/source/fe/fe_lib.criss_cross.cc b/deal.II/deal.II/source/fe/fe_lib.criss_cross.cc index 3c0adf2f3b..9c38373122 100644 --- a/deal.II/deal.II/source/fe/fe_lib.criss_cross.cc +++ b/deal.II/deal.II/source/fe/fe_lib.criss_cross.cc @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/fe/fe_lib.cubic.cc b/deal.II/deal.II/source/fe/fe_lib.cubic.cc index e5c37f342d..79f7324b61 100644 --- a/deal.II/deal.II/source/fe/fe_lib.cubic.cc +++ b/deal.II/deal.II/source/fe/fe_lib.cubic.cc @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/fe/fe_lib.dg.constant.cc b/deal.II/deal.II/source/fe/fe_lib.dg.constant.cc index 0c98e7ccbb..60292f722e 100644 --- a/deal.II/deal.II/source/fe/fe_lib.dg.constant.cc +++ b/deal.II/deal.II/source/fe/fe_lib.dg.constant.cc @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/fe/fe_lib.linear.cc b/deal.II/deal.II/source/fe/fe_lib.linear.cc index 1bea588b69..ff6751470d 100644 --- a/deal.II/deal.II/source/fe/fe_lib.linear.cc +++ b/deal.II/deal.II/source/fe/fe_lib.linear.cc @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/fe/fe_lib.quadratic.cc b/deal.II/deal.II/source/fe/fe_lib.quadratic.cc index afcda64e03..5a44fa9e7a 100644 --- a/deal.II/deal.II/source/fe/fe_lib.quadratic.cc +++ b/deal.II/deal.II/source/fe/fe_lib.quadratic.cc @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/fe/fe_lib.quartic.cc b/deal.II/deal.II/source/fe/fe_lib.quartic.cc index 0ea1ef55dc..09988f107a 100644 --- a/deal.II/deal.II/source/fe/fe_lib.quartic.cc +++ b/deal.II/deal.II/source/fe/fe_lib.quartic.cc @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index d3adb919c4..ba61fe7923 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include diff --git a/deal.II/deal.II/source/fe/q1_mapping.cc b/deal.II/deal.II/source/fe/q1_mapping.cc index 32b7ac9fcd..a69a63d74a 100644 --- a/deal.II/deal.II/source/fe/q1_mapping.cc +++ b/deal.II/deal.II/source/fe/q1_mapping.cc @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include @@ -665,12 +665,12 @@ void FEQ1Mapping::fill_fe_values (const DoFHandler::cell_iterator &cel ------------------------------------------- #include #include - #include + #include #include #include #include #include - #include + #include #include int main () { diff --git a/deal.II/deal.II/source/fe/q1_mapping.jacobians.cc b/deal.II/deal.II/source/fe/q1_mapping.jacobians.cc index c82d50415d..1c9f8642fa 100644 --- a/deal.II/deal.II/source/fe/q1_mapping.jacobians.cc +++ b/deal.II/deal.II/source/fe/q1_mapping.jacobians.cc @@ -5,7 +5,7 @@ #include #include -#include +#include #include diff --git a/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc b/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc index 77651cc8f3..3ee7217c76 100644 --- a/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc +++ b/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc @@ -1,6 +1,6 @@ /* $Id$ */ -#include +#include GridOut::UcdFlags::UcdFlags (const bool write_preamble, diff --git a/deal.II/deal.II/source/grid/grid_out.cc b/deal.II/deal.II/source/grid/grid_out.cc index a1bfc0babc..1f9fd183c9 100644 --- a/deal.II/deal.II/source/grid/grid_out.cc +++ b/deal.II/deal.II/source/grid/grid_out.cc @@ -2,7 +2,7 @@ #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/grid/intergrid_map.cc b/deal.II/deal.II/source/grid/intergrid_map.cc index d3850351c3..e99ee47d7a 100644 --- a/deal.II/deal.II/source/grid/intergrid_map.cc +++ b/deal.II/deal.II/source/grid/intergrid_map.cc @@ -1,11 +1,11 @@ /* $Id$ */ #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/deal.II/deal.II/source/grid/persistent_tria.cc b/deal.II/deal.II/source/grid/persistent_tria.cc index 2d37deb6f8..be4b0c1bfa 100644 --- a/deal.II/deal.II/source/grid/persistent_tria.cc +++ b/deal.II/deal.II/source/grid/persistent_tria.cc @@ -1,7 +1,7 @@ /* $Id$ */ #include -#include +#include #include diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index 7431b6ff96..35c64d92b2 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc index 0e72ae0e8f..96dab7eaa8 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc @@ -3,16 +3,16 @@ -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include diff --git a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc index 499d92e29e..87f8192c25 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc @@ -2,17 +2,17 @@ /* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include diff --git a/deal.II/deal.II/source/multigrid/mg_smoother.cc b/deal.II/deal.II/source/multigrid/mg_smoother.cc index 9fad33f9c8..2b68b6ba36 100644 --- a/deal.II/deal.II/source/multigrid/mg_smoother.cc +++ b/deal.II/deal.II/source/multigrid/mg_smoother.cc @@ -1,8 +1,8 @@ /* $Id$ */ #include -#include -#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/source/multigrid/multigrid.cc b/deal.II/deal.II/source/multigrid/multigrid.cc index 84dc85d452..1b23f08634 100644 --- a/deal.II/deal.II/source/multigrid/multigrid.cc +++ b/deal.II/deal.II/source/multigrid/multigrid.cc @@ -2,8 +2,8 @@ // Copyright Guido Kanschat, Universitaet Heidelberg, 1999 #include -#include -#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/assembler.cc b/deal.II/deal.II/source/numerics/assembler.cc index 41f44c8102..fa8df868fc 100644 --- a/deal.II/deal.II/source/numerics/assembler.cc +++ b/deal.II/deal.II/source/numerics/assembler.cc @@ -6,9 +6,9 @@ #include #include #include -#include +#include #include -#include +#include template diff --git a/deal.II/deal.II/source/numerics/base.cc b/deal.II/deal.II/source/numerics/base.cc index 8a0e99c71d..30c7516540 100644 --- a/deal.II/deal.II/source/numerics/base.cc +++ b/deal.II/deal.II/source/numerics/base.cc @@ -6,10 +6,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/data_io.cc b/deal.II/deal.II/source/numerics/data_io.cc index 5deb30cdd3..c348740fb5 100644 --- a/deal.II/deal.II/source/numerics/data_io.cc +++ b/deal.II/deal.II/source/numerics/data_io.cc @@ -2,9 +2,9 @@ /* Copyright W. Bangerth, Guido Kanschat, Stefan Nauber */ /* University of Heidelberg, 1998, 1999 */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index d33d5f2ccb..5fc709eac6 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -3,10 +3,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/data_out_stack.cc b/deal.II/deal.II/source/numerics/data_out_stack.cc index 4ede3bd649..45e38031ff 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -1,10 +1,10 @@ /* $Id$ */ -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/equation.cc b/deal.II/deal.II/source/numerics/equation.cc index ccf0415e69..117d0c36c0 100644 --- a/deal.II/deal.II/source/numerics/equation.cc +++ b/deal.II/deal.II/source/numerics/equation.cc @@ -4,9 +4,9 @@ #include #include #include -#include +#include #include -#include +#include template Equation::Equation (const unsigned int n_equations) : diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index e3605c7cb8..0a9be5f7dd 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/numerics/histogram.cc b/deal.II/deal.II/source/numerics/histogram.cc index 71c9d9aefa..290da45e0a 100644 --- a/deal.II/deal.II/source/numerics/histogram.cc +++ b/deal.II/deal.II/source/numerics/histogram.cc @@ -1,7 +1,7 @@ /* $Id$ */ #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc index 0e07954451..4226088910 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -1,8 +1,8 @@ /* $Id$ */ #include -#include -#include +#include +#include #include #include #include @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/numerics/mg_smoother.cc b/deal.II/deal.II/source/numerics/mg_smoother.cc index 9fad33f9c8..2b68b6ba36 100644 --- a/deal.II/deal.II/source/numerics/mg_smoother.cc +++ b/deal.II/deal.II/source/numerics/mg_smoother.cc @@ -1,8 +1,8 @@ /* $Id$ */ #include -#include -#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/multigrid.cc b/deal.II/deal.II/source/numerics/multigrid.cc index 84dc85d452..1b23f08634 100644 --- a/deal.II/deal.II/source/numerics/multigrid.cc +++ b/deal.II/deal.II/source/numerics/multigrid.cc @@ -2,8 +2,8 @@ // Copyright Guido Kanschat, Universitaet Heidelberg, 1999 #include -#include -#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/solution_transfer.cc b/deal.II/deal.II/source/numerics/solution_transfer.cc index 01c369c37c..09a10eadc4 100644 --- a/deal.II/deal.II/source/numerics/solution_transfer.cc +++ b/deal.II/deal.II/source/numerics/solution_transfer.cc @@ -3,13 +3,13 @@ /* Ralf Hartmann, University of Heidelberg */ #include -#include +#include #include -#include +#include #include #include #include -#include +#include diff --git a/deal.II/deal.II/source/numerics/time_dependent.cc b/deal.II/deal.II/source/numerics/time_dependent.cc index d07ec7c95b..5e0f7be822 100644 --- a/deal.II/deal.II/source/numerics/time_dependent.cc +++ b/deal.II/deal.II/source/numerics/time_dependent.cc @@ -1,7 +1,7 @@ // $Id$ -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index 621168aadb..ea54637429 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -4,19 +4,19 @@ #include -#include -#include +#include +#include #include -#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index d235bf7006..4f27465380 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -17,7 +17,7 @@ o-files = $(o-files-base3) go-files = $(patsubst lib/o/%,lib/go/%,$(o-files-base3:.o=.go)) h-files = $(shell echo include/lac/*.h) -forward-declarations = $D/lac/include/lac/forward-declarations.h +forward-declarations = $D/lac/include/lac/forward_declarations.h # get options which hold for all files of the project include $D/common/Make.global_options @@ -46,7 +46,8 @@ lib/liblac.g.a: $(forward-declarations) $(go-files) clean: - -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go include/base/forward-declarations.h* + -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go \ + include/base/forward_declarations.h* @@ -57,14 +58,14 @@ clean: #of this file. lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile @echo ============================ Remaking Makefile - @perl $D/common/scripts/Make_dep_2.pl $(INCLUDE) $(cc-files) \ + @perl $D/common/scripts/make_dependencies.pl $(INCLUDE) $(cc-files) \ > lib/Makefile.dep # include all the dependencies include lib/Makefile.dep # include a rule which tells how to remake the forward declarations file -include $D/common/Makescripts/forward_declarations +include $D/common/scripts/forward_declarations .PHONY: clean diff --git a/deal.II/lac/include/lac/.cvsignore b/deal.II/lac/include/lac/.cvsignore index e6ca8c2e66..fa946188cb 100644 --- a/deal.II/lac/include/lac/.cvsignore +++ b/deal.II/lac/include/lac/.cvsignore @@ -1 +1 @@ -forward-declarations.h +forward_declarations.h diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 0be861f1fb..10b97c8def 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -1,7 +1,7 @@ // $Id$ #include -#include +#include #include #include diff --git a/deal.II/lac/include/lac/mgbase.h b/deal.II/lac/include/lac/mgbase.h index 595bfb3f80..92fec377f0 100644 --- a/deal.II/lac/include/lac/mgbase.h +++ b/deal.II/lac/include/lac/mgbase.h @@ -8,11 +8,10 @@ #include #include -#include +#include #include #include -#include @@ -258,7 +257,7 @@ class MGVector : public Subscriptor * with a subscriptor for smart pointers. * @author Guido Kanschat, 1999 */ -template > +template > class MGMatrix : public Subscriptor, public vector { diff --git a/deal.II/lac/include/lac/precondition_block.h b/deal.II/lac/include/lac/precondition_block.h index ee42d8f416..75d33a9a93 100644 --- a/deal.II/lac/include/lac/precondition_block.h +++ b/deal.II/lac/include/lac/precondition_block.h @@ -4,7 +4,7 @@ #define __precondition_block_H /*---------------------------- precondition_block.h ---------------------------*/ -#include +#include #include #include #include diff --git a/deal.II/lac/include/lac/precondition_block.templates.h b/deal.II/lac/include/lac/precondition_block.templates.h index cc193eb454..4aad18d3a9 100644 --- a/deal.II/lac/include/lac/precondition_block.templates.h +++ b/deal.II/lac/include/lac/precondition_block.templates.h @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include template diff --git a/deal.II/lac/include/lac/solver.h b/deal.II/lac/include/lac/solver.h index 35e8e73bf5..530a8b2f5c 100644 --- a/deal.II/lac/include/lac/solver.h +++ b/deal.II/lac/include/lac/solver.h @@ -6,7 +6,7 @@ -#include +#include diff --git a/deal.II/lac/include/lac/solver_gmres.h b/deal.II/lac/include/lac/solver_gmres.h index 3d35082310..1dbd82e1c6 100644 --- a/deal.II/lac/include/lac/solver_gmres.h +++ b/deal.II/lac/include/lac/solver_gmres.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include diff --git a/deal.II/lac/include/lac/solver_selector.h b/deal.II/lac/include/lac/solver_selector.h index 0f7855dc7e..410b8108c7 100644 --- a/deal.II/lac/include/lac/solver_selector.h +++ b/deal.II/lac/include/lac/solver_selector.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/deal.II/lac/include/lac/sparse_ilu.h b/deal.II/lac/include/lac/sparse_ilu.h index 4666a03683..9e13efa130 100644 --- a/deal.II/lac/include/lac/sparse_ilu.h +++ b/deal.II/lac/include/lac/sparse_ilu.h @@ -5,7 +5,7 @@ /*---------------------------- sparse_ilu.h ---------------------------*/ -#include +#include diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h index 87bffb716b..d635266a19 100644 --- a/deal.II/lac/include/lac/sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix.templates.h @@ -6,7 +6,7 @@ // Revised, modified and extended by Wolfgang Bangerth, 1998, 1999 -#include +#include #include diff --git a/deal.II/lac/include/lac/sparse_vanka.h b/deal.II/lac/include/lac/sparse_vanka.h index b674416103..1191b6ea0c 100644 --- a/deal.II/lac/include/lac/sparse_vanka.h +++ b/deal.II/lac/include/lac/sparse_vanka.h @@ -8,7 +8,7 @@ #include -#include +#include #include diff --git a/deal.II/lac/include/lac/sparse_vanka.templates.h b/deal.II/lac/include/lac/sparse_vanka.templates.h index 5d66fda67a..60e6b88ccd 100644 --- a/deal.II/lac/include/lac/sparse_vanka.templates.h +++ b/deal.II/lac/include/lac/sparse_vanka.templates.h @@ -2,8 +2,8 @@ // Copyright Guido Kanschat, 1999 #include -#include -#include +#include +#include #include #include diff --git a/deal.II/lac/source/full_matrix.double.cc b/deal.II/lac/source/full_matrix.double.cc index 5a7f56265d..1818ba60d0 100644 --- a/deal.II/lac/source/full_matrix.double.cc +++ b/deal.II/lac/source/full_matrix.double.cc @@ -10,7 +10,7 @@ * 4. TYPEMAT2: numerical type for the second matrix */ -#include +#include #define TYPEMAT double diff --git a/deal.II/lac/source/full_matrix.float.cc b/deal.II/lac/source/full_matrix.float.cc index e662511cc5..1871cb4d52 100644 --- a/deal.II/lac/source/full_matrix.float.cc +++ b/deal.II/lac/source/full_matrix.float.cc @@ -10,7 +10,7 @@ * 4. TYPEMAT2: numerical type for the second matrix */ -#include +#include #define TYPEMAT float diff --git a/deal.II/lac/source/sparse_matrix.cc b/deal.II/lac/source/sparse_matrix.cc index 89710fcf78..3df0ce0b87 100644 --- a/deal.II/lac/source/sparse_matrix.cc +++ b/deal.II/lac/source/sparse_matrix.cc @@ -6,7 +6,7 @@ // Revised, modified and extended by Wolfgang Bangerth, 1998, 1999 -#include +#include #include #include diff --git a/deal.II/lac/source/sparse_matrix.double.cc b/deal.II/lac/source/sparse_matrix.double.cc index 3f46545d30..5768bb4f37 100644 --- a/deal.II/lac/source/sparse_matrix.double.cc +++ b/deal.II/lac/source/sparse_matrix.double.cc @@ -10,7 +10,7 @@ */ #include -#include +#include #define TYPEMAT double @@ -18,17 +18,17 @@ template class SparseMatrix; #define TYPE2 float -#include +#include #undef TYPE2 #define TYPE2 double -#include +#include #undef TYPE2 #define TYPE2 long double -#include +#include #undef TYPE2 #undef TYPEMAT diff --git a/deal.II/lac/source/sparse_matrix.float.cc b/deal.II/lac/source/sparse_matrix.float.cc index d2a2963b45..7a8a327aeb 100644 --- a/deal.II/lac/source/sparse_matrix.float.cc +++ b/deal.II/lac/source/sparse_matrix.float.cc @@ -10,7 +10,7 @@ */ #include -#include +#include #define TYPEMAT float @@ -20,14 +20,14 @@ template class SparseMatrix; #define TYPE2 float -#include +#include #undef TYPE2 #define TYPE2 double -#include +#include #undef TYPE2 #define TYPE2 long double -#include +#include diff --git a/deal.II/lac/source/sparse_matrix.long_double.cc b/deal.II/lac/source/sparse_matrix.long_double.cc index 651197dab0..62f326ca38 100644 --- a/deal.II/lac/source/sparse_matrix.long_double.cc +++ b/deal.II/lac/source/sparse_matrix.long_double.cc @@ -10,7 +10,7 @@ */ #include -#include +#include #define TYPEMAT long double @@ -20,14 +20,14 @@ template class SparseMatrix; #define TYPE2 float -#include +#include #undef TYPE2 #define TYPE2 double -#include +#include #undef TYPE2 #define TYPE2 long double -#include +#include diff --git a/tests/base/Makefile b/tests/base/Makefile index f90226de2c..b8a900ff9c 100644 --- a/tests/base/Makefile +++ b/tests/base/Makefile @@ -2,7 +2,7 @@ # Directory with the DEAL distribution ############################################################ -D = ../.. +D = ../../deal.II ############################################################ diff --git a/tests/deal.II/Makefile b/tests/deal.II/Makefile index b7c640c851..a28e9fa1cb 100644 --- a/tests/deal.II/Makefile +++ b/tests/deal.II/Makefile @@ -2,7 +2,7 @@ # Directory with the DEAL distribution ############################################################ -D = ../.. +D = ../../deal.II ############################################################ diff --git a/tests/deal.II/constraints.cc b/tests/deal.II/constraints.cc index b9cdfee7f8..ed72ae91a2 100644 --- a/tests/deal.II/constraints.cc +++ b/tests/deal.II/constraints.cc @@ -17,16 +17,16 @@ // was correct. -#include +#include #include #include #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/tests/deal.II/dof_test.cc b/tests/deal.II/dof_test.cc index c6e0aa377c..76c56ed1d9 100644 --- a/tests/deal.II/dof_test.cc +++ b/tests/deal.II/dof_test.cc @@ -6,17 +6,17 @@ -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/deal.II/fe_tables.cc b/tests/deal.II/fe_tables.cc index a55d2cb0a7..308edfab66 100644 --- a/tests/deal.II/fe_tables.cc +++ b/tests/deal.II/fe_tables.cc @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/deal.II/gradients.cc b/tests/deal.II/gradients.cc index cd97cf1a36..d6539c759a 100644 --- a/tests/deal.II/gradients.cc +++ b/tests/deal.II/gradients.cc @@ -14,13 +14,13 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/tests/deal.II/grid_test.cc b/tests/deal.II/grid_test.cc index 92b00508cf..352afcae3e 100644 --- a/tests/deal.II/grid_test.cc +++ b/tests/deal.II/grid_test.cc @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/deal.II/mg.cc b/tests/deal.II/mg.cc index e417533b67..b1ae34d72b 100644 --- a/tests/deal.II/mg.cc +++ b/tests/deal.II/mg.cc @@ -8,24 +8,24 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include "helmholtz.h" diff --git a/tests/deal.II/mglocal.cc b/tests/deal.II/mglocal.cc index bb2c983be3..43d7c22818 100644 --- a/tests/deal.II/mglocal.cc +++ b/tests/deal.II/mglocal.cc @@ -8,26 +8,26 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include #include #include MGSmoother* smoother_object; #include -#include +#include #include diff --git a/tests/deal.II/second_derivatives.cc b/tests/deal.II/second_derivatives.cc index b5b95b45f6..a9083c0327 100644 --- a/tests/deal.II/second_derivatives.cc +++ b/tests/deal.II/second_derivatives.cc @@ -6,13 +6,13 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/tests/deal.II/wave-test-3.cc b/tests/deal.II/wave-test-3.cc index 4d2434951f..afd6f89610 100644 --- a/tests/deal.II/wave-test-3.cc +++ b/tests/deal.II/wave-test-3.cc @@ -1,15 +1,15 @@ // deal_II_libraries.g=-ldeal_II_2d.g // deal_II_libraries=-ldeal_II_2d +#include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -187,7 +187,7 @@ class TimeStep_Dual : public TimeStep_Wave -#include +#include @@ -638,9 +638,9 @@ class HuyghensWave : public DualFunctional { }; -#include -#include -#include +#include +#include +#include #include #include @@ -1112,7 +1112,7 @@ class SweepInfo -#include +#include @@ -1174,7 +1174,7 @@ class UserMatrix : public SparseMatrix { #include -#include +#include #include @@ -1244,8 +1244,8 @@ struct FEHelper { -#include -#include +#include +#include #include #include @@ -1843,7 +1843,7 @@ class WaveParameters -#include +#include template class WaveParameters; template class DataOutStack; @@ -1979,11 +1979,11 @@ class WaveProblem : public MultipleParameterLoop::UserClass { #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include @@ -2650,17 +2650,17 @@ template class HuyghensWave<2>; #include -#include -#include +#include +#include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include @@ -3323,11 +3323,11 @@ template class EvaluateHuyghensWave<2>; /* $Id$ */ #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include @@ -3336,7 +3336,7 @@ template class EvaluateHuyghensWave<2>; #include #include -#include +#include template @@ -3692,7 +3692,7 @@ template class TimestepManager<2>; #include #include #include -#include +#include #include #include #include @@ -5047,8 +5047,8 @@ void WaveParameters::parse_parameters (ParameterHandler &prm) { template class WaveParameters<2>; /* $Id$ */ -#include -#include //?? +#include +#include //?? #include @@ -5166,15 +5166,15 @@ void SweepInfo::write_summary (const list*> &eval_list, #include #include #include -#include -#include +#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -5769,13 +5769,13 @@ template class TimeStep_Wave<2>; /* $Id$ */ #include -#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -6556,10 +6556,10 @@ template class TimeStep_Dual<2>; #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -7679,9 +7679,9 @@ template class TimeStep_ErrorEstimation<2>; #include -#include -#include -#include +#include +#include +#include @@ -7835,14 +7835,14 @@ template class TimeStep<2>; #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include @@ -8117,13 +8117,13 @@ template class TimeStep_Postprocess<2>; /* $Id$ */ #include -#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -9058,10 +9058,10 @@ template class FEHelper<2>; #include -#include +#include #include -#include -#include +#include +#include diff --git a/tests/fe/show_shapes.cc b/tests/fe/show_shapes.cc index 656be2921a..bd5b95833d 100644 --- a/tests/fe/show_shapes.cc +++ b/tests/fe/show_shapes.cc @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/fe/show_transform.cc b/tests/fe/show_transform.cc index df7954ebc4..934507a1a5 100644 --- a/tests/fe/show_transform.cc +++ b/tests/fe/show_transform.cc @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/lac/Makefile b/tests/lac/Makefile index fc8e2ad846..abbdcb8df8 100644 --- a/tests/lac/Makefile +++ b/tests/lac/Makefile @@ -2,7 +2,7 @@ # Directory with the DEAL distribution ############################################################ -D = ../.. +D = ../../deal.II ############################################################ diff --git a/tests/lac/mg.cc b/tests/lac/mg.cc index 23510ccf16..dd2779769a 100644 --- a/tests/lac/mg.cc +++ b/tests/lac/mg.cc @@ -6,7 +6,7 @@ #include #include "testmatrix.h" #include -#include +#include #include #include #include diff --git a/tests/lac/solver.cc b/tests/lac/solver.cc index eb6e0d4f48..3c126b0adb 100644 --- a/tests/lac/solver.cc +++ b/tests/lac/solver.cc @@ -7,7 +7,7 @@ #include #include "testmatrix.h" #include -#include +#include #include #include #include diff --git a/tests/lac/testmatrix.cc b/tests/lac/testmatrix.cc index 9450261738..2b3ae8afd4 100644 --- a/tests/lac/testmatrix.cc +++ b/tests/lac/testmatrix.cc @@ -1,7 +1,7 @@ // $Id$ #include "testmatrix.h" -#include +#include FDMatrix::FDMatrix(unsigned int nx, unsigned int ny) : diff --git a/tests/lac/testmatrix.h b/tests/lac/testmatrix.h index 885e6db18b..7b9f0e8e3f 100644 --- a/tests/lac/testmatrix.h +++ b/tests/lac/testmatrix.h @@ -1,6 +1,6 @@ // $Id$ -#include +#include #include #include -- 2.39.5