Skip to content

Commit 4a3f7e3

Browse files
author
Roberto Di Remigio
committed
Move old wavelet code (wem and pwl directories) to the attic. Create separate executables for PWC/PWL tests with increasing number of patches.
Unpack Monica's solvers from one single object with an if-else CTOR to two different objects: WEMSolver --> PWCSolver and PWLSolver. These two objects have the correct function Ansatz, interpolation grade and interpolation type set in the initializer list. I have also started unpacking the tests in wem_lin to two directories pwc and pwl. The tests with increasing number of patches are now in src/bin as separate executables as they do not need to use Boost.Test
1 parent a4ee6ba commit 4a3f7e3

File tree

150 files changed

+1720
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+1720
-80
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,6 @@ if(ENABLE_TESTS)
205205
add_subdirectory(tests) # This must come last!!
206206
endif()
207207

208-
# How to add a debug executable. Shouldn't be necessary, we have unit tests...
209-
#add_executable(debug_wavcav.x ${PROJECT_SOURCE_DIR}/src/debug_wavcav.cpp)
210-
#target_link_libraries(debug_wavcav.x solver green cavity wavcav pwl wem utils ${LIBS})
211-
212208
# Merge static libs from subfolders into one static lib: libpcm.a
213209
# This is the very last thing we do, i.e. DO NOT add anything depending on this target!!!
214210
merge_static_libs(pcm "${libs_to_merge}")

src/CMakeLists.txt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ if(DEVELOPMENT_CODE)
1212
set(header_dir_list_DEVELOPMENT
1313
${CMAKE_CURRENT_SOURCE_DIR}/wemSolvers
1414
${CMAKE_CURRENT_SOURCE_DIR}/wemFiles
15-
#${CMAKE_CURRENT_SOURCE_DIR}/pwl
16-
${CMAKE_CURRENT_SOURCE_DIR}/wavcav
17-
${CMAKE_CURRENT_SOURCE_DIR}/wem
15+
${CMAKE_CURRENT_SOURCE_DIR}/wavcav
16+
${CMAKE_CURRENT_SOURCE_DIR}/wem
1817
)
1918
list(APPEND header_dir_list "${header_dir_list_DEVELOPMENT}")
2019
list(SORT header_dir_list)
@@ -32,16 +31,13 @@ add_subdirectory(pedra)
3231
add_subdirectory(solver)
3332
add_subdirectory(utils)
3433
if(DEVELOPMENT_CODE)
35-
# The alphabetic order rule is here violated as the
36-
# wem directory contains some files also needed by
37-
# wavcav and pwl...
3834
add_subdirectory(wemFiles)
3935
add_subdirectory(wemSolvers)
40-
#add_subdirectory(wem)
41-
#add_subdirectory(pwl)
42-
add_subdirectory(tsless)
43-
add_subdirectory(wavcav)
36+
add_subdirectory(tsless)
37+
add_subdirectory(wavcav)
4438
endif()
39+
# This directory contains source file for executables
40+
add_subdirectory(bin)
4541

4642
# We need to export header_dir_list one level up
4743
set(header_dir_list ${header_dir_list} PARENT_SCOPE)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)