]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Move matrices definitions to own files that need not be included.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 7 Mar 2001 15:21:49 +0000 (15:21 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 7 Mar 2001 15:21:49 +0000 (15:21 +0000)
git-svn-id: https://svn.dealii.org/trunk@4149 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/fe/fe_q_1d.cc [moved from deal.II/deal.II/source/fe/mat_q.1 with 92% similarity]
deal.II/deal.II/source/fe/fe_q_2d.cc [moved from deal.II/deal.II/source/fe/mat_q.2 with 98% similarity]
deal.II/deal.II/source/fe/fe_q_3d.cc [moved from deal.II/deal.II/source/fe/mat_q.3 with 99% similarity]

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 187daae24c3c4ff584ea635f8545a2f912810b3b..c6df4676932c0884783582d1e879d053f8bf282d 100644 (file)
@@ -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
 
 
 
+// only compile this file if in 1d
+#if deal_II_dimension == 1
+
+
+#include <fe/fe_q.h>
+
 // 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
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 b591a0618e7fd0f8a3b40fbc8ad7f95b8423ea97..8a6bacfd92a0dacb896cd25bf8094d06234108b3 100644 (file)
@@ -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
 //
 //----------------------------------------------------------------
 
-// Transfer matrices for finite elements
 
-namespace FE_Q_2d {
+// only compile this file if in 2d
+#if deal_II_dimension == 2
+
+
+#include <fe/fe_q.h>
+
+// 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
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 450c1ec48922caaed5f1f64881bf6200976573be..ceafeaaf0379a3e401800a0742caea5d3f4586c9 100644 (file)
@@ -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
 // Transfer matrices for finite elements
 
 
+// only compile this file if in 3d
+#if deal_II_dimension == 3
+
+#include <fe/fe_q.h>
+
 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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.