ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-12 22:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

improved elementmapping for non-curved trigs

Browse Source
This commit is contained in:
Joachim Schoeberl 2012-06-07 18:51:36 +00:00
parent 97630292e2
commit 4e3be67517
1 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
libsrc/meshing/curvedelems.cpp
View File

@ -3270,37 +3270,73 @@ namespace netgen
if (x) if (x)
{ {
for (int j = 0; j < npts; j++) if (info.order == 1 && type == TRIG)
{ {
Point<2> vxi(xi[j*sxi], xi[j*sxi+1]); for (int j = 0; j < npts; j++)
CalcElementShapes (info, vxi, shapes); {
Point<2> vxi(xi[j*sxi], xi[j*sxi+1]);
Point<DIM_SPACE> val = 0.0; Point<DIM_SPACE> val (coefs[2]);
for (int i = 0; i < coefs.Size(); i++) val += vxi(0) * (coefs[0]-coefs[2]);
val += shapes(i) * coefs[i]; val += vxi(1) * (coefs[1]-coefs[2]);
for (int k = 0; k < DIM_SPACE; k++) for (int k = 0; k < DIM_SPACE; k++)
x[j*sx+k] = val(k); x[j*sx+k] = val(k);
}
} }
else
for (int j = 0; j < npts; j++)
{
Point<2> vxi(xi[j*sxi], xi[j*sxi+1]);
CalcElementShapes (info, vxi, shapes);
Point<DIM_SPACE> val = 0.0;
for (int i = 0; i < coefs.Size(); i++)
val += shapes(i) * coefs[i];
for (int k = 0; k < DIM_SPACE; k++)
x[j*sx+k] = val(k);
}
} }
if (dxdxi) if (dxdxi)
{ {
for (int j = 0; j < npts; j++) if (info.order == 1 && type == TRIG)
{ {
Point<2> vxi(xi[j*sxi], xi[j*sxi+1]); Point<2> xij(xi[0], xi[1]);
CalcElementDShapes (info, vxi, dshapes); CalcElementDShapes (info, xij, dshapes);
Mat<DIM_SPACE,2> ds; Mat<3,2> dxdxij;
ds = 0.0; dxdxij = 0.0;
for (int i = 0; i < coefs.Size(); i++) for (int i = 0; i < coefs.Size(); i++)
for (int j = 0; j < DIM_SPACE; j++) for (int j = 0; j < DIM_SPACE; j++)
for (int k = 0; k < 2; k++) for (int k = 0; k < 2; k++)
ds(j,k) += dshapes(i,k) * coefs[i](j); dxdxij(j,k) += dshapes(i,k) * coefs[i](j);
// (*dxdxi)[ip] = ds;
for (int k = 0; k < 2*DIM_SPACE; k++) for (int ip = 0; ip < npts; ip++)
dxdxi[j*sdxdxi+k] = ds(k); for (int j = 0; j < DIM_SPACE; j++)
for (int k = 0; k < 2; k++)
dxdxi[ip*sdxdxi+2*j+k] = dxdxij(j,k);
}
else
{
for (int j = 0; j < npts; j++)
{
Point<2> vxi(xi[j*sxi], xi[j*sxi+1]);
CalcElementDShapes (info, vxi, dshapes);
Mat<DIM_SPACE,2> ds;
ds = 0.0;
for (int i = 0; i < coefs.Size(); i++)
for (int j = 0; j < DIM_SPACE; j++)
for (int k = 0; k < 2; k++)
ds(j,k) += dshapes(i,k) * coefs[i](j);
// (*dxdxi)[ip] = ds;
for (int k = 0; k < 2*DIM_SPACE; k++)
dxdxi[j*sdxdxi+k] = ds(k);
}
} }
} }
} }