From 8450e5fbbbdcda150b836fda3d369c1f2f8a1526 Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 22 Feb 2000 20:31:34 +0000 Subject: [PATCH] new heads git-svn-id: https://svn.dealii.org/trunk@2477 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_accessor.cc | 57 +- .../deal.II/source/dofs/dof_constraints.cc | 36 +- deal.II/deal.II/source/dofs/dof_handler.cc | 218 +------- .../deal.II/source/dofs/dof_renumbering.cc | 38 +- deal.II/deal.II/source/dofs/dof_tools.cc | 45 +- deal.II/deal.II/source/fe/fe.cc | 41 +- .../deal.II/source/fe/fe_lib.criss_cross.cc | 85 +-- deal.II/deal.II/source/fe/fe_lib.cubic.cc | 63 +-- deal.II/deal.II/source/fe/fe_lib.dg.cc | 19 +- .../deal.II/source/fe/fe_lib.dg.constant.cc | 24 +- deal.II/deal.II/source/fe/fe_lib.linear.cc | 54 +- deal.II/deal.II/source/fe/fe_lib.quadratic.cc | 50 +- deal.II/deal.II/source/fe/fe_lib.quartic.cc | 53 +- deal.II/deal.II/source/fe/fe_system.cc | 43 +- deal.II/deal.II/source/fe/fe_values.cc | 73 +-- deal.II/deal.II/source/fe/q1_mapping.cc | 62 +-- .../deal.II/source/fe/q1_mapping.jacobians.cc | 22 +- deal.II/deal.II/source/grid/geometry_info.cc | 14 +- deal.II/deal.II/source/grid/grid_generator.cc | 30 +- deal.II/deal.II/source/grid/grid_in.cc | 24 +- .../source/grid/grid_out.all_dimensions.cc | 26 +- deal.II/deal.II/source/grid/grid_out.cc | 39 +- deal.II/deal.II/source/grid/intergrid_map.cc | 30 +- .../deal.II/source/grid/persistent_tria.cc | 20 +- .../source/grid/tria.all_dimensions.cc | 32 +- deal.II/deal.II/source/grid/tria.cc | 502 ++++-------------- deal.II/deal.II/source/grid/tria_accessor.cc | 105 +--- deal.II/deal.II/source/grid/tria_boundary.cc | 21 +- .../deal.II/source/grid/tria_boundary_lib.cc | 33 +- deal.II/deal.II/source/multigrid/mg_base.cc | 23 +- .../source/multigrid/mg_dof_accessor.cc | 65 +-- .../source/multigrid/mg_dof_handler.cc | 240 ++------- .../deal.II/source/multigrid/mg_dof_tools.cc | 16 +- .../deal.II/source/multigrid/mg_smoother.cc | 16 +- deal.II/deal.II/source/multigrid/multigrid.cc | 32 +- deal.II/deal.II/source/numerics/assembler.cc | 26 +- deal.II/deal.II/source/numerics/base.cc | 29 +- deal.II/deal.II/source/numerics/data_io.cc | 97 ++-- deal.II/deal.II/source/numerics/data_out.cc | 26 +- .../deal.II/source/numerics/data_out_stack.cc | 31 +- deal.II/deal.II/source/numerics/equation.cc | 19 +- .../source/numerics/error_estimator.cc | 103 ++-- deal.II/deal.II/source/numerics/histogram.cc | 34 +- deal.II/deal.II/source/numerics/matrices.cc | 76 +-- .../source/numerics/solution_transfer.cc | 34 +- .../deal.II/source/numerics/time_dependent.cc | 109 +--- .../source/numerics/vectors.all_dimensions.cc | 16 +- deal.II/deal.II/source/numerics/vectors.cc | 55 +- 48 files changed, 915 insertions(+), 1991 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index 20aade1bcd..7989c1cc92 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -1,6 +1,15 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ - +//---------------------------- dof_accessor.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_accessor.cc --------------------------- #include @@ -17,13 +26,9 @@ #include - - - /*------------------------- Functions: DoFLineAccessor -----------------------*/ - template void DoFObjectAccessor<1, dim>::set_dof_index (const unsigned int i, const unsigned int index) const @@ -40,8 +45,6 @@ void DoFObjectAccessor<1, dim>::set_dof_index (const unsigned int i, }; - - template void DoFObjectAccessor<1, dim>::set_vertex_dof_index (const unsigned int vertex, const unsigned int i, @@ -60,7 +63,6 @@ void DoFObjectAccessor<1, dim>::set_vertex_dof_index (const unsigned int vertex, }; - template void DoFObjectAccessor<1, dim>:: distribute_local_to_global (const Vector &local_source, @@ -85,7 +87,6 @@ distribute_local_to_global (const Vector &local_source, }; - template void DoFObjectAccessor<1, dim>:: distribute_local_to_global (const FullMatrix &local_source, @@ -115,7 +116,6 @@ distribute_local_to_global (const FullMatrix &local_source, }; - template template void @@ -146,7 +146,6 @@ DoFObjectAccessor<1,dim>::get_dof_values (const Vector &values, }; - template template void @@ -176,8 +175,6 @@ DoFObjectAccessor<1,dim>::set_dof_values (const Vector &local_values, }; - - /*------------------------- Functions: DoFQuadAccessor -----------------------*/ @@ -197,7 +194,6 @@ void DoFObjectAccessor<2, dim>::set_dof_index (const unsigned int i, }; - template void DoFObjectAccessor<2, dim>::set_vertex_dof_index (const unsigned int vertex, @@ -217,7 +213,6 @@ DoFObjectAccessor<2, dim>::set_vertex_dof_index (const unsigned int vertex, }; - template void DoFObjectAccessor<2, dim>:: distribute_local_to_global (const Vector &local_source, @@ -243,7 +238,6 @@ distribute_local_to_global (const Vector &local_source, }; - template void DoFObjectAccessor<2, dim>:: distribute_local_to_global (const FullMatrix &local_source, @@ -274,7 +268,6 @@ distribute_local_to_global (const FullMatrix &local_source, }; - template template void @@ -309,7 +302,6 @@ DoFObjectAccessor<2,dim>::get_dof_values (const Vector &values, }; - template template void @@ -344,10 +336,6 @@ DoFObjectAccessor<2,dim>::set_dof_values (const Vector &local_values, }; - - - - /*------------------------- Functions: DoFHexAccessor -----------------------*/ @@ -367,7 +355,6 @@ void DoFObjectAccessor<3, dim>::set_dof_index (const unsigned int i, }; - template void DoFObjectAccessor<3, dim>::set_vertex_dof_index (const unsigned int vertex, const unsigned int i, @@ -386,7 +373,6 @@ void DoFObjectAccessor<3, dim>::set_vertex_dof_index (const unsigned int vertex, }; - template void DoFObjectAccessor<3, dim>:: distribute_local_to_global (const Vector &local_source, @@ -413,7 +399,6 @@ distribute_local_to_global (const Vector &local_source, }; - template void DoFObjectAccessor<3, dim>:: distribute_local_to_global (const FullMatrix &local_source, @@ -446,7 +431,6 @@ distribute_local_to_global (const FullMatrix &local_source, }; - template template void @@ -485,7 +469,6 @@ DoFObjectAccessor<3,dim>::get_dof_values (const Vector &values, }; - template template void @@ -524,13 +507,9 @@ DoFObjectAccessor<3,dim>::set_dof_values (const Vector &local_values, }; - - - /*------------------------- Functions: DoFCellAccessor -----------------------*/ - #if deal_II_dimension == 1 template <> @@ -544,7 +523,6 @@ DoFCellAccessor<1>::face (const unsigned int) const #endif - #if deal_II_dimension == 2 template <> @@ -557,7 +535,6 @@ DoFCellAccessor<2>::face (const unsigned int i) const #endif - #if deal_II_dimension == 3 template <> @@ -570,8 +547,6 @@ DoFCellAccessor<3>::face (const unsigned int i) const #endif - - template template void @@ -634,7 +609,6 @@ DoFCellAccessor::get_interpolated_dof_values (const Vector &values, }; - template template void @@ -671,11 +645,6 @@ DoFCellAccessor::set_dof_values_by_interpolation (const Vector &loc }; - - - - - // explicit instantiations @@ -793,7 +762,6 @@ set_dof_values_by_interpolation(const Vector &, Vector &) const; - #if deal_II_dimension == 1 template class DoFObjectAccessor<1, 1>; #endif @@ -808,7 +776,6 @@ template class TriaActiveIterator<2,DoFObjectAccessor<1, 2> >; #endif - #if deal_II_dimension == 3 template class DoFObjectAccessor<1, 3>; template class DoFObjectAccessor<2, 3>; diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index 6c6315daf7..2b9e6178f8 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -1,6 +1,15 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ - +//---------------------------- dof_constraints.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_constraints.cc --------------------------- #include @@ -11,7 +20,6 @@ #include - inline bool ConstraintMatrix::ConstraintLine::operator < (const ConstraintLine &a) const @@ -20,13 +28,10 @@ ConstraintMatrix::ConstraintLine::operator < (const ConstraintLine &a) const }; - - ConstraintMatrix::ConstraintMatrix () : lines(), sorted(false) {}; - void ConstraintMatrix::add_line (const unsigned int line) { Assert (sorted==false, ExcMatrixIsClosed()); @@ -41,7 +46,6 @@ void ConstraintMatrix::add_line (const unsigned int line) { lines.push_back (ConstraintLine()); lines.back().line = line; }; - void ConstraintMatrix::add_entry (const unsigned int line, @@ -85,8 +89,6 @@ void ConstraintMatrix::add_entry (const unsigned int line, }; - - void ConstraintMatrix::close () { Assert (sorted==false, ExcMatrixIsClosed()); @@ -113,7 +115,6 @@ void ConstraintMatrix::close () { sorted = true; }; - void ConstraintMatrix::clear () { lines = vector(); @@ -121,7 +122,6 @@ void ConstraintMatrix::clear () { }; - void ConstraintMatrix::condense (const SparsityPattern &uncondensed, SparsityPattern &condensed) const { Assert (sorted == true, ExcMatrixNotClosed()); @@ -129,8 +129,8 @@ void ConstraintMatrix::condense (const SparsityPattern &uncondensed, Assert (uncondensed.n_rows() == uncondensed.n_cols(), ExcMatrixNotSquare()); - - // store for each line of the matrix + +// store for each line of the matrix // its new line number // after compression. If the shift is // -1, this line will be condensed away @@ -167,8 +167,8 @@ void ConstraintMatrix::condense (const SparsityPattern &uncondensed, else new_line.push_back (row-shift); - - next_constraint = lines.begin(); + +next_constraint = lines.begin(); // note: in this loop we need not check // whether #next_constraint# is a valid // iterator, since #next_constraint# is @@ -230,7 +230,6 @@ void ConstraintMatrix::condense (const SparsityPattern &uncondensed, }; - void ConstraintMatrix::condense (SparsityPattern &sparsity) const { Assert (sorted == true, ExcMatrixNotClosed()); Assert (sparsity.is_compressed() == false, ExcMatrixIsClosed()); @@ -309,14 +308,12 @@ void ConstraintMatrix::condense (SparsityPattern &sparsity) const { }; - unsigned int ConstraintMatrix::n_constraints () const { return lines.size(); }; - bool ConstraintMatrix::is_constrained (const unsigned int index) const { if (sorted == true) @@ -341,7 +338,6 @@ bool ConstraintMatrix::is_constrained (const unsigned int index) const }; - void ConstraintMatrix::print (ostream &out) const { for (unsigned int i=0; i!=lines.size(); ++i) for (unsigned int j=0; j!=lines[i].entries.size(); ++j) diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index 07246c45d2..c8c875f410 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -1,5 +1,15 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998, 1999 */ +//---------------------------- dof_handler.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_handler.cc --------------------------- #include @@ -16,7 +26,6 @@ #include - template DoFHandler::DoFHandler (Triangulation &tria) : tria(&tria), @@ -24,16 +33,11 @@ DoFHandler::DoFHandler (Triangulation &tria) : {}; - template DoFHandler::~DoFHandler () {}; - - - - #if deal_II_dimension == 1 template <> @@ -43,7 +47,6 @@ DoFHandler<1>::begin_raw (const unsigned int level) const { }; - template <> DoFHandler<1>::cell_iterator DoFHandler<1>::begin (const unsigned int level) const { @@ -51,7 +54,6 @@ DoFHandler<1>::begin (const unsigned int level) const { }; - template <> DoFHandler<1>::active_cell_iterator DoFHandler<1>::begin_active (const unsigned int level) const { @@ -59,7 +61,6 @@ DoFHandler<1>::begin_active (const unsigned int level) const { }; - template <> DoFHandler<1>::raw_cell_iterator DoFHandler<1>::end () const { @@ -67,7 +68,6 @@ DoFHandler<1>::end () const { }; - template <> DoFHandler<1>::raw_cell_iterator DoFHandler<1>::last_raw () const { @@ -75,7 +75,6 @@ DoFHandler<1>::last_raw () const { }; - template <> DoFHandler<1>::raw_cell_iterator DoFHandler<1>::last_raw (const unsigned int level) const { @@ -83,7 +82,6 @@ DoFHandler<1>::last_raw (const unsigned int level) const { }; - template <> DoFHandler<1>::cell_iterator DoFHandler<1>::last () const { @@ -91,7 +89,6 @@ DoFHandler<1>::last () const { }; - template <> DoFHandler<1>::cell_iterator DoFHandler<1>::last (const unsigned int level) const { @@ -99,7 +96,6 @@ DoFHandler<1>::last (const unsigned int level) const { }; - template <> DoFHandler<1>::active_cell_iterator DoFHandler<1>::last_active () const { @@ -107,7 +103,6 @@ DoFHandler<1>::last_active () const { }; - template <> DoFHandler<1>::active_cell_iterator DoFHandler<1>::last_active (const unsigned int level) const { @@ -115,7 +110,6 @@ DoFHandler<1>::last_active (const unsigned int level) const { }; - template <> DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::begin_raw_face (const unsigned int) const { @@ -124,7 +118,6 @@ DoFHandler<1>::begin_raw_face (const unsigned int) const { }; - template <> DoFDimensionInfo<1>::face_iterator DoFHandler<1>::begin_face (const unsigned int) const { @@ -133,7 +126,6 @@ DoFHandler<1>::begin_face (const unsigned int) const { }; - template <> DoFDimensionInfo<1>::active_face_iterator DoFHandler<1>::begin_active_face (const unsigned int) const { @@ -142,7 +134,6 @@ DoFHandler<1>::begin_active_face (const unsigned int) const { }; - template <> DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::end_face () const { @@ -151,7 +142,6 @@ DoFHandler<1>::end_face () const { }; - template <> DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::last_raw_face () const { @@ -160,7 +150,6 @@ DoFHandler<1>::last_raw_face () const { }; - template <> DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::last_raw_face (const unsigned int) const { @@ -169,7 +158,6 @@ DoFHandler<1>::last_raw_face (const unsigned int) const { }; - template <> DoFDimensionInfo<1>::face_iterator DoFHandler<1>::last_face () const { @@ -178,7 +166,6 @@ DoFHandler<1>::last_face () const { }; - template <> DoFDimensionInfo<1>::face_iterator DoFHandler<1>::last_face (const unsigned int) const { @@ -187,7 +174,6 @@ DoFHandler<1>::last_face (const unsigned int) const { }; - template <> DoFDimensionInfo<1>::active_face_iterator DoFHandler<1>::last_active_face () const { @@ -196,7 +182,6 @@ DoFHandler<1>::last_active_face () const { }; - template <> DoFDimensionInfo<1>::active_face_iterator DoFHandler<1>::last_active_face (const unsigned int) const { @@ -205,8 +190,6 @@ DoFHandler<1>::last_active_face (const unsigned int) const { }; - - template <> DoFHandler<1>::raw_quad_iterator DoFHandler<1>::begin_raw_quad (const unsigned int) const { @@ -215,7 +198,6 @@ DoFHandler<1>::begin_raw_quad (const unsigned int) const { }; - template <> DoFHandler<1>::quad_iterator DoFHandler<1>::begin_quad (const unsigned int) const { @@ -224,7 +206,6 @@ DoFHandler<1>::begin_quad (const unsigned int) const { }; - template <> DoFHandler<1>::active_quad_iterator DoFHandler<1>::begin_active_quad (const unsigned int) const { @@ -233,7 +214,6 @@ DoFHandler<1>::begin_active_quad (const unsigned int) const { }; - template <> DoFHandler<1>::raw_quad_iterator DoFHandler<1>::end_quad () const { @@ -242,7 +222,6 @@ DoFHandler<1>::end_quad () const { }; - template <> DoFHandler<1>::raw_quad_iterator DoFHandler<1>::last_raw_quad (const unsigned int) const { @@ -259,7 +238,6 @@ DoFHandler<1>::last_quad (const unsigned int) const { }; - template <> DoFHandler<1>::active_quad_iterator DoFHandler<1>::last_active_quad (const unsigned int) const { @@ -268,7 +246,6 @@ DoFHandler<1>::last_active_quad (const unsigned int) const { }; - template <> DoFHandler<1>::raw_quad_iterator DoFHandler<1>::last_raw_quad () const { @@ -277,7 +254,6 @@ DoFHandler<1>::last_raw_quad () const { }; - template <> DoFHandler<1>::quad_iterator DoFHandler<1>::last_quad () const { @@ -286,7 +262,6 @@ DoFHandler<1>::last_quad () const { }; - template <> DoFHandler<1>::active_quad_iterator DoFHandler<1>::last_active_quad () const { @@ -295,7 +270,6 @@ DoFHandler<1>::last_active_quad () const { }; - template <> DoFHandler<1>::raw_hex_iterator DoFHandler<1>::begin_raw_hex (const unsigned int) const { @@ -304,7 +278,6 @@ DoFHandler<1>::begin_raw_hex (const unsigned int) const { }; - template <> DoFHandler<1>::hex_iterator DoFHandler<1>::begin_hex (const unsigned int) const { @@ -313,7 +286,6 @@ DoFHandler<1>::begin_hex (const unsigned int) const { }; - template <> DoFHandler<1>::active_hex_iterator DoFHandler<1>::begin_active_hex (const unsigned int) const { @@ -322,7 +294,6 @@ DoFHandler<1>::begin_active_hex (const unsigned int) const { }; - template <> DoFHandler<1>::raw_hex_iterator DoFHandler<1>::end_hex () const { @@ -331,7 +302,6 @@ DoFHandler<1>::end_hex () const { }; - template <> DoFHandler<1>::raw_hex_iterator DoFHandler<1>::last_raw_hex (const unsigned int) const { @@ -340,7 +310,6 @@ DoFHandler<1>::last_raw_hex (const unsigned int) const { }; - template <> DoFHandler<1>::raw_hex_iterator DoFHandler<1>::last_raw_hex () const { @@ -349,7 +318,6 @@ DoFHandler<1>::last_raw_hex () const { }; - template <> DoFHandler<1>::hex_iterator DoFHandler<1>::last_hex (const unsigned int) const { @@ -358,7 +326,6 @@ DoFHandler<1>::last_hex (const unsigned int) const { }; - template <> DoFHandler<1>::hex_iterator DoFHandler<1>::last_hex () const { @@ -367,7 +334,6 @@ DoFHandler<1>::last_hex () const { }; - template <> DoFHandler<1>::active_hex_iterator DoFHandler<1>::last_active_hex (const unsigned int) const { @@ -376,7 +342,6 @@ DoFHandler<1>::last_active_hex (const unsigned int) const { }; - template <> DoFHandler<1>::active_hex_iterator DoFHandler<1>::last_active_hex () const { @@ -396,7 +361,6 @@ DoFHandler<2>::begin_raw (const unsigned int level) const { }; - template <> DoFHandler<2>::cell_iterator DoFHandler<2>::begin (const unsigned int level) const { @@ -404,7 +368,6 @@ DoFHandler<2>::begin (const unsigned int level) const { }; - template <> DoFHandler<2>::active_cell_iterator DoFHandler<2>::begin_active (const unsigned int level) const { @@ -412,7 +375,6 @@ DoFHandler<2>::begin_active (const unsigned int level) const { }; - template <> DoFHandler<2>::raw_cell_iterator DoFHandler<2>::end () const { @@ -420,7 +382,6 @@ DoFHandler<2>::end () const { }; - template <> DoFHandler<2>::raw_cell_iterator DoFHandler<2>::last_raw () const { @@ -428,7 +389,6 @@ DoFHandler<2>::last_raw () const { }; - template <> DoFHandler<2>::raw_cell_iterator DoFHandler<2>::last_raw (const unsigned int level) const { @@ -436,7 +396,6 @@ DoFHandler<2>::last_raw (const unsigned int level) const { }; - template <> DoFHandler<2>::cell_iterator DoFHandler<2>::last () const { @@ -444,7 +403,6 @@ DoFHandler<2>::last () const { }; - template <> DoFHandler<2>::cell_iterator DoFHandler<2>::last (const unsigned int level) const { @@ -452,7 +410,6 @@ DoFHandler<2>::last (const unsigned int level) const { }; - template <> DoFHandler<2>::active_cell_iterator DoFHandler<2>::last_active () const { @@ -460,7 +417,6 @@ DoFHandler<2>::last_active () const { }; - template <> DoFHandler<2>::active_cell_iterator DoFHandler<2>::last_active (const unsigned int level) const { @@ -475,7 +431,6 @@ DoFHandler<2>::begin_raw_face (const unsigned int level) const { }; - template <> DoFDimensionInfo<2>::face_iterator DoFHandler<2>::begin_face (const unsigned int level) const { @@ -483,7 +438,6 @@ DoFHandler<2>::begin_face (const unsigned int level) const { }; - template <> DoFDimensionInfo<2>::active_face_iterator DoFHandler<2>::begin_active_face (const unsigned int level) const { @@ -491,7 +445,6 @@ DoFHandler<2>::begin_active_face (const unsigned int level) const { }; - template <> DoFDimensionInfo<2>::raw_face_iterator DoFHandler<2>::end_face () const { @@ -499,7 +452,6 @@ DoFHandler<2>::end_face () const { }; - template <> DoFDimensionInfo<2>::raw_face_iterator DoFHandler<2>::last_raw_face () const { @@ -507,7 +459,6 @@ DoFHandler<2>::last_raw_face () const { }; - template <> DoFDimensionInfo<2>::raw_face_iterator DoFHandler<2>::last_raw_face (const unsigned int level) const { @@ -515,7 +466,6 @@ DoFHandler<2>::last_raw_face (const unsigned int level) const { }; - template <> DoFDimensionInfo<2>::face_iterator DoFHandler<2>::last_face () const { @@ -523,7 +473,6 @@ DoFHandler<2>::last_face () const { }; - template <> DoFDimensionInfo<2>::face_iterator DoFHandler<2>::last_face (const unsigned int level) const { @@ -531,7 +480,6 @@ DoFHandler<2>::last_face (const unsigned int level) const { }; - template <> DoFDimensionInfo<2>::active_face_iterator DoFHandler<2>::last_active_face () const { @@ -539,7 +487,6 @@ DoFHandler<2>::last_active_face () const { }; - template <> DoFDimensionInfo<2>::active_face_iterator DoFHandler<2>::last_active_face (const unsigned int level) const { @@ -547,7 +494,6 @@ DoFHandler<2>::last_active_face (const unsigned int level) const { }; - template <> DoFHandler<2>::raw_hex_iterator DoFHandler<2>::begin_raw_hex (const unsigned int) const { @@ -556,7 +502,6 @@ DoFHandler<2>::begin_raw_hex (const unsigned int) const { }; - template <> DoFHandler<2>::hex_iterator DoFHandler<2>::begin_hex (const unsigned int) const { @@ -565,7 +510,6 @@ DoFHandler<2>::begin_hex (const unsigned int) const { }; - template <> DoFHandler<2>::active_hex_iterator DoFHandler<2>::begin_active_hex (const unsigned int) const { @@ -574,7 +518,6 @@ DoFHandler<2>::begin_active_hex (const unsigned int) const { }; - template <> DoFHandler<2>::raw_hex_iterator DoFHandler<2>::end_hex () const { @@ -583,7 +526,6 @@ DoFHandler<2>::end_hex () const { }; - template <> DoFHandler<2>::raw_hex_iterator DoFHandler<2>::last_raw_hex (const unsigned int) const { @@ -592,7 +534,6 @@ DoFHandler<2>::last_raw_hex (const unsigned int) const { }; - template <> DoFHandler<2>::raw_hex_iterator DoFHandler<2>::last_raw_hex () const { @@ -601,7 +542,6 @@ DoFHandler<2>::last_raw_hex () const { }; - template <> DoFHandler<2>::hex_iterator DoFHandler<2>::last_hex (const unsigned int) const { @@ -610,7 +550,6 @@ DoFHandler<2>::last_hex (const unsigned int) const { }; - template <> DoFHandler<2>::hex_iterator DoFHandler<2>::last_hex () const { @@ -619,7 +558,6 @@ DoFHandler<2>::last_hex () const { }; - template <> DoFHandler<2>::active_hex_iterator DoFHandler<2>::last_active_hex (const unsigned int) const { @@ -628,7 +566,6 @@ DoFHandler<2>::last_active_hex (const unsigned int) const { }; - template <> DoFHandler<2>::active_hex_iterator DoFHandler<2>::last_active_hex () const { @@ -640,9 +577,6 @@ DoFHandler<2>::last_active_hex () const { #endif - - - #if deal_II_dimension == 3 template <> @@ -652,7 +586,6 @@ DoFHandler<3>::begin_raw (const unsigned int level) const { }; - template <> DoFHandler<3>::cell_iterator DoFHandler<3>::begin (const unsigned int level) const { @@ -660,7 +593,6 @@ DoFHandler<3>::begin (const unsigned int level) const { }; - template <> DoFHandler<3>::active_cell_iterator DoFHandler<3>::begin_active (const unsigned int level) const { @@ -668,7 +600,6 @@ DoFHandler<3>::begin_active (const unsigned int level) const { }; - template <> DoFHandler<3>::raw_cell_iterator DoFHandler<3>::end () const { @@ -676,7 +607,6 @@ DoFHandler<3>::end () const { }; - template <> DoFHandler<3>::raw_cell_iterator DoFHandler<3>::last_raw () const { @@ -684,7 +614,6 @@ DoFHandler<3>::last_raw () const { }; - template <> DoFHandler<3>::raw_cell_iterator DoFHandler<3>::last_raw (const unsigned int level) const { @@ -692,7 +621,6 @@ DoFHandler<3>::last_raw (const unsigned int level) const { }; - template <> DoFHandler<3>::cell_iterator DoFHandler<3>::last () const { @@ -700,7 +628,6 @@ DoFHandler<3>::last () const { }; - template <> DoFHandler<3>::cell_iterator DoFHandler<3>::last (const unsigned int level) const { @@ -708,7 +635,6 @@ DoFHandler<3>::last (const unsigned int level) const { }; - template <> DoFHandler<3>::active_cell_iterator DoFHandler<3>::last_active () const { @@ -716,7 +642,6 @@ DoFHandler<3>::last_active () const { }; - template <> DoFHandler<3>::active_cell_iterator DoFHandler<3>::last_active (const unsigned int level) const { @@ -724,11 +649,6 @@ DoFHandler<3>::last_active (const unsigned int level) const { }; - - - - - template <> DoFHandler<3>::raw_face_iterator DoFHandler<3>::begin_raw_face (const unsigned int level) const { @@ -736,7 +656,6 @@ DoFHandler<3>::begin_raw_face (const unsigned int level) const { }; - template <> DoFHandler<3>::face_iterator DoFHandler<3>::begin_face (const unsigned int level) const { @@ -744,7 +663,6 @@ DoFHandler<3>::begin_face (const unsigned int level) const { }; - template <> DoFHandler<3>::active_face_iterator DoFHandler<3>::begin_active_face (const unsigned int level) const { @@ -752,7 +670,6 @@ DoFHandler<3>::begin_active_face (const unsigned int level) const { }; - template <> DoFHandler<3>::raw_face_iterator DoFHandler<3>::end_face () const { @@ -760,7 +677,6 @@ DoFHandler<3>::end_face () const { }; - template <> DoFHandler<3>::raw_face_iterator DoFHandler<3>::last_raw_face () const { @@ -768,7 +684,6 @@ DoFHandler<3>::last_raw_face () const { }; - template <> DoFHandler<3>::raw_face_iterator DoFHandler<3>::last_raw_face (const unsigned int level) const { @@ -776,7 +691,6 @@ DoFHandler<3>::last_raw_face (const unsigned int level) const { }; - template <> DoFHandler<3>::face_iterator DoFHandler<3>::last_face () const { @@ -784,7 +698,6 @@ DoFHandler<3>::last_face () const { }; - template <> DoFHandler<3>::face_iterator DoFHandler<3>::last_face (const unsigned int level) const { @@ -792,7 +705,6 @@ DoFHandler<3>::last_face (const unsigned int level) const { }; - template <> DoFHandler<3>::active_face_iterator DoFHandler<3>::last_active_face () const { @@ -800,7 +712,6 @@ DoFHandler<3>::last_active_face () const { }; - template <> DoFHandler<3>::active_face_iterator DoFHandler<3>::last_active_face (const unsigned int level) const { @@ -811,7 +722,6 @@ DoFHandler<3>::last_active_face (const unsigned int level) const { #endif - template typename DoFHandler::raw_line_iterator DoFHandler::begin_raw_line (const unsigned int level) const { @@ -822,7 +732,6 @@ DoFHandler::begin_raw_line (const unsigned int level) const { }; - template typename DoFHandler::line_iterator DoFHandler::begin_line (const unsigned int level) const { @@ -833,7 +742,6 @@ DoFHandler::begin_line (const unsigned int level) const { }; - template typename DoFHandler::active_line_iterator DoFHandler::begin_active_line (const unsigned int level) const { @@ -844,7 +752,6 @@ DoFHandler::begin_active_line (const unsigned int level) const { }; - template typename DoFHandler::raw_quad_iterator DoFHandler::begin_raw_quad (const unsigned int level) const { @@ -855,7 +762,6 @@ DoFHandler::begin_raw_quad (const unsigned int level) const { }; - template typename DoFHandler::quad_iterator DoFHandler::begin_quad (const unsigned int level) const { @@ -866,7 +772,6 @@ DoFHandler::begin_quad (const unsigned int level) const { }; - template typename DoFHandler::active_quad_iterator DoFHandler::begin_active_quad (const unsigned int level) const { @@ -877,8 +782,6 @@ DoFHandler::begin_active_quad (const unsigned int level) const { }; - - template typename DoFHandler::raw_hex_iterator DoFHandler::begin_raw_hex (const unsigned int level) const { @@ -889,7 +792,6 @@ DoFHandler::begin_raw_hex (const unsigned int level) const { }; - template typename DoFHandler::hex_iterator DoFHandler::begin_hex (const unsigned int level) const { @@ -900,7 +802,6 @@ DoFHandler::begin_hex (const unsigned int level) const { }; - template typename DoFHandler::active_hex_iterator DoFHandler::begin_active_hex (const unsigned int level) const { @@ -911,7 +812,6 @@ DoFHandler::begin_active_hex (const unsigned int level) const { }; - template typename DoFHandler::raw_line_iterator DoFHandler::end_line () const { @@ -919,7 +819,6 @@ DoFHandler::end_line () const { }; - template typename DoFHandler::raw_quad_iterator DoFHandler::end_quad () const { @@ -927,7 +826,6 @@ DoFHandler::end_quad () const { }; - template typename DoFHandler::raw_hex_iterator DoFHandler::end_hex () const { @@ -935,7 +833,6 @@ DoFHandler::end_hex () const { }; - template typename DoFDimensionInfo::raw_cell_iterator DoFHandler::end_raw (const unsigned int level) const { @@ -945,7 +842,6 @@ DoFHandler::end_raw (const unsigned int level) const { }; - template typename DoFDimensionInfo::cell_iterator DoFHandler::end (const unsigned int level) const { @@ -955,7 +851,6 @@ DoFHandler::end (const unsigned int level) const { }; - template typename DoFDimensionInfo::active_cell_iterator DoFHandler::end_active (const unsigned int level) const { @@ -965,7 +860,6 @@ DoFHandler::end_active (const unsigned int level) const { }; - template typename DoFDimensionInfo::raw_face_iterator DoFHandler::end_raw_face (const unsigned int level) const { @@ -975,7 +869,6 @@ DoFHandler::end_raw_face (const unsigned int level) const { }; - template typename DoFDimensionInfo::face_iterator DoFHandler::end_face (const unsigned int level) const { @@ -985,7 +878,6 @@ DoFHandler::end_face (const unsigned int level) const { }; - template typename DoFDimensionInfo::active_face_iterator DoFHandler::end_active_face (const unsigned int level) const { @@ -995,7 +887,6 @@ DoFHandler::end_active_face (const unsigned int level) const { }; - template typename DoFDimensionInfo::raw_line_iterator DoFHandler::end_raw_line (const unsigned int level) const { @@ -1005,7 +896,6 @@ DoFHandler::end_raw_line (const unsigned int level) const { }; - template typename DoFDimensionInfo::line_iterator DoFHandler::end_line (const unsigned int level) const { @@ -1015,7 +905,6 @@ DoFHandler::end_line (const unsigned int level) const { }; - template typename DoFDimensionInfo::active_line_iterator DoFHandler::end_active_line (const unsigned int level) const { @@ -1025,8 +914,6 @@ DoFHandler::end_active_line (const unsigned int level) const { }; - - template typename DoFDimensionInfo::raw_quad_iterator DoFHandler::end_raw_quad (const unsigned int level) const { @@ -1036,7 +923,6 @@ DoFHandler::end_raw_quad (const unsigned int level) const { }; - template typename DoFDimensionInfo::quad_iterator DoFHandler::end_quad (const unsigned int level) const { @@ -1046,7 +932,6 @@ DoFHandler::end_quad (const unsigned int level) const { }; - template typename DoFDimensionInfo::active_quad_iterator DoFHandler::end_active_quad (const unsigned int level) const { @@ -1056,7 +941,6 @@ DoFHandler::end_active_quad (const unsigned int level) const { }; - template typename DoFDimensionInfo::raw_hex_iterator DoFHandler::end_raw_hex (const unsigned int level) const { @@ -1066,7 +950,6 @@ DoFHandler::end_raw_hex (const unsigned int level) const { }; - template typename DoFDimensionInfo::hex_iterator DoFHandler::end_hex (const unsigned int level) const { @@ -1076,7 +959,6 @@ DoFHandler::end_hex (const unsigned int level) const { }; - template typename DoFDimensionInfo::active_hex_iterator DoFHandler::end_active_hex (const unsigned int level) const { @@ -1086,7 +968,6 @@ DoFHandler::end_active_hex (const unsigned int level) const { }; - template typename DoFHandler::raw_line_iterator DoFHandler::last_raw_line (const unsigned int level) const { @@ -1097,7 +978,6 @@ DoFHandler::last_raw_line (const unsigned int level) const { }; - template typename DoFHandler::line_iterator DoFHandler::last_line (const unsigned int level) const { @@ -1108,7 +988,6 @@ DoFHandler::last_line (const unsigned int level) const { }; - template typename DoFHandler::active_line_iterator DoFHandler::last_active_line (const unsigned int level) const { @@ -1119,7 +998,6 @@ DoFHandler::last_active_line (const unsigned int level) const { }; - template typename DoFHandler::raw_quad_iterator DoFHandler::last_raw_quad (const unsigned int level) const { @@ -1130,8 +1008,6 @@ DoFHandler::last_raw_quad (const unsigned int level) const { }; - - template typename DoFHandler::quad_iterator DoFHandler::last_quad (const unsigned int level) const { @@ -1142,8 +1018,6 @@ DoFHandler::last_quad (const unsigned int level) const { }; - - template typename DoFHandler::active_quad_iterator DoFHandler::last_active_quad (const unsigned int level) const { @@ -1154,7 +1028,6 @@ DoFHandler::last_active_quad (const unsigned int level) const { }; - template typename DoFHandler::raw_hex_iterator DoFHandler::last_raw_hex (const unsigned int level) const { @@ -1165,8 +1038,6 @@ DoFHandler::last_raw_hex (const unsigned int level) const { }; - - template typename DoFHandler::hex_iterator DoFHandler::last_hex (const unsigned int level) const { @@ -1177,8 +1048,6 @@ DoFHandler::last_hex (const unsigned int level) const { }; - - template typename DoFHandler::active_hex_iterator DoFHandler::last_active_hex (const unsigned int level) const { @@ -1189,7 +1058,6 @@ DoFHandler::last_active_hex (const unsigned int level) const { }; - template typename DoFHandler::raw_line_iterator DoFHandler::last_raw_line () const { @@ -1197,7 +1065,6 @@ DoFHandler::last_raw_line () const { }; - template typename DoFHandler::raw_quad_iterator DoFHandler::last_raw_quad () const { @@ -1205,7 +1072,6 @@ DoFHandler::last_raw_quad () const { }; - template typename DoFHandler::raw_hex_iterator DoFHandler::last_raw_hex () const { @@ -1213,7 +1079,6 @@ DoFHandler::last_raw_hex () const { }; - template typename DoFHandler::line_iterator DoFHandler::last_line () const { @@ -1221,7 +1086,6 @@ DoFHandler::last_line () const { }; - template typename DoFHandler::quad_iterator DoFHandler::last_quad () const { @@ -1229,7 +1093,6 @@ DoFHandler::last_quad () const { }; - template typename DoFHandler::hex_iterator DoFHandler::last_hex () const { @@ -1237,7 +1100,6 @@ DoFHandler::last_hex () const { }; - template typename DoFHandler::active_line_iterator DoFHandler::last_active_line () const { @@ -1245,7 +1107,6 @@ DoFHandler::last_active_line () const { }; - template typename DoFHandler::active_quad_iterator DoFHandler::last_active_quad () const { @@ -1253,7 +1114,6 @@ DoFHandler::last_active_quad () const { }; - template typename DoFHandler::active_hex_iterator DoFHandler::last_active_hex () const { @@ -1261,18 +1121,9 @@ DoFHandler::last_active_hex () const { }; - - - - //------------------------------------------------------------------ - - - - - #if deal_II_dimension == 1 template <> @@ -1283,7 +1134,6 @@ unsigned int DoFHandler<1>::n_boundary_dofs () const { }; - template <> unsigned int DoFHandler<1>::n_boundary_dofs (const FunctionMap &) const { Assert (selected_fe != 0, ExcNoFESelected()); @@ -1294,9 +1144,6 @@ unsigned int DoFHandler<1>::n_boundary_dofs (const FunctionMap &) const { #endif - - - template unsigned int DoFHandler::n_boundary_dofs () const { Assert (selected_fe != 0, ExcNoFESelected()); @@ -1318,7 +1165,6 @@ unsigned int DoFHandler::n_boundary_dofs () const { }; - template unsigned int DoFHandler::n_boundary_dofs (const FunctionMap &boundary_indicators) const { Assert (selected_fe != 0, ExcNoFESelected()); @@ -1343,14 +1189,12 @@ unsigned int DoFHandler::n_boundary_dofs (const FunctionMap &boundary_indic }; - template const Triangulation & DoFHandler::get_tria () const { return *tria; }; - template void DoFHandler::distribute_dofs (const FiniteElement &ff, const unsigned int offset) @@ -1376,7 +1220,6 @@ void DoFHandler::distribute_dofs (const FiniteElement &ff, }; - template void DoFHandler::clear () { // release lock to old fe @@ -1387,8 +1230,6 @@ void DoFHandler::clear () { }; - - #if deal_II_dimension == 1 template <> @@ -1472,15 +1313,15 @@ unsigned int DoFHandler<2>::distribute_dofs_on_cell (active_cell_iterator &cell, for (unsigned int d=0; ddofs_per_line; ++d) line->set_dof_index (d, next_free_dof++); }; - - // dofs of quad + +// dofs of quad if (selected_fe->dofs_per_quad > 0) for (unsigned int d=0; ddofs_per_quad; ++d) cell->set_dof_index (d, next_free_dof++); - - // note that this cell has been processed + +// note that this cell has been processed cell->set_user_flag (); return next_free_dof; @@ -1489,7 +1330,6 @@ unsigned int DoFHandler<2>::distribute_dofs_on_cell (active_cell_iterator &cell, #endif - #if deal_II_dimension == 3 template <> @@ -1536,13 +1376,13 @@ unsigned int DoFHandler<3>::distribute_dofs_on_cell (active_cell_iterator &cell, }; - // dofs of hex +// dofs of hex if (selected_fe->dofs_per_hex > 0) for (unsigned int d=0; ddofs_per_hex; ++d) cell->set_dof_index (d, next_free_dof++); - - // note that this cell has been processed + +// note that this cell has been processed cell->set_user_flag (); return next_free_dof; @@ -1551,7 +1391,6 @@ unsigned int DoFHandler<3>::distribute_dofs_on_cell (active_cell_iterator &cell, #endif - #if deal_II_dimension == 1 template <> @@ -1709,8 +1548,6 @@ void DoFHandler<3>::renumber_dofs (const vector &new_numbers) { #endif - - #if deal_II_dimension == 1 template <> @@ -1720,7 +1557,6 @@ unsigned int DoFHandler<1>::max_couplings_between_dofs () const { }; - template <> unsigned int DoFHandler<1>::max_couplings_between_boundary_dofs () const { Assert (selected_fe != 0, ExcNoFESelected()); @@ -1731,7 +1567,6 @@ unsigned int DoFHandler<1>::max_couplings_between_boundary_dofs () const { #endif - #if deal_II_dimension == 2 template <> @@ -1788,7 +1623,6 @@ unsigned int DoFHandler<2>::max_couplings_between_dofs () const { }; - template <> unsigned int DoFHandler<2>::max_couplings_between_boundary_dofs () const { Assert (selected_fe != 0, ExcNoFESelected()); @@ -1821,13 +1655,12 @@ unsigned int DoFHandler<3>::max_couplings_between_dofs () const { 9*4*7*3*selected_fe->dofs_per_quad + 27*selected_fe->dofs_per_hex); - - Assert (false, ExcNotImplemented()); + +Assert (false, ExcNotImplemented()); return 0; }; - template <> unsigned int DoFHandler<3>::max_couplings_between_boundary_dofs () const { Assert (selected_fe != 0, ExcNoFESelected()); @@ -1850,13 +1683,9 @@ unsigned int DoFHandler<3>::max_couplings_between_boundary_dofs () const { }; - #endif - - - #if deal_II_dimension == 1 template <> @@ -1866,7 +1695,6 @@ void DoFHandler<1>::map_dof_to_boundary_indices (vector &) const { }; - template <> void DoFHandler<1>::map_dof_to_boundary_indices (const FunctionMap &, vector &) const { @@ -1877,7 +1705,6 @@ void DoFHandler<1>::map_dof_to_boundary_indices (const FunctionMap &, #endif - template void DoFHandler::map_dof_to_boundary_indices (vector &mapping) const { @@ -1906,7 +1733,6 @@ void DoFHandler::map_dof_to_boundary_indices (vector &mapping }; - template void DoFHandler::map_dof_to_boundary_indices (const FunctionMap &boundary_indicators, vector &mapping) const @@ -1943,7 +1769,6 @@ void DoFHandler::map_dof_to_boundary_indices (const FunctionMap &boundar }; - #if deal_II_dimension == 1 template <> @@ -2049,7 +1874,6 @@ void DoFHandler::clear_space () { }; - /*-------------- Explicit Instantiations -------------------------------*/ template class DoFHandler; diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index 6394aa15e2..c939584423 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -1,4 +1,16 @@ -/* $Id$ */ +//---------------------------- dof_renumbering.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_renumbering.cc --------------------------- + #include #include @@ -16,7 +28,6 @@ #include - template void DoFRenumbering::Cuthill_McKee (DoFHandler &dof_handler, const bool reversed_numbering, @@ -100,9 +111,9 @@ void DoFRenumbering::Cuthill_McKee (DoFHandler &dof_handler, // initialize the first dof last_round_dofs.push_back (starting_point); }; - - // store next free dof index + +// store next free dof index unsigned int next_free_number = 0; // enumerate the first round dofs @@ -150,9 +161,9 @@ void DoFRenumbering::Cuthill_McKee (DoFHandler &dof_handler, if (all_dofs_renumbered) // end loop if possible continue; - - // store for each coordination + +// store for each coordination // number the dofs with these // coordination number multimap dofs_by_coordination; @@ -207,8 +218,6 @@ void DoFRenumbering::Cuthill_McKee (DoFHandler &dof_handler, }; - - template void DoFRenumbering::Cuthill_McKee (MGDoFHandler &dof_handler, const unsigned int level, @@ -265,9 +274,9 @@ void DoFRenumbering::Cuthill_McKee (MGDoFHandler &dof_handler, // initialize the first dof last_round_dofs.push_back (starting_point); }; - - // store next free dof index + +// store next free dof index unsigned int next_free_number = 0; // enumerate the first round dofs @@ -315,9 +324,9 @@ void DoFRenumbering::Cuthill_McKee (MGDoFHandler &dof_handler, if (all_dofs_renumbered) // end loop if possible continue; - - // store for each coordination + +// store for each coordination // number the dofs with these // coordination number multimap dofs_by_coordination; @@ -373,7 +382,6 @@ void DoFRenumbering::Cuthill_McKee (MGDoFHandler &dof_handler, }; - template void DoFRenumbering::component_wise (DoFHandler &dof_handler, const vector &component_order_arg) @@ -468,10 +476,6 @@ void DoFRenumbering::component_wise (DoFHandler &dof_handler, dof_handler.renumber_dofs (new_indices); }; - - - - // explicit instantiations template diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 6752441bfe..7f17cf6d35 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -1,4 +1,15 @@ -// $Id$ +//---------------------------- dof_tools.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- dof_tools.cc --------------------------- #include @@ -74,9 +85,9 @@ DoFTools::make_sparsity_pattern (const DoFHandler &dof, dof_mask[i][j] = mask [dof.get_fe().system_to_component_index(i).first] [dof.get_fe().system_to_component_index(j).first]; - - - vector dofs_on_this_cell(dofs_per_cell); + + +vector dofs_on_this_cell(dofs_per_cell); DoFHandler::active_cell_iterator cell = dof.begin_active(), endc = dof.end(); for (; cell!=endc; ++cell) @@ -103,7 +114,6 @@ void DoFTools::make_boundary_sparsity_pattern (const DoFHandler<1>&, }; - template <> void DoFTools::make_boundary_sparsity_pattern (const DoFHandler<1>&, @@ -117,7 +127,6 @@ DoFTools::make_boundary_sparsity_pattern (const DoFHandler<1>&, #endif - template void DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, @@ -159,7 +168,6 @@ DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, }; - template void DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, const DoFHandler::FunctionMap &boundary_indicators, @@ -213,8 +221,6 @@ void DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, }; - - //TODO: Check this function for potential of optimization. (G) template @@ -269,7 +275,6 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler &dof, } - #if deal_II_dimension == 1 template <> @@ -282,7 +287,6 @@ void DoFTools::make_hanging_node_constraints (const DoFHandler<1> &, #endif - #if deal_II_dimension == 2 template <> @@ -311,11 +315,9 @@ void DoFTools::make_hanging_node_constraints (const DoFHandler<2> &dof_handler, for (unsigned int face=0; face::faces_per_cell; ++face) if (cell->face(face)->has_children()) cell->face(face)->set_user_flag(); - - - - // loop over all lines; only on lines + +// loop over all lines; only on lines // there can be constraints. for (line = dof_handler.begin_line(); line != endl; ++line) // if dofs on this line are subject @@ -376,7 +378,6 @@ void DoFTools::make_hanging_node_constraints (const DoFHandler<2> &dof_handler, #endif - #if deal_II_dimension == 3 template <> @@ -405,9 +406,9 @@ void DoFTools::make_hanging_node_constraints (const DoFHandler<3> &dof_handler, for (unsigned int face=0; face::faces_per_cell; ++face) if (cell->face(face)->has_children()) cell->face(face)->set_user_flag(); - - - // loop over all faces; only on faces + + +// loop over all faces; only on faces // there can be constraints. for (face=dof_handler.begin_face(); face != endf; ++face) // if dofs on this line are subject @@ -533,8 +534,6 @@ void DoFTools::make_hanging_node_constraints (const DoFHandler<3> &dof_handler, #endif - - template void DoFTools::distribute_cell_to_dof_vector (const DoFHandler &dof_handler, const Vector &cell_data, @@ -605,7 +604,6 @@ void DoFTools::distribute_cell_to_dof_vector (const DoFHandler &dof_handler }; - template void DoFTools::extract_dofs(const DoFHandler &dof, @@ -638,7 +636,6 @@ DoFTools::extract_dofs(const DoFHandler &dof, } - template void DoFTools::extract_level_dofs(const unsigned int level, @@ -671,7 +668,6 @@ DoFTools::extract_level_dofs(const unsigned int level, } - // explicit instantiations #if deal_II_dimension > 1 template void @@ -710,7 +706,6 @@ DoFTools::distribute_cell_to_dof_vector (const DoFHandler &do Vector &dof_data) const; - template void DoFTools::extract_dofs(const DoFHandler& dof, const vector& local_select, vector& selected_dofs); diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index 7fdbeb0efc..ccdd4e4ffc 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -1,5 +1,15 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ +//---------------------------- fe.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe.cc --------------------------- #include @@ -10,7 +20,6 @@ #include - /*------------------------------- FiniteElementData ----------------------*/ template @@ -20,8 +29,6 @@ FiniteElementData::FiniteElementData () }; - - template FiniteElementData::FiniteElementData (const unsigned int dofs_per_vertex, const unsigned int dofs_per_line, @@ -57,7 +64,6 @@ FiniteElementData::FiniteElementData (const unsigned int dofs_per_vertex, }; - template FiniteElementData::FiniteElementData (const unsigned int dofs_per_vertex, const unsigned int dofs_per_line, @@ -88,7 +94,6 @@ FiniteElementData::FiniteElementData (const unsigned int dofs_per_vertex, }; - template FiniteElementData::FiniteElementData (const unsigned int dofs_per_vertex, const unsigned int dofs_per_line, @@ -117,14 +122,11 @@ FiniteElementData::FiniteElementData (const unsigned int dofs_per_vertex, }; - template FiniteElementData::~FiniteElementData () {}; - - template bool FiniteElementData::operator== (const FiniteElementData &f) const { @@ -137,11 +139,9 @@ bool FiniteElementData::operator== (const FiniteElementData &f) const }; - /*------------------------------- FiniteElementBase ----------------------*/ - template FiniteElementBase::FiniteElementBase (const FiniteElementData &fe_data, const vector &restriction_is_additive_flags) : @@ -204,7 +204,6 @@ FiniteElementBase::FiniteElementBase (const FiniteElementData &fe_data }; - template const FullMatrix & FiniteElementBase::restrict (const unsigned int child) const @@ -215,7 +214,6 @@ FiniteElementBase::restrict (const unsigned int child) const }; - template const FullMatrix & FiniteElementBase::prolongate (const unsigned int child) const @@ -226,7 +224,6 @@ FiniteElementBase::prolongate (const unsigned int child) const }; - template const FullMatrix & FiniteElementBase::constraints () const @@ -240,7 +237,6 @@ FiniteElementBase::constraints () const }; - template bool FiniteElementBase::operator == (const FiniteElementBase &f) const { @@ -250,7 +246,6 @@ bool FiniteElementBase::operator == (const FiniteElementBase &f) const }; - /*------------------------------- FiniteElement ----------------------*/ @@ -290,7 +285,7 @@ void FiniteElement<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &cell, ExcWrongFieldDimension(support_points.size(), dofs_per_cell)); - // local mesh width +// local mesh width const double h=(cell->vertex(1)(0) - cell->vertex(0)(0)); for (unsigned int i=0; i::fill_fe_values (const DoFHandler<1>::cell_iterator &cell, }; - template <> void FiniteElement<1>::fill_fe_face_values (const DoFHandler<1>::cell_iterator &, const unsigned int , @@ -364,7 +358,6 @@ void FiniteElement<1>::fill_fe_subface_values (const DoFHandler<1>::cell_iterato }; - template <> void FiniteElement<1>::get_unit_support_points (vector > &support_points) const { Assert (support_points.size() == dofs_per_cell, @@ -386,7 +379,6 @@ void FiniteElement<1>::get_unit_support_points (vector > &support_point }; - template <> void FiniteElement<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, vector > &support_points) const { @@ -413,7 +405,6 @@ void FiniteElement<1>::get_support_points (const DoFHandler<1>::cell_iterator &c #endif - template void FiniteElement::fill_fe_values (const DoFHandler::cell_iterator &, const vector > &, @@ -431,7 +422,6 @@ void FiniteElement::fill_fe_values (const DoFHandler::cell_iterator &, }; - template void FiniteElement::fill_fe_face_values (const DoFHandler::cell_iterator &cell, const unsigned int face_no, @@ -482,8 +472,6 @@ void FiniteElement::fill_fe_face_values (const DoFHandler::cell_iterat }; - - template void FiniteElement::fill_fe_subface_values (const DoFHandler::cell_iterator &cell, const unsigned int face_no, @@ -527,7 +515,6 @@ void FiniteElement::fill_fe_subface_values (const DoFHandler::cell_ite }; - template void FiniteElement::get_unit_support_points (vector > &) const @@ -536,7 +523,6 @@ FiniteElement::get_unit_support_points (vector > &) const }; - template void FiniteElement::get_support_points (const DoFHandler::cell_iterator &, @@ -568,4 +554,3 @@ template class FiniteElementBase; template class FiniteElement; - diff --git a/deal.II/deal.II/source/fe/fe_lib.criss_cross.cc b/deal.II/deal.II/source/fe/fe_lib.criss_cross.cc index 9bedd8b522..b16cb3bfc9 100644 --- a/deal.II/deal.II/source/fe/fe_lib.criss_cross.cc +++ b/deal.II/deal.II/source/fe/fe_lib.criss_cross.cc @@ -1,5 +1,15 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ +//---------------------------- fe_lib.criss_cross.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe_lib.criss_cross.cc --------------------------- #include @@ -10,7 +20,6 @@ #include - /*-----------------------------------2d------------------------------------ Maple script to automate some of the error-prone computations on this strange sort of element. @@ -106,8 +115,8 @@ od: od: - - # these are the basis functions differentiated with respect to + +# these are the basis functions differentiated with respect to # xi and eta. we need them for the computation of the jacobi # matrix, since we can't just differentiate a function. phi_xi[0] := proc(x,y) if(y<1-x) then -1; else 0; fi; end: @@ -159,7 +168,7 @@ end: - # Now for the mass matrix: we divide the entire cell into four +# Now for the mass matrix: we divide the entire cell into four # sectors: # # *-------* @@ -299,11 +308,6 @@ -----------------------------------------------------------------------------*/ - - - - - #if deal_II_dimension == 1 @@ -317,7 +321,6 @@ FECrissCross<1>::FECrissCross () : }; - template <> double FECrissCross<1>::shape_value (const unsigned int, const Point<1> &) const { Assert (false, ExcNotUseful()); @@ -325,7 +328,6 @@ double FECrissCross<1>::shape_value (const unsigned int, const Point<1> &) const }; - template <> Tensor<1,1> FECrissCross<1>::shape_grad (const unsigned int, const Point<1> &) const { Assert (false, ExcNotUseful()); @@ -333,7 +335,6 @@ Tensor<1,1> FECrissCross<1>::shape_grad (const unsigned int, const Point<1> &) c }; - template <> Tensor<2,1> FECrissCross<1>::shape_grad_grad (const unsigned int, const Point<1> &) const { Assert (false, ExcNotUseful()); @@ -341,14 +342,12 @@ Tensor<2,1> FECrissCross<1>::shape_grad_grad (const unsigned int, const Point<1> }; - template <> void FECrissCross<1>::get_unit_support_points (vector >&) const { Assert (false, ExcNotUseful()); }; - template <> void FECrissCross<1>::get_support_points (const DoFHandler<1>::cell_iterator &, vector > &) const { @@ -356,7 +355,6 @@ void FECrissCross<1>::get_support_points (const DoFHandler<1>::cell_iterator &, }; - template <> void FECrissCross<1>::get_face_support_points (const DoFHandler<1>::face_iterator &, vector > &) const { @@ -364,7 +362,6 @@ void FECrissCross<1>::get_face_support_points (const DoFHandler<1>::face_iterato }; - template <> void FECrissCross<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &, FullMatrix &) const { @@ -372,7 +369,6 @@ void FECrissCross<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator }; - template <> double FECrissCross<1>::shape_value_transform (const unsigned int, const Point<1> &) const { @@ -381,7 +377,6 @@ double FECrissCross<1>::shape_value_transform (const unsigned int, }; - template <> Tensor<1,1> FECrissCross<1>::shape_grad_transform (const unsigned int, const Point<1> &) const { @@ -390,7 +385,6 @@ Tensor<1,1> FECrissCross<1>::shape_grad_transform (const unsigned int, }; - template <> void FECrissCross<1>::get_face_jacobians (const DoFHandler<1>::face_iterator &, const vector > &, @@ -399,7 +393,6 @@ void FECrissCross<1>::get_face_jacobians (const DoFHandler<1>::face_iterator &, }; - template <> void FECrissCross<1>::get_subface_jacobians (const DoFHandler<1>::face_iterator &, const unsigned int, @@ -409,7 +402,6 @@ void FECrissCross<1>::get_subface_jacobians (const DoFHandler<1>::face_iterator }; - template <> void FECrissCross<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator &, const unsigned int, @@ -419,7 +411,6 @@ void FECrissCross<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator &, }; - template <> void FECrissCross<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator &, const unsigned int, @@ -430,7 +421,6 @@ void FECrissCross<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator &, }; - template <> void FECrissCross<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &, const vector > &, @@ -450,10 +440,6 @@ void FECrissCross<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &, #endif - - - - #if deal_II_dimension == 2 @@ -509,8 +495,6 @@ FECrissCross<2>::FECrissCross () : }; - - template <> inline double FECrissCross<2>::shape_value (const unsigned int i, @@ -539,7 +523,6 @@ double FECrissCross<2>::shape_value (const unsigned int i, }; - template <> inline Tensor<1,2> FECrissCross<2>::shape_grad (const unsigned int i, const Point<2> &p) const @@ -582,7 +565,6 @@ FECrissCross<2>::shape_grad_grad (const unsigned int i, }; - template <> void FECrissCross<2>::get_unit_support_points (vector > &unit_points) const { Assert(unit_points.size()==dofs_per_cell, @@ -596,7 +578,6 @@ void FECrissCross<2>::get_unit_support_points (vector > &unit_points) c }; - template <> void FECrissCross<2>::get_support_points (const DoFHandler<2>::cell_iterator &cell, vector > &support_points) const { @@ -633,7 +614,6 @@ void FECrissCross<2>::get_support_points (const DoFHandler<2>::cell_iterator &ce }; - template <> void FECrissCross<2>::get_face_support_points (const DoFHandler<2>::face_iterator &face, vector > &support_points) const { @@ -649,7 +629,6 @@ void FECrissCross<2>::get_face_support_points (const DoFHandler<2>::face_iterato }; - template <> void FECrissCross<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, FullMatrix &mass_matrix) const { @@ -791,7 +770,6 @@ void FECrissCross<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator }; - template <> inline double FECrissCross<2>::shape_value_transform (const unsigned int i, @@ -801,7 +779,6 @@ double FECrissCross<2>::shape_value_transform (const unsigned int i, }; - template <> Tensor<1,2> FECrissCross<2>::shape_grad_transform (const unsigned int i, const Point<2> &p) const { @@ -810,7 +787,6 @@ Tensor<1,2> FECrissCross<2>::shape_grad_transform (const unsigned int i, }; - template <> void FECrissCross<2>::get_face_jacobians (const DoFHandler<2>::face_iterator &face, const vector > &unit_points, @@ -831,7 +807,6 @@ void FECrissCross<2>::get_face_jacobians (const DoFHandler<2>::face_iterator &fa }; - template <> void FECrissCross<2>::get_subface_jacobians (const DoFHandler<2>::face_iterator &face, const unsigned int, @@ -855,7 +830,6 @@ void FECrissCross<2>::get_subface_jacobians (const DoFHandler<2>::face_iterator }; - template <> void FECrissCross<2>::get_normal_vectors (const DoFHandler<2>::cell_iterator &cell, const unsigned int face_no, @@ -886,7 +860,6 @@ void FECrissCross<2>::get_normal_vectors (const DoFHandler<2>::cell_iterator &ce }; - template <> void FECrissCross<2>::get_normal_vectors (const DoFHandler<2>::cell_iterator &cell, const unsigned int face_no, @@ -923,7 +896,6 @@ void FECrissCross<2>::get_normal_vectors (const DoFHandler<2>::cell_iterator &ce }; - template void FECrissCross::fill_fe_values (const DoFHandler::cell_iterator &cell, const vector > &unit_points, @@ -944,8 +916,8 @@ void FECrissCross::fill_fe_values (const DoFHandler::cell_iterator &ce Assert (support_points.size() == dofs_per_cell, ExcWrongFieldDimension(support_points.size(), dofs_per_cell)); - - unsigned int n_points=unit_points.size(); + +unsigned int n_points=unit_points.size(); // we need the support points in any // way, wanted or not by the user @@ -970,7 +942,7 @@ void FECrissCross::fill_fe_values (const DoFHandler::cell_iterator &ce for (unsigned int l=0; l::fill_fe_values (const DoFHandler::cell_iterator &ce }; - if (compute_jacobians_grad) +if (compute_jacobians_grad) switch (dim) { case 1: @@ -1144,7 +1116,6 @@ void FECrissCross::fill_fe_values (const DoFHandler::cell_iterator &ce #endif - #if deal_II_dimension == 3 // provide dummy implementations of the functions above. the reason is @@ -1161,7 +1132,6 @@ FECrissCross<3>::FECrissCross () : }; - template <> double FECrissCross<3>::shape_value (const unsigned int, @@ -1172,7 +1142,6 @@ FECrissCross<3>::shape_value (const unsigned int, }; - template <> Tensor<1,3> FECrissCross<3>::shape_grad (const unsigned int, @@ -1183,7 +1152,6 @@ FECrissCross<3>::shape_grad (const unsigned int, }; - template <> Tensor<2,3> FECrissCross<3>::shape_grad_grad (const unsigned int, @@ -1194,7 +1162,6 @@ FECrissCross<3>::shape_grad_grad (const unsigned int, }; - template <> void FECrissCross<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, @@ -1204,7 +1171,6 @@ FECrissCross<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, }; - template <> void FECrissCross<3>::get_unit_support_points (vector > &) const { @@ -1212,7 +1178,6 @@ void FECrissCross<3>::get_unit_support_points (vector > &) const }; - template <> void FECrissCross<3>::get_support_points (const DoFHandler<3>::cell_iterator &, vector > &) const @@ -1221,7 +1186,6 @@ void FECrissCross<3>::get_support_points (const DoFHandler<3>::cell_iterator &, }; - template <> void FECrissCross<3>::get_face_support_points (const DoFHandler<3>::face_iterator &, vector > &) const @@ -1230,8 +1194,6 @@ void FECrissCross<3>::get_face_support_points (const DoFHandler<3>::face_iterato }; - - template <> void FECrissCross<3>::get_face_jacobians (const DoFHandler<3>::face_iterator &, const vector > &, @@ -1240,7 +1202,6 @@ void FECrissCross<3>::get_face_jacobians (const DoFHandler<3>::face_iterator &, }; - template <> void FECrissCross<3>::get_subface_jacobians (const DoFHandler<3>::face_iterator &, const unsigned int, @@ -1259,7 +1220,6 @@ void FECrissCross<3>::get_normal_vectors (const DoFHandler<3>::cell_iterator &, }; - template <> void FECrissCross<3>::get_normal_vectors (const DoFHandler<3>::cell_iterator &, const unsigned int, @@ -1270,7 +1230,6 @@ void FECrissCross<3>::get_normal_vectors (const DoFHandler<3>::cell_iterator &, }; - template <> void FECrissCross<3>::fill_fe_values (const DoFHandler<3>::cell_iterator &, const vector > &, @@ -1288,7 +1247,6 @@ void FECrissCross<3>::fill_fe_values (const DoFHandler<3>::cell_iterator &, }; - template <> double FECrissCross<3>::shape_value_transform (const unsigned int, const Point<3> &) const @@ -1298,7 +1256,6 @@ double FECrissCross<3>::shape_value_transform (const unsigned int, }; - template <> Tensor<1,3> FECrissCross<3>::shape_grad_transform (const unsigned int, const Point<3> &) const @@ -1311,8 +1268,6 @@ Tensor<1,3> FECrissCross<3>::shape_grad_transform (const unsigned int, #endif // deal_II_dimension == 3 - - /*--------------------------- QCrissCross* ------------------------------------*/ @@ -1328,7 +1283,6 @@ QCrissCross1<1>::QCrissCross1 () : #endif - #if deal_II_dimension == 2 template <> @@ -1351,7 +1305,6 @@ QCrissCross1<2>::QCrissCross1 () : #endif - // explicit instantiations template class FECrissCross; diff --git a/deal.II/deal.II/source/fe/fe_lib.cubic.cc b/deal.II/deal.II/source/fe/fe_lib.cubic.cc index e0e49b07dc..f57b895910 100644 --- a/deal.II/deal.II/source/fe/fe_lib.cubic.cc +++ b/deal.II/deal.II/source/fe/fe_lib.cubic.cc @@ -1,5 +1,15 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ +//---------------------------- fe_lib.cubic.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe_lib.cubic.cc --------------------------- #include @@ -9,14 +19,10 @@ #include - - // declare explicit specializations before use: template <> void FEQ3::initialize_matrices (); - - #if deal_II_dimension == 1 template <> @@ -27,7 +33,6 @@ FEQ3<1>::FEQ3 () : }; - template <> FEQ3<1>::FEQ3 (const int) : FEQ1Mapping<1> (0, 4, 0, 0, 1, @@ -37,7 +42,6 @@ FEQ3<1>::FEQ3 (const int) : }; - template <> void FEQ3<1>::initialize_matrices () { @@ -109,7 +113,6 @@ void FEQ3<1>::initialize_matrices () { }; - template <> double FEQ3<1>::shape_value (const unsigned int i, @@ -128,7 +131,6 @@ FEQ3<1>::shape_value (const unsigned int i, }; - template <> Tensor<1,1> FEQ3<1>::shape_grad (const unsigned int i, @@ -152,7 +154,6 @@ FEQ3<1>::shape_grad (const unsigned int i, }; - template <> Tensor<2,1> FEQ3<1>::shape_grad_grad (const unsigned int i, @@ -174,14 +175,12 @@ FEQ3<1>::shape_grad_grad (const unsigned int i, }; - template <> void FEQ3<1>::get_unit_support_points (vector > &unit_points) const { FiniteElement<1>::get_unit_support_points (unit_points); }; - template <> void FEQ3<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, vector > &support_points) const { @@ -189,7 +188,6 @@ void FEQ3<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, }; - template <> void FEQ3<1>::get_face_support_points (const DoFHandler<1>::face_iterator &, vector > &) const { @@ -197,7 +195,6 @@ void FEQ3<1>::get_face_support_points (const DoFHandler<1>::face_iterator &, }; - template <> void FEQ3<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { @@ -236,8 +233,6 @@ void FEQ3<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, #endif - - #if deal_II_dimension == 2 template <> @@ -264,7 +259,6 @@ FEQ3<2>::FEQ3 () : }; - template <> FEQ3<2>::FEQ3 (const int) : FEQ1Mapping<2> (0, 0, 16, 0, 1, @@ -274,7 +268,6 @@ FEQ3<2>::FEQ3 (const int) : }; - template <> void FEQ3<2>::initialize_matrices () { prolongation[0](0,0) = 1.0; @@ -697,7 +690,6 @@ void FEQ3<2>::initialize_matrices () { }; - template <> double FEQ3<2>::shape_value (const unsigned int i, @@ -763,7 +755,6 @@ xi*xi)*eta*eta*eta; }; - template <> Tensor<1,2> FEQ3<2>::shape_grad (const unsigned int i, @@ -817,7 +808,6 @@ FEQ3<2>::shape_grad (const unsigned int i, }; - template <> Tensor<2,2> FEQ3<2>::shape_grad_grad (const unsigned int i, @@ -920,7 +910,6 @@ FEQ3<2>::shape_grad_grad (const unsigned int i, }; - template <> void FEQ3<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { @@ -1482,7 +1471,6 @@ void FEQ3<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, }; - template <> void FEQ3<2>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == dofs_per_cell, @@ -1507,7 +1495,6 @@ void FEQ3<2>::get_unit_support_points (vector > &unit_points) const { }; - template <> void FEQ3<2>::get_support_points (const DoFHandler<2>::cell_iterator &cell, vector > &support_points) const { @@ -1581,7 +1568,6 @@ void FEQ3<2>::get_support_points (const DoFHandler<2>::cell_iterator &cell, }; - template <> void FEQ3<2>::get_face_support_points (const DoFHandler<2>::face_iterator &face, vector > &support_points) const { @@ -1595,12 +1581,9 @@ void FEQ3<2>::get_face_support_points (const DoFHandler<2>::face_iterator &face, }; - #endif - - #if deal_II_dimension == 3 // ignore the following, since it doesn't compile properly. it simply @@ -1871,7 +1854,6 @@ FEQ3<3>::FEQ3 () : }; - template <> FEQ3<3>::FEQ3 (const int) : FEQ1Mapping<3> (0, 0, 0, 64, 1, @@ -1881,7 +1863,6 @@ FEQ3<3>::FEQ3 (const int) : }; - template <> void FEQ3<3>::initialize_matrices () { @@ -9887,7 +9868,7 @@ void FEQ3<3>::initialize_matrices () prolongation[7](63,62) = 225.0/256.0; - restriction[0](0,0) = 1.0; +restriction[0](0,0) = 1.0; restriction[0](8,9) = 1.0; restriction[0](14,15) = 1.0; restriction[0](24,25) = 1.0; @@ -9954,7 +9935,6 @@ void FEQ3<3>::initialize_matrices () }; - template <> double FEQ3<3>::shape_value (const unsigned int i, @@ -10567,7 +10547,6 @@ xi*xi+6561.0/2.0*xi*xi*xi)*eta*eta+(-6561.0/8.0*xi+6561.0/2.0*xi*xi-19683.0/8.0 }; - template <> Tensor<1,3> FEQ3<3>::shape_grad (const unsigned int i, @@ -10782,7 +10761,6 @@ FEQ3<3>::shape_grad (const unsigned int i, }; - template <> Tensor<2,3> FEQ3<3>::shape_grad_grad (const unsigned int i, @@ -11398,7 +11376,6 @@ return_value[2][2] = 2.0*(729.0/2.0*xi-1458.0*xi*xi+2187.0/2.0*xi*xi*xi)*eta+2.0 }; - template <> void FEQ3<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, @@ -11413,7 +11390,6 @@ FEQ3<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, }; - template <> void FEQ3<3>::get_unit_support_points (vector > &unit_points) const { @@ -11486,7 +11462,6 @@ void FEQ3<3>::get_unit_support_points (vector > &unit_points) const }; - template <> void FEQ3<3>::get_support_points (const typename DoFHandler<3>::cell_iterator &cell, vector > &support_points) const @@ -11865,7 +11840,6 @@ void FEQ3<3>::get_support_points (const typename DoFHandler<3>::cell_iterator &c }; - template <> void FEQ3<3>::get_face_support_points (const typename DoFHandler<3>::face_iterator &face, vector > &support_points) const @@ -11904,7 +11878,6 @@ void FEQ3<3>::get_face_support_points (const typename DoFHandler<3>::face_iterat }; - #else // 0 // provide dummy implementations of the functions above. for the @@ -11919,7 +11892,6 @@ FEQ3<3>::FEQ3 () : }; - template <> FEQ3<3>::FEQ3 (const int) : FEQ1Mapping<3> (0, 0, 0, 64, 1, @@ -11929,7 +11901,6 @@ FEQ3<3>::FEQ3 (const int) : }; - template <> void FEQ3<3>::initialize_matrices () { @@ -11937,7 +11908,6 @@ void FEQ3<3>::initialize_matrices () }; - template <> double FEQ3<3>::shape_value (const unsigned int, @@ -11948,7 +11918,6 @@ FEQ3<3>::shape_value (const unsigned int, }; - template <> Tensor<1,3> FEQ3<3>::shape_grad (const unsigned int, @@ -11959,7 +11928,6 @@ FEQ3<3>::shape_grad (const unsigned int, }; - template <> Tensor<2,3> FEQ3<3>::shape_grad_grad (const unsigned int, @@ -11970,7 +11938,6 @@ FEQ3<3>::shape_grad_grad (const unsigned int, }; - template <> void FEQ3<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, @@ -11980,7 +11947,6 @@ FEQ3<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, }; - template <> void FEQ3<3>::get_unit_support_points (vector > &) const { @@ -11988,7 +11954,6 @@ void FEQ3<3>::get_unit_support_points (vector > &) const }; - template <> void FEQ3<3>::get_support_points (const DoFHandler<3>::cell_iterator &, vector > &) const @@ -11997,7 +11962,6 @@ void FEQ3<3>::get_support_points (const DoFHandler<3>::cell_iterator &, }; - template <> void FEQ3<3>::get_face_support_points (const DoFHandler<3>::face_iterator &, vector > &) const @@ -12006,7 +11970,6 @@ void FEQ3<3>::get_face_support_points (const DoFHandler<3>::face_iterator &, }; - #endif // 0 #endif // deal_II_dimension == 3 diff --git a/deal.II/deal.II/source/fe/fe_lib.dg.cc b/deal.II/deal.II/source/fe/fe_lib.dg.cc index c923a84ffe..2666c8cf24 100644 --- a/deal.II/deal.II/source/fe/fe_lib.dg.cc +++ b/deal.II/deal.II/source/fe/fe_lib.dg.cc @@ -1,8 +1,18 @@ -/* $Id$ */ -/* Ralf Hartmann, University of Heidelberg, Dez 98 */ +//---------------------------- fe_lib.dg.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe_lib.dg.cc --------------------------- -#include +#include template @@ -25,7 +35,6 @@ FEDG_Q4::FEDG_Q4(): FEQ4(1) {}; - template void FEDG_Q1::get_face_support_points (const typename DoFHandler::face_iterator &, @@ -62,8 +71,6 @@ FEDG_Q4::get_face_support_points (const typename DoFHandler::face_iter }; - - // explicit instantiations template class FEDG_Q1; template class FEDG_Q2; diff --git a/deal.II/deal.II/source/fe/fe_lib.dg.constant.cc b/deal.II/deal.II/source/fe/fe_lib.dg.constant.cc index 60292f722e..75ae788336 100644 --- a/deal.II/deal.II/source/fe/fe_lib.dg.constant.cc +++ b/deal.II/deal.II/source/fe/fe_lib.dg.constant.cc @@ -1,4 +1,15 @@ -/* Ralf Hartmann, University of Heidelberg, Dez 98 */ +//---------------------------- fe_lib.dg.constant.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe_lib.dg.constant.cc --------------------------- #include @@ -8,9 +19,6 @@ #include - - - template FEDG_Q0::FEDG_Q0 () : FEQ1Mapping (0, @@ -28,7 +36,6 @@ FEDG_Q0::FEDG_Q0 () : }; - #if deal_II_dimension == 1 @@ -53,7 +60,6 @@ FEDG_Q0::shape_value (const unsigned int i, }; - template inline Tensor<1,dim> @@ -65,7 +71,6 @@ FEDG_Q0::shape_grad (const unsigned int i, }; - template inline Tensor<2,dim> @@ -78,7 +83,6 @@ FEDG_Q0::shape_grad_grad (const unsigned int i, }; - template void FEDG_Q0::get_local_mass_matrix (const DoFHandler::cell_iterator &cell, FullMatrix &local_mass_matrix) const { @@ -91,7 +95,6 @@ void FEDG_Q0::get_local_mass_matrix (const DoFHandler::cell_iterator & }; - template void FEDG_Q0::get_unit_support_points (vector > &unit_points) const { @@ -100,7 +103,7 @@ FEDG_Q0::get_unit_support_points (vector > &unit_points) const { for (unsigned int d=0; d void @@ -122,7 +125,6 @@ FEDG_Q0::get_face_support_points (const typename DoFHandler::face_iter }; - // explicit instantiations template class FEDG_Q0; diff --git a/deal.II/deal.II/source/fe/fe_lib.linear.cc b/deal.II/deal.II/source/fe/fe_lib.linear.cc index ff6751470d..09b93bd42c 100644 --- a/deal.II/deal.II/source/fe/fe_lib.linear.cc +++ b/deal.II/deal.II/source/fe/fe_lib.linear.cc @@ -1,6 +1,15 @@ - -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ +//---------------------------- fe_lib.linear.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe_lib.linear.cc --------------------------- #include @@ -10,14 +19,10 @@ #include - - // declare explicit specializations before use: template <> void FEQ1::initialize_matrices (); - - #if deal_II_dimension == 1 template <> @@ -38,8 +43,6 @@ FEQ1<1>::FEQ1 (const int) : }; - - template <> void FEQ1<1>::initialize_matrices () { // for restriction and prolongation matrices: @@ -67,7 +70,6 @@ void FEQ1<1>::initialize_matrices () { }; - template <> double FEQ1<1>::shape_value(const unsigned int i, @@ -83,7 +85,6 @@ FEQ1<1>::shape_value(const unsigned int i, } - template <> inline Tensor<1,1> @@ -105,7 +106,6 @@ FEQ1<1>::shape_grad(const unsigned int i, }; - template <> inline Tensor<2,1> @@ -119,14 +119,12 @@ FEQ1<1>::shape_grad_grad (const unsigned int i, }; - template <> void FEQ1<1>::get_unit_support_points (vector > &support_points) const { FiniteElement<1>::get_unit_support_points (support_points); }; - template <> void FEQ1<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, vector > &support_points) const { @@ -134,7 +132,6 @@ void FEQ1<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, }; - template <> void FEQ1<1>::get_face_support_points (const DoFHandler<1>::face_iterator &, vector > &) const { @@ -142,7 +139,6 @@ void FEQ1<1>::get_face_support_points (const DoFHandler<1>::face_iterator &, }; - template <> void FEQ1<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { @@ -161,8 +157,6 @@ void FEQ1<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, #endif - - #if deal_II_dimension == 2 template <> @@ -177,7 +171,6 @@ FEQ1<2>::FEQ1 () : }; - template <> FEQ1<2>::FEQ1 (const int) : FEQ1Mapping<2> (0, 0, 4, 0, 1, @@ -187,7 +180,6 @@ FEQ1<2>::FEQ1 (const int) : }; - template <> void FEQ1<2>::initialize_matrices () { restriction[0](0,0) = 1.0; @@ -237,8 +229,6 @@ void FEQ1<2>::initialize_matrices () { }; - - template <> inline double @@ -257,7 +247,6 @@ FEQ1<2>::shape_value (const unsigned int i, }; - template <> inline Tensor<1,2> @@ -281,7 +270,6 @@ FEQ1<2>::shape_grad (const unsigned int i, }; - template <> inline Tensor<2,2> @@ -311,7 +299,6 @@ FEQ1<2>::shape_grad_grad (const unsigned int i, }; - template <> void FEQ1<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { @@ -417,7 +404,6 @@ void FEQ1<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, }; - template <> void FEQ1<2>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == dofs_per_cell, @@ -428,7 +414,7 @@ void FEQ1<2>::get_unit_support_points (vector > &unit_points) const { unit_points[2] = Point<2> (1,1); unit_points[3] = Point<2> (0,1); }; - + #endif @@ -457,7 +443,6 @@ FEQ1<3>::FEQ1 () : }; - template <> FEQ1<3>::FEQ1 (const int) : FEQ1Mapping<3> (0, 0, 0, 8, 1, @@ -467,7 +452,6 @@ FEQ1<3>::FEQ1 (const int) : }; - template <> void FEQ1<3>::initialize_matrices () { restriction[0](0,0) = 1.0; @@ -698,8 +682,6 @@ void FEQ1<3>::initialize_matrices () { }; - - template <> inline double @@ -722,7 +704,6 @@ FEQ1<3>::shape_value (const unsigned int i, }; - template <> inline Tensor<1,3> @@ -766,7 +747,6 @@ FEQ1<3>::shape_grad (const unsigned int i, }; - template <> inline Tensor<2,3> @@ -848,7 +828,6 @@ FEQ1<3>::shape_grad_grad (const unsigned int i, }; - template <> void FEQ1<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, FullMatrix &local_mass_matrix) const { @@ -861,7 +840,6 @@ void FEQ1<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, }; - template <> void FEQ1<3>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == dofs_per_cell, @@ -876,10 +854,9 @@ void FEQ1<3>::get_unit_support_points (vector > &unit_points) const { unit_points[6] = Point<3> (1,1,1); unit_points[7] = Point<3> (0,1,1); }; - -#endif +#endif template @@ -894,7 +871,6 @@ FEQ1::get_support_points (const typename DoFHandler::cell_iterator &ce }; - template void FEQ1::get_face_support_points (const typename DoFHandler::face_iterator &face, @@ -909,8 +885,6 @@ FEQ1::get_face_support_points (const typename DoFHandler::face_iterato }; - - // explicit instantiations template class FEQ1; diff --git a/deal.II/deal.II/source/fe/fe_lib.quadratic.cc b/deal.II/deal.II/source/fe/fe_lib.quadratic.cc index 5a44fa9e7a..7d97394c37 100644 --- a/deal.II/deal.II/source/fe/fe_lib.quadratic.cc +++ b/deal.II/deal.II/source/fe/fe_lib.quadratic.cc @@ -1,5 +1,15 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ +//---------------------------- fe_lib.quadratic.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe_lib.quadratic.cc --------------------------- #include @@ -9,12 +19,10 @@ #include - // declare explicit specializations before use: template <> void FEQ2::initialize_matrices (); - #if deal_II_dimension == 1 template <> @@ -25,7 +33,6 @@ FEQ2<1>::FEQ2 () : }; - template <> FEQ2<1>::FEQ2 (const int) : FEQ1Mapping<1> (0, 3, 0, 0, 1, @@ -34,7 +41,6 @@ FEQ2<1>::FEQ2 (const int) : }; - template <> void FEQ2<1>::initialize_matrices () { /* @@ -59,8 +65,7 @@ void FEQ2<1>::initialize_matrices () { od; - - # to get the restriction (interpolation) matrices, evaluate +# to get the restriction (interpolation) matrices, evaluate # the basis functions on the child cells at the global # interpolation points @@ -119,7 +124,6 @@ void FEQ2<1>::initialize_matrices () { }; - template <> double FEQ2<1>::shape_value(const unsigned int i, @@ -137,7 +141,6 @@ FEQ2<1>::shape_value(const unsigned int i, }; - template <> Tensor<1,1> FEQ2<1>::shape_grad(const unsigned int i, @@ -160,7 +163,6 @@ FEQ2<1>::shape_grad(const unsigned int i, }; - template <> Tensor<2,1> FEQ2<1>::shape_grad_grad (const unsigned int i, @@ -185,14 +187,12 @@ FEQ2<1>::shape_grad_grad (const unsigned int i, }; - template <> void FEQ2<1>::get_unit_support_points (vector > &unit_points) const { FiniteElement<1>::get_unit_support_points (unit_points); }; - template <> void FEQ2<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, vector > &support_points) const { @@ -200,7 +200,6 @@ void FEQ2<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, }; - template <> void FEQ2<1>::get_face_support_points (const DoFHandler<1>::face_iterator &, vector > &) const { @@ -208,7 +207,6 @@ void FEQ2<1>::get_face_support_points (const DoFHandler<1>::face_iterator &, }; - template <> void FEQ2<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { @@ -249,7 +247,6 @@ FEQ2<2>::FEQ2 () : }; - template <> FEQ2<2>::FEQ2 (const int) : FEQ1Mapping<2> (0, 0, 9, 0, 1, @@ -259,7 +256,6 @@ FEQ2<2>::FEQ2 (const int) : }; - template <> void FEQ2<2>::initialize_matrices () { /* @@ -645,7 +641,6 @@ void FEQ2<2>::initialize_matrices () { }; - template <> double FEQ2<2>::shape_value (const unsigned int i, @@ -671,7 +666,6 @@ FEQ2<2>::shape_value (const unsigned int i, }; - template <> Tensor<1,2> FEQ2<2>::shape_grad (const unsigned int i, @@ -711,7 +705,6 @@ FEQ2<2>::shape_grad (const unsigned int i, }; - template <> Tensor<2,2> FEQ2<2>::shape_grad_grad (const unsigned int i, @@ -784,7 +777,6 @@ FEQ2<2>::shape_grad_grad (const unsigned int i, }; - template <> void FEQ2<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { @@ -1059,7 +1051,6 @@ void FEQ2<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, }; - template <> void FEQ2<2>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == dofs_per_cell, @@ -1076,7 +1067,6 @@ void FEQ2<2>::get_unit_support_points (vector > &unit_points) const { unit_points[8] = Point<2> (0.5,0.5); }; - template <> void FEQ2<2>::get_support_points (const DoFHandler<2>::cell_iterator &cell, @@ -1105,7 +1095,6 @@ void FEQ2<2>::get_support_points (const DoFHandler<2>::cell_iterator &cell, }; - template <> void FEQ2<2>::get_face_support_points (const DoFHandler<2>::face_iterator &face, vector > &support_points) const { @@ -1120,7 +1109,6 @@ void FEQ2<2>::get_face_support_points (const DoFHandler<2>::face_iterator &face, #endif - #if deal_II_dimension == 3 template <> @@ -1210,7 +1198,6 @@ FEQ2<3>::FEQ2 () : }; - template <> FEQ2<3>::FEQ2 (const int) : FEQ1Mapping<3> (0, 0, 0, 27, 1, @@ -1220,7 +1207,6 @@ FEQ2<3>::FEQ2 (const int) : }; - template <> void FEQ2<3>::initialize_matrices () { prolongation[0](0,0) = 1.0; @@ -2291,7 +2277,6 @@ void FEQ2<3>::initialize_matrices () { }; - template <> double FEQ2<3>::shape_value (const unsigned int i, @@ -2385,7 +2370,6 @@ xi)*eta*eta)*zeta+((-16.0+48.0*xi-32.0*xi*xi)*eta+(16.0-48.0*xi+32.0*xi*xi)*eta }; - template <> Tensor<1,3> FEQ2<3>::shape_grad (const unsigned int i, @@ -2489,7 +2473,6 @@ FEQ2<3>::shape_grad (const unsigned int i, }; - template <> Tensor<2,3> FEQ2<3>::shape_grad_grad (const unsigned int i, @@ -2773,7 +2756,6 @@ return_value[2][2] = 2.0*(-64.0*xi+64.0*xi*xi)*eta+2.0*(64.0*xi-64.0*xi*xi)*eta* }; - template <> void FEQ2<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, FullMatrix &local_mass_matrix) const { @@ -2786,7 +2768,6 @@ void FEQ2<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, }; - template <> void FEQ2<3>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == dofs_per_cell, @@ -2821,7 +2802,6 @@ void FEQ2<3>::get_unit_support_points (vector > &unit_points) const { unit_points[26] = Point<3>(1/2, 1/2, 1/2); }; - template <> void FEQ2<3>::get_support_points (const DoFHandler<3>::cell_iterator &cell, @@ -2922,7 +2902,6 @@ void FEQ2<3>::get_support_points (const DoFHandler<3>::cell_iterator &cell, }; - template <> void FEQ2<3>::get_face_support_points (const DoFHandler<3>::face_iterator &face, vector > &support_points) const { @@ -2942,9 +2921,6 @@ void FEQ2<3>::get_face_support_points (const DoFHandler<3>::face_iterator &face, #endif - - - // explicit instantiations template class FEQ2; diff --git a/deal.II/deal.II/source/fe/fe_lib.quartic.cc b/deal.II/deal.II/source/fe/fe_lib.quartic.cc index 5f704d46c2..711be07606 100644 --- a/deal.II/deal.II/source/fe/fe_lib.quartic.cc +++ b/deal.II/deal.II/source/fe/fe_lib.quartic.cc @@ -1,5 +1,15 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ +//---------------------------- fe_lib.quartic.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe_lib.quartic.cc --------------------------- #include @@ -9,12 +19,10 @@ #include - // declare explicit specializations before use: template <> void FEQ4::initialize_matrices (); - #if deal_II_dimension == 1 template <> @@ -33,8 +41,6 @@ FEQ4<1>::FEQ4 (const int) : }; - - template <> void FEQ4<1>::initialize_matrices () { prolongation[0](0,0) = 1.0; @@ -73,7 +79,6 @@ void FEQ4<1>::initialize_matrices () { }; - template <> double FEQ4<1>::shape_value(const unsigned int i, @@ -93,7 +98,6 @@ FEQ4<1>::shape_value(const unsigned int i, }; - template <> Tensor<1,1> FEQ4<1>::shape_grad(const unsigned int i, @@ -118,7 +122,6 @@ FEQ4<1>::shape_grad(const unsigned int i, }; - template <> Tensor<2,1> FEQ4<1>::shape_grad_grad (const unsigned int i, @@ -141,14 +144,12 @@ FEQ4<1>::shape_grad_grad (const unsigned int i, }; - template <> void FEQ4<1>::get_unit_support_points (vector > &unit_points) const { FiniteElement<1>::get_unit_support_points (unit_points); }; - template <> void FEQ4<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, vector > &support_points) const { @@ -156,7 +157,6 @@ void FEQ4<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, }; - template <> void FEQ4<1>::get_face_support_points (const DoFHandler<1>::face_iterator &, vector > &) const { @@ -164,7 +164,6 @@ void FEQ4<1>::get_face_support_points (const DoFHandler<1>::face_iterator &, }; - template <> void FEQ4<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { @@ -214,8 +213,6 @@ void FEQ4<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, #endif - - #if deal_II_dimension == 2 template <> @@ -251,7 +248,6 @@ FEQ4<2>::FEQ4 () : }; - template <> FEQ4<2>::FEQ4 (const int) : FEQ1Mapping<2> (0, 0, 25, 0, 1, @@ -261,7 +257,6 @@ FEQ4<2>::FEQ4 (const int) : }; - template <> void FEQ4<2>::initialize_matrices () { prolongation[0](0,0) = 1.0; @@ -1127,7 +1122,6 @@ FEQ4<2>::shape_value (const unsigned int i, }; - template <> Tensor<1,2> FEQ4<2>::shape_grad (const unsigned int i, @@ -1199,7 +1193,6 @@ FEQ4<2>::shape_grad (const unsigned int i, }; - template <> Tensor<2,2> FEQ4<2>::shape_grad_grad (const unsigned int i, @@ -1338,7 +1331,6 @@ FEQ4<2>::shape_grad_grad (const unsigned int i, }; - template <> void FEQ4<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { @@ -2604,7 +2596,6 @@ void FEQ4<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, }; - template <> void FEQ4<2>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == dofs_per_cell, @@ -2638,7 +2629,6 @@ void FEQ4<2>::get_unit_support_points (vector > &unit_points) const { }; - template <> void FEQ4<2>::get_support_points (const DoFHandler<2>::cell_iterator &cell, vector > &support_points) const { @@ -2747,7 +2737,6 @@ void FEQ4<2>::get_support_points (const DoFHandler<2>::cell_iterator &cell, }; - template <> void FEQ4<2>::get_face_support_points (const DoFHandler<2>::face_iterator &face, vector > &support_points) const { @@ -2762,12 +2751,9 @@ void FEQ4<2>::get_face_support_points (const DoFHandler<2>::face_iterator &face, }; - #endif - - #if deal_II_dimension == 3 // provide dummy implementations of the functions above. the reason is @@ -2783,7 +2769,6 @@ FEQ4<3>::FEQ4 () : }; - template <> FEQ4<3>::FEQ4 (const int) : FEQ1Mapping<3> (0, 0, 0, 64, 1, @@ -2793,7 +2778,6 @@ FEQ4<3>::FEQ4 (const int) : }; - template <> void FEQ4<3>::initialize_matrices () { @@ -2801,7 +2785,6 @@ void FEQ4<3>::initialize_matrices () }; - template <> double FEQ4<3>::shape_value (const unsigned int, @@ -2812,7 +2795,6 @@ FEQ4<3>::shape_value (const unsigned int, }; - template <> Tensor<1,3> FEQ4<3>::shape_grad (const unsigned int, @@ -2823,7 +2805,6 @@ FEQ4<3>::shape_grad (const unsigned int, }; - template <> Tensor<2,3> FEQ4<3>::shape_grad_grad (const unsigned int, @@ -2834,7 +2815,6 @@ FEQ4<3>::shape_grad_grad (const unsigned int, }; - template <> void FEQ4<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, @@ -2844,7 +2824,6 @@ FEQ4<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, }; - template <> void FEQ4<3>::get_unit_support_points (vector > &) const { @@ -2852,7 +2831,6 @@ void FEQ4<3>::get_unit_support_points (vector > &) const }; - template <> void FEQ4<3>::get_support_points (const DoFHandler<3>::cell_iterator &, vector > &) const @@ -2861,7 +2839,6 @@ void FEQ4<3>::get_support_points (const DoFHandler<3>::cell_iterator &, }; - template <> void FEQ4<3>::get_face_support_points (const DoFHandler<3>::face_iterator &, vector > &) const @@ -2870,15 +2847,9 @@ void FEQ4<3>::get_face_support_points (const DoFHandler<3>::face_iterator &, }; - #endif // deal_II_dimension == 3 - - - - - // explicit instantiations template class FEQ4; diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index eb1f27b455..2bac4eaa73 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -1,13 +1,20 @@ -/* $Id$ */ -/* Copyright W. Bangerth, G. Kanschat University of Heidelberg, 1999 */ +//---------------------------- fe_system.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe_system.cc --------------------------- #include - - - template FESystem::~FESystem () { @@ -262,7 +269,6 @@ FESystem::build_face_table() } - template void FESystem::build_interface_constraints () { @@ -457,9 +463,6 @@ void FESystem::build_interface_constraints () }; - - - template void FESystem::initialize () { @@ -486,15 +489,13 @@ void FESystem::initialize () }; - // now set up the interface constraints. +// now set up the interface constraints. // this is kind'o hairy, so don't try // to do it dimension independent build_interface_constraints (); }; - - #if deal_II_dimension == 1 template <> @@ -717,8 +718,6 @@ FESystem::compute_restriction_is_additive_flags (const FiniteElement & return tmp; }; - - template double @@ -734,7 +733,6 @@ FESystem::shape_value (const unsigned int i, }; - template Tensor<1,dim> FESystem::shape_grad (const unsigned int i, @@ -749,7 +747,6 @@ FESystem::shape_grad (const unsigned int i, }; - template Tensor<2,dim> FESystem::shape_grad_grad (const unsigned int i, @@ -758,14 +755,13 @@ FESystem::shape_grad_grad (const unsigned int i, Assert((i comp = system_to_component_index(i); +pair comp = system_to_component_index(i); return base_element(component_to_base_table[comp.first]) .shape_grad_grad(comp.second, p); }; - template void FESystem::get_unit_support_points ( vector > &unit_support_points) const @@ -817,7 +813,6 @@ void FESystem::get_unit_support_points ( }; - template void FESystem::get_support_points (const DoFHandler::cell_iterator &cell, vector > &support_points) const @@ -847,7 +842,6 @@ void FESystem::get_support_points (const DoFHandler::cell_iterator &ce }; - template void FESystem::get_face_support_points (const DoFHandler::face_iterator & face, vector > & support_points) const @@ -875,7 +869,6 @@ void FESystem::get_face_support_points (const DoFHandler::face_iterato } - template void FESystem::get_local_mass_matrix (const DoFHandler::cell_iterator &cell, FullMatrix &local_mass_matrix) const @@ -918,7 +911,6 @@ void FESystem::get_local_mass_matrix (const DoFHandler::cell_iterator }; - template double FESystem::shape_value_transform (const unsigned int i, const Point &p) const @@ -935,7 +927,6 @@ Tensor<1,dim> FESystem::shape_grad_transform (const unsigned int i, }; - template void FESystem::get_face_jacobians (const DoFHandler::face_iterator &face, const vector > &unit_points, @@ -946,7 +937,6 @@ void FESystem::get_face_jacobians (const DoFHandler::face_iterator &fa }; - template void FESystem::get_subface_jacobians (const DoFHandler::face_iterator &face, const unsigned int subface_no, @@ -958,8 +948,6 @@ void FESystem::get_subface_jacobians (const DoFHandler::face_iterator }; - - template void FESystem::get_normal_vectors (const DoFHandler::cell_iterator &cell, const unsigned int face_no, @@ -971,7 +959,6 @@ void FESystem::get_normal_vectors (const DoFHandler::cell_iterator &ce }; - template void FESystem::get_normal_vectors (const DoFHandler::cell_iterator &cell, const unsigned int face_no, @@ -1036,10 +1023,8 @@ FESystem::fill_fe_values (const DoFHandler::cell_iterator &cell, } } - // explicit instantiations template class FESystem; - diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 7bd312b2e5..8bd23bd5fb 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -1,5 +1,15 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ +//---------------------------- fe_values.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- fe_values.cc --------------------------- #include @@ -45,8 +55,6 @@ FEValuesBase::FEValuesBase (const unsigned int n_q_points, {}; - - template double FEValuesBase::shape_value (const unsigned int i, const unsigned int j) const { @@ -62,7 +70,6 @@ double FEValuesBase::shape_value (const unsigned int i, }; - template void FEValuesBase::get_function_values (const Vector &fe_function, vector &values) const @@ -127,7 +134,6 @@ void FEValuesBase::get_function_values (const Vector &fe_functi }; - template const Tensor<1,dim> & FEValuesBase::shape_grad (const unsigned int i, @@ -143,7 +149,6 @@ FEValuesBase::shape_grad (const unsigned int i, }; - template void FEValuesBase::get_function_grads (const Vector &fe_function, vector > &gradients) const @@ -226,7 +231,6 @@ FEValuesBase::shape_2nd_derivative (const unsigned int i, }; - template void FEValuesBase::get_function_2nd_derivatives (const Vector &fe_function, vector > &second_derivatives) const @@ -259,7 +263,6 @@ void FEValuesBase::get_function_2nd_derivatives (const Vector &fe }; - template const Point & FEValuesBase::quadrature_point (const unsigned int i) const @@ -271,7 +274,6 @@ FEValuesBase::quadrature_point (const unsigned int i) const }; - template const Point & FEValuesBase::support_point (const unsigned int i) const @@ -283,7 +285,6 @@ FEValuesBase::support_point (const unsigned int i) const }; - template double FEValuesBase::JxW (const unsigned int i) const { @@ -294,8 +295,6 @@ double FEValuesBase::JxW (const unsigned int i) const }; - - /*------------------------------- FEValues -------------------------------*/ template @@ -344,11 +343,6 @@ FEValues::FEValues (const FiniteElement &fe, }; - - - - - template void FEValues::reinit (const typename DoFHandler::cell_iterator &cell) { present_cell = cell; @@ -404,7 +398,7 @@ void FEValues::reinit (const typename DoFHandler::cell_iterator &cell) contract (tmp2, tmp1, 1, jacobi_matrices[j], 1); - // second part: +// second part: // tmp1 := (d_k J_lj) (d_l phi) contract (tmp1, jacobi_matrices_grad[j], 2, unit_shape_gradients[i][j]); // tmp1_kj J_ki @@ -415,9 +409,9 @@ void FEValues::reinit (const typename DoFHandler::cell_iterator &cell) // add up first contribution shape_2nd_derivatives[i][j] += tmp2; }; - - - // compute Jacobi determinants in + + +// compute Jacobi determinants in // quadrature points. // refer to the general doc for // why we take the inverse of the @@ -428,9 +422,6 @@ void FEValues::reinit (const typename DoFHandler::cell_iterator &cell) }; - - - /*------------------------------- FEFaceValuesBase --------------------------*/ @@ -467,7 +458,6 @@ FEFaceValuesBase::FEFaceValuesBase (const unsigned int n_q_points, {}; - template const Point & FEFaceValuesBase::normal_vector (const unsigned int i) const { @@ -479,10 +469,6 @@ FEFaceValuesBase::normal_vector (const unsigned int i) const { }; - - - - /*------------------------------- FEFaceValues -------------------------------*/ @@ -534,7 +520,6 @@ FEFaceValues::FEFaceValues (const FiniteElement &fe, }; - template void FEFaceValues::reinit (const typename DoFHandler::cell_iterator &cell, const unsigned int face_no) { @@ -592,7 +577,7 @@ void FEFaceValues::reinit (const typename DoFHandler::cell_iterator &c }; - Tensor<2,dim> tmp1, tmp2; +Tensor<2,dim> tmp1, tmp2; if (update_flags & update_second_derivatives) for (unsigned int i=0; idofs_per_cell; ++i) for (unsigned int j=0; j::reinit (const typename DoFHandler::cell_iterator &c contract (tmp2, tmp1, 1, jacobi_matrices[j], 1); - // second part: +// second part: // tmp1 := (d_k J_lj) (d_l phi) contract (tmp1, jacobi_matrices_grad[j], 2, @@ -616,9 +601,9 @@ void FEFaceValues::reinit (const typename DoFHandler::cell_iterator &c // add up first contribution shape_2nd_derivatives[i][j] += tmp2; }; - - - // compute Jacobi determinants in + + +// compute Jacobi determinants in // quadrature points. // refer to the general doc for // why we take the inverse of the @@ -629,10 +614,6 @@ void FEFaceValues::reinit (const typename DoFHandler::cell_iterator &c }; - - - - /*------------------------------- FESubFaceValues -------------------------------*/ @@ -705,7 +686,6 @@ FESubfaceValues::FESubfaceValues (const FiniteElement &fe, }; - template void FESubfaceValues::reinit (const typename DoFHandler::cell_iterator &cell, const unsigned int face_no, @@ -778,7 +758,7 @@ void FESubfaceValues::reinit (const typename DoFHandler::cell_iterator contract (tmp2, tmp1, 1, jacobi_matrices[j], 1); - // second part: +// second part: // tmp1 := (d_k J_lj) (d_l phi) contract (tmp1, jacobi_matrices_grad[j], 2, @@ -791,9 +771,9 @@ void FESubfaceValues::reinit (const typename DoFHandler::cell_iterator // add up first contribution shape_2nd_derivatives[i][j] += tmp2; }; - - - // compute Jacobi determinants in + + +// compute Jacobi determinants in // quadrature points. // refer to the general doc for // why we take the inverse of the @@ -804,9 +784,6 @@ void FESubfaceValues::reinit (const typename DoFHandler::cell_iterator }; - - - /*------------------------------- Explicit Instantiations -------------*/ template class FEValuesBase; diff --git a/deal.II/deal.II/source/fe/q1_mapping.cc b/deal.II/deal.II/source/fe/q1_mapping.cc index 06acd7e7dc..0218d03fe1 100644 --- a/deal.II/deal.II/source/fe/q1_mapping.cc +++ b/deal.II/deal.II/source/fe/q1_mapping.cc @@ -1,7 +1,16 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ +//---------------------------- q1_mapping.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- q1_mapping.cc --------------------------- -// moved from file fe_linear_mapping.cc #include #include @@ -11,11 +20,9 @@ #include - /*---------------------------- FEQ1Mapping ----------------------------------*/ - #if deal_II_dimension == 1 template <> @@ -36,7 +43,6 @@ FEQ1Mapping<1>::FEQ1Mapping (const unsigned int dofs_per_vertex, }; - template <> inline double @@ -54,7 +60,6 @@ FEQ1Mapping<1>::shape_value_transform (const unsigned int i, }; - template <> inline Tensor<1,1> @@ -71,7 +76,6 @@ FEQ1Mapping<1>::shape_grad_transform(const unsigned int i, }; - template <> void FEQ1Mapping<1>::get_face_jacobians (const DoFHandler<1>::face_iterator &, const vector > &, @@ -80,7 +84,6 @@ void FEQ1Mapping<1>::get_face_jacobians (const DoFHandler<1>::face_iterator &, }; - template <> void FEQ1Mapping<1>::get_subface_jacobians (const DoFHandler<1>::face_iterator &, const unsigned int , @@ -90,7 +93,6 @@ void FEQ1Mapping<1>::get_subface_jacobians (const DoFHandler<1>::face_iterator & }; - template <> void FEQ1Mapping<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator &, const unsigned int, @@ -100,7 +102,6 @@ void FEQ1Mapping<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator &, }; - template <> void FEQ1Mapping<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator &, const unsigned int, @@ -111,7 +112,6 @@ void FEQ1Mapping<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator &, }; - template <> void FEQ1Mapping<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &cell, const vector > &unit_points, @@ -135,11 +135,9 @@ void FEQ1Mapping<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &cell, }; - #endif - #if deal_II_dimension == 2 template <> @@ -160,7 +158,6 @@ FEQ1Mapping<2>::FEQ1Mapping (const unsigned int dofs_per_vertex, }; - template <> inline double @@ -179,7 +176,6 @@ FEQ1Mapping<2>::shape_value_transform (const unsigned int i, }; - template <> inline Tensor<1,2> @@ -198,7 +194,6 @@ FEQ1Mapping<2>::shape_grad_transform (const unsigned int i, }; - template <> void FEQ1Mapping<2>::get_face_jacobians (const DoFHandler<2>::face_iterator &face, const vector > &unit_points, @@ -219,7 +214,6 @@ void FEQ1Mapping<2>::get_face_jacobians (const DoFHandler<2>::face_iterator &fac }; - template <> void FEQ1Mapping<2>::get_subface_jacobians (const DoFHandler<2>::face_iterator &face, const unsigned int , @@ -243,7 +237,6 @@ void FEQ1Mapping<2>::get_subface_jacobians (const DoFHandler<2>::face_iterator & }; - template <> void FEQ1Mapping<2>::get_normal_vectors (const DoFHandler<2>::cell_iterator &cell, const unsigned int face_no, @@ -274,7 +267,6 @@ void FEQ1Mapping<2>::get_normal_vectors (const DoFHandler<2>::cell_iterator &cel }; - template <> void FEQ1Mapping<2>::get_normal_vectors (const DoFHandler<2>::cell_iterator &cell, const unsigned int face_no, @@ -313,7 +305,6 @@ void FEQ1Mapping<2>::get_normal_vectors (const DoFHandler<2>::cell_iterator &cel #endif - #if deal_II_dimension == 3 template <> @@ -333,7 +324,6 @@ FEQ1Mapping<3>::FEQ1Mapping (const unsigned int dofs_per_vertex, {}; - template <> inline double @@ -356,7 +346,6 @@ FEQ1Mapping<3>::shape_value_transform (const unsigned int i, }; - template <> inline Tensor<1,3> @@ -395,7 +384,6 @@ FEQ1Mapping<3>::shape_grad_transform (const unsigned int i, }; - template <> void FEQ1Mapping<3>::get_face_jacobians (const DoFHandler<3>::face_iterator &face, const vector > &unit_points, @@ -467,7 +455,6 @@ void FEQ1Mapping<3>::get_face_jacobians (const DoFHandler<3>::face_iterator &fac }; - template <> void FEQ1Mapping<3>::get_subface_jacobians (const DoFHandler<3>::face_iterator &/*face*/, const unsigned int , @@ -478,7 +465,6 @@ void FEQ1Mapping<3>::get_subface_jacobians (const DoFHandler<3>::face_iterator & }; - template <> void FEQ1Mapping<3>::get_normal_vectors (const DoFHandler<3>::cell_iterator &cell, const unsigned int face_no, @@ -533,7 +519,6 @@ void FEQ1Mapping<3>::get_normal_vectors (const DoFHandler<3>::cell_iterator &cel }; - template <> void FEQ1Mapping<3>::get_normal_vectors (const DoFHandler<3>::cell_iterator &/*cell*/, const unsigned int /*face_no*/, @@ -552,7 +537,6 @@ void FEQ1Mapping<3>::get_normal_vectors (const DoFHandler<3>::cell_iterator &/*c #endif - template void FEQ1Mapping::fill_fe_values (const DoFHandler::cell_iterator &cell, const vector > &unit_points, @@ -576,15 +560,15 @@ void FEQ1Mapping::fill_fe_values (const DoFHandler::cell_iterator &cel Assert ((!compute_support_points) || (support_points.size() == dofs_per_cell), ExcWrongFieldDimension(support_points.size(), dofs_per_cell)); - - unsigned int n_points=unit_points.size(); + +unsigned int n_points=unit_points.size(); Point vertices[GeometryInfo::vertices_per_cell]; for (unsigned int l=0; l::vertices_per_cell; ++l) vertices[l] = cell->vertex(l); - - if (compute_q_points) + +if (compute_q_points) { // initialize points to zero for (unsigned int i=0; i::fill_fe_values (const DoFHandler::cell_iterator &cel for (unsigned int l=0; l::fill_fe_values (const DoFHandler::cell_iterator &cel }; }; - - One last note regarding whether we have to invert M or M transposed: it is + +One last note regarding whether we have to invert M or M transposed: it is easy to try out, by computing the gradients of a function on a distorted cell (just move one vertex) where the nodal values for linear elements are one for the moved vertex and zero otherwise. Please also note that @@ -687,9 +671,9 @@ void FEQ1Mapping::fill_fe_values (const DoFHandler::cell_iterator &cel QTrapez<2> q; FEValues<2> fevalues(fe,q,update_gradients); fevalues.reinit (dof.begin_active(),b); - - - Vector val(4); + + +Vector val(4); val(2) = 1; vector > grads(4); @@ -728,8 +712,6 @@ void FEQ1Mapping::fill_fe_values (const DoFHandler::cell_iterator &cel }; - - /*------------------------------- Explicit Instantiations -------------*/ template class FEQ1Mapping; diff --git a/deal.II/deal.II/source/fe/q1_mapping.jacobians.cc b/deal.II/deal.II/source/fe/q1_mapping.jacobians.cc index 1c9f8642fa..acc9dede48 100644 --- a/deal.II/deal.II/source/fe/q1_mapping.jacobians.cc +++ b/deal.II/deal.II/source/fe/q1_mapping.jacobians.cc @@ -1,7 +1,16 @@ -/* $Id$ */ -/* Copyright W. Bangerth, University of Heidelberg, 1998 */ +//---------------------------- q1_mapping.jacobians.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- q1_mapping.jacobians.cc --------------------------- -// moved from file fe_linear_mapping_jacobians.cc #include #include @@ -10,7 +19,6 @@ #include - /** * This file has been singled out from q1_mapping.cc because the computation * of the 3d matrices is so extremely large that it can't be done with @@ -21,7 +29,6 @@ */ - #if deal_II_dimension == 1 template <> @@ -39,7 +46,6 @@ void FEQ1Mapping<1>::compute_jacobian_matrices (const DoFHandler<1>::cell_iterat }; - template <> void FEQ1Mapping<1>::compute_jacobian_gradients (const DoFHandler<1>::cell_iterator &, const vector > &unit_points, @@ -59,7 +65,6 @@ void FEQ1Mapping<1>::compute_jacobian_gradients (const DoFHandler<1>::cell_itera #endif - #if deal_II_dimension == 2 template <> @@ -114,7 +119,6 @@ void FEQ1Mapping<2>::compute_jacobian_matrices (const DoFHandler<2>::cell_iterat }; - template <> void FEQ1Mapping<2>::compute_jacobian_gradients (const DoFHandler<2>::cell_iterator &cell, const vector > &unit_points, @@ -196,7 +200,6 @@ void FEQ1Mapping<2>::compute_jacobian_gradients (const DoFHandler<2>::cell_itera #endif - #if deal_II_dimension == 3 template <> @@ -1335,7 +1338,6 @@ void FEQ1Mapping<3>::compute_jacobian_matrices (const DoFHandler<3>::cell_iterat }; - template <> void FEQ1Mapping<3>::compute_jacobian_gradients (const DoFHandler<3>::cell_iterator &cell, const vector > &unit_points, diff --git a/deal.II/deal.II/source/grid/geometry_info.cc b/deal.II/deal.II/source/grid/geometry_info.cc index e62b5f4f94..023896c41c 100644 --- a/deal.II/deal.II/source/grid/geometry_info.cc +++ b/deal.II/deal.II/source/grid/geometry_info.cc @@ -1,4 +1,16 @@ -/* $Id$ */ +//---------------------------- geometry_info.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- geometry_info.cc --------------------------- + #include diff --git a/deal.II/deal.II/source/grid/grid_generator.cc b/deal.II/deal.II/source/grid/grid_generator.cc index bc023fc627..bee3e8b1ee 100644 --- a/deal.II/deal.II/source/grid/grid_generator.cc +++ b/deal.II/deal.II/source/grid/grid_generator.cc @@ -1,4 +1,15 @@ -/* $Id$ */ +//---------------------------- grid_generator.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- grid_generator.cc --------------------------- #include @@ -6,8 +17,6 @@ #include - - #if deal_II_dimension == 1 template <> @@ -26,7 +35,6 @@ void GridGenerator::hyper_cube<> (Triangulation<1> &tria, }; - template <> void GridGenerator::hyper_cube_slit<> (Triangulation<1> &, const double, @@ -35,7 +43,6 @@ void GridGenerator::hyper_cube_slit<> (Triangulation<1> &, }; - template <> void GridGenerator::hyper_L<> (Triangulation<1> &, const double, @@ -44,7 +51,6 @@ void GridGenerator::hyper_L<> (Triangulation<1> &, }; - template <> void GridGenerator::hyper_ball<> (Triangulation<1> &, const Point<1> &, @@ -53,7 +59,6 @@ void GridGenerator::hyper_ball<> (Triangulation<1> &, }; - template <> void GridGenerator::hyper_shell<> (Triangulation<1> &, const Point<1> &, @@ -66,7 +71,6 @@ void GridGenerator::hyper_shell<> (Triangulation<1> &, #endif - #if deal_II_dimension == 2 template <> @@ -89,7 +93,6 @@ void GridGenerator::hyper_cube<> (Triangulation<2> &tria, }; - template <> void GridGenerator::hyper_cube_slit<> (Triangulation<2> &tria, const double left, @@ -122,7 +125,6 @@ void GridGenerator::hyper_cube_slit<> (Triangulation<2> &tria, }; - template <> void GridGenerator::hyper_L<> (Triangulation<2> &tria, const double a, @@ -155,7 +157,6 @@ void GridGenerator::hyper_L<> (Triangulation<2> &tria, }; - template <> void GridGenerator::hyper_ball<> (Triangulation<2> &tria, const Point<2> &p, @@ -193,7 +194,6 @@ void GridGenerator::hyper_ball<> (Triangulation<2> &tria, }; - template <> void GridGenerator::hyper_shell<> (Triangulation<2> &tria, const Point<2> ¢er, @@ -283,7 +283,6 @@ void GridGenerator::hyper_cube<> (Triangulation<3> &tria, }; - template <> void GridGenerator::hyper_cube_slit<> (Triangulation<3> &, const double, @@ -292,7 +291,6 @@ void GridGenerator::hyper_cube_slit<> (Triangulation<3> &, }; - template <> void GridGenerator::hyper_L<> (Triangulation<3> &tria, const double a, @@ -356,7 +354,6 @@ void GridGenerator::hyper_L<> (Triangulation<3> &tria, }; - template <> void GridGenerator::hyper_ball<> (Triangulation<3> &tria, const Point<3> &p, @@ -415,7 +412,6 @@ void GridGenerator::hyper_ball<> (Triangulation<3> &tria, }; - template <> void GridGenerator::hyper_shell<> (Triangulation<3> &, const Point<3> &, @@ -430,8 +426,6 @@ void GridGenerator::hyper_shell<> (Triangulation<3> &, #endif - - // explicit instantiations // template void GridGenerator::hyper_cube (Triangulation &, // const double, diff --git a/deal.II/deal.II/source/grid/grid_in.cc b/deal.II/deal.II/source/grid/grid_in.cc index 6653a85742..e2898672b9 100644 --- a/deal.II/deal.II/source/grid/grid_in.cc +++ b/deal.II/deal.II/source/grid/grid_in.cc @@ -1,4 +1,16 @@ -/* $Id$ */ +//---------------------------- grid_in.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- grid_in.cc --------------------------- + #include #include @@ -6,13 +18,11 @@ #include - template GridIn::GridIn () : tria(0) {}; - template void GridIn::attach_triangulation (Triangulation &t) { @@ -20,7 +30,6 @@ void GridIn::attach_triangulation (Triangulation &t) }; - template void GridIn::read_ucd (istream &in) { @@ -41,9 +50,9 @@ void GridIn::read_ucd (istream &in) // put back first character of // first non-comment line in.putback (c); - - - unsigned int n_vertices; + + +unsigned int n_vertices; unsigned int n_cells; int dummy; @@ -154,6 +163,5 @@ void GridIn::read_ucd (istream &in) }; - //explicit instantiations template class GridIn; diff --git a/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc b/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc index 3ee7217c76..59a5d7f600 100644 --- a/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc +++ b/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc @@ -1,4 +1,16 @@ -/* $Id$ */ +//---------------------------- grid_out.all_dimensions.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- grid_out.all_dimensions.cc --------------------------- + #include @@ -10,7 +22,6 @@ GridOut::UcdFlags::UcdFlags (const bool write_preamble, {}; - GridOut::GnuplotFlags::GnuplotFlags (const bool write_cell_numbers, const bool write_level) : write_cell_numbers (write_cell_numbers), @@ -18,7 +29,6 @@ GridOut::GnuplotFlags::GnuplotFlags (const bool write_cell_numbers, {}; - GridOut::EpsFlagsBase::EpsFlagsBase (const SizeType size_type, const unsigned int size, const double line_width) : @@ -28,7 +38,6 @@ GridOut::EpsFlagsBase::EpsFlagsBase (const SizeType size_type, {}; - // egcs 1.1.2 does not understand this, so I made it inlined in the // class declaration // @@ -40,42 +49,36 @@ GridOut::EpsFlagsBase::EpsFlagsBase (const SizeType size_type, // {}; - void GridOut::set_flags (const UcdFlags &flags) { ucd_flags = flags; }; - void GridOut::set_flags (const GnuplotFlags &flags) { gnuplot_flags = flags; }; - void GridOut::set_flags (const EpsFlags<1> &flags) { eps_flags_1 = flags; }; - void GridOut::set_flags (const EpsFlags<2> &flags) { eps_flags_2 = flags; }; - void GridOut::set_flags (const EpsFlags<3> &flags) { eps_flags_3 = flags; }; - string GridOut::default_suffix (const OutputFormat output_format) { switch (output_format) @@ -94,8 +97,6 @@ string GridOut::default_suffix (const OutputFormat output_format) return ""; }; }; - - GridOut::OutputFormat @@ -116,7 +117,6 @@ GridOut::parse_output_format (const string &format_name) }; - string GridOut::get_output_format_names () { return "gnuplot|eps"; }; diff --git a/deal.II/deal.II/source/grid/grid_out.cc b/deal.II/deal.II/source/grid/grid_out.cc index 1f9fd183c9..033f056497 100644 --- a/deal.II/deal.II/source/grid/grid_out.cc +++ b/deal.II/deal.II/source/grid/grid_out.cc @@ -1,4 +1,15 @@ -/* $Id$ */ +//---------------------------- grid_out.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- grid_out.cc --------------------------- #include @@ -14,7 +25,6 @@ #include - template void GridOut::write_ucd (const Triangulation &tria, ostream &out) @@ -42,9 +52,9 @@ void GridOut::write_ucd (const Triangulation &tria, vertices[cell->vertex_index(vertex)] = cell->vertex(vertex); ++n_vertices; }; - - // write preamble + +// write preamble if (ucd_flags.write_preamble) { // block this to have local @@ -137,7 +147,6 @@ void GridOut::write_ucd (const Triangulation &tria, }; - #if deal_II_dimension == 1 template <> @@ -149,7 +158,6 @@ unsigned int GridOut::n_boundary_faces (const Triangulation<1> &) const #endif - template unsigned int GridOut::n_boundary_faces (const Triangulation &tria) const { @@ -166,7 +174,6 @@ unsigned int GridOut::n_boundary_faces (const Triangulation &tria) const }; - #if deal_II_dimension == 1 template <> @@ -180,7 +187,6 @@ void GridOut::write_ucd_faces (const Triangulation<1> &, #endif - template void GridOut::write_ucd_faces (const Triangulation &tria, const unsigned int starting_index, @@ -213,7 +219,6 @@ void GridOut::write_ucd_faces (const Triangulation &tria, }; - template void GridOut::write_gnuplot (const Triangulation &tria, ostream &out) @@ -282,7 +287,6 @@ void GridOut::write_gnuplot (const Triangulation &tria, }; - template void GridOut::write_eps (const Triangulation &tria, ostream &out) @@ -409,10 +413,9 @@ void GridOut::write_eps (const Triangulation &tria, default: Assert (false, ExcNotImplemented()); }; - - - // find out minimum and maximum x and + +// find out minimum and maximum x and // y coordinates to compute offsets // and scaling factors double x_min = tria.begin_active_line()->vertex(0)(0); @@ -445,9 +448,9 @@ void GridOut::write_eps (const Triangulation &tria, (eps_flags_base.size_type==EpsFlagsBase::width ? x_max - x_min : y_min - y_max)); - - - // now write preamble + + +// now write preamble if (true) { // block this to have local @@ -502,8 +505,6 @@ void GridOut::write_eps (const Triangulation &tria, }; - - template void GridOut::write (const Triangulation &tria, ostream &out, @@ -528,8 +529,6 @@ void GridOut::write (const Triangulation &tria, }; - - // explicit instantiations. note that write instantiates all the other // functions as needed template void GridOut::write (const Triangulation &, ostream &, OutputFormat); diff --git a/deal.II/deal.II/source/grid/intergrid_map.cc b/deal.II/deal.II/source/grid/intergrid_map.cc index 0299d848f3..64767b115c 100644 --- a/deal.II/deal.II/source/grid/intergrid_map.cc +++ b/deal.II/deal.II/source/grid/intergrid_map.cc @@ -1,4 +1,16 @@ -/* $Id$ */ +//---------------------------- intergrid_map.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 1998, 1999, 2000 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- intergrid_map.cc --------------------------- + #include #include @@ -10,7 +22,6 @@ #include - // helper function to aquire the number of levels within a grid template unsigned int @@ -38,18 +49,15 @@ get_n_levels (const Triangulation &grid) }; - - - template