From 66b754eeac77ef5d510db3dff34c3b8abe8151e8 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Fri, 8 Jun 2007 13:14:05 +0000
Subject: [PATCH] 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
---
 deal.II/deal.II/include/hp/dof_faces.h                 |  2 +-
 deal.II/deal.II/include/hp/dof_handler.h               | 10 ++--------
 deal.II/deal.II/include/hp/dof_objects.h               |  2 +-
 deal.II/deal.II/include/{fe => hp}/fe_collection.h     |  0
 deal.II/deal.II/include/hp/fe_values.h                 |  6 +++---
 .../deal.II/include/{fe => hp}/mapping_collection.h    |  0
 deal.II/deal.II/include/{fe => hp}/q_collection.h      |  0
 deal.II/deal.II/include/numerics/vectors.templates.h   |  4 ++--
 deal.II/deal.II/source/dofs/dof_tools.cc               |  2 +-
 deal.II/deal.II/source/grid/grid_tools.cc              |  2 +-
 deal.II/deal.II/source/{fe => hp}/fe_collection.cc     |  2 +-
 .../deal.II/source/{fe => hp}/mapping_collection.cc    |  2 +-
 .../source/numerics/derivative_approximation.cc        |  6 +++---
 deal.II/deal.II/source/numerics/error_estimator.cc     |  4 ++--
 deal.II/deal.II/source/numerics/matrices.cc            |  2 +-
 15 files changed, 19 insertions(+), 25 deletions(-)
 rename deal.II/deal.II/include/{fe => hp}/fe_collection.h (100%)
 rename deal.II/deal.II/include/{fe => hp}/mapping_collection.h (100%)
 rename deal.II/deal.II/include/{fe => hp}/q_collection.h (100%)
 rename deal.II/deal.II/source/{fe => hp}/fe_collection.cc (99%)
 rename deal.II/deal.II/source/{fe => hp}/mapping_collection.cc (98%)

diff --git a/deal.II/deal.II/include/hp/dof_faces.h b/deal.II/deal.II/include/hp/dof_faces.h
index 9770356f88..0dad67d400 100644
--- 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 8c378a10fd..caea3b6ae3 100644
--- 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 099a622d1c..745fafd82b 100644
--- 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 3b3727ccff..818f2c9ed1 100644
--- 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 d49f096c3b..84661e3da3 100644
--- 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 43e42c20f8..30e0f47869 100644
--- 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 b3089f32a8..fd48b3173d 100644
--- 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 e0c758090f..7400de54d9 100644
--- 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 377fa779e7..2d35df2b67 100644
--- 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 30bcc3c483..ea283b1200 100644
--- 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 a07dbed42a..627fb9f192 100644
--- 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 2bbc000880..d8e583b707 100644
--- 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>
-- 
2.39.5