]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
use Quadrature::size() instead of n_quadrature_points
authorkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 17 Jan 2008 17:37:37 +0000 (17:37 +0000)
committerkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 17 Jan 2008 17:37:37 +0000 (17:37 +0000)
git-svn-id: https://svn.dealii.org/trunk@15623 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/source/polynomials_bdm.cc
deal.II/base/source/quadrature_lib.cc

index a382a7cf538d30aaf8714bd74be1c0332f038dbd..ef7443035bb259d3dc1ac48d2b2ece8408823007 100644 (file)
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2004, 2005, 2006 by the deal.II authors
+//    Copyright (C) 2004, 2005, 2006, 2007, 2008 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -146,7 +146,7 @@ PolynomialsBDM<dim>::compute_node_matrix (Table<2,double>& A) const
       if ((face==0) || (face==3))
        orientation = -1.;
       
-      for (unsigned int k=0;k<qface.n_quadrature_points;++k)
+      for (unsigned int k=0;k<qface.size();++k)
        {
          const double w = qface.weight(k) * orientation;
          const double x = qface.point(k)(0);
index e2406c5a378cd63faedee671776b32f2637a55aa..05d3d2ec3654663a94925e075d1c55b062b74a65 100644 (file)
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 by the deal.II authors
+//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -331,7 +331,7 @@ QGauss2<1>::QGauss2 ()
   static const double wts[]  = { wts_normal[0]/2.,
                                 wts_normal[1]/2.  };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
@@ -362,7 +362,7 @@ QGauss3<1>::QGauss3 ()
                                 wts_normal[1]/2.,
                                 wts_normal[2]/2. };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
@@ -397,7 +397,7 @@ QGauss4<1>::QGauss4 ()
                                 wts_normal[2]/2.,
                                 wts_normal[3]/2. };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
@@ -435,7 +435,7 @@ QGauss5<1>::QGauss5 ()
                                 wts_normal[3]/2.,
                                 wts_normal[4]/2. };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
@@ -478,7 +478,7 @@ QGauss6<1>::QGauss6 ()
                                 wts_normal[4]/2.,
                                 wts_normal[5]/2. };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
@@ -525,7 +525,7 @@ QGauss7<1>::QGauss7 ()
                                 wts_normal[5]/2.,
                                 wts_normal[6]/2. };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
@@ -553,7 +553,7 @@ QTrapez<1>::QTrapez ()
   static const double xpts[] = { 0.0, 1.0 };
   static const double wts[]  = { 0.5, 0.5 };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
@@ -570,7 +570,7 @@ QSimpson<1>::QSimpson ()
   static const double xpts[] = { 0.0, 0.5, 1.0 };
   static const double wts[]  = { 1./6., 2./3., 1./6. };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
@@ -587,7 +587,7 @@ QMilne<1>::QMilne ()
   static const double xpts[] = { 0.0, .25, .5, .75, 1.0 };
   static const double wts[]  = { 7./90., 32./90., 12./90., 32./90., 7./90. };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
@@ -606,7 +606,7 @@ QWeddle<1>::QWeddle ()
                                 27./840., 216./840., 41./840.
   };
 
-  for (unsigned int i=0; i<this->n_quadrature_points; ++i) 
+  for (unsigned int i=0; i<this->size(); ++i) 
     {
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];

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.