From: guido Date: Fri, 1 Feb 2002 13:59:20 +0000 (+0000) Subject: backward compatibility finite elements removed X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=134a3f2655d70935ed79da1d69a2074e6501ed48;p=dealii-svn.git backward compatibility finite elements removed git-svn-id: https://svn.dealii.org/trunk@5448 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_lib.dg.h b/deal.II/deal.II/include/fe/fe_lib.dg.h deleted file mode 100644 index 69954b42fd..0000000000 --- a/deal.II/deal.II/include/fe/fe_lib.dg.h +++ /dev/null @@ -1,139 +0,0 @@ -//--------------------------------------------------------------- -// $Id$ -// Version: $Name$ -// -// Copyright (C) 1998, 1999, 2000, 2001, 2002 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. -// -//--------------------------------------------------------------- -#ifndef __deal2__fe_lib_dg_h -#define __deal2__fe_lib_dg_h - - -#include -#include - - - - - -/** - * This class is an abbreviation for the @ref{FE_DGQ} class, where the - * polynomial degree (which is passed through the constructor of - * @ref{FE_DGQ}) is fixed to zero, i.e. piecewise constant elements. - * - * This class is only here for backward compatibility and will go away - * someday. Use the @ref{FE_DGQ} class instead. - * - * @author Wolfgang Bangerth, Ralf Hartmann, 2001 - */ -template -class FEDG_Q0 : public FE_DGQ -{ - public: - /** - * Constructor. Simply pass - * correct polynomial degree to - * constructor of base class. - */ - FEDG_Q0(): FE_DGQ(0) {}; -}; - - -/** - * This class is an abbreviation for the @ref{FE_DGQ} class, where the - * polynomial degree (which is passed through the constructor of - * @ref{FE_DGQ}) is fixed to one, i.e. piecewise @p{d}-linear elements. - * - * This class is only here for backward compatibility and will go away - * someday. Use the @ref{FE_DGQ} class instead. - * - * @author Wolfgang Bangerth, Ralf Hartmann, 2001 - */ -template -class FEDG_Q1 : public FE_DGQ -{ - public: - /** - * Constructor. Simply pass - * correct polynomial degree to - * constructor of base class. - */ - FEDG_Q1(): FE_DGQ(1) {}; -}; - - -/** - * This class is an abbreviation for the @ref{FE_DGQ} class, where the - * polynomial degree (which is passed through the constructor of - * @ref{FE_DGQ}) is fixed to two, i.e. piecewise @p{d}-quadratic elements. - * - * This class is only here for backward compatibility and will go away - * someday. Use the @ref{FE_DGQ} class instead. - * - * @author Wolfgang Bangerth, Ralf Hartmann, 2001 - */ -template -class FEDG_Q2 : public FE_DGQ -{ - public: - /** - * Constructor. Simply pass - * correct polynomial degree to - * constructor of base class. - */ - FEDG_Q2(): FE_DGQ(2) {}; -}; - - -/** - * This class is an abbreviation for the @ref{FE_DGQ} class, where the - * polynomial degree (which is passed through the constructor of - * @ref{FE_DGQ}) is fixed to three, i.e. piecewise @p{d}-cubic elements. - * - * This class is only here for backward compatibility and will go away - * someday. Use the @ref{FE_DGQ} class instead. - * - * @author Wolfgang Bangerth, Ralf Hartmann, 2001 - */ -template -class FEDG_Q3 : public FE_DGQ -{ - public: - /** - * Constructor. Simply pass - * correct polynomial degree to - * constructor of base class. - */ - FEDG_Q3(): FE_DGQ(3) {}; -}; - - -/** - * This class is an abbreviation for the @ref{FE_DGQ} class, where the - * polynomial degree (which is passed through the constructor of - * @ref{FE_DGQ}) is fixed to four, i.e. piecewise @p{d}-quartic elements. - * - * This class is only here for backward compatibility and will go away - * someday. Use the @ref{FE_DGQ} class instead. - * - * @author Wolfgang Bangerth, Ralf Hartmann, 2001 - */ -template -class FEDG_Q4 : public FE_DGQ -{ - public: - /** - * Constructor. Simply pass - * correct polynomial degree to - * constructor of base class. - */ - FEDG_Q4(): FE_DGQ(4) {}; -}; - - -#endif diff --git a/deal.II/deal.II/include/fe/fe_lib.lagrange.h b/deal.II/deal.II/include/fe/fe_lib.lagrange.h deleted file mode 100644 index e654a32079..0000000000 --- a/deal.II/deal.II/include/fe/fe_lib.lagrange.h +++ /dev/null @@ -1,115 +0,0 @@ -//--------------------------------------------------------------- -// $Id$ -// Version: $Name$ -// -// Copyright (C) 1998, 1999, 2000, 2001, 2002 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. -// -//--------------------------------------------------------------- -#ifndef __deal2__fe_lib_lagrange_h -#define __deal2__fe_lib_lagrange_h - - -#include -#include - - - - -/** - * This class is an abbreviation for the @ref{FE_Q} class, where the - * polynomial degree (which is passed through the constructor of - * @ref{FE_Q}) is fixed to one, i.e. @p{d}-linear elements. - * - * This class is only here for backward compatibility and will go away - * someday. Use the @ref{FE_Q} class instead. - * - * @author Wolfgang Bangerth, Ralf Hartmann, 2001 - */ -template -class FEQ1 : public FE_Q -{ - public: - /** - * Constructor. Simply pass - * correct polynomial degree to - * constructor of base class. - */ - FEQ1(): FE_Q(1) {}; -}; - - -/** - * This class is an abbreviation for the @ref{FE_Q} class, where the - * polynomial degree (which is passed through the constructor of - * @ref{FE_Q}) is fixed to two, i.e. @p{d}-quadratic elements. - * - * This class is only here for backward compatibility and will go away - * someday. Use the @ref{FE_Q} class instead. - * - * @author Wolfgang Bangerth, Ralf Hartmann, 2001 - */ -template -class FEQ2 : public FE_Q -{ - public: - /** - * Constructor. Simply pass - * correct polynomial degree to - * constructor of base class. - */ - FEQ2(): FE_Q(2) {}; -}; - - -/** - * This class is an abbreviation for the @ref{FE_Q} class, where the - * polynomial degree (which is passed through the constructor of - * @ref{FE_Q}) is fixed to three, i.e. @p{d}-cubic elements. - * - * This class is only here for backward compatibility and will go away - * someday. Use the @ref{FE_Q} class instead. - * - * @author Wolfgang Bangerth, Ralf Hartmann, 2001 - */ -template -class FEQ3 : public FE_Q -{ - public: - /** - * Constructor. Simply pass - * correct polynomial degree to - * constructor of base class. - */ - FEQ3(): FE_Q(3) {}; -}; - - -/** - * This class is an abbreviation for the @ref{FE_Q} class, where the - * polynomial degree (which is passed through the constructor of - * @ref{FE_Q}) is fixed to four, i.e. @p{d}-quartic elements. - * - * This class is only here for backward compatibility and will go away - * someday. Use the @ref{FE_Q} class instead. - * - * @author Wolfgang Bangerth, Ralf Hartmann, 2001 - */ -template -class FEQ4 : public FE_Q -{ - public: - /** - * Constructor. Simply pass - * correct polynomial degree to - * constructor of base class. - */ - FEQ4(): FE_Q(4) {}; -}; - - -#endif diff --git a/tests/deal.II/fe_tables.cc b/tests/deal.II/fe_tables.cc index c05af66913..d8b1cad108 100644 --- a/tests/deal.II/fe_tables.cc +++ b/tests/deal.II/fe_tables.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,8 +15,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/tests/deal.II/wave-test-3.cc b/tests/deal.II/wave-test-3.cc index 7110281a81..5dcbe6c44a 100644 --- a/tests/deal.II/wave-test-3.cc +++ b/tests/deal.II/wave-test-3.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// std::copyright (C) 1998, 1999, 2000, 2001 by Wolfgang Bangerth +// std::copyright (C) 1998, 1999, 2000, 2001, 2002 by Wolfgang Bangerth // // This file is subject to QPL and may not be distributed // without std::copyright and license information. Please refer @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -997,11 +998,11 @@ inline number sqr (const number a) { */ template struct FEHelper { - static const FEQ1 fe_linear; - static const FEQ2 fe_quadratic_sub; + static const FE_Q fe_linear; + static const FE_Q fe_quadratic_sub; #if 2 < 3 - static const FEQ3 fe_cubic_sub; - static const FEQ4 fe_quartic_sub; + static const FE_Q fe_cubic_sub; + static const FE_Q fe_quartic_sub; #endif static const QGauss2 q_gauss_2; @@ -1040,6 +1041,12 @@ struct FEHelper { static const Quadrature & get_quadrature_face (const std::string &name); }; +template const FE_Q FEHelper::fe_linear(1); +template const FE_Q FEHelper::fe_quadratic_sub(2); +#if 2 < 3 +template const FE_Q FEHelper::fe_cubic_sub(3); +template const FE_Q FEHelper::fe_quartic_sub(4); +#endif template class DualFunctional; template class EvaluationBase; @@ -7584,19 +7591,16 @@ void UserMatrix::precondition (Vector &dst, }; - - -#include #include #include -const FEQ1<2> FEHelper<2>::fe_linear; -const FEQ2<2> FEHelper<2>::fe_quadratic_sub; +const FE_Q<2> FEHelper<2>::fe_linear(1); +const FE_Q<2> FEHelper<2>::fe_quadratic_sub(2); #if 2 < 3 -const FEQ3<2> FEHelper<2>::fe_cubic_sub; -const FEQ4<2> FEHelper<2>::fe_quartic_sub; +const FE_Q<2> FEHelper<2>::fe_cubic_sub(3); +const FE_Q<2> FEHelper<2>::fe_quartic_sub(4); #endif const QGauss2<2> FEHelper<2>::q_gauss_2; diff --git a/tests/fe/mapping_q1_eulerian.cc b/tests/fe/mapping_q1_eulerian.cc index 96b4be9ac1..029b64623c 100644 --- a/tests/fe/mapping_q1_eulerian.cc +++ b/tests/fe/mapping_q1_eulerian.cc @@ -1,5 +1,5 @@ // $Id$ -// Copyright (C) 2001 Michael Stadler, Wolfgang Bangerth +// Copyright (C) 2001, 2002 Michael Stadler, Wolfgang Bangerth // #include @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/fe/show_transfer.cc b/tests/fe/show_transfer.cc index 93b75d5719..7cfa4383a4 100644 --- a/tests/fe/show_transfer.cc +++ b/tests/fe/show_transfer.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -21,8 +21,6 @@ #include #include #include -#include -#include #include #include #include