Skip to content
Snippets Groups Projects
Commit c1f06d0e authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

*** empty log message ***

parent 183f2766
No related branches found
No related tags found
No related merge requests found
...@@ -129,10 +129,12 @@ OpenFile${OBJEXT}: OpenFile.cpp GmshConfig.h GmshMessage.h ../Geo/Geo.h \ ...@@ -129,10 +129,12 @@ OpenFile${OBJEXT}: OpenFile.cpp GmshConfig.h GmshMessage.h ../Geo/Geo.h \
../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \ ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \
../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h Context.h ../Geo/CGNSOptions.h \ ../Geo/SBoundingBox3d.h ../Mesh/HighOrder.h ../Geo/MFace.h \
../Mesh/meshPartitionOptions.h OpenFile.h CommandLine.h \ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
../Graphics/ReadImg.h OS.h StringUtils.h ../Parser/Parser.h \ Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
../Post/PView.h ../Post/PViewData.h ../Fltk/GUI.h ../Fltk/Draw.h OpenFile.h CommandLine.h ../Graphics/ReadImg.h OS.h StringUtils.h \
../Parser/Parser.h ../Post/PView.h ../Post/PViewData.h ../Fltk/GUI.h \
../Fltk/Draw.h
CreateFile${OBJEXT}: CreateFile.cpp GmshConfig.h GmshMessage.h ../Geo/GModel.h \ CreateFile${OBJEXT}: CreateFile.cpp GmshConfig.h GmshMessage.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
......
...@@ -80,6 +80,7 @@ GEdge${OBJEXT}: GEdge.cpp ../Common/GmshConfig.h ../Common/GmshDefines.h \ ...@@ -80,6 +80,7 @@ GEdge${OBJEXT}: GEdge.cpp ../Common/GmshConfig.h ../Common/GmshDefines.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h MVertex.h MEdge.h MFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h MVertex.h MEdge.h MFace.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
../Numeric/GaussLegendre1D.h ../Numeric/GaussLegendre1D.h
GEdgeLoop${OBJEXT}: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \ GEdgeLoop${OBJEXT}: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \ SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \
......
...@@ -261,7 +261,8 @@ static void getEdgeVertices(GEdge *ge, MElement *ele, std::vector<MVertex*> &ve, ...@@ -261,7 +261,8 @@ static void getEdgeVertices(GEdge *ge, MElement *ele, std::vector<MVertex*> &ve,
break; break;
} }
if(relax < 1.e-2) if(relax < 1.e-2)
Msg::Warning("Failed to compute equidistant parameters (relax = %g) for edge %d-%d", Msg::Warning
("Failed to compute equidistant parameters (relax = %g) for edge %d-%d",
relax, v0->getNum(), v1->getNum()); relax, v0->getNum(), v1->getNum());
} }
} }
...@@ -271,7 +272,8 @@ static void getEdgeVertices(GEdge *ge, MElement *ele, std::vector<MVertex*> &ve, ...@@ -271,7 +272,8 @@ static void getEdgeVertices(GEdge *ge, MElement *ele, std::vector<MVertex*> &ve,
double uc = (1. - t) * u0 + t * u1; // can be wrong, that's ok double uc = (1. - t) * u0 + t * u1; // can be wrong, that's ok
MVertex *v; MVertex *v;
if(linear || !reparamOK || uc < u0 || uc > u1){ if(linear || !reparamOK || uc < u0 || uc > u1){
Msg::Warning("We don't have a valid parameter on curve %d-%d",v0->getNum(),v1->getNum()); Msg::Warning("We don't have a valid parameter on curve %d-%d",
v0->getNum(), v1->getNum());
// we don't have a (valid) parameter on the curve // we don't have a (valid) parameter on the curve
SPoint3 pc = edge.interpolate(t); SPoint3 pc = edge.interpolate(t);
v = new MVertex(pc.x(), pc.y(), pc.z(), ge); v = new MVertex(pc.x(), pc.y(), pc.z(), ge);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment