]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Move files relating to hp into their own directories. This also required a number...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 24 May 2007 04:16:26 +0000 (04:16 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 24 May 2007 04:16:26 +0000 (04:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@14698 0785d39b-7218-0410-832d-ea1e28bc413d

27 files changed:
deal.II/deal.II/Makefile
deal.II/deal.II/include/dofs/dof_accessor.h
deal.II/deal.II/include/dofs/dof_accessor.templates.h
deal.II/deal.II/include/fe/fe_values.h
deal.II/deal.II/include/hp/dof_faces.h [moved from deal.II/deal.II/include/dofs/hp_dof_faces.h with 99% similarity]
deal.II/deal.II/include/hp/dof_handler.h [moved from deal.II/deal.II/include/dofs/hp_dof_handler.h with 100% similarity]
deal.II/deal.II/include/hp/dof_levels.h [moved from deal.II/deal.II/include/dofs/hp_dof_levels.h with 99% similarity]
deal.II/deal.II/include/hp/dof_objects.h [moved from deal.II/deal.II/include/dofs/hp_dof_objects.h with 99% similarity]
deal.II/deal.II/include/hp/fe_values.h [moved from deal.II/deal.II/include/fe/hp_fe_values.h with 100% similarity]
deal.II/deal.II/include/numerics/vectors.templates.h
deal.II/deal.II/source/dofs/dof_accessor.cc
deal.II/deal.II/source/dofs/dof_renumbering.cc
deal.II/deal.II/source/hp/dof_faces.cc [moved from deal.II/deal.II/source/dofs/hp_dof_faces.cc with 97% similarity]
deal.II/deal.II/source/hp/dof_handler.cc [moved from deal.II/deal.II/source/dofs/hp_dof_handler.cc with 99% similarity]
deal.II/deal.II/source/hp/dof_levels.all_dimensions.cc [moved from deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc with 96% similarity]
deal.II/deal.II/source/hp/dof_levels.cc [moved from deal.II/deal.II/source/dofs/hp_dof_levels.cc with 97% similarity]
deal.II/deal.II/source/hp/dof_objects.all_dimensions.cc [moved from deal.II/deal.II/source/dofs/hp_dof_objects.all_dimensions.cc with 97% similarity]
deal.II/deal.II/source/hp/fe_values.cc [moved from deal.II/deal.II/source/fe/hp_fe_values.cc with 99% similarity]
deal.II/deal.II/source/numerics/data_out.cc
deal.II/deal.II/source/numerics/data_out_faces.cc
deal.II/deal.II/source/numerics/data_out_rotation.cc
deal.II/deal.II/source/numerics/data_out_stack.cc
deal.II/deal.II/source/numerics/derivative_approximation.cc
deal.II/deal.II/source/numerics/error_estimator.cc
deal.II/deal.II/source/numerics/matrices.cc
deal.II/deal.II/source/numerics/vectors.cc
deal.II/examples/step-27/step-27.cc

index 21a5fb8d11989c08e6c8144ffeeeede391670666..ef3c0a0af0fac0d4d81a908f770d96c8326926be 100644 (file)
@@ -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)
 
 
index a6065b874eabde19878460373aab265dbc475f4a..46c8311e0c98940c3ee9095cf85eaa6ffa065b25 100644 (file)
@@ -17,7 +17,7 @@
 #include <base/config.h>
 #include <grid/tria_accessor.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 
 #include <vector>
 
index a72e369f591fa93ba334451cbad34104bde27267..65e23ccecbef3d03cb8a8c59fd27b164d349ede1 100644 (file)
@@ -17,7 +17,7 @@
 #include <base/config.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_levels.h>
-#include <dofs/hp_dof_levels.h>
+#include <hp/dof_levels.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_iterator.templates.h>
 
index bc94dbd71f995f5f9e78c31e02eee102a1bd45ba..e081ead4aa4062ae9909061331d21f2269c22e28 100644 (file)
@@ -30,7 +30,7 @@
 #include <grid/tria_iterator.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <fe/fe.h>
 #include <fe/fe_update_flags.h>
 #include <fe/mapping.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 86868b83d7a6f2b04e0989a996e6ea4b6289d4c2..9770356f8859e9247892755ad5c54b47ab3c48c1 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <base/config.h>
 #include <dofs/dof_levels.h>
-#include <dofs/hp_dof_objects.h>
+#include <hp/dof_objects.h>
 #include <fe/fe_collection.h>
 
 #include <vector>
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 47e9c32f2570e9bd33e0575001741823c988302c..da45c679a406e0d259b9b9bd2f8e83132fa7c0f5 100644 (file)
@@ -15,7 +15,7 @@
 
 
 #include <base/config.h>
-#include <dofs/hp_dof_objects.h>
+#include <hp/dof_objects.h>
 
 #include <vector>
 
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 22674871c0b898ac1fc1ef4ef1c6ef6bcce5a2a3..099a622d1c40af47d7ce3a083117bd878e778c96 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <base/config.h>
 #include <fe/fe_collection.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 
 #include <vector>
 
index e1540eb8ed6639e3843f71ce87f9c17941032f28..d49f096c3b791560cc5fd06335d124bcbdb9e100 100644 (file)
@@ -29,7 +29,7 @@
 #include <dofs/dof_constraints.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/mapping_q1.h>
 #include <fe/mapping_collection.h>
 #include <fe/q_collection.h>
index de75f523cac18ba0ffd42e6d18ec1d6feb860ff5..1ab78a7c1134a081e6386ed4d4d12388496d26e3 100644 (file)
@@ -21,7 +21,7 @@
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_levels.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/tria_boundary.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_iterator.templates.h>
index 3a9f5ec507c1ffa693669fff6f19a7eab3d6679a..6dc414d7ed57c8d4a42a082eb58330407e9aaaaa 100644 (file)
@@ -25,7 +25,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <dofs/dof_constraints.h>
 #include <dofs/dof_tools.h>
 #include <fe/fe.h>
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 d21b41e7fb846abca003a1ed97f814b16f246f20..930a7560689c779ef7f77342e285f651645bac3c 100644 (file)
@@ -13,7 +13,7 @@
 
 
 #include <base/memory_consumption.h>
-#include <dofs/hp_dof_faces.h>
+#include <hp/dof_faces.h>
 
 DEAL_II_NAMESPACE_OPEN
 
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 56331d5d12851d8e4a1feb54d362db029ab2fa33..3507cf01480cb2d8c34db4becb9ec4aaf1073da3 100644 (file)
 
 
 #include <base/memory_consumption.h>
-#include <dofs/hp_dof_handler.h>
-#include <dofs/hp_dof_objects.h>
-#include <dofs/hp_dof_levels.h>
-#include <dofs/hp_dof_faces.h>
+#include <hp/dof_handler.h>
+#include <hp/dof_objects.h>
+#include <hp/dof_levels.h>
+#include <hp/dof_faces.h>
 #include <dofs/dof_accessor.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
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 b380a423cff0694319bf8cb3915a91a3e6284d94..0667240893a5858e22ef84a88db9102994939d67 100644 (file)
@@ -13,7 +13,7 @@
 
 
 #include <base/memory_consumption.h>
-#include <dofs/hp_dof_levels.h>
+#include <hp/dof_levels.h>
 
 DEAL_II_NAMESPACE_OPEN
 
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 93bb07d2d9ff46ee6cb0e93781e5af9bbd55e038..01f6ffa0327aa291e81d38ac5973386f30f8a8e0 100644 (file)
@@ -13,7 +13,7 @@
 
 
 #include <base/memory_consumption.h>
-#include <dofs/hp_dof_levels.h>
+#include <hp/dof_levels.h>
 
 DEAL_II_NAMESPACE_OPEN
 
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 2db13eb238275a1c8c87cd45c27705de4a5aa677..1f93a567bb3e1258f00d124cb64f4771451eeadd 100644 (file)
@@ -13,7 +13,7 @@
 
 
 #include <base/memory_consumption.h>
-#include <dofs/hp_dof_objects.h>
+#include <hp/dof_objects.h>
 
 DEAL_II_NAMESPACE_OPEN
 
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 604d9839bebf7a18f466839fde6d73e2a6fe3d6c..9f47c163775bbb810752ebbe63d6928bbf9d0177 100644 (file)
@@ -12,7 +12,7 @@
 //----------------------------  hp_fe_values.cc  ---------------------------
 
 
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/mapping_q1.h>
 
 DEAL_II_NAMESPACE_OPEN
index 25e72cfc1a3f719a095f1ca5acbbdbc5b17de70f..181117637bc692464c7dde9460c63455cc8c2798 100644 (file)
 #include <grid/tria.h>
 #include <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/mapping_q1.h>
 
 #include <sstream>
index 2d84ea7f88466c452c253c82d5bb5c33ac7a462b..bb0eed7fe1d60a33fc123b260cb46e4cd96a59c8 100644 (file)
@@ -23,7 +23,7 @@
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/mapping_q1.h>
 
 DEAL_II_NAMESPACE_OPEN
index 7d0b806c1b94aa84bbaa46ba0317a6cddd226c81..66ba817302140f3f484e01bbce30b66261fbb8c8 100644 (file)
@@ -22,7 +22,7 @@
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/mapping_q1.h>
 #include <numerics/data_out_rotation.h>
 
index 9d400bc4118032ed0f85101ff7688edf4b234363..8530a5f9a5810b0474279437ed16d097764672bc 100644 (file)
@@ -22,7 +22,7 @@
 #include <grid/tria_iterator.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/mapping_q1.h>
 
 #include <sstream>
index 2661d11ff213fa43c384f05c2f15070e86864170..30bcc3c4831489c6d30c9c07edfe3329ab2d3f81 100644 (file)
@@ -24,7 +24,7 @@
 #include <dofs/dof_handler.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/mapping_q1.h>
 #include <fe/q_collection.h>
 #include <fe/fe_collection.h>
index 705c681a8df488be8667f55c33069eb4d3c562fc..a07dbed42a57cf805355b01178713d0b10d6542d 100644 (file)
@@ -25,7 +25,7 @@
 #include <dofs/dof_accessor.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/fe_update_flags.h>
 #include <fe/mapping_q1.h>
 #include <fe/q_collection.h>
index 0cfa1ccbd43ac892423e7f50b3af501e9373604b..2bbc00088045317e706bbdc56cc9b6a09f4b87ec 100644 (file)
@@ -26,7 +26,7 @@
 #include <base/quadrature.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <fe/mapping_collection.h>
 #include <numerics/matrices.h>
 #include <lac/vector.h>
index bc888cdd07a8507ecf450ad50fae6776edebe59b..860a756bd1abfeab6dd91af5c452916af7970e38 100644 (file)
@@ -12,7 +12,7 @@
 //---------------------------------------------------------------------------
 
 #include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 
 #include<numerics/vectors.templates.h>
 
index 8c4bd15c2f0e7b0260f05d1a90fd7ae2c6adfd45..05db6bac683e1c73874a8faefd385391c9e01e28 100644 (file)
 #include <lac/solver_cg.h>
 #include <lac/precondition.h>
 #include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
 #include <grid/grid_generator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary_lib.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.