diff --git a/src/check_delaunay.f90 b/src/check_delaunay.f90 index 411fde40ea485ad5e9a7cab31b0c437818fde3fd..307d7a61579720a830c8340fdf99a55b68757e61 100644 --- a/src/check_delaunay.f90 +++ b/src/check_delaunay.f90 @@ -173,21 +173,26 @@ do while (nflip > 0) j1=ed(iedge)%m1 j2=ed(iedge)%m2 - dn1n2=dist(surface%x (i1),surface%x (i2),surface%y (i1),surface%y (i2),surface%z (i1),surface%z (i2), & - surface%xn(i1),surface%xn(i2),surface%yn(i1),surface%yn(i2),surface%zn(i1),surface%zn(i2), & - params%distance_exponent) - dn1m1=dist(surface%x (i1),surface%x (j1),surface%y (i1),surface%y (j1),surface%z (i1),surface%z (j1), & - surface%xn(i1),surface%xn(j1),surface%yn(i1),surface%yn(j1),surface%zn(i1),surface%zn(j1), & - params%distance_exponent) - dn1m2=dist(surface%x (i1),surface%x (j2),surface%y (i1),surface%y (j2),surface%z (i1),surface%z (j2), & - surface%xn(i1),surface%xn(j2),surface%yn(i1),surface%yn(j2),surface%zn(i1),surface%zn(j2), & - params%distance_exponent) - dn2m1=dist(surface%x (i2),surface%x (j1),surface%y (i2),surface%y (j1),surface%z (i2),surface%z (j1), & - surface%xn(i2),surface%xn(j1),surface%yn(i2),surface%yn(j1),surface%zn(i2),surface%zn(j1), & - params%distance_exponent) - dn2m2=dist(surface%x (i2),surface%x (j2),surface%y (i2),surface%y (j2),surface%z (i2),surface%z (j2), & - surface%xn(i2),surface%xn(j2),surface%yn(i2),surface%yn(j2),surface%zn(i2),surface%zn(j2), & - params%distance_exponent) + dn1n2=dist(surface%x(i1),surface%x(i2),surface%y(i1),surface%y(i2), & + surface%z(i1),surface%z(i2)) + !dn1n2=dist(surface%x(i1),surface%x(i2),surface%y(i1),surface%y(i2), & + ! surface%z(i1),surface%z(i2),params%distance_exponent) + dn1m1=dist(surface%x(i1),surface%x(j1),surface%y(i1),surface%y(j1), & + surface%z(i1),surface%z(j1)) + !dn1m1=dist(surface%x(i1),surface%x(j1),surface%y(i1),surface%y(j1), & + ! surface%z(i1),surface%z(j1),params%distance_exponent) + dn1m2=dist(surface%x(i1),surface%x(j2),surface%y(i1),surface%y(j2), & + surface%z(i1),surface%z(j2)) + !dn1m2=dist(surface%x(i1),surface%x(j2),surface%y(i1),surface%y(j2), & + ! surface%z(i1),surface%z(j2),params%distance_exponent) + dn2m1=dist(surface%x(i2),surface%x(j1),surface%y(i2),surface%y(j1), & + surface%z(i2),surface%z(j1)) + !dn2m1=dist(surface%x(i2),surface%x(j1),surface%y(i2),surface%y(j1), & + ! surface%z(i2),surface%z(j1),params%distance_exponent) + dn2m2=dist(surface%x(i2),surface%x(j2),surface%y(i2),surface%y(j2), & + surface%z(i2),surface%z(j2)) + !dn2m2=dist(surface%x(i2),surface%x(j2),surface%y(i2),surface%y(j2), & + ! surface%z(i2),surface%z(j2),params%distance_exponent) dist1=(dn1m1**2+dn2m1**2-dn1n2**2)/(2.d0*dn1m1*dn2m1) dist2=(dn1m2**2+dn2m2**2-dn1n2**2)/(2.d0*dn1m2*dn2m2) @@ -320,14 +325,15 @@ end subroutine !------------------------------------------------------------------------------| !------------------------------------------------------------------------------| -function dist (x1,x2,y1,y2,z1,z2,xn1,xn2,yn1,yn2,zn1,zn2,distance_exponent) +function dist (x1,x2,y1,y2,z1,z2) +!function dist (x1,x2,y1,y2,z1,z2,distance_exponent) implicit none double precision dist double precision x1,y1,z1,x2,y2,z2 double precision xn1,yn1,zn1,xn2,yn2,zn2 -double precision distance_exponent +!double precision distance_exponent !prod=xxn(i1)*xxn(i2)+yyn(i1)*yyn(i2)+zzn(i1)*zzn(i2) !dist=sqrt(x**2+y**2+z**2)/sqrt(prod) diff --git a/src/refine_surface.f90 b/src/refine_surface.f90 index babd0c578dc33f9cd4b5a5faf48fbf137eba3990..200448d1139619c7b2b9db7fe19df780b7913d9b 100644 --- a/src/refine_surface.f90 +++ b/src/refine_surface.f90 @@ -180,8 +180,10 @@ removep=.false. do iedge=1+iproc,nedge,nproc i1=ed(iedge)%n1 i2=ed(iedge)%n2 - dist1=dist(surface%x (i1),surface%x (i2),surface%y (i1),surface%y (i2),surface%z (i1),surface%z (i2), & - surface%xn(i1),surface%xn(i2),surface%yn(i1),surface%yn(i2),surface%zn(i1),surface%zn(i2), params%distance_exponent) + dist1=dist(surface%x(i1),surface%x(i2),surface%y(i1),surface%y(i2), & + surface%z(i1),surface%z(i2)) + !dist1=dist(surface%x(i1),surface%x(i2),surface%y(i1),surface%y(i2), & + ! surface%z(i1),surface%z(i2),params%distance_exponent) prod=surface%xn(i1)*surface%xn(i2)+surface%yn(i1)*surface%yn(i2)+surface%zn(i1)*surface%zn(i2) !if (dist1.gt.distmax .or. prod.lt.prodmin) refinep(iedge)=1 refinep(iedge)=(dist1.gt.distmax)