From 422e19bd0edcad4556c154c655ad27eb5d26732a Mon Sep 17 00:00:00 2001 From: Felix Gruber <felgru@gmx.de> Date: Tue, 16 Feb 2016 23:16:03 +0100 Subject: [PATCH] [cleanup] fix typos mostly found with codespell --- cmake/modules/DuneCMakePackageConfigHelpers.cmake | 2 +- cmake/modules/DuneMPI.cmake | 2 +- cmake/modules/FindGMP.cmake | 2 +- cmake/modules/FindMETIS.cmake | 2 +- cmake/modules/FindPTScotch.cmake | 2 +- cmake/modules/FindParMETIS.cmake | 2 +- cmake/modules/FindSuiteSparse.cmake | 2 +- cmake/modules/FindThreadsCMake31.cmake | 2 +- cmake/modules/FindUMFPack.cmake | 2 +- cmake/modules/UseInkscape.cmake | 2 +- cmake/modules/UseLATEX.cmake | 2 +- doc/buildsystem/dune-common.rst | 4 ++-- doc/doxygen/Doxystyle | 8 ++++---- dune/common/arraylist.hh | 8 ++++---- dune/common/concept.hh | 2 +- dune/common/exceptions.hh | 2 +- dune/common/float_cmp.cc | 2 +- dune/common/parallel/collectivecommunication.hh | 4 ++-- dune/common/parallel/communicator.hh | 6 +++--- dune/common/parallel/interface.hh | 4 ++-- dune/common/parallel/mpiguard.hh | 4 ++-- dune/common/parallel/remoteindices.hh | 4 ++-- dune/common/parallel/test/remoteindicestest.cc | 2 +- dune/common/parallel/test/syncertest.cc | 2 +- dune/common/parallel/variablesizecommunicator.hh | 2 +- dune/common/path.cc | 4 ++-- dune/common/path.hh | 6 +++--- dune/common/poolallocator.hh | 2 +- dune/common/sllist.hh | 2 +- dune/common/stdstreams.hh | 2 +- dune/common/stringutility.hh | 2 +- dune/common/tupleutility.hh | 4 ++-- dune/common/typetraits.hh | 4 ++-- lib/dunemodules.lib | 8 ++++---- 34 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cmake/modules/DuneCMakePackageConfigHelpers.cmake b/cmake/modules/DuneCMakePackageConfigHelpers.cmake index 1ad1b023a..87c5c76c8 100644 --- a/cmake/modules/DuneCMakePackageConfigHelpers.cmake +++ b/cmake/modules/DuneCMakePackageConfigHelpers.cmake @@ -23,7 +23,7 @@ else(CMakePkgConfigHelpersMacroFile) if(NOT PMPKG_INSTALL_DESTINATION) message(FATAL_ERROR "configure_package_config_file needs an option INSTALL_DESTINATION with a relative path") endif(NOT PMPKG_INSTALL_DESTINATION) - # asume that PMPKG_INSTALL_DESTINATION is relative + # assume that PMPKG_INSTALL_DESTINATION is relative string(REGEX REPLACE "[^/]+" ".." prefix_path ${PMPKG_INSTALL_DESTINATION}) set(PACKAGE_INIT "# Set prefix to source dir get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/${prefix_path}\" ABSOLUTE) diff --git a/cmake/modules/DuneMPI.cmake b/cmake/modules/DuneMPI.cmake index 4b13ba40c..c2ab25bff 100644 --- a/cmake/modules/DuneMPI.cmake +++ b/cmake/modules/DuneMPI.cmake @@ -38,7 +38,7 @@ if(MPI_C_FOUND) set(MPI_DUNE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${MPI_C_LIBRARIES} CACHE STRING "Libraries used by DUNE when linking MPI programs") - # TODO check on where to position this exactly, doesnt look completely thought through + # TODO check on where to position this exactly, doesn't look completely thought through dune_register_package_flags(COMPILE_DEFINITIONS "ENABLE_MPI=1;MPICH_SKIP_MPICXX;MPIPP_H" INCLUDE_DIRS "${MPI_DUNE_INCLUDE_PATH}" LIBRARIES "${MPI_DUNE_LIBRARIES}") diff --git a/cmake/modules/FindGMP.cmake b/cmake/modules/FindGMP.cmake index 22ddf8c2e..6553d4d1f 100644 --- a/cmake/modules/FindGMP.cmake +++ b/cmake/modules/FindGMP.cmake @@ -80,7 +80,7 @@ if(GMP_FOUND) set(GMP_COMPILE_FLAGS "-DENABLE_GMP=1") # log result file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determing location of GMP succeded:\n" + "Determing location of GMP succeeded:\n" "Include directory: ${GMP_INCLUDE_DIRS}\n" "Library directory: ${GMP_LIBRARIES}\n\n") else(GMP_FOUND) diff --git a/cmake/modules/FindMETIS.cmake b/cmake/modules/FindMETIS.cmake index 545003ba8..5cdc24324 100644 --- a/cmake/modules/FindMETIS.cmake +++ b/cmake/modules/FindMETIS.cmake @@ -131,7 +131,7 @@ if(METIS_FOUND) set(HAVE_METIS ${METIS_FOUND}) # log result file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determing location of METIS succeded:\n" + "Determing location of METIS succeeded:\n" "Include directory: ${METIS_INCLUDE_DIRS}\n" "Library directory: ${METIS_LIBRARIES}\n\n") else(METIS_FOUND) diff --git a/cmake/modules/FindPTScotch.cmake b/cmake/modules/FindPTScotch.cmake index 7146c5007..49ecbfa44 100644 --- a/cmake/modules/FindPTScotch.cmake +++ b/cmake/modules/FindPTScotch.cmake @@ -99,7 +99,7 @@ if(PTSCOTCH_FOUND) set(HAVE_PTSCOTCH 1) # log result file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determing location of PT-Scotch succeded:\n" + "Determing location of PT-Scotch succeeded:\n" "Include directory: ${PTSCOTCH_INCLUDE_DIRS}\n" "Library directory: ${PTSCOTCH_LIBRARIES}\n\n") diff --git a/cmake/modules/FindParMETIS.cmake b/cmake/modules/FindParMETIS.cmake index 2e0ae9b61..4d423cb31 100644 --- a/cmake/modules/FindParMETIS.cmake +++ b/cmake/modules/FindParMETIS.cmake @@ -148,7 +148,7 @@ if(PARMETIS_FOUND) CACHE STRING "ParMETIS link flags") # log result file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determing location of ParMETIS succeded:\n" + "Determing location of ParMETIS succeeded:\n" "Include directory: ${PARMETIS_INCLUDE_DIRS}\n" "Library directory: ${PARMETIS_LIBRARIES}\n\n") endif(PARMETIS_FOUND) diff --git a/cmake/modules/FindSuiteSparse.cmake b/cmake/modules/FindSuiteSparse.cmake index dbf60ffc2..9adb25fc7 100644 --- a/cmake/modules/FindSuiteSparse.cmake +++ b/cmake/modules/FindSuiteSparse.cmake @@ -219,7 +219,7 @@ if(SuiteSparse_FOUND) set(SuiteSparse_INCLUDE_DIRS ${SUITESPARSE_INCLUDE_DIR}) # log result file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining location of SuiteSparse succeded:\n" + "Determining location of SuiteSparse succeeded:\n" "Include directory: ${SuiteSparse_INCLUDE_DIRS}\n" "Library directory: ${SuiteSparse_LIBRARIES}\n\n") set(SuiteSparse_COMPILER_FLAGS) diff --git a/cmake/modules/FindThreadsCMake31.cmake b/cmake/modules/FindThreadsCMake31.cmake index 00515099e..d7ce105fc 100644 --- a/cmake/modules/FindThreadsCMake31.cmake +++ b/cmake/modules/FindThreadsCMake31.cmake @@ -29,7 +29,7 @@ # # .. cmake_variable:: THREADS_PREFER_PTHREAD_FLAG # -# If the use of the -pthread compiler and linker flag is prefered then the +# If the use of the -pthread compiler and linker flag is preferred then the # caller can set this variable. Modifies the behaviour of :ref:`FindThreadsCMake31`. # diff --git a/cmake/modules/FindUMFPack.cmake b/cmake/modules/FindUMFPack.cmake index 222b1542f..811253a45 100644 --- a/cmake/modules/FindUMFPack.cmake +++ b/cmake/modules/FindUMFPack.cmake @@ -56,7 +56,7 @@ if(UMFPACK_FOUND) set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES}) # log result file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining location of UMFPack succeded:\n" + "Determining location of UMFPack succeeded:\n" "Include directory: ${UMFPACK_INCLUDE_DIRS}\n" "Library directory: ${UMFPACK_LIBRARIES}\n\n") set(UMFPACK_DUNE_COMPILE_FLAGS "${UMFPACK_INCLUDE_FLAGS}" diff --git a/cmake/modules/UseInkscape.cmake b/cmake/modules/UseInkscape.cmake index 7ceb8eb04..7e9db307c 100644 --- a/cmake/modules/UseInkscape.cmake +++ b/cmake/modules/UseInkscape.cmake @@ -1,4 +1,4 @@ -# Module that provides convertion routines using inkscape +# Module that provides conversion routines using inkscape # # .. cmake_function:: inkscape_generate_png_from_svg # diff --git a/cmake/modules/UseLATEX.cmake b/cmake/modules/UseLATEX.cmake index afe4fd87a..c81537433 100644 --- a/cmake/modules/UseLATEX.cmake +++ b/cmake/modules/UseLATEX.cmake @@ -33,7 +33,7 @@ # the BIBFILES option, and any .cls, .bst, and .clo files found in # the current source directory. Images found in the IMAGE_DIRS # directories or listed by IMAGES are also copied to the output -# directory and coverted to an appropriate format if necessary. Any +# directory and converted to an appropriate format if necessary. Any # tex files also listed with the CONFIGURE option are also processed # with the CMake CONFIGURE_FILE command (with the @ONLY flag). Any # file listed in CONFIGURE but not the target tex file or listed with diff --git a/doc/buildsystem/dune-common.rst b/doc/buildsystem/dune-common.rst index b57530be2..fd2084bbd 100644 --- a/doc/buildsystem/dune-common.rst +++ b/doc/buildsystem/dune-common.rst @@ -86,7 +86,7 @@ language: - :ref:`dune_add_test` to register tests to the test suite. - :ref:`install` to mark files for installation. -For futher commands, browse this documentation. +For further commands, browse this documentation. If your module requires any other packages than the dune modules listed in your :code:`dune.module` file, you should also use the command :ref:`find_package` in the module :code:`dune-foo/cmake/modules/DuneFooMacros.cmake` @@ -248,7 +248,7 @@ How should I handle ini and grid files in an out-of-source-build setup? ======================================================================= Such files are under version control, but they are needed in the build directory. -There are some CMake functions targetting this issue: +There are some CMake functions targeting this issue: * :ref:`dune_symlink_to_source_tree` * :ref:`dune_symlink_to_source_files` diff --git a/doc/doxygen/Doxystyle b/doc/doxygen/Doxystyle index ab70bf100..029f54ac8 100644 --- a/doc/doxygen/Doxystyle +++ b/doc/doxygen/Doxystyle @@ -159,10 +159,10 @@ DOT_MULTI_TARGETS = NO GENERATE_LEGEND = NO DOT_CLEANUP = NO -#################################################################### -# Header Footer and Stylesheet in use is controled by the Makefile # -# (christi 16. Jan 2006) # -#################################################################### +##################################################################### +# Header Footer and Stylesheet in use is controlled by the Makefile # +# (christi 16. Jan 2006) # +##################################################################### # The HTML_HEADER tag can be used to specify a personal HTML header for # each generated HTML page. If it is left blank doxygen will generate a diff --git a/dune/common/arraylist.hh b/dune/common/arraylist.hh index 8422b4ce6..5c790cfbb 100644 --- a/dune/common/arraylist.hh +++ b/dune/common/arraylist.hh @@ -310,7 +310,7 @@ namespace Dune /** * @brief Get the value of the list at an arbitrary position. - * @return The value at that postion. + * @return The value at that position. */ inline reference elementAt(size_type i) const; @@ -358,7 +358,7 @@ namespace Dune inline ArrayListIterator(ArrayList<T,N,A>& arrayList, size_type position); /** - * @brief The current postion. + * @brief The current position. */ size_type position_; /** @@ -429,7 +429,7 @@ namespace Dune /** * @brief Get the value of the list at an arbitrary position. - * @return The value at that postion. + * @return The value at that position. */ inline const_reference elementAt(size_type i) const; @@ -456,7 +456,7 @@ namespace Dune inline ConstArrayListIterator(const ArrayList<T,N,A>& arrayList, size_type position); /** - * @brief The current postion. + * @brief The current position. */ size_type position_; /** diff --git a/dune/common/concept.hh b/dune/common/concept.hh index 327cce4bc..0309dfa31 100644 --- a/dune/common/concept.hh +++ b/dune/common/concept.hh @@ -154,7 +154,7 @@ constexpr auto tupleEntriesModel() // ############################################################################# // # The following require*() functions are just helpers that allow to -// # propagate a failed check as substitution failure. This is usefull +// # propagate a failed check as substitution failure. This is useful // # inside of a concept definition. // ############################################################################# diff --git a/dune/common/exceptions.hh b/dune/common/exceptions.hh index 3580007e8..ffecfa1d4 100644 --- a/dune/common/exceptions.hh +++ b/dune/common/exceptions.hh @@ -279,7 +279,7 @@ namespace Dune { class InvalidStateException : public Exception {}; /*! \brief Default exception if an error in the parallel - communication of the programm occured + communication of the programm occurred \ingroup ParallelCommunication */ class ParallelError : public Exception {}; diff --git a/dune/common/float_cmp.cc b/dune/common/float_cmp.cc index 8a85acc51..7230d4581 100644 --- a/dune/common/float_cmp.cc +++ b/dune/common/float_cmp.cc @@ -311,7 +311,7 @@ namespace Dune { static I trunc(const T &val, typename EpsilonType<T>::Type epsilon = (DefaultEpsilon<T, cstyle>::value())) { - // this sould be optimized away unless needed + // this should be optimized away unless needed if(!std::numeric_limits<I>::is_signed) // make sure this works for all useful cases even if I is an unsigned type if(eq<T, cstyle>(val, T(0), epsilon)) return I(0); diff --git a/dune/common/parallel/collectivecommunication.hh b/dune/common/parallel/collectivecommunication.hh index c8995510f..c7294596b 100644 --- a/dune/common/parallel/collectivecommunication.hh +++ b/dune/common/parallel/collectivecommunication.hh @@ -300,9 +300,9 @@ namespace Dune * @param[in] sendlen The number of elements to send on each task. * @param[out] out The buffer to store the received data in. * @param[in] recvlen An array with size equal to the number of processes containing the number - * of elements to recieve from process i at position i, i.e. the number that + * of elements to receive from process i at position i, i.e. the number that * is passed as sendlen argument to this function in process i. - * @param[in] displ An array with size equal to the number of processes. Data recieved from + * @param[in] displ An array with size equal to the number of processes. Data received from * process i will be written starting at out+displ[i]. */ template<typename T> diff --git a/dune/common/parallel/communicator.hh b/dune/common/parallel/communicator.hh index 84d02fff6..2e2a3da96 100644 --- a/dune/common/parallel/communicator.hh +++ b/dune/common/parallel/communicator.hh @@ -75,10 +75,10 @@ namespace Dune * Based on the information about the distributed index sets, data * independent interfaces between different sets of the index sets * can be setup using the class Interface. For the actual communication - * data dependant communicators can be setup using BufferedCommunicator, + * data dependent communicators can be setup using BufferedCommunicator, * DatatypeCommunicator VariableSizeCommunicator based on the interface * information. In contrast to the former - * the latter is independant of the class Interface can work on a map + * the latter is independent of the class Interface can work on a map * from process number to a pair of index lists describing which local indices * are send and received from that processs, respectively. */ @@ -265,7 +265,7 @@ namespace Dune * \code * bool contains(Attribute flag) const; * \endcode - * for checking whether the set contains a specfic flag. + * for checking whether the set contains a specific flag. * This functionality is for example provided the classes * EnumItem, EnumRange and Combine. * diff --git a/dune/common/parallel/interface.hh b/dune/common/parallel/interface.hh index be135580c..4ddb2104b 100644 --- a/dune/common/parallel/interface.hh +++ b/dune/common/parallel/interface.hh @@ -55,7 +55,7 @@ namespace Dune * \code * bool contains(Attribute flag) const; * \endcode - * for checking whether the set contains a specfic flag. + * for checking whether the set contains a specific flag. * This functionality is for example provided the classes * EnumItem, EnumRange and Combine. * @@ -222,7 +222,7 @@ namespace Dune * \code * bool contains(Attribute flag) const; * \endcode - * for checking whether the set contains a specfic flag. + * for checking whether the set contains a specific flag. * This functionality is for example provided the classes * EnumItem, EnumRange and Combine. * @param remoteIndices The indices known to remote processes. diff --git a/dune/common/parallel/mpiguard.hh b/dune/common/parallel/mpiguard.hh index d99354d33..66e142079 100644 --- a/dune/common/parallel/mpiguard.hh +++ b/dune/common/parallel/mpiguard.hh @@ -108,7 +108,7 @@ namespace Dune You create a MPIGuard object. If an exception is risen on a process the MPIGuard detects the exception, because the finalize method was not called. when reaching the finalize call all - other processes are informed that an error occured and the + other processes are informed that an error occurred and the MPIGuard throws an exception of type MPIGuardError. @note You can initialize the MPIGuard from different types of communication objects: @@ -189,7 +189,7 @@ namespace Dune If no success parameter is passed, the guard assumes that everything worked as planned. All errors are communicated and an exception of type MPIGuardError is thrown if an error - (or exception) occured on any of the processors in the + (or exception) occurred on any of the processors in the communicator. @param success inform the guard about possible errors diff --git a/dune/common/parallel/remoteindices.hh b/dune/common/parallel/remoteindices.hh index bf5c43fcb..fdf10ecad 100644 --- a/dune/common/parallel/remoteindices.hh +++ b/dune/common/parallel/remoteindices.hh @@ -503,12 +503,12 @@ namespace Dune { * @param localEntries The number of local indices. * @param type The mpi data type for unpacking. * @param p_in The input buffer to unpack from. - * @param postion The position in the buffer to start unpacking from. + * @param position The position in the buffer to start unpacking from. * @param bufferSize The size of the input buffer. */ inline void unpackIndices(RemoteIndexList& remote, int remoteEntries, PairType** local, int localEntries, char* p_in, - MPI_Datatype type, int* positon, int bufferSize, + MPI_Datatype type, int* position, int bufferSize, bool fromOurself); inline void unpackIndices(RemoteIndexList& send, RemoteIndexList& receive, diff --git a/dune/common/parallel/test/remoteindicestest.cc b/dune/common/parallel/test/remoteindicestest.cc index 4fbc23b31..96a9d0fbb 100644 --- a/dune/common/parallel/test/remoteindicestest.cc +++ b/dune/common/parallel/test/remoteindicestest.cc @@ -664,7 +664,7 @@ void MPI_err_handler(MPI_Comm *comm, int *err_code, ...){ std::string s(err_string, err_length); int rank; MPI_Comm_rank(MPI_COMM_WORLD, &rank); - std::cerr << rank<<": An MPI Error ocurred:"<<std::endl<<s<<std::endl; + std::cerr << rank<<": An MPI Error occurred:"<<std::endl<<s<<std::endl; delete[] err_string; throw MPIError(s, *err_code); } diff --git a/dune/common/parallel/test/syncertest.cc b/dune/common/parallel/test/syncertest.cc index 28274b234..56990e6c9 100644 --- a/dune/common/parallel/test/syncertest.cc +++ b/dune/common/parallel/test/syncertest.cc @@ -341,7 +341,7 @@ void MPI_err_handler(MPI_Comm *comm, int *err_code, ...){ int err_length; MPI_Error_string(*err_code, err_string, &err_length); std::string s(err_string, err_length); - std::cerr << "An MPI Error ocurred:"<<std::endl<<s<<std::endl; + std::cerr << "An MPI Error occurred:"<<std::endl<<s<<std::endl; delete[] err_string; throw MPIError(s, *err_code); } diff --git a/dune/common/parallel/variablesizecommunicator.hh b/dune/common/parallel/variablesizecommunicator.hh index 0fde9e4c7..fd3ccf7ac 100644 --- a/dune/common/parallel/variablesizecommunicator.hh +++ b/dune/common/parallel/variablesizecommunicator.hh @@ -944,7 +944,7 @@ bool validRecvRequests(const std::vector<MPI_Request> reqs) * @param handle The data handle describing the data. * @param trackers The trackers for the communication interfaces. * @param buffers The buffers for the comunication. One for each neighbour. - * @param requests The send requests for each neigbour. + * @param requests The send requests for each neighbour. * @param setupFunctor The functor responsible for setting up the request. */ template<class DataHandle, class Functor> diff --git a/dune/common/path.cc b/dune/common/path.cc index d89d4acba..c993a9aef 100644 --- a/dune/common/path.cc +++ b/dune/common/path.cc @@ -45,7 +45,7 @@ namespace Dune { // each path component now has a trailing '/' - // collapse any occurance of multiple '/' to a single '/' + // collapse any occurrence of multiple '/' to a single '/' dst = src = 0; while(src < result.size()) { result[dst] = result[src]; @@ -59,7 +59,7 @@ namespace Dune { // the path is now free of multiple '/' in a row - // collapse any occurance of "/./" to "/" + // collapse any occurrence of "/./" to "/" dst = src = 0; while(src < result.size()) { result[dst] = result[src]; diff --git a/dune/common/path.hh b/dune/common/path.hh index 933a0eadc..39d89cca8 100644 --- a/dune/common/path.hh +++ b/dune/common/path.hh @@ -55,13 +55,13 @@ namespace Dune { * <ul> * <li> The path is a series of components, each followed by a single '/'. * <li> An absolute path starts with an empty component followed by a '/', - * so its first charachter will be '/'. This is the only case where an + * so its first character will be '/'. This is the only case where an * empty component can occur. * <li> The path does not contain any component ".". Any such component in * the input is removed. * <li> A ".." component may only occur in the following case: A relative * path may contain a series of ".." in the beginning. Any other - * occurances of ".." int eh input is collapsed with a preceding + * occurrences of ".." in the input is collapsed with a preceding * component or simply removed if it is at the beginning of an absolute * path. * </ul> @@ -113,7 +113,7 @@ namespace Dune { * directory. * * Pretty print the path. This removes any duplicate '/' and any - * superfluous occurances of ".." and ".". The resulting path will have a + * superfluous occurrences of ".." and ".". The resulting path will have a * trailing '/' if it is the root path or if isDirectory is true. It will * however not have a trailing '/' if it is otherwise clear that it is a * directory -- i.e. if its last component is "." or "..". diff --git a/dune/common/poolallocator.hh b/dune/common/poolallocator.hh index 463b032f5..e18439d0e 100644 --- a/dune/common/poolallocator.hh +++ b/dune/common/poolallocator.hh @@ -163,7 +163,7 @@ namespace Dune char chunk_[chunkSize]; /** - * @brief Adress the first properly aligned + * @brief Address of the first properly aligned * position in the chunk. */ char* memory_; diff --git a/dune/common/sllist.hh b/dune/common/sllist.hh index 0c93ac21b..19df55c92 100644 --- a/dune/common/sllist.hh +++ b/dune/common/sllist.hh @@ -517,7 +517,7 @@ namespace Dune /** * @brief Delete the entry at the current position. * - * The iterator will be positioned at the next postion after the + * The iterator will be positioned at the next position after the * deletion * @warning This will invalidate all iterators positioned at the delete position! Use with care! */ diff --git a/dune/common/stdstreams.hh b/dune/common/stdstreams.hh index 39dfc8a65..c23cea872 100644 --- a/dune/common/stdstreams.hh +++ b/dune/common/stdstreams.hh @@ -24,7 +24,7 @@ namespace Dune { standard debug streams with level below MINIMAL_DEBUG_LEVEL will collapse to doing nothing if output is requested. - MINIMAL_DEBUG_LEVEL is set to DUNE_MINIMAL_DEBUG_LEVEL, wich is + MINIMAL_DEBUG_LEVEL is set to DUNE_MINIMAL_DEBUG_LEVEL, which is defined in config.h and can be changed by the configure option @code --with-minimal-debug-level=[grave|warn|info|verb|vverb] @endcode diff --git a/dune/common/stringutility.hh b/dune/common/stringutility.hh index 6a39dc7f5..3ce9c82a8 100644 --- a/dune/common/stringutility.hh +++ b/dune/common/stringutility.hh @@ -61,7 +61,7 @@ namespace Dune { * \brief Format values according to printf format string * * \param s The format string to be used - * \param args The valued to be formated + * \param args The valued to be formatted * * This is a wrapper to std::snprintf that provides * overflow save printf functionality. For up to 1000 diff --git a/dune/common/tupleutility.hh b/dune/common/tupleutility.hh index 8e94ad699..a66621a0c 100644 --- a/dune/common/tupleutility.hh +++ b/dune/common/tupleutility.hh @@ -549,7 +549,7 @@ namespace Dune { }; /** - * @brief Find the first occurance of a type in a std::tuple + * @brief Find the first occurrence of a type in a std::tuple * * \tparam Tuple The std::tuple type to search in. * \tparam T Type to search for. @@ -558,7 +558,7 @@ namespace Dune { * * This class can search for a particular type in std::tuple. It will check each * type in the std::tuple in turn, and set its member constant \c value to the - * index of the first occurance of type was found. If the type was not + * index of the first occurrence of type was found. If the type was not * found, a static_assert is triggered. */ template<class Tuple, class T, std::size_t start = 0> diff --git a/dune/common/typetraits.hh b/dune/common/typetraits.hh index 094af3691..f74613b2c 100644 --- a/dune/common/typetraits.hh +++ b/dune/common/typetraits.hh @@ -213,7 +213,7 @@ namespace Dune /** \brief template which always yields a false value - \tparam T Some type. It sould be a type expression involving template + \tparam T Some type. It should be a type expression involving template parameters of the class or function using AlwaysFalse. Suppose you have a template class. You want to document the required @@ -259,7 +259,7 @@ namespace Dune /** \brief template which always yields a true value - \tparam T Some type. It sould be a type expression involving template + \tparam T Some type. It should be a type expression involving template parameters of the class or function using AlwaysTrue. \note This class exists mostly for consistency with AlwaysFalse. diff --git a/lib/dunemodules.lib b/lib/dunemodules.lib index b80652e18..3d7f2f27d 100644 --- a/lib/dunemodules.lib +++ b/lib/dunemodules.lib @@ -42,9 +42,9 @@ BLANK="$space$tab" NOBLANK="^$space$tab" # -# read paramters from a $CONTROL file +# read parameters from a $CONTROL file # -# paramters: +# parameters: # $1 file to read # PARSER_TRIM="awk '{gsub(/^[ \\t]+|[ \\t]+$/,\"\");printf(\"%s\", \$0);}'" @@ -402,7 +402,7 @@ _check_deps() # recursive part of sort_modules # evaluate dependencies of one module # -# paramters: +# parameters: # $1 name of the modules # $2 parser mode: # DEPS: search for dependencies @@ -528,7 +528,7 @@ check_modname() { # get_sub_version() { #it would be nice to give the part to awk via a "-v FIELD=$2" - #command line argument. Unfortunatly, SunOS does not support this. + #command line argument. Unfortunately, SunOS does not support this. #Worse, we cannot use awks int() function here, since under SunOS it #will always return 0 for string input. echo $1 | cut -d. -f"$2" | sed 's/[^0-9].*$//;s/^$/0/' -- GitLab