From 07f6ef28384d3177ce5765c301baded4629a2f6c Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 24 May 2007 04:16:26 +0000 Subject: [PATCH] Move files relating to hp into their own directories. This also required a number of changes to deal.II/Makefile, since we now have a number of file names that appear more than once, though in different directories. git-svn-id: https://svn.dealii.org/trunk@14698 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/Makefile | 17 +++++++---------- deal.II/deal.II/include/dofs/dof_accessor.h | 2 +- .../include/dofs/dof_accessor.templates.h | 2 +- deal.II/deal.II/include/fe/fe_values.h | 2 +- .../{dofs/hp_dof_faces.h => hp/dof_faces.h} | 2 +- .../{dofs/hp_dof_handler.h => hp/dof_handler.h} | 0 .../{dofs/hp_dof_levels.h => hp/dof_levels.h} | 2 +- .../{dofs/hp_dof_objects.h => hp/dof_objects.h} | 2 +- .../{fe/hp_fe_values.h => hp/fe_values.h} | 0 .../include/numerics/vectors.templates.h | 2 +- deal.II/deal.II/source/dofs/dof_accessor.cc | 2 +- deal.II/deal.II/source/dofs/dof_renumbering.cc | 2 +- .../{dofs/hp_dof_faces.cc => hp/dof_faces.cc} | 2 +- .../hp_dof_handler.cc => hp/dof_handler.cc} | 8 ++++---- .../dof_levels.all_dimensions.cc} | 2 +- .../{dofs/hp_dof_levels.cc => hp/dof_levels.cc} | 2 +- .../dof_objects.all_dimensions.cc} | 2 +- .../{fe/hp_fe_values.cc => hp/fe_values.cc} | 2 +- deal.II/deal.II/source/numerics/data_out.cc | 4 ++-- .../deal.II/source/numerics/data_out_faces.cc | 2 +- .../source/numerics/data_out_rotation.cc | 2 +- .../deal.II/source/numerics/data_out_stack.cc | 2 +- .../source/numerics/derivative_approximation.cc | 2 +- .../deal.II/source/numerics/error_estimator.cc | 2 +- deal.II/deal.II/source/numerics/matrices.cc | 2 +- deal.II/deal.II/source/numerics/vectors.cc | 2 +- deal.II/examples/step-27/step-27.cc | 4 ++-- 27 files changed, 36 insertions(+), 39 deletions(-) rename deal.II/deal.II/include/{dofs/hp_dof_faces.h => hp/dof_faces.h} (99%) rename deal.II/deal.II/include/{dofs/hp_dof_handler.h => hp/dof_handler.h} (100%) rename deal.II/deal.II/include/{dofs/hp_dof_levels.h => hp/dof_levels.h} (99%) rename deal.II/deal.II/include/{dofs/hp_dof_objects.h => hp/dof_objects.h} (99%) rename deal.II/deal.II/include/{fe/hp_fe_values.h => hp/fe_values.h} (100%) rename deal.II/deal.II/source/{dofs/hp_dof_faces.cc => hp/dof_faces.cc} (97%) rename deal.II/deal.II/source/{dofs/hp_dof_handler.cc => hp/dof_handler.cc} (99%) rename deal.II/deal.II/source/{dofs/hp_dof_levels.all_dimensions.cc => hp/dof_levels.all_dimensions.cc} (96%) rename deal.II/deal.II/source/{dofs/hp_dof_levels.cc => hp/dof_levels.cc} (97%) rename deal.II/deal.II/source/{dofs/hp_dof_objects.all_dimensions.cc => hp/dof_objects.all_dimensions.cc} (97%) rename deal.II/deal.II/source/{fe/hp_fe_values.cc => hp/fe_values.cc} (99%) diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index 21a5fb8d11..ef3c0a0af0 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -28,13 +28,9 @@ cc-files = $(shell echo source/*/*.cc) h-files = $(sort $(shell echo include/*/*.h)) -# strip subdirectories from cc file names, preprend a "lib/[g]o" -# and change the suffix. We place the object files with or without -# debug info in different directories, since we want to use the -# -frepo switch to gcc; this, however, creates a .rpo file which -# would be the same for both debug and non-debug versions, if we -# don't care about different directories -tmp1 = $(notdir $(cc-files)) +# replace subdirectories in cc file names by a prefix, preprend a "lib/[g]o" +# and change the suffix +tmp1 = $(shell cd source ; echo */*cc | $(PERL) -pi -e 's,/,_,g;') o-files-1d = $(addprefix $(LIBDIR)/1d/, $(tmp1:.cc=_1d.$(OBJEXT)) ) go-files-1d = $(addprefix $(LIBDIR)/1d/, $(tmp1:.cc=_1d.g.$(OBJEXT))) o-files-2d = $(addprefix $(LIBDIR)/2d/, $(tmp1:.cc=_2d.$(OBJEXT)) ) @@ -162,11 +158,12 @@ $(LIBDIR)/libdeal_II_3d$(shared-lib-suffix): $(o-files-3d) # If the command fails, then remove Makefile.dep again and fail Makefile.dep: $(cc-files) $(h-files) Makefile $D/common/Make.global_options @echo "============================ Remaking deal.II/Makefile" - @$D/common/scripts/make_dependencies $(INCLUDE) "-B\$$(LIBDIR)" $(cc-files) \ + @(for dir in dofs fe grid hp multigrid numerics ; do $D/common/scripts/make_dependencies $(INCLUDE) "-B\$$(LIBDIR)" `echo source/$$dir/*cc` \ | $(PERL) -p -e 's!LIBDIR\)/(.*):!LIBDIR)/DIM_PLACEHOLDER/$$1:!g;' \ | $(PERL) -pe 's!((\.g)?.$(OBJEXT)):!_DIM_PLACEHOLDER$$1:!g;' \ - | $(PERL) -pe 's!^(.*)/DIM_PLACEHOLDER/(.*)_DIM_PLACEHOLDER(\..*):!$$1/1d/$$2_1d$$3 $$1/2d/$$2_2d$$3 $$1/3d/$$2_3d$$3:!g;'\ - > $@ \ + | $(PERL) -pe 's!^(.*)/DIM_PLACEHOLDER/(.*)_DIM_PLACEHOLDER(\..*):!$$1/1d/DIRPLACEHOLDER_$$2_1d$$3 $$1/2d/DIRPLACEHOLDER_$$2_2d$$3 $$1/3d/DIRPLACEHOLDER_$$2_3d$$3:!g;'\ + | $(PERL) -pe "s/DIRPLACEHOLDER/$$dir/g;" \ + ; done ) > $@ \ || (rm -f $@ ; false) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index a6065b874e..46c8311e0c 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -17,7 +17,7 @@ #include #include #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 a72e369f59..65e23ccecb 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -17,7 +17,7 @@ #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 bc94dbd71f..e081ead4aa 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/include/dofs/hp_dof_faces.h b/deal.II/deal.II/include/hp/dof_faces.h similarity index 99% rename from deal.II/deal.II/include/dofs/hp_dof_faces.h rename to deal.II/deal.II/include/hp/dof_faces.h index 86868b83d7..9770356f88 100644 --- a/deal.II/deal.II/include/dofs/hp_dof_faces.h +++ b/deal.II/deal.II/include/hp/dof_faces.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/include/dofs/hp_dof_handler.h b/deal.II/deal.II/include/hp/dof_handler.h similarity index 100% rename from deal.II/deal.II/include/dofs/hp_dof_handler.h rename to deal.II/deal.II/include/hp/dof_handler.h diff --git a/deal.II/deal.II/include/dofs/hp_dof_levels.h b/deal.II/deal.II/include/hp/dof_levels.h similarity index 99% rename from deal.II/deal.II/include/dofs/hp_dof_levels.h rename to deal.II/deal.II/include/hp/dof_levels.h index 47e9c32f25..da45c679a4 100644 --- a/deal.II/deal.II/include/dofs/hp_dof_levels.h +++ b/deal.II/deal.II/include/hp/dof_levels.h @@ -15,7 +15,7 @@ #include -#include +#include #include diff --git a/deal.II/deal.II/include/dofs/hp_dof_objects.h b/deal.II/deal.II/include/hp/dof_objects.h similarity index 99% rename from deal.II/deal.II/include/dofs/hp_dof_objects.h rename to deal.II/deal.II/include/hp/dof_objects.h index 22674871c0..099a622d1c 100644 --- a/deal.II/deal.II/include/dofs/hp_dof_objects.h +++ b/deal.II/deal.II/include/hp/dof_objects.h @@ -15,7 +15,7 @@ #include #include -#include +#include #include diff --git a/deal.II/deal.II/include/fe/hp_fe_values.h b/deal.II/deal.II/include/hp/fe_values.h similarity index 100% rename from deal.II/deal.II/include/fe/hp_fe_values.h rename to deal.II/deal.II/include/hp/fe_values.h diff --git a/deal.II/deal.II/include/numerics/vectors.templates.h b/deal.II/deal.II/include/numerics/vectors.templates.h index e1540eb8ed..d49f096c3b 100644 --- a/deal.II/deal.II/include/numerics/vectors.templates.h +++ b/deal.II/deal.II/include/numerics/vectors.templates.h @@ -29,7 +29,7 @@ #include #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 de75f523ca..1ab78a7c11 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -21,7 +21,7 @@ #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 3a9f5ec507..6dc414d7ed 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/dofs/hp_dof_faces.cc b/deal.II/deal.II/source/hp/dof_faces.cc similarity index 97% rename from deal.II/deal.II/source/dofs/hp_dof_faces.cc rename to deal.II/deal.II/source/hp/dof_faces.cc index d21b41e7fb..930a756068 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_faces.cc +++ b/deal.II/deal.II/source/hp/dof_faces.cc @@ -13,7 +13,7 @@ #include -#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/deal.II/source/dofs/hp_dof_handler.cc b/deal.II/deal.II/source/hp/dof_handler.cc similarity index 99% rename from deal.II/deal.II/source/dofs/hp_dof_handler.cc rename to deal.II/deal.II/source/hp/dof_handler.cc index 56331d5d12..3507cf0148 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_handler.cc +++ b/deal.II/deal.II/source/hp/dof_handler.cc @@ -13,10 +13,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc b/deal.II/deal.II/source/hp/dof_levels.all_dimensions.cc similarity index 96% rename from deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc rename to deal.II/deal.II/source/hp/dof_levels.all_dimensions.cc index b380a423cf..0667240893 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc +++ b/deal.II/deal.II/source/hp/dof_levels.all_dimensions.cc @@ -13,7 +13,7 @@ #include -#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/deal.II/source/dofs/hp_dof_levels.cc b/deal.II/deal.II/source/hp/dof_levels.cc similarity index 97% rename from deal.II/deal.II/source/dofs/hp_dof_levels.cc rename to deal.II/deal.II/source/hp/dof_levels.cc index 93bb07d2d9..01f6ffa032 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_levels.cc +++ b/deal.II/deal.II/source/hp/dof_levels.cc @@ -13,7 +13,7 @@ #include -#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/deal.II/source/dofs/hp_dof_objects.all_dimensions.cc b/deal.II/deal.II/source/hp/dof_objects.all_dimensions.cc similarity index 97% rename from deal.II/deal.II/source/dofs/hp_dof_objects.all_dimensions.cc rename to deal.II/deal.II/source/hp/dof_objects.all_dimensions.cc index 2db13eb238..1f93a567bb 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_objects.all_dimensions.cc +++ b/deal.II/deal.II/source/hp/dof_objects.all_dimensions.cc @@ -13,7 +13,7 @@ #include -#include +#include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/deal.II/source/fe/hp_fe_values.cc b/deal.II/deal.II/source/hp/fe_values.cc similarity index 99% rename from deal.II/deal.II/source/fe/hp_fe_values.cc rename to deal.II/deal.II/source/hp/fe_values.cc index 604d9839be..9f47c16377 100644 --- a/deal.II/deal.II/source/fe/hp_fe_values.cc +++ b/deal.II/deal.II/source/hp/fe_values.cc @@ -12,7 +12,7 @@ //---------------------------- hp_fe_values.cc --------------------------- -#include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 25e72cfc1a..181117637b 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -23,11 +23,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/numerics/data_out_faces.cc b/deal.II/deal.II/source/numerics/data_out_faces.cc index 2d84ea7f88..bb0eed7fe1 100644 --- a/deal.II/deal.II/source/numerics/data_out_faces.cc +++ b/deal.II/deal.II/source/numerics/data_out_faces.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/deal.II/source/numerics/data_out_rotation.cc b/deal.II/deal.II/source/numerics/data_out_rotation.cc index 7d0b806c1b..66ba817302 100644 --- a/deal.II/deal.II/source/numerics/data_out_rotation.cc +++ b/deal.II/deal.II/source/numerics/data_out_rotation.cc @@ -22,7 +22,7 @@ #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 9d400bc411..8530a5f9a5 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/source/numerics/derivative_approximation.cc b/deal.II/deal.II/source/numerics/derivative_approximation.cc index 2661d11ff2..30bcc3c483 100644 --- a/deal.II/deal.II/source/numerics/derivative_approximation.cc +++ b/deal.II/deal.II/source/numerics/derivative_approximation.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index 705c681a8d..a07dbed42a 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -25,7 +25,7 @@ #include #include #include -#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 0cfa1ccbd4..2bbc000880 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -26,7 +26,7 @@ #include #include #include -#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 bc888cdd07..860a756bd1 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -12,7 +12,7 @@ //--------------------------------------------------------------------------- #include -#include +#include #include diff --git a/deal.II/examples/step-27/step-27.cc b/deal.II/examples/step-27/step-27.cc index 8c4bd15c2f..05db6bac68 100644 --- a/deal.II/examples/step-27/step-27.cc +++ b/deal.II/examples/step-27/step-27.cc @@ -29,14 +29,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include -- 2.39.5