ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-04-10 23:27:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

curved prism vertical edges

Browse Source
This commit is contained in:
Joachim Schoeberl 2023-07-13 06:00:33 -07:00
parent 93b39231c4
commit ca5f562503
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libsrc/meshing/curvedelems.cpp
View File

@ -2787,15 +2787,20 @@ namespace netgen
int vi1 = edges[i][0]-1, vi2 = edges[i][1]-1; int vi1 = edges[i][0]-1, vi2 = edges[i][1]-1;
if (el[vi1] > el[vi2]) swap (vi1, vi2); if (el[vi1] > el[vi2]) swap (vi1, vi2);
T bubxy = lami[vi1];
/*
T bubz = lamiz[vi1]*lamiz[vi2]; T bubz = lamiz[vi1]*lamiz[vi2];
T polyz = lamiz[vi1] - lamiz[vi2]; T polyz = lamiz[vi1] - lamiz[vi2];
T bubxy = lami[vi1];
for (int j = 0; j < eorder-1; j++) for (int j = 0; j < eorder-1; j++)
{ {
shapes(ii+j) = bubxy * bubz; shapes(ii+j) = bubxy * bubz;
bubz *= polyz; bubz *= polyz;
} }
*/
CalcEdgeShape (eorder, lamiz[vi1]-lamiz[vi2], &shapes(ii));
for (int j = 0; j < eorder-1; j++)
shapes(ii+j) *= bubxy;
ii += eorder-1; ii += eorder-1;
} }
} }
@ -3246,6 +3251,7 @@ namespace netgen
if (info.order == 1) return; if (info.order == 1) return;
NgArrayMem<T, 20> hshapes(order+1), hdshapes(order+1);
const ELEMENT_EDGE * edges = MeshTopology::GetEdges1 (PRISM); const ELEMENT_EDGE * edges = MeshTopology::GetEdges1 (PRISM);
for (int i = 0; i < 6; i++) // horizontal edges for (int i = 0; i < 6; i++) // horizontal edges
@ -3311,7 +3317,7 @@ namespace netgen
T bubxy = lami[(vi1)%3]; T bubxy = lami[(vi1)%3];
T dbubxydx = dlami[(vi1)%3][0]; T dbubxydx = dlami[(vi1)%3][0];
T dbubxydy = dlami[(vi1)%3][1]; T dbubxydy = dlami[(vi1)%3][1];
/*
for (int j = 0; j < eorder-1; j++) for (int j = 0; j < eorder-1; j++)
{ {
dshapes(ii+j,0) = dbubxydx * bubz; dshapes(ii+j,0) = dbubxydx * bubz;
@ -3321,6 +3327,18 @@ namespace netgen
dbubz = bubz * dpolyz + dbubz * polyz; dbubz = bubz * dpolyz + dbubz * polyz;
bubz *= polyz; bubz *= polyz;
} }
*/
CalcEdgeShapeDx (eorder, lamiz[vi1]-lamiz[vi2], &hshapes[0], &hdshapes[0]);
for (int j = 0; j < eorder-1; j++)
{
dshapes(ii+j,0) = dbubxydx * hshapes[j];
dshapes(ii+j,1) = dbubxydy * hshapes[j];
dshapes(ii+j,2) = bubxy * hdshapes[j];
}
ii += eorder-1; ii += eorder-1;
} }
} }