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

Merge remote-tracking branch 'luzpaz/misc-typo-fixes'

Browse Source
This commit is contained in:
Matthias Hochsteger 2017-07-26 12:37:33 +02:00
commit 0fe8f9bfcf
16 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -95,7 +95,7 @@ endif(INTEL_MIC)
####################################################################### #######################################################################
# Append install paths of software in non-standard paths (e.g. openmpi, metis, intel mkl, ...) # Append install paths of software in non-standard paths (e.g. openmpi, metis, intel mkl, ...)
# cmake -DUSE_MPI=ON -DCMAKE_PREFIX_PATH="/opt/openmpi165;/opt/metis51" ../ # cmake -DUSE_MPI=ON -DCMAKE_PREFIX_PATH="/opt/openmpi165;/opt/metis51" ../
set(ADDITIONAL_PATHS "" CACHE PATH "List of paths to additional libraries in non-standard locations, seperated by ';'") set(ADDITIONAL_PATHS "" CACHE PATH "List of paths to additional libraries in non-standard locations, separated by ';'")
if (ADDITIONAL_PATHS) if (ADDITIONAL_PATHS)
set(CMAKE_PREFIX_PATH ${ADDITIONAL_PATHS}) set(CMAKE_PREFIX_PATH ${ADDITIONAL_PATHS})
endif (ADDITIONAL_PATHS) endif (ADDITIONAL_PATHS)
@ -496,6 +496,6 @@ message("
------------------------------------------------------------------------ ------------------------------------------------------------------------
") ")
if (ADDITIONAL_PATHS) if (ADDITIONAL_PATHS)
message(WARNING "The use of ADDITIONAL_PATHS is depricated, use CMAKE_PREFIX_PATH instead") message(WARNING "The use of ADDITIONAL_PATHS is deprecated, use CMAKE_PREFIX_PATH instead")
endif (ADDITIONAL_PATHS) endif (ADDITIONAL_PATHS)

6
doc/ng4.tex
View File

@ -56,7 +56,7 @@ Forschung'' (http://www.fwf.ac.at) under projects P 10643-TEC and SFB
1306. Starting from 2002, the development continued within the Start 1306. Starting from 2002, the development continued within the Start
project ``hp-FEM'' (http://www.hpfem.jku.at) granted by the FWF. In project ``hp-FEM'' (http://www.hpfem.jku.at) granted by the FWF. In
2006, the Netgen development moved together with J.~Sch\"oberl to RWTH 2006, the Netgen development moved together with J.~Sch\"oberl to RWTH
Aachen Universtiy, Germany (http://www.mathcces.rwth-aachen.de/netgen). Aachen University, Germany (http://www.mathcces.rwth-aachen.de/netgen).
\section{How to receive NETGEN} \section{How to receive NETGEN}
@ -161,7 +161,7 @@ ASCII file in a text editor.
The geometry is defined by the Eulerian operations (union, The geometry is defined by the Eulerian operations (union,
intersection and complement) from primitives. A complete list of intersection and complement) from primitives. A complete list of
availabe primitives is given in Section~\ref{sec_primitives}. available primitives is given in Section~\ref{sec_primitives}.
The following input describes a cube: The following input describes a cube:
\begin{quote} \begin{quote}
@ -443,7 +443,7 @@ have to be specified explicitely in the .geo file with the command
\tt \tt
identify closesurfaces <surface1> <surface2>; identify closesurfaces <surface1> <surface2>;
\end{quote} \end{quote}
(this feature originally was intented for close surface, which is the reason for the command name). (this feature originally was intended for close surface, which is the reason for the command name).
\paragraph{Optional parameters:} (selection) \paragraph{Optional parameters:} (selection)
\begin{itemize} \begin{itemize}
\item \texttt{-tlo=<name of top level object>}\\ \item \texttt{-tlo=<name of top level object>}\\

2
ng/CMakeLists.txt
View File

@ -9,7 +9,7 @@ if(WIN32)
# add icon to netgen executable # add icon to netgen executable
enable_language(RC) enable_language(RC)
set(netgen_sources ${netgen_sources} ../windows/netgen.rc) set(netgen_sources ${netgen_sources} ../windows/netgen.rc)
# Don't use ccache here due to incompatiblity with the resource compiler # Don't use ccache here due to incompatibility with the resource compiler
set_directory_properties(PROPERTIES RULE_LAUNCH_COMPILE "") set_directory_properties(PROPERTIES RULE_LAUNCH_COMPILE "")
endif(WIN32) endif(WIN32)

2
ng/Togl-1.7/togl.c
View File

@ -3974,7 +3974,7 @@ Togl_MacInit(void)
/* /*
* Tk needs us to set the qd pointer it uses. This is needed * Tk needs us to set the qd pointer it uses. This is needed
* so Tk doesn't have to assume the availablity of the qd global * so Tk doesn't have to assume the availability of the qd global
* variable. Which in turn allows Tk to be used in code resources. * variable. Which in turn allows Tk to be used in code resources.
*/ */
tcl_macQdPtr = &qd; tcl_macQdPtr = &qd;

2
ng/Togl2.1/README.bin
View File

@ -67,7 +67,7 @@ File hierarchy:
*.html Start with index.html *.html Start with index.html
The contents of the include and lib directories can be placed verbatim The contents of the include and lib directories can be placed verbatim
in the Tcl installataion hierachy. in the Tcl installataion hierarchy.
Documentation is in the doc directory. Start with doc/index.html in Documentation is in the doc directory. Start with doc/index.html in
your web browser. your web browser.

4
ng/Togl2.1/Xmu/CrCmap.c
View File

@ -298,7 +298,7 @@ static Status readwrite_map(dpy, vinfo, colormap)
#undef calc #undef calc
} }
/* We have a read-only map defined. Now free unused cells, /* We have a read-only map defined. Now free unused cells,
* first those occuring before the contiguous sequence begins, * first those occurring before the contiguous sequence begins,
* then any following the contiguous sequence. * then any following the contiguous sequence.
*/ */
@ -439,7 +439,7 @@ static void free_cells(dpy, cmap, pixels, npixels, p)
{ {
/* One of the npixels allocated has already been freed. /* One of the npixels allocated has already been freed.
* p is the index of the freed pixel. * p is the index of the freed pixel.
* First free the pixels preceeding p, and there are p of them; * First free the pixels preceding p, and there are p of them;
* then free the pixels following p, there are npixels - p - 1 of them. * then free the pixels following p, there are npixels - p - 1 of them.
*/ */
XFreeColors(dpy, cmap, pixels, p, (unsigned long) 0); XFreeColors(dpy, cmap, pixels, p, (unsigned long) 0);

6
ng/Togl2.1/configure vendored
View File

@ -2477,7 +2477,7 @@ $as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
elif test "`uname -s`" = "Darwin"; then elif test "`uname -s`" = "Darwin"; then
# If Tcl was built as a framework, attempt to use the libraries # If Tcl was built as a framework, attempt to use the libraries
# from the framework at the given location so that linking works # from the framework at the given location so that linking works
# against Tcl.framework installed in an arbitary location. # against Tcl.framework installed in an arbitrary location.
case ${TCL_DEFS} in case ${TCL_DEFS} in
*TCL_FRAMEWORK*) *TCL_FRAMEWORK*)
if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then
@ -2690,7 +2690,7 @@ $as_echo "could not find ${TK_BIN_DIR}/tkConfig.sh" >&6; }
elif test "`uname -s`" = "Darwin"; then elif test "`uname -s`" = "Darwin"; then
# If Tk was built as a framework, attempt to use the libraries # If Tk was built as a framework, attempt to use the libraries
# from the framework at the given location so that linking works # from the framework at the given location so that linking works
# against Tk.framework installed in an arbitary location. # against Tk.framework installed in an arbitrary location.
case ${TK_DEFS} in case ${TK_DEFS} in
*TK_FRAMEWORK*) *TK_FRAMEWORK*)
if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then
@ -7906,7 +7906,7 @@ $as_echo "$tcl_cv_ld_single_module" >&6; }
SHLIB_LD="${SHLIB_LD} -Wl,-single_module" SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
fi fi
# TEA specific: link shlib with current and compatiblity version flags # TEA specific: link shlib with current and compatibility version flags
vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([0-9]\{1,5\}\)\(\(\.[0-9]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d` vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([0-9]\{1,5\}\)\(\(\.[0-9]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}" SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
SHLIB_LD_LIBS='${LIBS}' SHLIB_LD_LIBS='${LIBS}'

2
ng/Togl2.1/doc/stereo.html
View File

@ -43,7 +43,7 @@
<p> <p>
There are lots of stereo modes in Togl because there are many ways to There are lots of stereo modes in Togl because there are many ways to
draw stereo with different tradeoffs. draw stereo with different tradeoffs.
All of the stereo modes are choosen with the All of the stereo modes are chosen with the
<a href="tclapi.html#pixelformat"> <a href="tclapi.html#pixelformat">
<code>-stereo</code> configuration option</a>. <code>-stereo</code> configuration option</a>.
All of the non-native stereo techniques All of the non-native stereo techniques

6
ng/Togl2.1/tclconfig/tcl.m4
View File

@ -356,7 +356,7 @@ AC_DEFUN([TEA_LOAD_TCLCONFIG], [
elif test "`uname -s`" = "Darwin"; then elif test "`uname -s`" = "Darwin"; then
# If Tcl was built as a framework, attempt to use the libraries # If Tcl was built as a framework, attempt to use the libraries
# from the framework at the given location so that linking works # from the framework at the given location so that linking works
# against Tcl.framework installed in an arbitary location. # against Tcl.framework installed in an arbitrary location.
case ${TCL_DEFS} in case ${TCL_DEFS} in
*TCL_FRAMEWORK*) *TCL_FRAMEWORK*)
if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then
@ -445,7 +445,7 @@ AC_DEFUN([TEA_LOAD_TKCONFIG], [
elif test "`uname -s`" = "Darwin"; then elif test "`uname -s`" = "Darwin"; then
# If Tk was built as a framework, attempt to use the libraries # If Tk was built as a framework, attempt to use the libraries
# from the framework at the given location so that linking works # from the framework at the given location so that linking works
# against Tk.framework installed in an arbitary location. # against Tk.framework installed in an arbitrary location.
case ${TK_DEFS} in case ${TK_DEFS} in
*TK_FRAMEWORK*) *TK_FRAMEWORK*)
if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then
@ -1800,7 +1800,7 @@ dnl AC_CHECK_TOOL(AR, ar)
AS_IF([test $tcl_cv_ld_single_module = yes], [ AS_IF([test $tcl_cv_ld_single_module = yes], [
SHLIB_LD="${SHLIB_LD} -Wl,-single_module" SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
]) ])
# TEA specific: link shlib with current and compatiblity version flags # TEA specific: link shlib with current and compatibility version flags
vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([[0-9]]\{1,5\}\)\(\(\.[[0-9]]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d` vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([[0-9]]\{1,5\}\)\(\(\.[[0-9]]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}" SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
SHLIB_LD_LIBS='${LIBS}' SHLIB_LD_LIBS='${LIBS}'

2
ng/Togl2.1/toglAGL.c
View File

@ -144,7 +144,7 @@ togl_pixelFormat(Togl *togl)
} }
/* TODO: since we aglDestroyPixelFormat elsewhere, this code may leak /* TODO: since we aglDestroyPixelFormat elsewhere, this code may leak
* memory if the pixel format choosen is not the original (because * memory if the pixel format chosen is not the original (because
* aglDestroyPixelFormat will give an error). */ * aglDestroyPixelFormat will give an error). */
count = 0; count = 0;
do { do {

2
ng/Togl2.1/toglpy.h
View File

@ -5,7 +5,7 @@
* and <togl.h> should be included before this. If included into a C file, * and <togl.h> should be included before this. If included into a C file,
* there should be a static keyword just before the include. * there should be a static keyword just before the include.
* *
* There should be one copy of getToglFromWidget per-shared libary so that * There should be one copy of getToglFromWidget per-shared library so that
* the library's Tcl/Tk/Togl stub pointers are properly initialized. * the library's Tcl/Tk/Togl stub pointers are properly initialized.
* *
* Copyright (C) 2006 Greg Couch * Copyright (C) 2006 Greg Couch

2
ng/nghelp.tcl
View File

@ -138,7 +138,7 @@ set_menu_help "Quit" "Quits Netgen"
set_menu_help "Geometry" "Preparing geometries, visualiztion of geometries." set_menu_help "Geometry" "Preparing geometries, visualiztion of geometries."
set_menu_help "Scan CSG Geometry" "Generates surface triangulation for rendering" set_menu_help "Scan CSG Geometry" "Generates surface triangulation for rendering"
set_menu_help "CSG Options" "Sets Options for CSG visualization (bounding box, detail size, number of facets)." set_menu_help "CSG Options" "Sets Options for CSG visualization (bounding box, detail size, number of facets)."
set_menu_help "CSG Properties" "Defines appearence of current CSG geometry (color, visibility, transparency)" set_menu_help "CSG Properties" "Defines appearance of current CSG geometry (color, visibility, transparency)"
set_menu_help "STL Doctor" "Calls STL Doctor for preprocessing STL geometry files." set_menu_help "STL Doctor" "Calls STL Doctor for preprocessing STL geometry files."
set_menu_help "STL Info" "Retrieves information about current STL geometry." set_menu_help "STL Info" "Retrieves information about current STL geometry."

2
ng/ngshell.tcl
View File

@ -215,7 +215,7 @@ proc ngoptimizesurface { {step all} } {
} elseif {$step == "combinepoints"} { } elseif {$step == "combinepoints"} {
Ng_GenerateMesh os os c Ng_GenerateMesh os os c
} else { } else {
puts "error: unkown option in ngoptimizesurface" puts "error: unknown option in ngoptimizesurface"
return return
} }
Ng_ReadStatus Ng_ReadStatus

2
ng/ngtesting.tcl
View File

@ -142,7 +142,7 @@ proc ngtest { {t all} {f ""}} {
puts "*** pde tests complete" puts "*** pde tests complete"
} else { } else {
puts $logfile "error: unkown test program '$t'"; flush $logfile puts $logfile "error: unknown test program '$t'"; flush $logfile
} }
puts "" puts ""
} }

4
ng/onetcl.cpp
View File

@ -4311,7 +4311,7 @@ const char * ngscript[] = {""
,"set_menu_help \"Geometry\" \"Preparing geometries, visualiztion of geometries.\"\n" ,"set_menu_help \"Geometry\" \"Preparing geometries, visualiztion of geometries.\"\n"
,"set_menu_help \"Scan CSG Geometry\" \"Generates surface triangulation for rendering\"\n" ,"set_menu_help \"Scan CSG Geometry\" \"Generates surface triangulation for rendering\"\n"
,"set_menu_help \"CSG Options\" \"Sets Options for CSG visualization (bounding box, detail size, number of facets).\"\n" ,"set_menu_help \"CSG Options\" \"Sets Options for CSG visualization (bounding box, detail size, number of facets).\"\n"
,"set_menu_help \"CSG Properties\" \"Defines appearence of current CSG geometry (color, visibility, transparency)\"\n" ,"set_menu_help \"CSG Properties\" \"Defines appearance of current CSG geometry (color, visibility, transparency)\"\n"
,"set_menu_help \"STL Doctor\" \"Calls STL Doctor for preprocessing STL geometry files.\"\n" ,"set_menu_help \"STL Doctor\" \"Calls STL Doctor for preprocessing STL geometry files.\"\n"
,"set_menu_help \"STL Info\" \"Retrieves information about current STL geometry.\"\n" ,"set_menu_help \"STL Info\" \"Retrieves information about current STL geometry.\"\n"
,"set_menu_help \"Mesh\" \"Menu for mesh generation\"\n" ,"set_menu_help \"Mesh\" \"Menu for mesh generation\"\n"
@ -5897,7 +5897,7 @@ const char * ngscript[] = {""
,"} elseif {$step == \"combinepoints\"} {\n" ,"} elseif {$step == \"combinepoints\"} {\n"
,"Ng_GenerateMesh os os c\n" ,"Ng_GenerateMesh os os c\n"
,"} else {\n" ,"} else {\n"
,"puts \"error: unkown option in ngoptimizesurface\"\n" ,"puts \"error: unknown option in ngoptimizesurface\"\n"
,"return\n" ,"return\n"
,"}\n" ,"}\n"
,"Ng_ReadStatus\n" ,"Ng_ReadStatus\n"

2
ng/onetcl.py
View File

@ -11,7 +11,7 @@ for fname in glob.glob('*.tcl'):
fnames = list(tclfiles.keys()) fnames = list(tclfiles.keys())
fnames.sort(key=functools.cmp_to_key( lambda x,y: tclfiles[x].find('/'+y) )) fnames.sort(key=functools.cmp_to_key( lambda x,y: tclfiles[x].find('/'+y) ))
# replace all occurences of 'source bla.tcl' with the code of bla.tcl # replace all occurrences of 'source bla.tcl' with the code of bla.tcl
for f in fnames: for f in fnames:
for g in fnames: for g in fnames:
if(tclfiles[f].find('/'+g) >= 0): if(tclfiles[f].find('/'+g) >= 0):