]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Anpassung an neue Verzeichnisse
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 6 Nov 1998 13:20:50 +0000 (13:20 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 6 Nov 1998 13:20:50 +0000 (13:20 +0000)
git-svn-id: https://svn.dealii.org/trunk@644 0785d39b-7218-0410-832d-ea1e28bc413d

30 files changed:
deal.II/base/include/base/quadrature_lib.h
deal.II/base/source/function.cc
deal.II/base/source/parameter_handler.cc
deal.II/base/source/quadrature.cc
deal.II/base/source/quadrature_lib.cc
deal.II/base/source/timer.cc
deal.II/deal.II/Attic/examples/convergence/convergence.cc
deal.II/deal.II/Attic/examples/dof/Makefile
deal.II/deal.II/Attic/examples/dof/dof_test.cc
deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc
deal.II/deal.II/Attic/examples/multigrid/multigrid.cc
deal.II/deal.II/Attic/examples/poisson/Makefile
deal.II/deal.II/Attic/examples/poisson/poisson.h
deal.II/deal.II/include/fe/fe_lib.criss_cross.h
deal.II/deal.II/include/numerics/error_estimator.h
deal.II/deal.II/source/fe/fe.cc
deal.II/deal.II/source/fe/fe_linear_mapping.cc
deal.II/deal.II/source/fe/fe_values.cc
deal.II/deal.II/source/numerics/base.cc
deal.II/deal.II/source/numerics/data_io.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
tests/big-tests/convergence/convergence.cc
tests/big-tests/dof/Makefile
tests/big-tests/dof/dof_test.cc
tests/big-tests/error-estimation/error-estimation.cc
tests/big-tests/multigrid/multigrid.cc
tests/big-tests/poisson/Makefile
tests/big-tests/poisson/poisson.h

index dcdfdcb913b9188796c06ff439143bd30588a982..6ecfe60de2598dcce5d346b390687acec66af6fb 100644 (file)
@@ -6,7 +6,7 @@
 /*----------------------------   quadrature_lib.h     ---------------------------*/
 
 
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 
 
 /**
index f6d462218000e29e7c01733edb7afba67ad9ff2a..a88413d6775af5ff747061597eb60b9af636026a 100644 (file)
@@ -1,7 +1,7 @@
 /*      $Id$                 */
 
 
-#include <basic/function.h>
+#include <base/function.h>
 #include <vector>
 
 
@@ -152,6 +152,12 @@ void ConstantFunction<dim>::value_list (const vector<Point<dim> > &points,
 
 // explicit instantiations
 
-template class Function<deal_II_dimension>;
-template class ZeroFunction<deal_II_dimension>;
-template class ConstantFunction<deal_II_dimension>;
+template class Function<1>;
+template class ZeroFunction<1>;
+template class ConstantFunction<1>;
+template class Function<2>;
+template class ZeroFunction<2>;
+template class ConstantFunction<2>;
+template class Function<3>;
+template class ZeroFunction<3>;
+template class ConstantFunction<3>;
index 4583d491c244db4bcf23353f6aef077d440502b6..2cafb3adcfc16c55d2486f39d9f8d9307a5dde09 100644 (file)
@@ -2,7 +2,7 @@
 /* Copyright W. Bangerth, University of Heidelberg, 1998 */
 
 
-#include <basic/parameter_handler.h>
+#include <base/parameter_handler.h>
 #include <fstream>
 #include <iomanip>
 #include <strstream>
index 73e0286c19108a3ccf3739da979ac75981f57473..e0445aec47b6acfa7d5168a690fc3a9dae45e07d 100644 (file)
@@ -2,7 +2,7 @@
 /* Copyright W. Bangerth, University of Heidelberg, 1998 */
 
 
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 
 
 template <int dim>
@@ -94,8 +94,6 @@ const vector<double> & Quadrature<dim>::get_weights () const {
 
 
 
-#if deal_II_dimension == 2
-
 template <>
 void QProjector<2>::project_to_face (const Quadrature<1> &quadrature,
                                     const unsigned int   face_no,
@@ -196,7 +194,6 @@ void QProjector<2>::project_to_subface (const Quadrature<1> &quadrature,
       };
 };
 
-#endif
 
 
 
index 3e700e8a34f531c3229175e8cca874ab0440282b..e71ed2b2c918736260fc114ed782de174fff8a10 100644 (file)
@@ -2,7 +2,7 @@
 /* Copyright W. Bangerth, University of Heidelberg, 1998 */
 
 
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <cmath>
 
 
 // for all lower dimensions as well. That is why in this file the check
 // is for deal_II_dimension >= any_number and not for ==
 
-
-
-#if deal_II_dimension >= 1
-
 template <>
 QGauss2<1>::QGauss2 () :
                Quadrature<1> (2)
@@ -333,13 +329,6 @@ QIteratedTrapez<1>::QIteratedTrapez (const unsigned n) :
   weights[n] = .5/n;
 }
 
-#endif
-
-
-
-
-#if deal_II_dimension >= 2
-
 // construct the quadrature formulae in higher dimensions by
 // tensor product of lower dimensions
 
@@ -417,17 +406,15 @@ QIteratedTrapez<dim>::QIteratedTrapez (const unsigned n) :
 
 
 // explicite specialization
-template class QGauss2<deal_II_dimension>;
-template class QGauss3<deal_II_dimension>;
-template class QGauss4<deal_II_dimension>;
-template class QGauss5<deal_II_dimension>;
-template class QGauss6<deal_II_dimension>;
-template class QGauss7<deal_II_dimension>;
-template class QGauss8<deal_II_dimension>;
-template class QMidpoint<deal_II_dimension>;
-template class QSimpson<deal_II_dimension>;
-template class QTrapez<deal_II_dimension>;
-template class QIteratedTrapez<deal_II_dimension>;
-
-
-#endif
+template class QGauss2<2>;
+template class QGauss3<2>;
+template class QGauss4<2>;
+template class QGauss5<2>;
+template class QGauss6<2>;
+template class QGauss7<2>;
+template class QGauss8<2>;
+template class QMidpoint<2>;
+template class QSimpson<2>;
+template class QTrapez<2>;
+template class QIteratedTrapez<2>;
+
index c51d26376ecc66e5ec9c8f12f7445a9e57c32cce..cc0731a987954cee8fee2bc8403f640a64c4eeee 100644 (file)
@@ -2,7 +2,7 @@
 /* Copyright W. Bangerth, University of Heidelberg, 1998 */
 
 
-#include <basic/timer.h>
+#include <base/timer.h>
 #include <ctime>
 #include <sys/time.h>
 
index bbc332e62c72a86bfaeeefe91acef9c9039075d7..71872f5a6d09c1bd8f2dd3f3bd876fd536a5c6a7 100644 (file)
@@ -9,11 +9,11 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary.h>
 #include <grid/dof_constraints.h>
-#include <basic/function.h>
+#include <base/function.h>
 #include <basic/data_io.h>
 #include <fe/fe_lib.lagrange.h>
 #include <fe/fe_lib.criss_cross.h>
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
 #include <numerics/vectors.h>
index 29dee5924548390c38a0f7a5caa3286e99f16e76..248fd7d5f93247d2e2e15d0f08d4ccf9c78d624b 100644 (file)
@@ -49,8 +49,8 @@ h-files     = $(wildcard *.h)
 lib-h-files = $(wildcard ../../include/*/*.h)
 
 # list of libraries needed to link with
-libs     = ./Obj.a   ../../lib/libdeal_II.a   ../../../lac/lib/liblac.a
-libs.g   = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a
+libs     = ./Obj.a   ../../lib/libdeal_II.a   ../../../lac/lib/liblac.a   ../../../base/lib/libbase.a
+libs.g   = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a ../../../base/lib/libbase.g.a ../../../base/lib/libbase.g.a
 
 
 # check whether we use debug mode or not
index dee0ed501cea9e8b2e60b63b85fbbbe6436b2a12..15b5395016de381612394713ae3d24eadc523e9b 100644 (file)
@@ -10,7 +10,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <lac/dsmatrix.h>
-#include <basic/parameter_handler.h>
+#include <base/parameter_handler.h>
 #include <grid/dof_constraints.h>
 
 
index 4d377124901f7cd683607d68a3fe596ccd0b1348..88897903fd47be227eb13a47e45f9bc0f8747d4c 100644 (file)
@@ -9,11 +9,11 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary.h>
 #include <grid/dof_constraints.h>
-#include <basic/function.h>
+#include <base/function.h>
 #include <basic/data_io.h>
-#include <basic/parameter_handler.h>
+#include <base/parameter_handler.h>
 #include <fe/fe_lib.lagrange.h>
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
 #include <numerics/vectors.h>
index 7d602803e82ecca19cb6cde7a6b5fcfd0b844570..2778e090347618e6394be3654c304378be53b94b 100644 (file)
@@ -9,12 +9,12 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary.h>
 #include <grid/dof_constraints.h>
-#include <basic/function.h>
+#include <base/function.h>
 #include <basic/data_io.h>
 #include <fe/fe_lib.lagrange.h>
 #include <fe/fe_lib.criss_cross.h>
 #include <fe/fe_update_flags.h>
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <numerics/assembler.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
index 4e622ce5bf6f2b63834e2da7f85609d2e48a2722..ba6405c2a215ebc0e60587a1e00ee2b8bd1107fd 100644 (file)
@@ -51,8 +51,8 @@ h-files     = $(wildcard *.h)
 lib-h-files = $(wildcard ../../include/*/*.h)
 
 # list of libraries needed to link with
-libs     = ./Obj.a   -ldeal_II   -llac -lbase
-libs.g   = ./Obj.g.a -ldeal_II.g lac.g -lbase.g
+libs     = ./Obj.a     -ldeal_II   -llac -lbase
+libs.g   = ./Obj.g.a -ldeal_II.g -llac.g -lbase.g
 
 
 # check whether we use debug mode or not
index c0612a8bf252ef3662c187e804afdebf5201ea7e..a26bd89b74f218702311a977c5db537dbc7ecba9 100644 (file)
 #include <grid/tria_boundary.h>
 #include <grid/dof_constraints.h>
 #include <basic/data_io.h>
-#include <basic/function.h>
-#include <basic/parameter_handler.h>
+#include <base/function.h>
+#include <base/parameter_handler.h>
 #include <fe/fe_lib.lagrange.h>
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
 #include <lac/dsmatrix.h>
index 1078dbe6879786fcbe0c1a0842c38df2cb865b4b..6001b5e9c81db0737e29d5bc5c6fd7041a992990 100644 (file)
@@ -7,7 +7,7 @@
 
 
 #include <fe/fe.h>
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 
 
 /**
index bdc52af0c7c13c4d1139ee994f97d81a60b71393..d80d0f8110a322202ef25388b456c1b70679dba5 100644 (file)
@@ -7,7 +7,7 @@
 
 
 #include <base/exceptions.h>
-#include <basic/function.h>
+#include <base/function.h>
 #include <map>
 
 
index e1438e8d6ceb9dcaf83e0ce8606cf39ae51f61fd..1726959110ae816614ab552d2ab4aecf9b5bdf13 100644 (file)
@@ -3,7 +3,7 @@
 
 
 #include <fe/fe.h>
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 #include <grid/tria_iterator.h>
 #include <grid/dof_accessor.h>
 #include <grid/tria_boundary.h>
index bc1fda90ea640ce74158ccc0238d2008dc27fff8..a6eada6302a429b889002f58b93767065570e609 100644 (file)
@@ -3,7 +3,7 @@
 
 
 #include <fe/fe_linear_mapping.h>
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 #include <grid/tria_iterator.h>
 #include <grid/dof_accessor.h>
 #include <grid/tria_boundary.h>
index 3957483e7a1056c1d8ebaf4391bb6f95b1b6b270..cec0e6e9ad9c678951184cc049a89f2d1bbc14d9 100644 (file)
@@ -4,7 +4,7 @@
 
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <grid/tria_boundary.h>
index a883c41abe7222a1d57943a902b4c442c732a77c..de0e78a65b14fafd3bdd326b5631462ae68e4938 100644 (file)
@@ -9,9 +9,9 @@
 #include <grid/dof_constraints.h>
 #include <grid/tria_iterator.h>
 #include <basic/data_io.h>
-#include <basic/function.h>
+#include <base/function.h>
 #include <fe/fe.h>
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 #include <lac/dvector.h>
 #include <lac/solver_cg.h>
 #include <lac/vector_memory.h>
index 708fbb89100da03c7e80d802d3c7e01c04cb9841..6ef7ea5b7611f31f6655d99e0cf5c7dc16699345 100644 (file)
@@ -9,7 +9,7 @@
 #include <grid/tria_boundary.h>
 #include <grid/tria.h>
 #include <grid/geometry_info.h>
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <fe/fe_values.h>
 #include <fe/fe.h>
 #include <lac/dvector.h>
index 23b0002265b15b7a79ca5ee35e86e82089d445cf..f0102a9f6026e0b6ab1a2d72e32d8fd6e45e9716 100644 (file)
@@ -4,7 +4,7 @@
 #include <fe/fe.h>
 #include <fe/fe_values.h>
 #include <fe/fe_update_flags.h>
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 #include <numerics/error_estimator.h>
 #include <grid/dof.h>
 #include <grid/tria_iterator.h>
index dd8c5c0177bc00efffb122edae7605432c7ba052..19e5d6cc7bca9b5c7c64bfde67064123bc52c823 100644 (file)
@@ -1,11 +1,11 @@
 /*      $Id$                 */
 
-#include <basic/function.h>
+#include <base/function.h>
 #include <grid/dof.h>
 #include <grid/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/geometry_info.h>
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
 #include <numerics/matrices.h>
index 76f09c5c7f36a6c5f854ec7c892523c750bf0d62..9f21f6718dcded7a620da36eb4f83a2791cf84f7 100644 (file)
@@ -3,14 +3,14 @@
 
 
 
-#include <basic/function.h>
+#include <base/function.h>
 #include <grid/dof.h>
 #include <grid/dof_accessor.h>
 #include <grid/tria_iterator.h>
 #include <grid/dof_constraints.h>
 #include <fe/fe.h>
 #include <fe/fe_values.h>
-#include <fe/quadrature.h>
+#include <base/quadrature.h>
 #include <numerics/assembler.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
index bbc332e62c72a86bfaeeefe91acef9c9039075d7..71872f5a6d09c1bd8f2dd3f3bd876fd536a5c6a7 100644 (file)
@@ -9,11 +9,11 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary.h>
 #include <grid/dof_constraints.h>
-#include <basic/function.h>
+#include <base/function.h>
 #include <basic/data_io.h>
 #include <fe/fe_lib.lagrange.h>
 #include <fe/fe_lib.criss_cross.h>
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
 #include <numerics/vectors.h>
index 29dee5924548390c38a0f7a5caa3286e99f16e76..248fd7d5f93247d2e2e15d0f08d4ccf9c78d624b 100644 (file)
@@ -49,8 +49,8 @@ h-files     = $(wildcard *.h)
 lib-h-files = $(wildcard ../../include/*/*.h)
 
 # list of libraries needed to link with
-libs     = ./Obj.a   ../../lib/libdeal_II.a   ../../../lac/lib/liblac.a
-libs.g   = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a
+libs     = ./Obj.a   ../../lib/libdeal_II.a   ../../../lac/lib/liblac.a   ../../../base/lib/libbase.a
+libs.g   = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a ../../../base/lib/libbase.g.a ../../../base/lib/libbase.g.a
 
 
 # check whether we use debug mode or not
index dee0ed501cea9e8b2e60b63b85fbbbe6436b2a12..15b5395016de381612394713ae3d24eadc523e9b 100644 (file)
@@ -10,7 +10,7 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_accessor.h>
 #include <lac/dsmatrix.h>
-#include <basic/parameter_handler.h>
+#include <base/parameter_handler.h>
 #include <grid/dof_constraints.h>
 
 
index 4d377124901f7cd683607d68a3fe596ccd0b1348..88897903fd47be227eb13a47e45f9bc0f8747d4c 100644 (file)
@@ -9,11 +9,11 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary.h>
 #include <grid/dof_constraints.h>
-#include <basic/function.h>
+#include <base/function.h>
 #include <basic/data_io.h>
-#include <basic/parameter_handler.h>
+#include <base/parameter_handler.h>
 #include <fe/fe_lib.lagrange.h>
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
 #include <numerics/vectors.h>
index 7d602803e82ecca19cb6cde7a6b5fcfd0b844570..2778e090347618e6394be3654c304378be53b94b 100644 (file)
@@ -9,12 +9,12 @@
 #include <grid/tria_iterator.h>
 #include <grid/tria_boundary.h>
 #include <grid/dof_constraints.h>
-#include <basic/function.h>
+#include <base/function.h>
 #include <basic/data_io.h>
 #include <fe/fe_lib.lagrange.h>
 #include <fe/fe_lib.criss_cross.h>
 #include <fe/fe_update_flags.h>
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <numerics/assembler.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
index 4e622ce5bf6f2b63834e2da7f85609d2e48a2722..ba6405c2a215ebc0e60587a1e00ee2b8bd1107fd 100644 (file)
@@ -51,8 +51,8 @@ h-files     = $(wildcard *.h)
 lib-h-files = $(wildcard ../../include/*/*.h)
 
 # list of libraries needed to link with
-libs     = ./Obj.a   -ldeal_II   -llac -lbase
-libs.g   = ./Obj.g.a -ldeal_II.g lac.g -lbase.g
+libs     = ./Obj.a     -ldeal_II   -llac -lbase
+libs.g   = ./Obj.g.a -ldeal_II.g -llac.g -lbase.g
 
 
 # check whether we use debug mode or not
index c0612a8bf252ef3662c187e804afdebf5201ea7e..a26bd89b74f218702311a977c5db537dbc7ecba9 100644 (file)
 #include <grid/tria_boundary.h>
 #include <grid/dof_constraints.h>
 #include <basic/data_io.h>
-#include <basic/function.h>
-#include <basic/parameter_handler.h>
+#include <base/function.h>
+#include <base/parameter_handler.h>
 #include <fe/fe_lib.lagrange.h>
-#include <fe/quadrature_lib.h>
+#include <base/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
 #include <lac/dsmatrix.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.