diff --git a/contrib/hxt/tetMesh/include/hxt_tetDelaunay.h b/contrib/hxt/tetMesh/include/hxt_tetDelaunay.h index e88d952410512e18e1b14f5b369a51a2a842b336..23871f13a62d707983295c5560416c278fb104d5 100644 --- a/contrib/hxt/tetMesh/include/hxt_tetDelaunay.h +++ b/contrib/hxt/tetMesh/include/hxt_tetDelaunay.h @@ -81,7 +81,7 @@ typedef struct { * if the vertex was successfully inserted or not. * - nodeInfo[i].status==HXT_STATUS_TRUE if the vertex was successfully inserted. * - nodeInfo[i].status==HXT_STATUS_FALSE if the vertex was not inserted. - * - nodeInfo[i].status==HXT_STATUS_TRYAGAIN if an error occured before the vertex could be inserted + * - nodeInfo[i].status==HXT_STATUS_TRYAGAIN if an error occurred before the vertex could be inserted * * \warning * - the order of nodeInfo will change diff --git a/contrib/hxt/tetMesh/include/hxt_tetFlag.h b/contrib/hxt/tetMesh/include/hxt_tetFlag.h index 0c37fa829681cbf253d00608352f9c72fa57ff06..7e57b98c6ecc377ec1fa5834c5ad77e8c83661cb 100644 --- a/contrib/hxt/tetMesh/include/hxt_tetFlag.h +++ b/contrib/hxt/tetMesh/include/hxt_tetFlag.h @@ -56,11 +56,11 @@ HXTStatus hxtConstrainTriangles(HXTMesh* mesh, uint64_t* tri2TetMap); * Constrain an edge in all tetrahedra surrounding it * * In single-thread cases, put edgeFlag==NULL. - * This function will directly set the contraint bit corresponding to the edge + * This function will directly set the constraint bit corresponding to the edge * '6*firstTet+edge' on all tetrahedra surrounding this edge. * * In multi-threaded case, if multiple thread modify different edges of the - * same tetrahedra, modifying the same flag would resuld in a race condition. + * same tetrahedra, modifying the same flag would result in a race condition. * Therefore, in parallel section, you must give an array with a char per edge. * This function will set the edges corresponding to '6*firstTet+edge' to 1. * @@ -129,10 +129,10 @@ HXTStatus hxtConstrainLinesNotInTriangles(HXTMesh* mesh, uint64_t* lines2TetMap, * flag is a 16-bit number * * 0X1 | 0 edge between facet 0 and facet 1 is constrained, node 2-3 - * 0X2 | 1 edge betwwen facet 0 and facet 2 is constrained, node 1-3 - * 0X4 | 2 edge betwwen facet 0 and facet 3 is constrained, node 1-2 - * 0X8 | 3 edge betwwen facet 1 and facet 2 is constrained, node 0-3 - * 0X10 | 4 edge betwwen facet 1 and facet 3 is constrained, node 0-2 + * 0X2 | 1 edge between facet 0 and facet 2 is constrained, node 1-3 + * 0X4 | 2 edge between facet 0 and facet 3 is constrained, node 1-2 + * 0X8 | 3 edge between facet 1 and facet 2 is constrained, node 0-3 + * 0X10 | 4 edge between facet 1 and facet 3 is constrained, node 0-2 * 0X20 | 5 edge between facet 2 and facet 3 is constrained, node 0-1 * 0X40 | 6 the tetrahedron is deleted * 0X80 | 7 the tetrahedron has already been processed (a vertex was already inserted inside it and it failed) diff --git a/contrib/hxt/tetMesh/include/hxt_tetMesh.h b/contrib/hxt/tetMesh/include/hxt_tetMesh.h index 61cb4eeddb42aea8f4e549c0d0be99bb7bbba5df..9651736fedd4be5516c309ad4c6b88330dc8d60e 100644 --- a/contrib/hxt/tetMesh/include/hxt_tetMesh.h +++ b/contrib/hxt/tetMesh/include/hxt_tetMesh.h @@ -74,7 +74,7 @@ typedef struct { /** Function: hxtTetMesh * ==================== * - * Given a surface mesh taht bounds some volumes, this function + * Given a surface mesh that bounds some volumes, this function * - computes a tetrahedralization of the volumes * - optionally refines the tetrahedralization by adding new points, according * to a mesh sizing function diff --git a/contrib/hxt/tetMesh/include/hxt_vertices.h b/contrib/hxt/tetMesh/include/hxt_vertices.h index 18e04271f8601e87aaffbc2cc2be56dfac802d83..bc66e035ce9af042a88230c72cf42e5b6569861a 100644 --- a/contrib/hxt/tetMesh/include/hxt_vertices.h +++ b/contrib/hxt/tetMesh/include/hxt_vertices.h @@ -56,7 +56,7 @@ typedef struct { * \param vertices: the vertices coordinates * \param n: the number of vertices * \param shift[3]: a value between 0 and 1 that commands how the Hilbert/Moore curve is deformed in each dimension. - * {0.5, 0.5, 0.5} is the underformed Hilbert/Moore curve. + * {0.5, 0.5, 0.5} is the undeformed Hilbert/Moore curve. * * \details Compute the Hilbert/Moore index of each vertex in its \ref HXTVertex.padding.hilbertDist structure member. * A deformation of the Hilbert/Moore curve can be done with the shift parameter diff --git a/contrib/hxt/tetMesh/src/HXTSPR.c b/contrib/hxt/tetMesh/src/HXTSPR.c index c71b79acd11c01d1232552ebba3115922b6d4f11..bbf6fd9d60bd439c155b4bed0185101c03a2bca8 100644 --- a/contrib/hxt/tetMesh/src/HXTSPR.c +++ b/contrib/hxt/tetMesh/src/HXTSPR.c @@ -347,7 +347,7 @@ static inline int tet_tri_intersection(SPRCavity* SPR, e5e0 = get_orient3d(SPR, tet[2], tet[3], tri[0], tri[1]); // if a point of the edge is coplanar with the facet of - // the tet, we don't really care trying to check the intersecton + // the tet, we don't really care trying to check the intersection // between the edge and this facet. Indeed: // - if the whole line is coplanar to the facet and intersects it, // it will intersect another facet @@ -446,7 +446,7 @@ static SPRNOINLINE int tet_edge_intersection(SPRCavity* SPR, l1_to_tet = 3; } - if(l0_to_tet!=-1 && l1_to_tet!=-1) // the line is there: no interseection + if(l0_to_tet!=-1 && l1_to_tet!=-1) // the line is there: no intersection return 0; int f0v0 = get_orient3d(SPR, edge[0], tet[1], tet[2], tet[3]); @@ -500,7 +500,7 @@ static SPRNOINLINE int tet_edge_intersection(SPRCavity* SPR, int c5 = get_orient3d(SPR, tet[2], tet[3], edge[0], edge[1]); // if one point of the edge is coplanar with the facet of - // the tet, we don't really care trying to check the intersecton + // the tet, we don't really care trying to check the intersection // between the edge and this facet. // If the point is on the facet, it would have been detected earlier // If the line is coplanar to the facet and intersects it, @@ -1074,7 +1074,7 @@ HXTStatus hxtSPR(SPRCavity* SPR) } -/* if hxtSPR or hxtSPR_advanced stopped abruttely +/* if hxtSPR or hxtSPR_advanced stopped abruptly * because it reached max_search_nodes, we can rewind * the cavity to its initial state thanks to this function */ diff --git a/contrib/hxt/tetMesh/src/HXTSPR.h b/contrib/hxt/tetMesh/src/HXTSPR.h index 551a737dc58568dc551425174c97591ee574f58f..fb82642f1ce04e5b30763fe3bc3c170e36382d55 100644 --- a/contrib/hxt/tetMesh/src/HXTSPR.h +++ b/contrib/hxt/tetMesh/src/HXTSPR.h @@ -35,7 +35,7 @@ extern "C" { * and at most `ntri=n^2 − 3n = 2*ntet+2` triangles */ #define SPR_MAX_TETS ((SPR_MAX_PTS*SPR_MAX_PTS - 3*SPR_MAX_PTS - 2)/2) //463 -/* In pratices however, the number of triangles will certainly never be greater than 500 +/* In practice however, the number of triangles will certainly never be greater than 500 * because the different constraints of the SPR make the upper bound impossible to be reached * Same argument for constrained interior triangles and edges */ #define SPR_MAX_BNDTRIANGLES 500 diff --git a/contrib/hxt/tetMesh/src/hxt_edgeRemoval.c b/contrib/hxt/tetMesh/src/hxt_edgeRemoval.c index 7c30559b70da4467dba7fc64b54a5ed092654af6..8e2173f6f1e00e0928a8288fbe9fa0db653fb14b 100644 --- a/contrib/hxt/tetMesh/src/hxt_edgeRemoval.c +++ b/contrib/hxt/tetMesh/src/hxt_edgeRemoval.c @@ -26,7 +26,7 @@ typedef struct { // bipyramidal cavity for the edge-removal /* An oriented edge {up,down} is described by its 'in' and 'out' facets : -(hxt_tetFlag.h is of little help, because edge contraints are not oriented) +(hxt_tetFlag.h is of little help, because edge constraints are not oriented) v_up @@ -166,7 +166,7 @@ typedef struct { * (- we could have use n/3 and n%3 but %4 is faster) * * if the number n is negative - * - the neighbor is a old tet. a tet outisde the boundary of the cavity + * - the neighbor is a old tet. a tet outside the boundary of the cavity * - the index of the neighbor-number in the list of neighbor is directly -n-1 * */ diff --git a/contrib/hxt/tetMesh/src/hxt_edgeRemoval.h b/contrib/hxt/tetMesh/src/hxt_edgeRemoval.h index 3d1452bf0ec73d23d60335345ba6657c55a2f025..4d63546e62ec511d6c86983967e183fe158277de 100644 --- a/contrib/hxt/tetMesh/src/hxt_edgeRemoval.h +++ b/contrib/hxt/tetMesh/src/hxt_edgeRemoval.h @@ -14,8 +14,8 @@ /* return internal error (that you must catch) if: * - the cavity overlap different partitions => HXT_STATUS_CONFLICT - * - there is a contraint inside the cavity => HXT_STATUS_CONSTRAINT - * - does'nt result in a better triangulation => HXT_STATUS_NOTBETTER + * - there is a constraint inside the cavity => HXT_STATUS_CONSTRAINT + * - doesn't result in a better triangulation => HXT_STATUS_NOTBETTER * - there is more than 7 pts around the edge => HXT_STATUS_INTERNAL * a facet without neighbor (set to HXT_NO_ADJACENT) is also a constraint. */ diff --git a/contrib/hxt/tetMesh/src/hxt_smoothing.h b/contrib/hxt/tetMesh/src/hxt_smoothing.h index 6e747ddc5c83c77c39c4e04ded7779b14f4a8fe7..9a7bfb2a9099434ac26e919c550a35802c2ddce7 100644 --- a/contrib/hxt/tetMesh/src/hxt_smoothing.h +++ b/contrib/hxt/tetMesh/src/hxt_smoothing.h @@ -17,8 +17,8 @@ extern "C" { /* return internal error (that you must catch) if: * - the cavity overlap different partitions => HXT_STATUS_CONFLICT - * - there is a contraint inside the cavity => HXT_STATUS_CONSTRAINT - * - does'nt result in a better triangulation => HXT_STATUS_INTERNAL + * - there is a constraint inside the cavity => HXT_STATUS_CONSTRAINT + * - doesn't result in a better triangulation => HXT_STATUS_INTERNAL * a facet without neighbor (set to HXT_NO_ADJACENT) is also a constraint * a node n with n<numVerticesConstrained has its position constrained */ diff --git a/contrib/hxt/tetMesh/src/hxt_tetColor.c b/contrib/hxt/tetMesh/src/hxt_tetColor.c index b6a94d52b13ce62735d7ad7797a087e1b4e033af..cd16460909cae26d10b6aebb70297f3b90189571 100644 --- a/contrib/hxt/tetMesh/src/hxt_tetColor.c +++ b/contrib/hxt/tetMesh/src/hxt_tetColor.c @@ -380,6 +380,6 @@ HXTStatus setFlagsToProcessOnlyVolumesInBrep(HXTMesh* mesh) -// TODO: compute a boundinng box following some surface mesh colors ! +// TODO: compute a bounding box following some surface mesh colors ! // we should get this bbox from the triangles (and not the tetrahedra) to be quick // we should thus have a function that receive a volume color and receive a list of surface colors ! \ No newline at end of file diff --git a/contrib/hxt/tetMesh/src/hxt_tetDelaunay.c b/contrib/hxt/tetMesh/src/hxt_tetDelaunay.c index 5dd40c24e6498346543e7d8338836f8acf6aaa50..3f112bf56da94e40d7984399d5cc8c325d9426df 100644 --- a/contrib/hxt/tetMesh/src/hxt_tetDelaunay.c +++ b/contrib/hxt/tetMesh/src/hxt_tetDelaunay.c @@ -88,7 +88,7 @@ static inline HXTStatus hxtTetrahedraInit(HXTMesh* mesh, HXTNodeInfo* nodeInfo, double crossx = bdy * cdz - bdz * cdy; double crossy = bdz * cdx - bdx * cdz; double crossz = bdx * cdy - bdy * cdx; - // check for colinearity: cross product + // check for collinearity: cross product if(crossx == 0.0 && crossy == 0.0 && crossz == 0.0) continue; for (l=k+1; orientation==0 && l<nToInsert; l++) @@ -222,7 +222,7 @@ unsigned computePasses(uint32_t passes[12], /****************************************** - * initialisation of the TetLocal structure + * initialization of the TetLocal structure ******************************************/ static inline HXTStatus localInit(TetLocal* local){ local->ball.size = 1024; @@ -1196,7 +1196,7 @@ static HXTStatus parallelDelaunay3D(HXTMesh* mesh, Initializations and allocations ******************************************************/ if(mesh->tetrahedra.num<5){ - HXT_ASSERT_MSG(options->numVerticesInMesh==0 && mesh->tetrahedra.num==0, "no ghosts or unvalid mesh"); + HXT_ASSERT_MSG(options->numVerticesInMesh==0 && mesh->tetrahedra.num==0, "no ghosts or invalid mesh"); HXT_INFO_COND(options->verbosity>0, "Initialization of tet. mesh"); HXT_CHECK( hxtTetrahedraInit(mesh, nodeInfo, nToInsert, options->verbosity) ); @@ -1365,7 +1365,7 @@ static HXTStatus parallelDelaunay3D(HXTMesh* mesh, * we will select the tet in the good partition that has the lowest lexicographic ordering of its nodes. * In this section, we run the maximum number of threads: max threads (=>not corresponding to partitions threads) * Each of the max thread look at a chunk of tetrahedra and updates its own array with his idea of what tet. - * will be the first for each partiton thread. + * will be the first for each partition thread. * Next (line 1659 as I'm writing this), each partition threads will check the results obtained by each maxThreads * threads and take the tet which appear first lexicographically. */ uint64_t* startTetLocal = startTetGlobal + threadID * nthreads; diff --git a/contrib/hxt/tetMesh/src/hxt_tetDelaunayReshape.c b/contrib/hxt/tetMesh/src/hxt_tetDelaunayReshape.c index d2307a3eea5b0b3ea84b2608bf7752574180de35..ce1b43a3c5a93a25b157da4b58a437ef88e27688 100644 --- a/contrib/hxt/tetMesh/src/hxt_tetDelaunayReshape.c +++ b/contrib/hxt/tetMesh/src/hxt_tetDelaunayReshape.c @@ -7,8 +7,8 @@ #include <stdint.h> /* check if the cavity is star shaped - This isn't usefull for pure Delaunay but when we constrain cavity with color, - it is usefull */ + This isn't useful for pure Delaunay but when we constrain cavity with color, + it is useful */ static HXTStatus isStarShaped(TetLocal* local, HXTMesh* mesh, const uint32_t vta, uint64_t* blindFaceIndex) { HXTVertex* vertices = (HXTVertex*) mesh->vertices.coord; @@ -144,7 +144,7 @@ HXTStatus respectEdgeConstraint(TetLocal* local, HXTMesh* mesh, const uint32_t v break; if(getDeletedFlag(mesh, curTet)!=0) { - // mark that the edge as been treate + // mark that the edge as been treated #ifdef DEBUG if((mesh->tetrahedra.color[curTet] & (1U<<getEdgeFromFacets(in_facet, out_facet)))!=0) return HXT_ERROR_MSG(HXT_STATUS_ERROR, "the flag says that the tet has already been processed for this edge..."); diff --git a/contrib/hxt/tetMesh/src/hxt_tetFlag.c b/contrib/hxt/tetMesh/src/hxt_tetFlag.c index 5172c1c93fce3e5f6e70f0f859844f494a7e0e6b..ef3c39c47a6b9e8a77615859786c91222ba91fb9 100644 --- a/contrib/hxt/tetMesh/src/hxt_tetFlag.c +++ b/contrib/hxt/tetMesh/src/hxt_tetFlag.c @@ -653,7 +653,7 @@ HXTStatus hxtConstrainTriangles(HXTMesh* mesh, uint64_t* tri2TetMap) } } - // constrain corresponding flag, teetrahedron by tetrahedron to avoid race conditions + // constrain corresponding flag, tetrahedron by tetrahedron to avoid race conditions #pragma omp parallel for for (uint64_t i=0; i<mesh->tetrahedra.num; i++) { for (uint64_t j=0; j<4; j++) { @@ -673,11 +673,11 @@ HXTStatus hxtConstrainTriangles(HXTMesh* mesh, uint64_t* tri2TetMap) * Constrain an edge in all tetrahedra surrounding it ********************************************************* * In single-thread cases, put edgeFlag==NULL. - * This function will directly set the contraint bit corresponding to the edge + * This function will directly set the constraint bit corresponding to the edge * '6*firstTet+edge' on all tetrahedra surrounding this edge. * * In multi-threaded case, if multiple thread modify different edges of the - * same tetrahedra, modifying the same flag would resuld in a race condition. + * same tetrahedra, modifying the same flag would result in a race condition. * Therefore, in parallel section, you must give an array with a char per edge. * This function will set the edges corresponding to '6*firstTet+edge' to 1. */ diff --git a/contrib/hxt/tetMesh/src/hxt_tetMesh.c b/contrib/hxt/tetMesh/src/hxt_tetMesh.c index 88030aeaf831abd5e5b1464213cd73c7e761a762..b91c1e3dbb1dd8803a72324161e21afa91942033 100644 --- a/contrib/hxt/tetMesh/src/hxt_tetMesh.c +++ b/contrib/hxt/tetMesh/src/hxt_tetMesh.c @@ -158,7 +158,7 @@ HXTStatus hxtTetMesh(HXTMesh* mesh, if(nbLinesNotInTriangles!=0) HXT_CHECK( hxtConstrainLinesNotInTriangles(mesh, lines2TetMap, lines2TriMap) ); - // now that tetrahedra are flaged, we can proceed to colorize the mesh + // now that tetrahedra are flagged, we can proceed to colorize the mesh HXT_ASSERT(mesh->tetrahedra.color == NULL); HXT_CHECK( hxtMapColorsToBrep(mesh, tri2TetMap) ); diff --git a/contrib/hxt/tetMesh/src/hxt_tetRefine.c b/contrib/hxt/tetMesh/src/hxt_tetRefine.c index aa4dc22fc63f81473e49c4c010749ca3aea09d05..8d4c6142fdd3855ab14bbc62d6d02bdd0340f3ca 100644 --- a/contrib/hxt/tetMesh/src/hxt_tetRefine.c +++ b/contrib/hxt/tetMesh/src/hxt_tetRefine.c @@ -215,7 +215,7 @@ static int getBestCenter(double p[4][4], double nodalSize[4], double center[4], if(!isfinite(bary0) || !isfinite(bary1) || !isfinite(bary2) || !isfinite(bary3)) bary0 = bary1 = bary2 = bary3 = 0.25; - // compute the cartesian coordinates from the barycentric ones + // compute the Cartesian coordinates from the barycentric ones double otherCenter[4]; otherCenter[0] = bary0*p[0][0] + bary1*p[1][0] + bary2*p[2][0] + bary3*p[3][0]; otherCenter[1] = bary0*p[0][1] + bary1*p[1][1] + bary2*p[2][1] + bary3*p[3][1]; diff --git a/contrib/hxt/tetMesh/src/hxt_tetRefine.h b/contrib/hxt/tetMesh/src/hxt_tetRefine.h index c70fb036504ebcc73e81972d9e76245895bb3e14..2d8f4d6cf74da946a52b16c7aaffd8986e1429ea 100644 --- a/contrib/hxt/tetMesh/src/hxt_tetRefine.h +++ b/contrib/hxt/tetMesh/src/hxt_tetRefine.h @@ -14,7 +14,7 @@ //// creates a mesh with all points of the surface mesh HXTStatus hxtEmptyMesh(HXTMesh* mesh, HXTDelaunayOptions* delOptions); -/// Add points at tets circumcenter in order to fullfill a mesh size constraint +/// Add points at tets circumcenter in order to fulfill a mesh size constraint HXTStatus hxtRefineTetrahedra(HXTMesh* mesh, HXTDelaunayOptions* delOptions); #endif diff --git a/contrib/hxt/tetMesh/src/hxt_tetSync.c b/contrib/hxt/tetMesh/src/hxt_tetSync.c index 91551a7f693a1b58b17d5b3e92beaa1d58c95ee0..a0018c1b01ab7a3d576f251bad0e3ef84d0cee1f 100644 --- a/contrib/hxt/tetMesh/src/hxt_tetSync.c +++ b/contrib/hxt/tetMesh/src/hxt_tetSync.c @@ -63,7 +63,7 @@ HXTStatus waitForPossibleReallocation(HXT2Sync* shared, int val = 0; do{ // threads are waiting here for another thread's reallocation - // untill all threads finished + // until all threads finished HXT_CHECK( synchronizeReallocation(shared, &val) ); }while(val < numThreads); return HXT_STATUS_OK;