Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions mesh_tools/mesh_conversion_tools_netcdf_c/mpas_mesh_converter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ int buildUnorderedCellConnectivity();
int firstOrderingVerticesOnCell();
int buildCompleteCellMask();
int buildEdges();
pnt edgeDirectionPoint(const int iVertex, const int iEdge);
int orderVertexArrays();
int orderCellArrays();
int buildAreas();
Expand Down Expand Up @@ -1377,6 +1378,32 @@ int buildEdges(){/*{{{*/

return 0;
}/*}}}*/
pnt edgeDirectionPoint(const int iVertex, const int iEdge){/*{{{*/
/*
* edgeDirectionPoint returns a point in the direction of edge iEdge as seen
* from vertex iVertex, for ordering the edges around the vertex: the
* vertex at the other end of the edge, or the edge's location if there
* is no other vertex.
*
* The edge's location will not do in general. It is where the edge
* crosses the line between its cells, and if the triangle the vertex
* is the circumcenter of is obtuse, that point lies behind the vertex
* for the edge opposite the obtuse angle. Ordering by it then
* reverses that edge's place around the vertex, and each kite in
* kiteAreasOnVertex pairs a cell with an edge it doesn't share.
*/
int otherVertex;

otherVertex = verticesOnEdge.at(iEdge).at(0);
if(otherVertex == iVertex){
otherVertex = verticesOnEdge.at(iEdge).at(1);
}

if(otherVertex != -1){
return vertices.at(otherVertex);
}
return edges.at(iEdge);
}/*}}}*/
int orderVertexArrays(){/*{{{*/
/*
* orderVertexArrays builds and orders the connectivity arrays for vertices.
Expand All @@ -1389,7 +1416,7 @@ int orderVertexArrays(){/*{{{*/
pnt normal;
pnt cross;
pnt vec1, vec2;
pnt cell_loc, edge_loc1, edge_loc2;
pnt cell_loc, dir_point1, dir_point2;
double mag1, mag2, min_angle, angle;
double dvEdge, dot, area;
bool fixed_area;
Expand Down Expand Up @@ -1431,13 +1458,13 @@ int orderVertexArrays(){/*{{{*/
for(j = 0; j < edgesOnVertex.at(iVertex).size(); j++){
edge1 = edgesOnVertex.at(iVertex).at(j);

edge_loc1 = edges.at(edge1);
dir_point1 = edgeDirectionPoint(iVertex, edge1);

// Fix edge1 periodicity
// Fix dir_point1 periodicity
if(!spherical){
edge_loc1.fixPeriodicity(vertices.at(iVertex), xPeriodicFix, yPeriodicFix);
dir_point1.fixPeriodicity(vertices.at(iVertex), xPeriodicFix, yPeriodicFix);
}
vec1 = edge_loc1 - vertices.at(iVertex);
vec1 = dir_point1 - vertices.at(iVertex);

mag1 = vec1.magnitude();
min_angle = 2.0*M_PI;
Expand All @@ -1448,13 +1475,13 @@ int orderVertexArrays(){/*{{{*/
for(k = j+1; k < edgesOnVertex.at(iVertex).size(); k++){
edge2 = edgesOnVertex.at(iVertex).at(k);

edge_loc2 = edges.at(edge2);
dir_point2 = edgeDirectionPoint(iVertex, edge2);

// Fix edge2 periodicity
// Fix dir_point2 periodicity
if(!spherical){
edge_loc2.fixPeriodicity(vertices.at(iVertex), xPeriodicFix, yPeriodicFix);
dir_point2.fixPeriodicity(vertices.at(iVertex), xPeriodicFix, yPeriodicFix);
}
vec2 = edge_loc2 - vertices.at(iVertex);
vec2 = dir_point2 - vertices.at(iVertex);
mag2 = vec2.magnitude();

cross = vec1.cross(vec2);
Expand Down
8 changes: 6 additions & 2 deletions mesh_tools/mesh_conversion_tools_netcdf_c/pnt.h
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,9 @@ double planarTriangleArea(const pnt &A, const pnt &B, const pnt &C){/*{{{*/
// Semi-perimeter of TRI(ABC)
s = (a + b + c) * 0.5;

return sqrt(s * (s - a) * (s - b) * (s - c));
// A degenerate triangle can give a product that round-off makes slightly
// negative, and the square root of that is NaN rather than zero.
return sqrt(std::max(s * (s - a) * (s - b) * (s - c), 0.0));
}/*}}}*/
double sphericalTriangleArea(const pnt &A, const pnt &B, const pnt &C){/*{{{*/
/*
Expand All @@ -435,7 +437,9 @@ double sphericalTriangleArea(const pnt &A, const pnt &B, const pnt &C){/*{{{*/
c = C.sphereDistance(A);
s = 0.5*(a+b+c);

tanqe = sqrt(tan(0.5*s)*tan(0.5*(s-a))*tan(0.5*(s-b))*tan(0.5*(s-c)));
// A degenerate triangle can give a product that round-off makes slightly
// negative, and the square root of that is NaN rather than zero.
tanqe = sqrt(std::max(tan(0.5*s)*tan(0.5*(s-a))*tan(0.5*(s-b))*tan(0.5*(s-c)), 0.0));
e = 4.*atan(tanqe);

return e;
Expand Down
Loading