Skip to content

Commit

Permalink
[WIP] Add multigrid (#425)
Browse files Browse the repository at this point in the history
Partial multigrid
  • Loading branch information
landinjm authored Feb 18, 2025
1 parent ba71fb3 commit 64b20eb
Show file tree
Hide file tree
Showing 257 changed files with 12,585 additions and 94,422 deletions.
7 changes: 5 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,18 @@ FixNamespaceComments: true

IncludeBlocks: Regroup
IncludeCategories:
# customPDE.h in main.cc must always be first
- Regex: '"customPDE.h"'
# custom_pde.h in main.cc must always be first
- Regex: '"custom_pde.h"'
Priority: -1
# deal.II headers:
- Regex: '<deal.II.*>'
Priority: 1
# boost headers:
- Regex: '<boost.*>'
Priority: 9
# prismspf headers:
- Regex: '<prismspf.*>'
Priority: 10
# all standard <...> headers
- Regex: '<[-\w\/-_]+[\.\/]*[-\w\/-_]+>>'
Priority: 99
Expand Down
4 changes: 4 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ Checks: >
-cppcoreguidelines-avoid-const-or-ref-data-members,
-cppcoreguidelines-non-private-member-variables-in-classes,
-cppcoreguidelines-avoid-magic-numbers,
-cppcoreguidelines-owning-memory,
-cppcoreguidelines-special-member-functions,
hicpp-*,
-hicpp-special-member-functions,
misc-*,
-misc-non-private-member-variables-in-classes,
modernize-*,
Expand All @@ -23,5 +26,6 @@ Checks: >
-readability-identifier-length,
-readability-magic-numbers,
-readability-convert-member-functions-to-static,
-readability-function-cognitive-complexity,
WarningsAsErrors: '*'
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Makefile
build.ninja

# Config files
include/config.h
include/prismspf/config.h
*.project
*.cproject
*.DS_Store
Expand Down
12 changes: 10 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ project(prisms_pf CXX)
set(PRISMS_PF_SOURCE_DIR ${CMAKE_SOURCE_DIR})

configure_file(
${CMAKE_SOURCE_DIR}/include/config.h.in
${CMAKE_BINARY_DIR}/include/config.h
${CMAKE_SOURCE_DIR}/include/prismspf/config.h.in
${CMAKE_BINARY_DIR}/include/prismspf/config.h
)

# Collect source files
Expand Down Expand Up @@ -287,6 +287,10 @@ if(${PRISMS_PF_BUILD_DEBUG} STREQUAL "ON")
set_property(TARGET ${LIBRARY_NAME_DEBUG} PROPERTY OUTPUT_NAME prisms-pf-debug)
target_include_directories(${LIBRARY_NAME_DEBUG} PRIVATE ${CMAKE_BINARY_DIR}/include include)
deal_ii_setup_target(${LIBRARY_NAME_DEBUG} DEBUG)

if(${PRISMS_PF_WITH_CALIPER})
target_link_libraries(${LIBRARY_NAME_DEBUG} caliper)
endif()
endif()

if(${PRISMS_PF_BUILD_RELEASE} STREQUAL "ON")
Expand All @@ -295,4 +299,8 @@ if(${PRISMS_PF_BUILD_RELEASE} STREQUAL "ON")
set_property(TARGET ${LIBRARY_NAME_RELEASE} PROPERTY OUTPUT_NAME prisms-pf-release)
target_include_directories(${LIBRARY_NAME_RELEASE} PRIVATE ${CMAKE_BINARY_DIR}/include include)
deal_ii_setup_target(${LIBRARY_NAME_RELEASE} RELEASE)

if(${PRISMS_PF_WITH_CALIPER})
target_link_libraries(${LIBRARY_NAME_RELEASE} caliper)
endif()
endif()
Binary file not shown.

This file was deleted.

Binary file not shown.
Loading

0 comments on commit 64b20eb

Please sign in to comment.