From: guido Date: Fri, 6 Nov 1998 13:20:50 +0000 (+0000) Subject: Anpassung an neue Verzeichnisse X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ea8d1d24ed19c676e3df332d397c32c78352554;p=dealii-svn.git Anpassung an neue Verzeichnisse git-svn-id: https://svn.dealii.org/trunk@644 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/quadrature_lib.h b/deal.II/base/include/base/quadrature_lib.h index dcdfdcb913..6ecfe60de2 100644 --- a/deal.II/base/include/base/quadrature_lib.h +++ b/deal.II/base/include/base/quadrature_lib.h @@ -6,7 +6,7 @@ /*---------------------------- quadrature_lib.h ---------------------------*/ -#include +#include /** diff --git a/deal.II/base/source/function.cc b/deal.II/base/source/function.cc index f6d4622180..a88413d677 100644 --- a/deal.II/base/source/function.cc +++ b/deal.II/base/source/function.cc @@ -1,7 +1,7 @@ /* $Id$ */ -#include +#include #include @@ -152,6 +152,12 @@ void ConstantFunction::value_list (const vector > &points, // explicit instantiations -template class Function; -template class ZeroFunction; -template class ConstantFunction; +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>; diff --git a/deal.II/base/source/parameter_handler.cc b/deal.II/base/source/parameter_handler.cc index 4583d491c2..2cafb3adcf 100644 --- a/deal.II/base/source/parameter_handler.cc +++ b/deal.II/base/source/parameter_handler.cc @@ -2,7 +2,7 @@ /* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#include +#include #include #include #include diff --git a/deal.II/base/source/quadrature.cc b/deal.II/base/source/quadrature.cc index 73e0286c19..e0445aec47 100644 --- a/deal.II/base/source/quadrature.cc +++ b/deal.II/base/source/quadrature.cc @@ -2,7 +2,7 @@ /* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#include +#include template @@ -94,8 +94,6 @@ const vector & Quadrature::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 diff --git a/deal.II/base/source/quadrature_lib.cc b/deal.II/base/source/quadrature_lib.cc index 3e700e8a34..e71ed2b2c9 100644 --- a/deal.II/base/source/quadrature_lib.cc +++ b/deal.II/base/source/quadrature_lib.cc @@ -2,7 +2,7 @@ /* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#include +#include #include @@ -10,10 +10,6 @@ // 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::QIteratedTrapez (const unsigned n) : // explicite specialization -template class QGauss2; -template class QGauss3; -template class QGauss4; -template class QGauss5; -template class QGauss6; -template class QGauss7; -template class QGauss8; -template class QMidpoint; -template class QSimpson; -template class QTrapez; -template class QIteratedTrapez; - - -#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>; + diff --git a/deal.II/base/source/timer.cc b/deal.II/base/source/timer.cc index c51d26376e..cc0731a987 100644 --- a/deal.II/base/source/timer.cc +++ b/deal.II/base/source/timer.cc @@ -2,7 +2,7 @@ /* Copyright W. Bangerth, University of Heidelberg, 1998 */ -#include +#include #include #include diff --git a/deal.II/deal.II/Attic/examples/convergence/convergence.cc b/deal.II/deal.II/Attic/examples/convergence/convergence.cc index bbc332e62c..71872f5a6d 100644 --- a/deal.II/deal.II/Attic/examples/convergence/convergence.cc +++ b/deal.II/deal.II/Attic/examples/convergence/convergence.cc @@ -9,11 +9,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/Attic/examples/dof/Makefile b/deal.II/deal.II/Attic/examples/dof/Makefile index 29dee59245..248fd7d5f9 100644 --- a/deal.II/deal.II/Attic/examples/dof/Makefile +++ b/deal.II/deal.II/Attic/examples/dof/Makefile @@ -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 diff --git a/deal.II/deal.II/Attic/examples/dof/dof_test.cc b/deal.II/deal.II/Attic/examples/dof/dof_test.cc index dee0ed501c..15b5395016 100644 --- a/deal.II/deal.II/Attic/examples/dof/dof_test.cc +++ b/deal.II/deal.II/Attic/examples/dof/dof_test.cc @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include diff --git a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index 4d37712490..88897903fd 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -9,11 +9,11 @@ #include #include #include -#include +#include #include -#include +#include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc index 7d602803e8..2778e09034 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc +++ b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc @@ -9,12 +9,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index 4e622ce5bf..ba6405c2a2 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -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 diff --git a/deal.II/deal.II/Attic/examples/poisson/poisson.h b/deal.II/deal.II/Attic/examples/poisson/poisson.h index c0612a8bf2..a26bd89b74 100644 --- a/deal.II/deal.II/Attic/examples/poisson/poisson.h +++ b/deal.II/deal.II/Attic/examples/poisson/poisson.h @@ -14,10 +14,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/include/fe/fe_lib.criss_cross.h b/deal.II/deal.II/include/fe/fe_lib.criss_cross.h index 1078dbe687..6001b5e9c8 100644 --- a/deal.II/deal.II/include/fe/fe_lib.criss_cross.h +++ b/deal.II/deal.II/include/fe/fe_lib.criss_cross.h @@ -7,7 +7,7 @@ #include -#include +#include /** diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h index bdc52af0c7..d80d0f8110 100644 --- a/deal.II/deal.II/include/numerics/error_estimator.h +++ b/deal.II/deal.II/include/numerics/error_estimator.h @@ -7,7 +7,7 @@ #include -#include +#include #include diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index e1438e8d6c..1726959110 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -3,7 +3,7 @@ #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/fe/fe_linear_mapping.cc b/deal.II/deal.II/source/fe/fe_linear_mapping.cc index bc1fda90ea..a6eada6302 100644 --- a/deal.II/deal.II/source/fe/fe_linear_mapping.cc +++ b/deal.II/deal.II/source/fe/fe_linear_mapping.cc @@ -3,7 +3,7 @@ #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 3957483e7a..cec0e6e9ad 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/base.cc b/deal.II/deal.II/source/numerics/base.cc index a883c41abe..de0e78a65b 100644 --- a/deal.II/deal.II/source/numerics/base.cc +++ b/deal.II/deal.II/source/numerics/base.cc @@ -9,9 +9,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/numerics/data_io.cc b/deal.II/deal.II/source/numerics/data_io.cc index 708fbb8910..6ef7ea5b76 100644 --- a/deal.II/deal.II/source/numerics/data_io.cc +++ b/deal.II/deal.II/source/numerics/data_io.cc @@ -9,7 +9,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 23b0002265..f0102a9f60 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -4,7 +4,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 dd8c5c0177..19e5d6cc7b 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -1,11 +1,11 @@ /* $Id$ */ -#include +#include #include #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 76f09c5c7f..9f21f6718d 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -3,14 +3,14 @@ -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include diff --git a/tests/big-tests/convergence/convergence.cc b/tests/big-tests/convergence/convergence.cc index bbc332e62c..71872f5a6d 100644 --- a/tests/big-tests/convergence/convergence.cc +++ b/tests/big-tests/convergence/convergence.cc @@ -9,11 +9,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index 29dee59245..248fd7d5f9 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -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 diff --git a/tests/big-tests/dof/dof_test.cc b/tests/big-tests/dof/dof_test.cc index dee0ed501c..15b5395016 100644 --- a/tests/big-tests/dof/dof_test.cc +++ b/tests/big-tests/dof/dof_test.cc @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index 4d37712490..88897903fd 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -9,11 +9,11 @@ #include #include #include -#include +#include #include -#include +#include #include -#include +#include #include #include #include diff --git a/tests/big-tests/multigrid/multigrid.cc b/tests/big-tests/multigrid/multigrid.cc index 7d602803e8..2778e09034 100644 --- a/tests/big-tests/multigrid/multigrid.cc +++ b/tests/big-tests/multigrid/multigrid.cc @@ -9,12 +9,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index 4e622ce5bf..ba6405c2a2 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -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 diff --git a/tests/big-tests/poisson/poisson.h b/tests/big-tests/poisson/poisson.h index c0612a8bf2..a26bd89b74 100644 --- a/tests/big-tests/poisson/poisson.h +++ b/tests/big-tests/poisson/poisson.h @@ -14,10 +14,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include