From: Wolfgang Bangerth Date: Wed, 7 Mar 2001 15:21:49 +0000 (+0000) Subject: Move matrices definitions to own files that need not be included. X-Git-Tag: v8.0.0~19622 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de6cdd98ee7d10bc7e364168ccd9c3e1ec6458ef;p=dealii.git Move matrices definitions to own files that need not be included. git-svn-id: https://svn.dealii.org/trunk@4149 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/fe/mat_q.1 b/deal.II/deal.II/source/fe/fe_q_1d.cc similarity index 92% rename from deal.II/deal.II/source/fe/mat_q.1 rename to deal.II/deal.II/source/fe/fe_q_1d.cc index 187daae24c..c6df467693 100644 --- a/deal.II/deal.II/source/fe/mat_q.1 +++ b/deal.II/deal.II/source/fe/fe_q_1d.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001 by the deal.II authors +// Copyright (C) 2001 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -13,9 +13,16 @@ +// only compile this file if in 1d +#if deal_II_dimension == 1 + + +#include + // Transfer matrices for finite elements -namespace FE_Q_1d { +namespace FE_Q_1d +{ static const double q1_into_q1_refined_0[] = { 1., 0., @@ -102,3 +109,5 @@ FE_Q<1>::Matrices::n_constraint_matrices = 0; const double * const FE_Q<1>::Matrices::constraint_matrices[] = { 0 }; + +#endif // #if deal_II_dimension == 1 diff --git a/deal.II/deal.II/source/fe/mat_q.2 b/deal.II/deal.II/source/fe/fe_q_2d.cc similarity index 98% rename from deal.II/deal.II/source/fe/mat_q.2 rename to deal.II/deal.II/source/fe/fe_q_2d.cc index b591a0618e..8a6bacfd92 100644 --- a/deal.II/deal.II/source/fe/mat_q.2 +++ b/deal.II/deal.II/source/fe/fe_q_2d.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001 by the deal.II authors +// Copyright (C) 2001 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -11,9 +11,16 @@ // //---------------------------------------------------------------- -// Transfer matrices for finite elements -namespace FE_Q_2d { +// only compile this file if in 2d +#if deal_II_dimension == 2 + + +#include + +// Transfer matrices for finite elements +namespace FE_Q_2d +{ static const double q1_into_q1_refined_0[] = { 1., 0., 0., 0., @@ -247,3 +254,7 @@ FE_Q<2>::Matrices::constraint_matrices[] = const unsigned int FE_Q<2>::Matrices::n_constraint_matrices = 4; + + + +#endif // #if deal_II_dimension == 2 diff --git a/deal.II/deal.II/source/fe/mat_q.3 b/deal.II/deal.II/source/fe/fe_q_3d.cc similarity index 99% rename from deal.II/deal.II/source/fe/mat_q.3 rename to deal.II/deal.II/source/fe/fe_q_3d.cc index 450c1ec489..ceafeaaf03 100644 --- a/deal.II/deal.II/source/fe/mat_q.3 +++ b/deal.II/deal.II/source/fe/fe_q_3d.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001 by the deal.II authors +// Copyright (C) 2001 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,6 +14,11 @@ // Transfer matrices for finite elements +// only compile this file if in 3d +#if deal_II_dimension == 3 + +#include + namespace FE_Q_3d { static const double q1_into_q1_refined_0[] = @@ -431,3 +436,5 @@ FE_Q<3>::Matrices::constraint_matrices[] = const unsigned int FE_Q<3>::Matrices::n_constraint_matrices = 2; + +#endif // #if deal_II_dimension == 3