ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 21:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'luzpaz/typos'

Browse Source
This commit is contained in:
Christopher Lackner 2022-09-13 16:12:46 +02:00
commit be9e15e635
14 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/csg/polyhedra.cpp
View File

@ -272,7 +272,7 @@ namespace netgen
if (printing) if (printing)
*testout << "lam = " << lam1 << " " << lam2 << " " << lam3 << endl; *testout << "lam = " << lam1 << " " << lam2 << " " << lam3 << endl;
if (lam1 >= -eps_base1 && lam2 >= -eps_base1 && lam3 >= -eps_base1) if (lam1 >= -eps_base1 && lam2 >= -eps_base1 && lam3 >= -eps_base1)
{ // point is close to trianlge, perturbe by alpha*v { // point is close to triangle, perturbed by alpha*v
double dlamn = face.nn*v; double dlamn = face.nn*v;
if (fabs(dlamn) < 1e-8) // vec also in plane if (fabs(dlamn) < 1e-8) // vec also in plane
@ -540,7 +540,7 @@ namespace netgen
double lam3 = 1-lam1-lam2; double lam3 = 1-lam1-lam2;
if (lam1 >= -eps_base1 && lam2 >= -eps_base1 && lam3 >= -eps_base1) if (lam1 >= -eps_base1 && lam2 >= -eps_base1 && lam3 >= -eps_base1)
{ // point is close to trianlge, perturbe by alpha*v { // point is close to triangle, perturbed by alpha*v
double dlamn = face.nn*v; double dlamn = face.nn*v;
if (fabs(dlamn) < 1e-8) // vec also in plane if (fabs(dlamn) < 1e-8) // vec also in plane

2
libsrc/csg/specpoin.cpp
View File

@ -21,7 +21,7 @@
namespace netgen namespace netgen
{ {
DLL_HEADER NgArray<Box<3> > boxes; // for visualizaton DLL_HEADER NgArray<Box<3> > boxes; // for visualization
void ProjectToEdge (const Surface * f1, const Surface * f2, Point<3> & hp); void ProjectToEdge (const Surface * f1, const Surface * f2, Point<3> & hp);

6
libsrc/general/mpi_interface.hpp
View File

@ -93,7 +93,7 @@ namespace netgen
} }
template <class T, int BASE> template <class T, int BASE>
[[deprecated("use ngcore - Array insterad")]] [[deprecated("use ngcore - Array instead")]]
inline void MyMPI_Recv ( NgArray <T, BASE> & s, int src, int tag, MPI_Comm comm) inline void MyMPI_Recv ( NgArray <T, BASE> & s, int src, int tag, MPI_Comm comm)
{ {
MPI_Status status; MPI_Status status;
@ -106,7 +106,7 @@ namespace netgen
} }
template <class T, int BASE> template <class T, int BASE>
[[deprecated("use ngcore - Array insterad")]] [[deprecated("use ngcore - Array instead")]]
inline int MyMPI_Recv ( NgArray <T, BASE> & s, int tag, MPI_Comm comm) inline int MyMPI_Recv ( NgArray <T, BASE> & s, int tag, MPI_Comm comm)
{ {
MPI_Status status; MPI_Status status;
@ -141,7 +141,7 @@ namespace netgen
template <class T, int BASE> template <class T, int BASE>
[[deprecated("mympi_isend ngflatarray, use comm.send instead")]] [[deprecated("mympi_isend ngflatarray, use comm.send instead")]]
[[deprecated("use ngcore - Array insterad")]] [[deprecated("use ngcore - Array instead")]]
inline MPI_Request MyMPI_ISend (NgFlatArray<T, BASE> s, int dest, int tag, MPI_Comm comm) inline MPI_Request MyMPI_ISend (NgFlatArray<T, BASE> s, int dest, int tag, MPI_Comm comm)
{ {
MPI_Request request; MPI_Request request;

2
libsrc/geom2d/spline2d.hpp
View File

@ -88,7 +88,7 @@ public:
virtual void GetPoints (int n, NgArray<Point<2> > & points); virtual void GetPoints (int n, NgArray<Point<2> > & points);
/** calculates lineintersections: /** calculates lineintersections:
for lines $$ a x + b y + c = 0 $$ the interecting points are calculated for lines $$ a x + b y + c = 0 $$ the intersecting points are calculated
and stored in points */ and stored in points */
virtual void LineIntersections (const double a, const double b, const double c, virtual void LineIntersections (const double a, const double b, const double c,
NgArray < Point<2> > & points, const double eps) const NgArray < Point<2> > & points, const double eps) const

2
libsrc/gprim/spline.hpp
View File

@ -100,7 +100,7 @@ namespace netgen
virtual void GetPoints (int n, NgArray<Point<D> > & points) const; virtual void GetPoints (int n, NgArray<Point<D> > & points) const;
/** calculates (2D) lineintersections: /** calculates (2D) lineintersections:
for lines $$ a x + b y + c = 0 $$ the interecting points are calculated for lines $$ a x + b y + c = 0 $$ the intersecting points are calculated
and stored in points */ and stored in points */
virtual void LineIntersections (const double a, const double b, const double c, virtual void LineIntersections (const double a, const double b, const double c,
NgArray < Point<D> > & points, const double eps) const NgArray < Point<D> > & points, const double eps) const

2
libsrc/meshing/meshfunc.cpp
View File

@ -213,7 +213,7 @@ namespace netgen
for(auto & sel : mesh.OpenElements()) for(auto & sel : mesh.OpenElements())
{ {
// For quads: check if this open element is already closed by a hex // For quads: check if this open element is already closed by a hex
// this happends when we have identifications in two directions // this happens when we have identifications in two directions
if(sel.GetNP() == 4) if(sel.GetNP() == 4)
{ {
Element2d face = sel; Element2d face = sel;

2
libsrc/occ/Partition_Inter2d.cxx
View File

@ -157,7 +157,7 @@ static Standard_Boolean findVOnE(const TopoDS_Vertex & theV,
// Check that vertex equal to V already exists on one // Check that vertex equal to V already exists on one
// of edges, in such a case, V is not added but // of edges, in such a case, V is not added but
// existing vertex is updated to be on E1 and E2 and // existing vertex is updated to be on E1 and E2 and
// is returned insead of V. // is returned instead of V.
//======================================================================= //=======================================================================
TopoDS_Vertex Partition_Inter2d::AddVonE(const TopoDS_Vertex& theV, TopoDS_Vertex Partition_Inter2d::AddVonE(const TopoDS_Vertex& theV,

6
libsrc/occ/Partition_Spliter.cxx
View File

@ -1080,7 +1080,7 @@ void Partition_Spliter::MakeShells(const TopoDS_Shape& S,
//function : findEqual //function : findEqual
//purpose : compare edges of EL1 against edges of EL2, //purpose : compare edges of EL1 against edges of EL2,
// Result is in EMM binding EL1 edges to list of equal edges. // Result is in EMM binding EL1 edges to list of equal edges.
// Edges are considered equall only if they have same vertices. // Edges are considered equal only if they have same vertices.
// <addSame>==True makes consider same edges as equal // <addSame>==True makes consider same edges as equal
// Put in <AllEqMap> all equal edges // Put in <AllEqMap> all equal edges
//======================================================================= //=======================================================================
@ -1486,7 +1486,7 @@ void Partition_Spliter::MakeEdges (const TopoDS_Edge& E,
//---------------------------------------------------------------- //----------------------------------------------------------------
// Construction of the new edges . // Construction of the new edges.
//---------------------------------------------------------------- //----------------------------------------------------------------
if (VF.IsSame(VL)) { // closed edge if (VF.IsSame(VL)) { // closed edge
@ -1501,7 +1501,7 @@ void Partition_Spliter::MakeEdges (const TopoDS_Edge& E,
else if (endV.IsSame(SV.Last())) else if (endV.IsSame(SV.Last()))
SV.Prepend(endV); SV.Prepend(endV);
else else
MESSAGE ("END VERTEX IS IN SEQUNCE MIDDLE"); MESSAGE ("END VERTEX IS IN SEQUENCE MIDDLE");
} }
NbVer = SV.Length(); NbVer = SV.Length();
} }

2
libsrc/occ/occmeshsurf.cpp
View File

@ -360,7 +360,7 @@ namespace netgen
void OCCSurface :: Project (Point<3> & ap, PointGeomInfo & gi) void OCCSurface :: Project (Point<3> & ap, PointGeomInfo & gi)
{ {
static Timer t("OccSurface::Project"); RegionTimer reg(t); static Timer t("OccSurface::Project"); RegionTimer reg(t);
static Timer t2("OccSurface::Project actural"); static Timer t2("OccSurface::Project actual");
// try Newton's method ... // try Newton's method ...

4
libsrc/occ/python_occ_shapes.cpp
View File

@ -2227,7 +2227,7 @@ deg_min : int
Minimum polynomial degree of splines Minimum polynomial degree of splines
deg_max : int deg_max : int
Maxmium polynomial degree of splines Maximum polynomial degree of splines
continuity : ShapeContinuity continuity : ShapeContinuity
Continuity requirement on the approximating surface Continuity requirement on the approximating surface
@ -2345,7 +2345,7 @@ deg_min : int
Minimum polynomial degree of splines Minimum polynomial degree of splines
deg_max : int deg_max : int
Maxmium polynomial degree of splines Maximum polynomial degree of splines
continuity : ShapeContinuity continuity : ShapeContinuity
Continuity requirement on the approximating surface Continuity requirement on the approximating surface

2
libsrc/stlgeom/stltool.cpp
View File

@ -1162,7 +1162,7 @@ bool STLBoundary :: TestSeg(const Point<3>& p1, const Point<3> & p2, const Vec<3
/* /*
(*testout) << "TestSeg-calls for classes:" << endl; (*testout) << "TestSeg-calls for classes:" << endl;
(*testout) << cnti << " inner calls, " << cnto << " outercalls" << endl; (*testout) << cnti << " inner calls, " << cnto << " outercalls" << endl;
(*testout) << "total testes segments: " << cntsegs << endl; (*testout) << "total tested segments: " << cntsegs << endl;
for (i = 1; i <= cntclass.Size(); i++) for (i = 1; i <= cntclass.Size(); i++)
{ {
(*testout) << int (exp (i * log(2.0))) << " bnd segs: " << cntclass.Get(i) << endl; (*testout) << int (exp (i * log(2.0))) << " bnd segs: " << cntclass.Get(i) << endl;

4
ng/Togl2.1/aclocal.m4 vendored
View File

@ -48,7 +48,7 @@ AC_DEFUN(TOGL_ENABLE_STUBS, [
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# TOGL_UNDEF_GET_PROC_ADDRESS -- # TOGL_UNDEF_GET_PROC_ADDRESS --
# #
# Does defining GLX_GLXEXT_LEGACY interfer with including GL/glxext.h? # Does defining GLX_GLXEXT_LEGACY interfere with including GL/glxext.h?
# #
# Arguments: # Arguments:
# none # none
@ -59,7 +59,7 @@ AC_DEFUN(TOGL_ENABLE_STUBS, [
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
AC_DEFUN(TOGL_UNDEF_GET_PROC_ADDRESS, [ AC_DEFUN(TOGL_UNDEF_GET_PROC_ADDRESS, [
AC_MSG_CHECKING([if GLX_GLXEXT_LEGACY interfers with including GL/glxext.h]) AC_MSG_CHECKING([if GLX_GLXEXT_LEGACY interferes with including GL/glxext.h])
AC_LANG_PUSH(C) AC_LANG_PUSH(C)
ac_save_CFLAGS=$CFLAGS ac_save_CFLAGS=$CFLAGS
CFLAGS=$TK_XINCLUDES CFLAGS=$TK_XINCLUDES

4
ng/Togl2.1/configure vendored
View File

@ -6028,8 +6028,8 @@ fi
LIBGLU=-lGLU LIBGLU=-lGLU
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if GLX_GLXEXT_LEGACY interfers with including GL/glxext.h" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GLX_GLXEXT_LEGACY interferes with including GL/glxext.h" >&5
$as_echo_n "checking if GLX_GLXEXT_LEGACY interfers with including GL/glxext.h... " >&6; } $as_echo_n "checking if GLX_GLXEXT_LEGACY interferes with including GL/glxext.h... " >&6; }
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

4
ng/Togl2.1/togl.c
View File

@ -5018,7 +5018,7 @@ Togl_Frustum(const Togl *togl, GLdouble left, GLdouble right,
eyeOffset = togl->EyeSeparation / 2; /* for right eye */ eyeOffset = togl->EyeSeparation / 2; /* for right eye */
eyeShift = (togl->Convergence - zNear) * (eyeOffset / togl->Convergence); eyeShift = (togl->Convergence - zNear) * (eyeOffset / togl->Convergence);
/* compenstate for altered viewports */ /* compensate for altered viewports */
switch (togl->Stereo) { switch (togl->Stereo) {
default: default:
break; break;
@ -5053,7 +5053,7 @@ Togl_Ortho(const Togl *togl, GLdouble left, GLdouble right,
eyeOffset = togl->EyeSeparation / 2; /* for right eye */ eyeOffset = togl->EyeSeparation / 2; /* for right eye */
eyeShift = (togl->Convergence - zNear) * (eyeOffset / togl->Convergence); eyeShift = (togl->Convergence - zNear) * (eyeOffset / togl->Convergence);
/* compenstate for altered viewports */ /* compensate for altered viewports */
switch (togl->Stereo) { switch (togl->Stereo) {
default: default:
break; break;