Merge branch 'master' into bugfix/rwa/coarsen-L2-proj
This commit is contained in:
+5
-5
@@ -213,7 +213,7 @@ void BiQuadPos2DFiniteElement::GetLocalInterpolation(
|
||||
void BiQuadPos2DFiniteElement::Project(
|
||||
Coefficient &coeff, ElementTransformation &Trans, Vector &dofs) const
|
||||
{
|
||||
double *d = dofs;
|
||||
double *d = dofs.GetData();
|
||||
|
||||
for (int i = 0; i < 9; i++)
|
||||
{
|
||||
@@ -383,8 +383,8 @@ void H1Pos_QuadrilateralElement::CalcShape(const IntegrationPoint &ip,
|
||||
Vector shape_x(p+1), shape_y(p+1);
|
||||
#endif
|
||||
|
||||
Poly_1D::CalcBernstein(p, ip.x, shape_x.GetData() );
|
||||
Poly_1D::CalcBernstein(p, ip.y, shape_y.GetData() );
|
||||
Poly_1D::CalcBernstein(p, ip.x, shape_x);
|
||||
Poly_1D::CalcBernstein(p, ip.y, shape_y);
|
||||
|
||||
// Reorder so that vertices are at the beginning of the list
|
||||
for (int o = 0, j = 0; j <= p; j++)
|
||||
@@ -403,8 +403,8 @@ void H1Pos_QuadrilateralElement::CalcDShape(const IntegrationPoint &ip,
|
||||
Vector shape_x(p+1), shape_y(p+1), dshape_x(p+1), dshape_y(p+1);
|
||||
#endif
|
||||
|
||||
Poly_1D::CalcBernstein(p, ip.x, shape_x.GetData(), dshape_x.GetData() );
|
||||
Poly_1D::CalcBernstein(p, ip.y, shape_y.GetData(), dshape_y.GetData() );
|
||||
Poly_1D::CalcBernstein(p, ip.x, shape_x, dshape_x);
|
||||
Poly_1D::CalcBernstein(p, ip.y, shape_y, dshape_y);
|
||||
|
||||
// Reorder so that vertices are at the beginning of the list
|
||||
for (int o = 0, j = 0; j <= p; j++)
|
||||
|
||||
Reference in New Issue
Block a user