Refactor GetDofToQuad to support H(curl) and H(div) for non-tensor elements
This commit is contained in:
+15
-15
@@ -150,16 +150,16 @@ void RT_QuadrilateralElement::CalcVShape(const IntegrationPoint &ip,
|
||||
|
||||
if (obasis1d.IsIntegratedType())
|
||||
{
|
||||
cbasis1d.Eval(ip.x, shape_cx, dshape_cx);
|
||||
cbasis1d.Eval(ip.y, shape_cy, dshape_cy);
|
||||
basis1d.Eval(ip.x, shape_cx, dshape_cx);
|
||||
basis1d.Eval(ip.y, shape_cy, dshape_cy);
|
||||
obasis1d.ScaleIntegrated(false);
|
||||
obasis1d.EvalIntegrated(dshape_cx, shape_ox);
|
||||
obasis1d.EvalIntegrated(dshape_cy, shape_oy);
|
||||
}
|
||||
else
|
||||
{
|
||||
cbasis1d.Eval(ip.x, shape_cx);
|
||||
cbasis1d.Eval(ip.y, shape_cy);
|
||||
basis1d.Eval(ip.x, shape_cx);
|
||||
basis1d.Eval(ip.y, shape_cy);
|
||||
obasis1d.Eval(ip.x, shape_ox);
|
||||
obasis1d.Eval(ip.y, shape_oy);
|
||||
}
|
||||
@@ -207,8 +207,8 @@ void RT_QuadrilateralElement::CalcDivShape(const IntegrationPoint &ip,
|
||||
Vector dshape_cx(pp1 + 1), dshape_cy(pp1 + 1);
|
||||
#endif
|
||||
|
||||
cbasis1d.Eval(ip.x, shape_cx, dshape_cx);
|
||||
cbasis1d.Eval(ip.y, shape_cy, dshape_cy);
|
||||
basis1d.Eval(ip.x, shape_cx, dshape_cx);
|
||||
basis1d.Eval(ip.y, shape_cy, dshape_cy);
|
||||
if (obasis1d.IsIntegratedType())
|
||||
{
|
||||
obasis1d.ScaleIntegrated(false);
|
||||
@@ -478,9 +478,9 @@ void RT_HexahedronElement::CalcVShape(const IntegrationPoint &ip,
|
||||
|
||||
if (obasis1d.IsIntegratedType())
|
||||
{
|
||||
cbasis1d.Eval(ip.x, shape_cx, dshape_cx);
|
||||
cbasis1d.Eval(ip.y, shape_cy, dshape_cy);
|
||||
cbasis1d.Eval(ip.z, shape_cz, dshape_cz);
|
||||
basis1d.Eval(ip.x, shape_cx, dshape_cx);
|
||||
basis1d.Eval(ip.y, shape_cy, dshape_cy);
|
||||
basis1d.Eval(ip.z, shape_cz, dshape_cz);
|
||||
obasis1d.ScaleIntegrated(false);
|
||||
obasis1d.EvalIntegrated(dshape_cx, shape_ox);
|
||||
obasis1d.EvalIntegrated(dshape_cy, shape_oy);
|
||||
@@ -488,9 +488,9 @@ void RT_HexahedronElement::CalcVShape(const IntegrationPoint &ip,
|
||||
}
|
||||
else
|
||||
{
|
||||
cbasis1d.Eval(ip.x, shape_cx);
|
||||
cbasis1d.Eval(ip.y, shape_cy);
|
||||
cbasis1d.Eval(ip.z, shape_cz);
|
||||
basis1d.Eval(ip.x, shape_cx);
|
||||
basis1d.Eval(ip.y, shape_cy);
|
||||
basis1d.Eval(ip.z, shape_cz);
|
||||
obasis1d.Eval(ip.x, shape_ox);
|
||||
obasis1d.Eval(ip.y, shape_oy);
|
||||
obasis1d.Eval(ip.z, shape_oz);
|
||||
@@ -564,9 +564,9 @@ void RT_HexahedronElement::CalcDivShape(const IntegrationPoint &ip,
|
||||
Vector dshape_cx(pp1 + 1), dshape_cy(pp1 + 1), dshape_cz(pp1 + 1);
|
||||
#endif
|
||||
|
||||
cbasis1d.Eval(ip.x, shape_cx, dshape_cx);
|
||||
cbasis1d.Eval(ip.y, shape_cy, dshape_cy);
|
||||
cbasis1d.Eval(ip.z, shape_cz, dshape_cz);
|
||||
basis1d.Eval(ip.x, shape_cx, dshape_cx);
|
||||
basis1d.Eval(ip.y, shape_cy, dshape_cy);
|
||||
basis1d.Eval(ip.z, shape_cz, dshape_cz);
|
||||
if (obasis1d.IsIntegratedType())
|
||||
{
|
||||
obasis1d.ScaleIntegrated(false);
|
||||
|
||||
Reference in New Issue
Block a user