diff --git a/3rdparty/getall b/3rdparty/getall index e9bb9057a..27da186c8 100755 --- a/3rdparty/getall +++ b/3rdparty/getall @@ -263,19 +263,12 @@ sub downloadone{ system $cmd; if($?){ print "Download 2 times failed from $url of $pkg\n"; - my $url="http://104.46.50.187/pkg/$pkg"; + my $url="https://joliv.et/freefem/pkg/$pkg"; my $cmd="../bin/build/download $url pkg/$pkg $opts"; print "Try (2 times) other site: $url\n"; system $cmd; if ($?){ - print "Download 3 times failed from $url of $pkg\n"; - my $url="https://joliv.et/freefem/pkg/$pkg"; - my $cmd="../bin/build/download $url pkg/$pkg $opts"; - print "Try (2 times) other site: $url\n"; - system $cmd; - if ($?){ - $errors.="ERROR: $cmd FAILED\n" - } + $errors.="ERROR: $cmd FAILED\n" } } diff --git a/src/femlib/BamgFreeFem.cpp b/src/femlib/BamgFreeFem.cpp index f48119a44..cdedb53e0 100644 --- a/src/femlib/BamgFreeFem.cpp +++ b/src/femlib/BamgFreeFem.cpp @@ -531,6 +531,7 @@ const Fem2D::Mesh * BuildMesh(Stack stack,const Fem2D::MeshL **ppmshL , int nb } double diameter=Max(Gh->pmax.x-Gh->pmin.x,Gh->pmax.y-Gh->pmin.y); + eps = Min(eps, diameter*1e-4); Gh->coefIcoor= (MaxICoor)/diameter; Icoor1 epsI = (Icoor1) (Gh->coefIcoor*eps); ffassert(Gh->coefIcoor >0); @@ -937,6 +938,7 @@ const Fem2D::Mesh * BuildMesh(Stack stack, E_BorderN const * const & b,bool jus } double diameter=Max(Gh->pmax.x-Gh->pmin.x,Gh->pmax.y-Gh->pmin.y); + eps = Min(eps, diameter*1e-4); Gh->coefIcoor= (MaxICoor)/diameter; Icoor1 epsI = (Icoor1) (Gh->coefIcoor*eps); ffassert(Gh->coefIcoor >0);