From: Jan Philipp Thiele Date: Wed, 27 Nov 2024 07:45:14 +0000 (+0100) Subject: [pre-commit] add and apply config and CI X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F17893%2Fhead;p=dealii.git [pre-commit] add and apply config and CI This adds a set of useful pre-commit hook checks as well as a GitHub actions workflow to run these checks on each PR. As some checks failed on the current codebase, the fixes where applied as well. More concretely these were - fix trailing whitespaces - fix EOF to one single linebreak - typos --- diff --git a/.github/workflows/indent.yml b/.github/workflows/indent.yml index 03f4a97d22..6c276a9f3b 100644 --- a/.github/workflows/indent.yml +++ b/.github/workflows/indent.yml @@ -68,16 +68,3 @@ jobs: with: name: doxygen_documentation path: build/doc/doxygen - - typos: - # check for typos - - name: typos - runs-on: [ubuntu-24.04] - - steps: - - uses: actions/checkout@v4 - - uses: crate-ci/typos@v1.27.3 - with: - files: doc examples include source tests - config: ./.typos.toml diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml new file mode 100644 index 0000000000..54f5539a0f --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,19 @@ +name: pre-commit + +on: [push, pull_request] +concurrency: + group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{github.event_name == 'pull_request'}} +permissions: + contents: read + +env: + SKIP: clang-format, no-commit-to-branch + +jobs: + pre-commit: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + - uses: pre-commit/action@v3.0.1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100755 index 0000000000..7998454cc1 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,48 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v5.0.0 + hooks: + - id: check-added-large-files + args: [--maxkb=8192] + - id: check-merge-conflict + - id: check-json + exclude: tests/a-framework/parameter_file_3\.json + - id: check-toml + - id: check-yaml + args: [--allow-multiple-documents] + - id: end-of-file-fixer + exclude: | + (?x)( + \.output| + \.run_only| + \.diff| + ^bundled/ + ) + - id: no-commit-to-branch + args: [--branch,master] + - id: trailing-whitespace + files: | + (?x)( + \.(cc|h$|html|doc|txt)| + ^doc/news + ) + exclude: ^bundled/ +- repo: https://github.com/gitleaks/gitleaks + rev: v8.21.2 + hooks: + - id: gitleaks +- repo: https://github.com/pre-commit/mirrors-clang-format + rev: v16.0.6 + hooks: + - id: clang-format + files: | + (?x)( + \.inst\.in | + \.cc | + \.h + )$ +- repo: https://github.com/crate-ci/typos + rev: v1.28.1 + hooks: + - id: typos + files: (?x) ^(doc|examples|include|source|tests)/ diff --git a/CHANGELOG.md b/CHANGELOG.md index a597cf015f..6d60847561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,4 +3,4 @@ Changes to deal.II between versions The list of changes between versions of deal.II is maintained as part of the regular documentation. You can find it -[here](https://www.dealii.org/developer/doxygen/deal.II/pages.html). \ No newline at end of file +[here](https://www.dealii.org/developer/doxygen/deal.II/pages.html). diff --git a/CMakeLists.txt b/CMakeLists.txt index 89e3d3e715..1e74da92e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ cmake_policy(VERSION 3.13.4) if(POLICY CMP0074) # Introduced in CMake 3.12: find_package() also searches - # _ROOT CMake and environment variables when set to NEW. + # _ROOT CMake and environment variables when set to NEW. cmake_policy(SET CMP0074 NEW) endif() diff --git a/README.md b/README.md index b43140e60a..0cc5f51009 100644 --- a/README.md +++ b/README.md @@ -82,4 +82,3 @@ by running, for example: The above command would drop you into an isolated environment, in which you will find the latest version of deal.II (master development branch) installed under `/usr/local`. - diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt index 1673b929b7..bd1aca2318 100644 --- a/cmake/config/CMakeLists.txt +++ b/cmake/config/CMakeLists.txt @@ -192,4 +192,3 @@ install(FILES # message(STATUS "Setting up project configuration - Done") - diff --git a/cmake/config/ConfigGit.cmake.in b/cmake/config/ConfigGit.cmake.in index ac62112250..1855c7aff3 100644 --- a/cmake/config/ConfigGit.cmake.in +++ b/cmake/config/ConfigGit.cmake.in @@ -21,4 +21,3 @@ set(DEAL_II_GIT_BRANCH "@DEAL_II_GIT_BRANCH@") set(DEAL_II_GIT_REVISION "@DEAL_II_GIT_REVISION@") set(DEAL_II_GIT_SHORTREV "@DEAL_II_GIT_SHORTREV@") set(DEAL_II_GIT_TAG "@DEAL_II_GIT_TAG@") - diff --git a/cmake/config/ConfigVersion.cmake.in b/cmake/config/ConfigVersion.cmake.in index 627c1bea4d..21bf9e291f 100644 --- a/cmake/config/ConfigVersion.cmake.in +++ b/cmake/config/ConfigVersion.cmake.in @@ -14,4 +14,3 @@ else() set(PACKAGE_VERSION_EXACT TRUE) endif() endif() - diff --git a/cmake/configure/TestBoostBug/polymorphic_derived2.cpp b/cmake/configure/TestBoostBug/polymorphic_derived2.cpp index 2e445d464c..9cc7780ed8 100644 --- a/cmake/configure/TestBoostBug/polymorphic_derived2.cpp +++ b/cmake/configure/TestBoostBug/polymorphic_derived2.cpp @@ -44,4 +44,4 @@ void polymorphic_derived2::serialize( ); // note: export has to be AFTER #includes for all archive classes -BOOST_CLASS_EXPORT_IMPLEMENT(polymorphic_derived2) \ No newline at end of file +BOOST_CLASS_EXPORT_IMPLEMENT(polymorphic_derived2) diff --git a/cmake/configure/TestBoostBug/polymorphic_derived2.hpp b/cmake/configure/TestBoostBug/polymorphic_derived2.hpp index 10774495f0..5a5f5a3b37 100644 --- a/cmake/configure/TestBoostBug/polymorphic_derived2.hpp +++ b/cmake/configure/TestBoostBug/polymorphic_derived2.hpp @@ -39,4 +39,3 @@ BOOST_CLASS_TYPE_INFO( ) #endif // POLYMORPHIC_DERIVED2_HPP - diff --git a/cmake/configure/configure_10_taskflow.cmake b/cmake/configure/configure_10_taskflow.cmake index 9fbee7972d..9e55cc7288 100644 --- a/cmake/configure/configure_10_taskflow.cmake +++ b/cmake/configure/configure_10_taskflow.cmake @@ -46,4 +46,3 @@ endmacro() configure_feature(TASKFLOW) - diff --git a/cmake/configure/configure_30_kokkos.cmake b/cmake/configure/configure_30_kokkos.cmake index db8dbefb8c..f524d6e2c8 100644 --- a/cmake/configure/configure_30_kokkos.cmake +++ b/cmake/configure/configure_30_kokkos.cmake @@ -37,4 +37,3 @@ if(NOT DEAL_II_WITH_KOKKOS) ) endif() endif() - diff --git a/cmake/configure/configure_50_arborx.cmake b/cmake/configure/configure_50_arborx.cmake index 2fd680b07f..ea6eb3fcfe 100644 --- a/cmake/configure/configure_50_arborx.cmake +++ b/cmake/configure/configure_50_arborx.cmake @@ -78,4 +78,3 @@ macro(feature_arborx_find_external var) endmacro() configure_feature(ARBORX) - diff --git a/cmake/configure/configure_50_complex_values.cmake b/cmake/configure/configure_50_complex_values.cmake index 3b04a0e726..46a6fe5b5b 100644 --- a/cmake/configure/configure_50_complex_values.cmake +++ b/cmake/configure/configure_50_complex_values.cmake @@ -38,4 +38,3 @@ if(${DEAL_II_WITH_COMPLEX_VALUES}) "LinearAlgebra::distributed::BlockVector >" ) endif() - diff --git a/cmake/macros/check_compiler_setup/CMakeLists.txt b/cmake/macros/check_compiler_setup/CMakeLists.txt index 0b68d5a942..561dbed24a 100644 --- a/cmake/macros/check_compiler_setup/CMakeLists.txt +++ b/cmake/macros/check_compiler_setup/CMakeLists.txt @@ -8,4 +8,3 @@ add_executable(CheckCompilerSetupExec dummy.cpp) target_compile_options(CheckCompilerSetupExec PRIVATE ${TEST_COMPILE_OPTIONS}) target_link_options(CheckCompilerSetupExec PRIVATE ${TEST_LINK_OPTIONS}) target_link_libraries(CheckCompilerSetupExec ${TEST_LINK_LIBRARIES}) - diff --git a/cmake/macros/macro_add_flags.cmake b/cmake/macros/macro_add_flags.cmake index 55b696c965..5ec7c394a1 100644 --- a/cmake/macros/macro_add_flags.cmake +++ b/cmake/macros/macro_add_flags.cmake @@ -27,4 +27,3 @@ macro(add_flags _variable _flags) string(STRIP "${${_variable}}" ${_variable}) endif() endmacro() - diff --git a/cmake/macros/macro_check_cxx_compiler_bug.cmake b/cmake/macros/macro_check_cxx_compiler_bug.cmake index 36437e3158..3e370d943d 100644 --- a/cmake/macros/macro_check_cxx_compiler_bug.cmake +++ b/cmake/macros/macro_check_cxx_compiler_bug.cmake @@ -42,4 +42,3 @@ macro(check_cxx_compiler_bug _source _var) set(${_var} TRUE) endif() endmacro() - diff --git a/cmake/macros/macro_check_mpi_interface.cmake b/cmake/macros/macro_check_mpi_interface.cmake index 21cd9e595b..11def5959d 100644 --- a/cmake/macros/macro_check_mpi_interface.cmake +++ b/cmake/macros/macro_check_mpi_interface.cmake @@ -66,4 +66,3 @@ macro(check_mpi_interface _feature _var) endif() endif() endmacro() - diff --git a/cmake/macros/macro_clear_cmake_required.cmake b/cmake/macros/macro_clear_cmake_required.cmake index ec49738d24..030278aebd 100644 --- a/cmake/macros/macro_clear_cmake_required.cmake +++ b/cmake/macros/macro_clear_cmake_required.cmake @@ -24,4 +24,3 @@ macro(clear_cmake_required) set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_LIBRARIES) endmacro() - diff --git a/cmake/macros/macro_copy_target_properties.cmake b/cmake/macros/macro_copy_target_properties.cmake index 68643f034c..9a59656063 100644 --- a/cmake/macros/macro_copy_target_properties.cmake +++ b/cmake/macros/macro_copy_target_properties.cmake @@ -154,4 +154,3 @@ function(copy_target_properties _destination_target) target_link_options(${_destination_target} INTERFACE ${_link_options}) endif() endfunction() - diff --git a/cmake/macros/macro_deal_ii_invoke_autopilot.cmake b/cmake/macros/macro_deal_ii_invoke_autopilot.cmake index 330f0c29a8..e742107712 100644 --- a/cmake/macros/macro_deal_ii_invoke_autopilot.cmake +++ b/cmake/macros/macro_deal_ii_invoke_autopilot.cmake @@ -326,4 +326,3 @@ ${_switch_targets}# endif() endmacro() - diff --git a/cmake/macros/macro_enable_if_supported.cmake b/cmake/macros/macro_enable_if_supported.cmake index 45bc5f9c0d..c51205e270 100644 --- a/cmake/macros/macro_enable_if_supported.cmake +++ b/cmake/macros/macro_enable_if_supported.cmake @@ -56,4 +56,3 @@ macro(enable_if_supported _variable _flag) unset(CMAKE_REQUIRED_FLAGS) endmacro() - diff --git a/cmake/macros/macro_expand_instantiations.cmake b/cmake/macros/macro_expand_instantiations.cmake index 489be88d7b..8842febf18 100644 --- a/cmake/macros/macro_expand_instantiations.cmake +++ b/cmake/macros/macro_expand_instantiations.cmake @@ -92,4 +92,3 @@ macro(expand_instantiations _target _inst_in_files) endforeach() endmacro() - diff --git a/cmake/macros/macro_item_matches.cmake b/cmake/macros/macro_item_matches.cmake index d5939eece2..198ce8688c 100644 --- a/cmake/macros/macro_item_matches.cmake +++ b/cmake/macros/macro_item_matches.cmake @@ -30,4 +30,3 @@ macro(item_matches _var _regex) endif() endforeach() endmacro() - diff --git a/cmake/macros/macro_print_target_properties.cmake b/cmake/macros/macro_print_target_properties.cmake index 9a23f1cec7..3f629c62fb 100644 --- a/cmake/macros/macro_print_target_properties.cmake +++ b/cmake/macros/macro_print_target_properties.cmake @@ -56,4 +56,3 @@ function(print_target_properties _target) set(${ARGN} "${_messages}" PARENT_SCOPE) endif() endfunction() - diff --git a/cmake/macros/macro_reset_cmake_required.cmake b/cmake/macros/macro_reset_cmake_required.cmake index a01a13d458..c82f7ec28b 100644 --- a/cmake/macros/macro_reset_cmake_required.cmake +++ b/cmake/macros/macro_reset_cmake_required.cmake @@ -25,4 +25,3 @@ macro(reset_cmake_required) set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_LIBRARIES ${DEAL_II_LINKER_FLAGS_SAVED}) endmacro() - diff --git a/cmake/macros/macro_strip_flag.cmake b/cmake/macros/macro_strip_flag.cmake index e3d35772c9..bba80d7ea5 100644 --- a/cmake/macros/macro_strip_flag.cmake +++ b/cmake/macros/macro_strip_flag.cmake @@ -27,4 +27,3 @@ macro(strip_flag _variable _flag) string(REPLACE " " " " ${_variable} "${${_variable}}") string(STRIP "${${_variable}}" ${_variable}) endmacro() - diff --git a/cmake/macros/macro_strip_known_generator_expressions.cmake b/cmake/macros/macro_strip_known_generator_expressions.cmake index 3b91d12024..15e618bf2e 100644 --- a/cmake/macros/macro_strip_known_generator_expressions.cmake +++ b/cmake/macros/macro_strip_known_generator_expressions.cmake @@ -30,4 +30,3 @@ macro(strip_known_generator_expressions _variable) string(REGEX REPLACE ${expression} "\\1" ${_variable} "${${_variable}}") endforeach() endmacro() - diff --git a/cmake/modules/FindDEAL_II_TRILINOS.cmake b/cmake/modules/FindDEAL_II_TRILINOS.cmake index 5eae1a3ae9..7ff28686dd 100644 --- a/cmake/modules/FindDEAL_II_TRILINOS.cmake +++ b/cmake/modules/FindDEAL_II_TRILINOS.cmake @@ -196,4 +196,3 @@ else() EPETRA_CONFIG_H ${_libraries} TRILINOS_CXX_SUPPORTS_SACADO_COMPLEX_RAD ) endif() - diff --git a/cmake/setup_compiler_flags_intel.cmake b/cmake/setup_compiler_flags_intel.cmake index bae8f85682..8108cde40d 100644 --- a/cmake/setup_compiler_flags_intel.cmake +++ b/cmake/setup_compiler_flags_intel.cmake @@ -184,4 +184,3 @@ if (CMAKE_BUILD_TYPE MATCHES "Debug") enable_if_supported(DEAL_II_CXX_FLAGS_DEBUG "-gdwarf-2") enable_if_supported(DEAL_II_CXX_FLAGS_DEBUG "-grecord-gcc-switches") endif() - diff --git a/cmake/setup_compiler_flags_msvc.cmake b/cmake/setup_compiler_flags_msvc.cmake index fea55d9ff5..373bb0aca8 100644 --- a/cmake/setup_compiler_flags_msvc.cmake +++ b/cmake/setup_compiler_flags_msvc.cmake @@ -118,4 +118,3 @@ if (CMAKE_BUILD_TYPE MATCHES "Debug") # generate some debug info: enable_if_supported(DEAL_II_CXX_FLAGS_DEBUG "/Zi /MDd /Od") endif() - diff --git a/cmake/setup_finalize.cmake b/cmake/setup_finalize.cmake index 38d82a070a..e4c05850b0 100644 --- a/cmake/setup_finalize.cmake +++ b/cmake/setup_finalize.cmake @@ -67,4 +67,3 @@ file(WRITE ${CMAKE_BINARY_DIR}/revision.log # ###" ) - diff --git a/contrib/python-bindings/tests/manifold_wrapper.vtk b/contrib/python-bindings/tests/manifold_wrapper.vtk index 7fd1552e80..03783fbfb0 100644 --- a/contrib/python-bindings/tests/manifold_wrapper.vtk +++ b/contrib/python-bindings/tests/manifold_wrapper.vtk @@ -103,4 +103,3 @@ SCALARS ManifoldID int 1 LOOKUP_TABLE default 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - diff --git a/contrib/utilities/checkdoxygen.py b/contrib/utilities/checkdoxygen.py index 2566a7dbd9..1f321bc7be 100755 --- a/contrib/utilities/checkdoxygen.py +++ b/contrib/utilities/checkdoxygen.py @@ -133,4 +133,3 @@ if 'intro.dox' in filename: # check the file group check_multiple_defined_headers(lines) - diff --git a/contrib/utilities/count_lines.sh b/contrib/utilities/count_lines.sh index 124218849b..47a9ec083f 100755 --- a/contrib/utilities/count_lines.sh +++ b/contrib/utilities/count_lines.sh @@ -128,4 +128,3 @@ for commit in $commits ; do done git checkout -q ${current_branch} - diff --git a/contrib/utilities/parse_ctest_output.py b/contrib/utilities/parse_ctest_output.py index 751027d349..2439d044a5 100644 --- a/contrib/utilities/parse_ctest_output.py +++ b/contrib/utilities/parse_ctest_output.py @@ -298,5 +298,3 @@ f.write('') f.write('') - - diff --git a/contrib/utilities/relocate_libraries.py b/contrib/utilities/relocate_libraries.py index e01561a923..b61fe62127 100755 --- a/contrib/utilities/relocate_libraries.py +++ b/contrib/utilities/relocate_libraries.py @@ -116,7 +116,3 @@ for c in xrange(len(libraries)): print('Last command failed!') print(" ".join(command)) print('*********************************************\n\n') - - - - diff --git a/contrib/utilities/run_clang_tidy.sh b/contrib/utilities/run_clang_tidy.sh index cdae209007..df8837fa78 100755 --- a/contrib/utilities/run_clang_tidy.sh +++ b/contrib/utilities/run_clang_tidy.sh @@ -75,4 +75,3 @@ fi echo "OK" exit 0 - diff --git a/contrib/utilities/update-copyright.sh b/contrib/utilities/update-copyright.sh index 4ce0949547..d0216eb4f2 100755 --- a/contrib/utilities/update-copyright.sh +++ b/contrib/utilities/update-copyright.sh @@ -182,4 +182,3 @@ process() process "." "CMakeLists.txt|CTestConfig.cmake" update_copyright process "cmake contrib doc examples include source tests" ".*" update_copyright - diff --git a/contrib/utilities/wrapcomments.py b/contrib/utilities/wrapcomments.py index e2876641b1..8b7214a51d 100755 --- a/contrib/utilities/wrapcomments.py +++ b/contrib/utilities/wrapcomments.py @@ -592,8 +592,3 @@ assert(cur==[]) for line in out: print (line) - - - - - diff --git a/doc/news/changes/README.md b/doc/news/changes/README.md index e89cb519fa..88ac65b91f 100644 --- a/doc/news/changes/README.md +++ b/doc/news/changes/README.md @@ -1,22 +1,22 @@ This folder contains changelog entries ====================================== -Changes between different releases in deal.II are documented in the file +Changes between different releases in deal.II are documented in the file "changes.h" that is automatically created from the files in the directories - * "major", - * "minor" and + * "major", + * "minor" and * "incompatibilities". Each of these files contain a short description of a change, the authors' names -and the date where the latter two a separated by "
" from the first one. +and the date where the latter two a separated by "
" from the first one. A typical file could look like this: New: We can do fancy stuff now.
(John Doe, YYYY/MM/DD) -and is named "YYYYMMDDJohnDoe". File names for multiple contributions from the +and is named "YYYYMMDDJohnDoe". File names for multiple contributions from the same author on one day have a number appended, e.g. "YYYMMDDJohnDoe\_1". Only the file name is used to have a proper order in "changes.h". This means that the file can in principle have an arbitrary name as long as the date @@ -25,7 +25,7 @@ in the file and in the file name match. incompatibilities ----------------- -The "incompatibilities" section contains modifications to the library that +The "incompatibilities" section contains modifications to the library that are incompatible with previous versions of the library, but which are necessary for the future maintainability of the library. diff --git a/doc/news/changes/minor/20241127Thiele b/doc/news/changes/minor/20241127Thiele new file mode 100644 index 0000000000..a5e86b7389 --- /dev/null +++ b/doc/news/changes/minor/20241127Thiele @@ -0,0 +1,7 @@ +New: Configuration and CI job for pre-commit. +The tool pre-commit can install hooks into the local git repo. +These will be run on every call to git commit and perform some quick checks +on the changeset. +The CI job runs these checks on the whole codebase. +
+(Jan Philipp Thiele, 2024/11/27) diff --git a/doc/users/CMakeLists.txt.sample2 b/doc/users/CMakeLists.txt.sample2 index 33989d825e..ae7c546a52 100644 --- a/doc/users/CMakeLists.txt.sample2 +++ b/doc/users/CMakeLists.txt.sample2 @@ -14,7 +14,7 @@ set(TARGET "step-1") # you may want to either replace the following statement by something like # FILE(GLOB_RECURSE TARGET_SRC "source/*.cc") # FILE(GLOB_RECURSE TARGET_INC "include/*.h") -# SET(TARGET_SRC ${TARGET_SRC} ${TARGET_INC}) +# SET(TARGET_SRC ${TARGET_SRC} ${TARGET_INC}) # or switch altogether to the large project CMakeLists.txt file discussed # in the "CMake in user projects" page accessible from the "User info" # page of the documentation. diff --git a/doc/users/CMakeLists.txt.sample3 b/doc/users/CMakeLists.txt.sample3 index 7eb2cd95d0..eecced8771 100644 --- a/doc/users/CMakeLists.txt.sample3 +++ b/doc/users/CMakeLists.txt.sample3 @@ -14,7 +14,7 @@ set(TARGET "step-1") # you may want to either replace the following statement by something like # FILE(GLOB_RECURSE TARGET_SRC "source/*.cc") # FILE(GLOB_RECURSE TARGET_INC "include/*.h") -# SET(TARGET_SRC ${TARGET_SRC} ${TARGET_INC}) +# SET(TARGET_SRC ${TARGET_SRC} ${TARGET_INC}) # or switch altogether to the large project CMakeLists.txt file discussed # in the "CMake in user projects" page accessible from the "User info" # page of the documentation. diff --git a/examples/step-1/doc/builds-on b/examples/step-1/doc/builds-on index 8b13789179..e69de29bb2 100644 --- a/examples/step-1/doc/builds-on +++ b/examples/step-1/doc/builds-on @@ -1 +0,0 @@ - diff --git a/examples/step-11/doc/tooltip b/examples/step-11/doc/tooltip index 17a5334733..06d2d28353 100644 --- a/examples/step-11/doc/tooltip +++ b/examples/step-11/doc/tooltip @@ -1,2 +1 @@ Higher order mappings. Dealing with constraints. - diff --git a/examples/step-33/slide.inp b/examples/step-33/slide.inp index 66684bc8b6..ccf22072d3 100644 --- a/examples/step-33/slide.inp +++ b/examples/step-33/slide.inp @@ -3557,4 +3557,3 @@ 1824 4 line 31 32 1825 4 line 32 33 1826 4 line 33 9 - diff --git a/examples/step-57/doc/gnuplot.gpl b/examples/step-57/doc/gnuplot.gpl index ded394cc71..2e72f8816a 100644 --- a/examples/step-57/doc/gnuplot.gpl +++ b/examples/step-57/doc/gnuplot.gpl @@ -61,5 +61,3 @@ plot "7500-line-0.txt" using 2:1 w l ls 1 title "Refinement 0", \ "7500-line-4.txt" using 2:1 w l ls 5 title "Refinement 4", \ "ref_2d_ghia_u.txt" using 7:1 ls 10 pt 4 w p title "Reference [Ghia 82]", \ "ref_2d_erturk_u.txt" using 5:1 ls 11 pt 6 w p title "Reference [Erturk]" - - diff --git a/examples/step-58/doc/kind b/examples/step-58/doc/kind index 53c432fbd8..86a44aa1ef 100644 --- a/examples/step-58/doc/kind +++ b/examples/step-58/doc/kind @@ -1,2 +1 @@ time dependent - diff --git a/examples/step-6/doc/tooltip b/examples/step-6/doc/tooltip index 00262bfbfb..f8540af409 100644 --- a/examples/step-6/doc/tooltip +++ b/examples/step-6/doc/tooltip @@ -1 +1 @@ -Adaptive local refinement. Higher order elements. \ No newline at end of file +Adaptive local refinement. Higher order elements. diff --git a/examples/step-60/parameters.prm b/examples/step-60/parameters.prm index 7c9638427c..0ceb949e3c 100644 --- a/examples/step-60/parameters.prm +++ b/examples/step-60/parameters.prm @@ -187,5 +187,3 @@ subsection Distributed Lagrange<1,2> end end - - diff --git a/examples/step-71/doc/builds-on b/examples/step-71/doc/builds-on index 8b13789179..e69de29bb2 100644 --- a/examples/step-71/doc/builds-on +++ b/examples/step-71/doc/builds-on @@ -1 +0,0 @@ - diff --git a/examples/step-71/parameters.prm b/examples/step-71/parameters.prm index b5a8058ac8..89646981e2 100644 --- a/examples/step-71/parameters.prm +++ b/examples/step-71/parameters.prm @@ -27,5 +27,3 @@ subsection Coupled Constitutive Laws end end - - diff --git a/examples/step-86/doc/results.dox b/examples/step-86/doc/results.dox index b7b57f6f00..d079aa411b 100644 --- a/examples/step-86/doc/results.dox +++ b/examples/step-86/doc/results.dox @@ -278,4 +278,3 @@ you have somewhere in the range of 50,000 to 100,000 unknowns *per MPI process*. But it is not difficult to adapt the program at hand here to run with a much finer mesh, or perhaps in 3d, so that one is beyond that limit and sees the benefits of parallel computing. - diff --git a/examples/step-89/CMakeLists.txt b/examples/step-89/CMakeLists.txt index fcc646a0c6..faed51b64e 100644 --- a/examples/step-89/CMakeLists.txt +++ b/examples/step-89/CMakeLists.txt @@ -52,4 +52,3 @@ deal_ii_initialize_cached_variables() set(CLEAN_UP_FILES *.log *.gmv *.gnuplot *.gpl *.eps *.pov *.ucd *.d2 *.vtu *.pvtu) project(${TARGET}) deal_ii_invoke_autopilot() - diff --git a/source/differentiation/ad/ad_drivers.inst1.in b/source/differentiation/ad/ad_drivers.inst1.in index 091560f798..f28edf876e 100644 --- a/source/differentiation/ad/ad_drivers.inst1.in +++ b/source/differentiation/ad/ad_drivers.inst1.in @@ -69,4 +69,4 @@ for () \} \} -} \ No newline at end of file +} diff --git a/source/grid/grid_out.cc b/source/grid/grid_out.cc index 421013ae02..9d6b2fd4f9 100644 --- a/source/grid/grid_out.cc +++ b/source/grid/grid_out.cc @@ -344,7 +344,7 @@ namespace GridOutFlags param.declare_entry("Azimuth", "30", Patterns::Double(), - "Azimuth of the viw point, that is, the angle " + "Azimuth of the view point, that is, the angle " "in the plane from the x-axis."); param.declare_entry("Elevation", "30", diff --git a/source/grid/tria_accessor.inst.in b/source/grid/tria_accessor.inst.in index 9280ae6801..299f6cf693 100644 --- a/source/grid/tria_accessor.inst.in +++ b/source/grid/tria_accessor.inst.in @@ -63,4 +63,4 @@ for (deal_II_struct_dimension : DIMENSIONS; deal_II_dimension : DIMENSIONS; template class InvalidAccessor; - } \ No newline at end of file + } diff --git a/tests/cgal/input_grids/cube.off b/tests/cgal/input_grids/cube.off index e200aa44bd..b1afa5a685 100644 --- a/tests/cgal/input_grids/cube.off +++ b/tests/cgal/input_grids/cube.off @@ -19,4 +19,4 @@ OFF 3 6 4 7 3 6 5 4 3 1 5 6 -3 2 1 6 \ No newline at end of file +3 2 1 6 diff --git a/tests/cgal/input_grids/hedra.off b/tests/cgal/input_grids/hedra.off index 597be0e2f3..6341b59858 100644 --- a/tests/cgal/input_grids/hedra.off +++ b/tests/cgal/input_grids/hedra.off @@ -13,4 +13,4 @@ OFF 3 1 2 0 3 3 4 0 3 4 5 1 -3 3 2 5 \ No newline at end of file +3 3 2 5 diff --git a/tests/cgal/input_grids/octahedron.off b/tests/cgal/input_grids/octahedron.off index 1b38ebfc59..799bcb0fa8 100644 --- a/tests/cgal/input_grids/octahedron.off +++ b/tests/cgal/input_grids/octahedron.off @@ -13,4 +13,4 @@ OFF 3 1 5 2 3 2 5 3 3 3 5 4 -3 4 5 1 \ No newline at end of file +3 4 5 1 diff --git a/tests/cgal/input_grids/tripod.off b/tests/cgal/input_grids/tripod.off index ea3b32d191..eda1804a9f 100644 --- a/tests/cgal/input_grids/tripod.off +++ b/tests/cgal/input_grids/tripod.off @@ -69,4 +69,3 @@ OFF 3 2 23 3 3 12 23 2 3 13 23 12 - diff --git a/tests/codim_one/grids/sphere_0.inp b/tests/codim_one/grids/sphere_0.inp index 0c2733d9b6..5ea249c4dc 100644 --- a/tests/codim_one/grids/sphere_0.inp +++ b/tests/codim_one/grids/sphere_0.inp @@ -13,4 +13,3 @@ 4 1 quad 3 7 8 4 5 1 quad 5 7 3 1 6 1 quad 2 4 8 6 - diff --git a/tests/examples/step-9.diff b/tests/examples/step-9.diff index 4f4c15a979..1ffc61c221 100644 --- a/tests/examples/step-9.diff +++ b/tests/examples/step-9.diff @@ -26,4 +26,3 @@ < output_results(cycle); --- > //output_results(cycle); - diff --git a/tests/grid/grid_in_gmsh_03.geo b/tests/grid/grid_in_gmsh_03.geo index 60ae7795b9..188ac4cf64 100644 --- a/tests/grid/grid_in_gmsh_03.geo +++ b/tests/grid/grid_in_gmsh_03.geo @@ -22,7 +22,3 @@ Plane Surface(2) = {2}; Physical Curve("1", 10) = {2, 7, 6, 5, 4, 3}; Physical Surface("1", 9) = {2, 1}; - - - - diff --git a/tests/grid/grid_in_gmsh_03.msh b/tests/grid/grid_in_gmsh_03.msh index 76426b1002..87567ff862 100644 --- a/tests/grid/grid_in_gmsh_03.msh +++ b/tests/grid/grid_in_gmsh_03.msh @@ -182,4 +182,4 @@ $Elements 62 30 33 26 63 29 32 15 64 8 33 30 -$EndElements \ No newline at end of file +$EndElements diff --git a/tests/grid/grid_in_msh_02/mesh.msh b/tests/grid/grid_in_msh_02/mesh.msh index 7c5fc1fa45..c93eb2c583 100644 --- a/tests/grid/grid_in_msh_02/mesh.msh +++ b/tests/grid/grid_in_msh_02/mesh.msh @@ -75,4 +75,4 @@ $ELM 41 3 0 8 4 17 6 18 28 42 3 0 8 4 28 18 19 29 43 3 0 8 4 29 19 7 8 -$ENDELM \ No newline at end of file +$ENDELM diff --git a/tests/grid/grid_in_ucd_02_grids/grid_2.inp b/tests/grid/grid_in_ucd_02_grids/grid_2.inp index 41efaf5f68..dfbc50ee16 100644 --- a/tests/grid/grid_in_ucd_02_grids/grid_2.inp +++ b/tests/grid/grid_in_ucd_02_grids/grid_2.inp @@ -8,4 +8,3 @@ 3 100 line 2 4 4 100 line 4 3 5 100 line 3 1 - diff --git a/tests/grid/grid_in_ucd_02_grids/grid_3.inp b/tests/grid/grid_in_ucd_02_grids/grid_3.inp index 5218408f06..f63eb89b87 100644 --- a/tests/grid/grid_in_ucd_02_grids/grid_3.inp +++ b/tests/grid/grid_in_ucd_02_grids/grid_3.inp @@ -26,4 +26,3 @@ 17 101 line 2 6 18 101 line 3 7 19 101 line 4 8 - diff --git a/tests/grid/grid_in_vtk_1d_3d.tria1.vtk b/tests/grid/grid_in_vtk_1d_3d.tria1.vtk index e9e55dfd07..92c33430a5 100644 --- a/tests/grid/grid_in_vtk_1d_3d.tria1.vtk +++ b/tests/grid/grid_in_vtk_1d_3d.tria1.vtk @@ -33,5 +33,3 @@ LOOKUP_TABLE default SCALARS ManifoldID int 1 LOOKUP_TABLE default -1 -1 -1 -1 - - diff --git a/tests/grid/grid_in_vtk_1d_3d.tria2.vtk b/tests/grid/grid_in_vtk_1d_3d.tria2.vtk index c7e2416d39..11ecfd427a 100644 --- a/tests/grid/grid_in_vtk_1d_3d.tria2.vtk +++ b/tests/grid/grid_in_vtk_1d_3d.tria2.vtk @@ -33,5 +33,3 @@ LOOKUP_TABLE default SCALARS ManifoldID int 1 LOOKUP_TABLE default -1 -1 -1 -1 - - diff --git a/tests/grid/grids/abaqus/2d/2d_short_handwritten.inp b/tests/grid/grids/abaqus/2d/2d_short_handwritten.inp index c0a127f8ea..33a0d7f8d1 100644 --- a/tests/grid/grids/abaqus/2d/2d_short_handwritten.inp +++ b/tests/grid/grids/abaqus/2d/2d_short_handwritten.inp @@ -9,4 +9,4 @@ It does not have a new line at the end of the last line. 3,0,1 4,1,1 *ELEMENT, TYPE=CPE4, ELSET=EB0 -1,1,2,4,3 \ No newline at end of file +1,1,2,4,3 diff --git a/tests/grid/grids/abaqus/3d/codim_1-jagged_surface.inp b/tests/grid/grids/abaqus/3d/codim_1-jagged_surface.inp index e9fdd3189d..68007cb472 100644 --- a/tests/grid/grids/abaqus/3d/codim_1-jagged_surface.inp +++ b/tests/grid/grids/abaqus/3d/codim_1-jagged_surface.inp @@ -835,4 +835,3 @@ 2412, 2456, 2556, 2457, 2357 2509, 2651, 2556, 2456, 2555 *End Part - diff --git a/tests/grid/grids/abaqus/3d/codim_1-tube.inp b/tests/grid/grids/abaqus/3d/codim_1-tube.inp index e41fa8f09a..ce3f494276 100644 --- a/tests/grid/grids/abaqus/3d/codim_1-tube.inp +++ b/tests/grid/grids/abaqus/3d/codim_1-tube.inp @@ -218,4 +218,3 @@ 95, 119, 120, 24, 23 96, 120, 45, 6, 24 *End Part - diff --git a/tests/grid/grids/comsol/mesh_example_with_domain_geom_info_1_7.mphtxt b/tests/grid/grids/comsol/mesh_example_with_domain_geom_info_1_7.mphtxt index 22df34044b..fff2381d4c 100644 --- a/tests/grid/grids/comsol/mesh_example_with_domain_geom_info_1_7.mphtxt +++ b/tests/grid/grids/comsol/mesh_example_with_domain_geom_info_1_7.mphtxt @@ -70,4 +70,4 @@ 2 # number of geometric entity indices # Geometric entity indices 6 -7 \ No newline at end of file +7 diff --git a/tests/parameter_handler/parameter_handler_1_include_in.prm2 b/tests/parameter_handler/parameter_handler_1_include_in.prm2 index cbf86bd5ac..4ed62961ce 100644 --- a/tests/parameter_handler/parameter_handler_1_include_in.prm2 +++ b/tests/parameter_handler/parameter_handler_1_include_in.prm2 @@ -1,2 +1 @@ set test_1 = 1,0,1 -