ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-13 17:48:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'findpoint_newton_quads' into 'master'

Browse Source 
PointInElement2d use newton in nonlinear quad, better startpoint for

See merge request ngsolve/netgen!561
This commit is contained in:
Schöberl, Joachim 2023-03-30 16:50:32 +02:00
commit d07321ad90
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libsrc/meshing/meshclass.cpp
View File

@ -5288,6 +5288,32 @@ namespace netgen
const Point3d & p3 = Point(el.PNum(3)); const Point3d & p3 = Point(el.PNum(3));
const Point3d & p4 = Point(el.PNum(4)); const Point3d & p4 = Point(el.PNum(4));
if (el.GetOrder() > 1 || el.GetHpElnr() != -1) {
netgen::Point<2> lam(0.5,0.5);
Vec<3> rhs;
Vec<2> deltalam;
netgen::Point<3> x;
Mat<3,2> Jac;
double delta = 1.;
const int maxits = 30;
int i = 0;
while(delta > 1e-16 && i < maxits)
{
curvedelems->CalcSurfaceTransformation(lam,element-1,x,Jac);
rhs = p - x;
Jac.Solve(rhs,deltalam);
lam += deltalam;
delta = deltalam.Length2();
i++;
}
if(i == maxits)
return false;
lami[0] = lam[0];
lami[1] = lam[1];
return true;
}
// Coefficients of Bilinear Mapping from Ref-Elem to global Elem // Coefficients of Bilinear Mapping from Ref-Elem to global Elem
// X = a + b x + c y + d x y // X = a + b x + c y + d x y
Vec3d a = p1; Vec3d a = p1;
@ -5638,7 +5664,13 @@ namespace netgen
if (SurfaceElement(element).GetType() ==TRIG6 || curvedelems->IsSurfaceElementCurved(element-1)) if (SurfaceElement(element).GetType() ==TRIG6 || curvedelems->IsSurfaceElementCurved(element-1))
{ {
netgen::Point<2> lam(1./3,1./3); // netgen::Point<2> lam(1./3,1./3);
netgen::Point<2> lam(sol.X(), sol.Y());
if(SurfaceElement(element).GetType() != TRIG6)
{
lam[0] = 1-sol.X()-sol.Y();
lam[1] = sol.X();
}
Vec<3> rhs; Vec<3> rhs;
Vec<2> deltalam; Vec<2> deltalam;
netgen::Point<3> x; netgen::Point<3> x;