fixes for mac and windows

This commit is contained in:
Christopher Lackner 2019-11-05 15:19:54 +01:00
parent 073e215bb6
commit b99e37999f
5 changed files with 5 additions and 5 deletions

View File

@ -219,7 +219,7 @@ namespace netgen
mindist = min2(mindist, line.Dist(other));
}
if(mindist == 1e99) continue;
mindist /= mparam.closeedgefac.value() + 1e-10;
mindist /= *mparam.closeedgefac + 1e-10;
if(mindist < 1e-3 * bounding_box.Diam())
{
(*testout) << "extremely small local h: " << mindist

View File

@ -2803,7 +2803,7 @@ namespace netgen
<< " inverttets = " << inverttets << endl
<< " inverttrigs = " << inverttrigs << endl
<< "closeedge enabled = " << closeedgefac.has_value() << endl
<< "closeedgefac = " << (closeedgefac.has_value() ? closeedgefac.value() : 0.) << endl;
<< "closeedgefac = " << closeedgefac.value_or(0.) << endl;
}
/*

View File

@ -1260,7 +1260,7 @@ namespace netgen
/// file for meshsize
string meshsizefilename = "";
/// restrict h based on close edges
optional<double> closeedgefac = {};
optional<double> closeedgefac = nullopt;
/// start surfacemeshing from everywhere in surface
bool startinsurface = false;
/// check overlapping surfaces (debug)

View File

@ -1259,7 +1259,7 @@ namespace netgen
mindist = min (mindist, line.Dist(lines[num]));
}
mindist /= (mparam.closeedgefac.value() + VSMALL);
mindist /= (*mparam.closeedgefac + VSMALL);
if (mindist < 1e-3 * bb.Diam())
{

View File

@ -926,7 +926,7 @@ void STLGeometry :: RestrictLocalH(class Mesh & mesh, double gh, const STLParame
PushStatusF("Restrict H due to close edges");
//geht nicht für spiralen!!!!!!!!!!!!!!!!!!
double disttohfact = sqr(10.0 / mparam.closeedgefac.value());
double disttohfact = sqr(10.0 / *mparam.closeedgefac);
int k,l;
double h1, h2, dist;
int rc = 0;