Move the rest of the hp stuff into its own directory.

git-svn-id: https://svn.dealii.org/trunk@14771 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/include/hp/dof_faces.h b/deal.II/deal.II/include/hp/dof_faces.h
index 9770356f8859e9247892755ad5c54b47ab3c48c1..0dad67d400d4f4f49b89682898b440be0d9aa91c 100644 (file)
--- a/deal.II/deal.II/include/hp/dof_faces.h
+++ b/deal.II/deal.II/include/hp/dof_faces.h
@@ -17,7 +17,7 @@
 #include <base/config.h>
 #include <dofs/dof_levels.h>
 #include <hp/dof_objects.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 
 #include <vector>
 

diff --git a/deal.II/deal.II/include/hp/dof_handler.h b/deal.II/deal.II/include/hp/dof_handler.h
index 8c378a10fd5edb4806171aed7f2b7800a25bbcca..caea3b6ae3564cb46d1f3cfa29574b4d6d68516c 100644 (file)
--- a/deal.II/deal.II/include/hp/dof_handler.h
+++ b/deal.II/deal.II/include/hp/dof_handler.h
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2005, 2006 by the deal.II authors
+//    Copyright (C) 2005, 2006, 2007 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -21,7 +21,7 @@
 #include <base/smartpointer.h>
 #include <dofs/function_map.h>
 #include <dofs/dof_iterator_selector.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 
 #include <vector>
 #include <map>
@@ -41,12 +41,6 @@ namespace internal
 
     
 
-/**
- * A namespace that holds all the classes that have to do with hp finite
- * elements.
- * 
- * @ingroup hp
- */
 namespace hp
 {
 

diff --git a/deal.II/deal.II/include/hp/dof_objects.h b/deal.II/deal.II/include/hp/dof_objects.h
index 099a622d1c40af47d7ce3a083117bd878e778c96..745fafd82b5cf7e9f382032a3410e07271fb5e09 100644 (file)
--- a/deal.II/deal.II/include/hp/dof_objects.h
+++ b/deal.II/deal.II/include/hp/dof_objects.h
@@ -14,7 +14,7 @@
 #define __deal2__hp_dof_objects_h
 
 #include <base/config.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <hp/dof_handler.h>
 
 #include <vector>

diff --git a/deal.II/deal.II/include/fe/fe_collection.h b/deal.II/deal.II/include/hp/fe_collection.h
similarity index 100%
rename from deal.II/deal.II/include/fe/fe_collection.h
rename to deal.II/deal.II/include/hp/fe_collection.h

diff --git a/deal.II/deal.II/include/hp/fe_values.h b/deal.II/deal.II/include/hp/fe_values.h
index 3b3727ccffdc0b9236e4e6075a041b5a40213d68..818f2c9ed1ec77c633e5c29ad9a9437b64f95f79 100644 (file)
--- a/deal.II/deal.II/include/hp/fe_values.h
+++ b/deal.II/deal.II/include/hp/fe_values.h
@@ -15,9 +15,9 @@
 
 #include <base/config.h>
 #include <fe/fe.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
-#include <fe/mapping_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
+#include <hp/mapping_collection.h>
 #include <fe/fe_values.h>
 
 #include <map>

diff --git a/deal.II/deal.II/include/fe/mapping_collection.h b/deal.II/deal.II/include/hp/mapping_collection.h
similarity index 100%
rename from deal.II/deal.II/include/fe/mapping_collection.h
rename to deal.II/deal.II/include/hp/mapping_collection.h

diff --git a/deal.II/deal.II/include/fe/q_collection.h b/deal.II/deal.II/include/hp/q_collection.h
similarity index 100%
rename from deal.II/deal.II/include/fe/q_collection.h
rename to deal.II/deal.II/include/hp/q_collection.h

diff --git a/deal.II/deal.II/include/numerics/vectors.templates.h b/deal.II/deal.II/include/numerics/vectors.templates.h
index d49f096c3b791560cc5fd06335d124bcbdb9e100..84661e3da37ed4c834bf57f87bb7e0487eea55c7 100644 (file)
--- a/deal.II/deal.II/include/numerics/vectors.templates.h
+++ b/deal.II/deal.II/include/numerics/vectors.templates.h
@@ -31,8 +31,8 @@
 #include <fe/fe.h>
 #include <hp/fe_values.h>
 #include <fe/mapping_q1.h>
-#include <fe/mapping_collection.h>
-#include <fe/q_collection.h>
+#include <hp/mapping_collection.h>
+#include <hp/q_collection.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 

diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc
index 43e42c20f83be742b0979a725f4cf8512f66c42a..30e0f478698c9fc1e1254f2f9f163739d8c8d816 100644 (file)
--- a/deal.II/deal.II/source/dofs/dof_tools.cc
+++ b/deal.II/deal.II/source/dofs/dof_tools.cc
@@ -26,7 +26,7 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <dofs/dof_tools.h>
 #include <lac/sparsity_pattern.h>
 #include <lac/compressed_sparsity_pattern.h>

diff --git a/deal.II/deal.II/source/grid/grid_tools.cc b/deal.II/deal.II/source/grid/grid_tools.cc
index b3089f32a8ea63e28d7a80b24bdca534f9003e30..fd48b3173d7a49126ca7069b77aab4fc97daf456 100644 (file)
--- a/deal.II/deal.II/source/grid/grid_tools.cc
+++ b/deal.II/deal.II/source/grid/grid_tools.cc
@@ -25,7 +25,7 @@
 #include <dofs/dof_tools.h>
 #include <fe/fe_dgq.h>
 #include <fe/mapping_q1.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <multigrid/mg_dof_handler.h>
 #include <multigrid/mg_dof_accessor.h>
 

diff --git a/deal.II/deal.II/source/fe/fe_collection.cc b/deal.II/deal.II/source/hp/fe_collection.cc
similarity index 99%
rename from deal.II/deal.II/source/fe/fe_collection.cc
rename to deal.II/deal.II/source/hp/fe_collection.cc
index e0c758090f5c2ed5ee2d4e5c75aef9745cf2ba66..7400de54d9b753f8778b6a67a649b05bcff7302f 100644 (file)
--- a/deal.II/deal.II/source/fe/fe_collection.cc
+++ b/deal.II/deal.II/source/hp/fe_collection.cc
@@ -12,7 +12,7 @@
 //----------------------------  fe_collection.cc  ---------------------------
 
 #include <base/memory_consumption.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/deal.II/source/fe/mapping_collection.cc b/deal.II/deal.II/source/hp/mapping_collection.cc
similarity index 98%
rename from deal.II/deal.II/source/fe/mapping_collection.cc
rename to deal.II/deal.II/source/hp/mapping_collection.cc
index 377fa779e707c942eaf9c6e0c92ca45ef08efce3..2d35df2b6712995d49633ffebb0fda0bb65f1017 100644 (file)
--- a/deal.II/deal.II/source/fe/mapping_collection.cc
+++ b/deal.II/deal.II/source/hp/mapping_collection.cc
@@ -12,7 +12,7 @@
 //-----------------------  mapping_collection.cc  ---------------------------
 
 #include <base/memory_consumption.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/deal.II/source/numerics/derivative_approximation.cc b/deal.II/deal.II/source/numerics/derivative_approximation.cc
index 30bcc3c4831489c6d30c9c07edfe3329ab2d3f81..ea283b1200bca28b74cbfc9011b729c2b3485a8f 100644 (file)
--- a/deal.II/deal.II/source/numerics/derivative_approximation.cc
+++ b/deal.II/deal.II/source/numerics/derivative_approximation.cc
@@ -26,9 +26,9 @@
 #include <fe/fe_values.h>
 #include <hp/fe_values.h>
 #include <fe/mapping_q1.h>
-#include <fe/q_collection.h>
-#include <fe/fe_collection.h>
-#include <fe/mapping_collection.h>
+#include <hp/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/derivative_approximation.h>
 
 #include <cmath>

diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc
index a07dbed42a57cf805355b01178713d0b10d6542d..627fb9f1927881dbcc91f982ccd6cdf3849c9f35 100644 (file)
--- a/deal.II/deal.II/source/numerics/error_estimator.cc
+++ b/deal.II/deal.II/source/numerics/error_estimator.cc
@@ -28,8 +28,8 @@
 #include <hp/fe_values.h>
 #include <fe/fe_update_flags.h>
 #include <fe/mapping_q1.h>
-#include <fe/q_collection.h>
-#include <fe/mapping_collection.h>
+#include <hp/q_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/error_estimator.h>
 
 #include <numeric>

diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc
index 2bbc00088045317e706bbdc56cc9b6a09f4b87ec..d8e583b707f64248ec590cbfb2e6923cef6144a5 100644 (file)
--- a/deal.II/deal.II/source/numerics/matrices.cc
+++ b/deal.II/deal.II/source/numerics/matrices.cc
@@ -27,7 +27,7 @@
 #include <fe/fe.h>
 #include <fe/fe_values.h>
 #include <hp/fe_values.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/matrices.h>
 #include <lac/vector.h>
 #include <lac/block_vector.h>