Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update backwards compatability to remove support prior to deal.II 9.2.0 #236

Merged
merged 4 commits into from
Sep 13, 2024
Merged

Update backwards compatability to remove support prior to deal.II 9.2.0 #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e41d45b
remove deprecated tests
landinjm Sep 11, 2024
9a4e643
update required deal.II version
landinjm Sep 11, 2024
dc7aa8c
remove some old comments
landinjm Sep 11, 2024
a205956
updating cmake requirements to reflect dealii version requirement
landinjm Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 8.3.0 REQUIRED
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
HINTS ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR})

DEAL_II_INITIALIZE_CACHED_VARIABLES()
Expand Down Expand Up @@ -33,17 +33,11 @@ INCLUDE_DIRECTORIES(include)

FILE(GLOB headers include/*.h)
FILE(GLOB matrixfree_sources src/matrixfree/*.cc)

FILE(GLOB userinputparameters_sources src/userInputParameters/*.cc)

FILE(GLOB solverparameters_sources src/SolverParameters/*.cc)

FILE(GLOB equationdependencyparser_sources src/EquationDependencyParser/*.cc)

FILE(GLOB floodfiller_sources src/FloodFiller/*.cc)

FILE(GLOB orderparameterremapper_sources src/OrderParameterRemapper/*.cc)

FILE(GLOB simplifiedgrainrepresentation_sources src/SimplifiedGrainRepresentation/*.cc)


Expand All @@ -52,11 +46,8 @@ SET(CMAKE_BUILD_TYPE Release)

# Append extra flags for the GNU compiler to suppress some warnings
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
#set(DEAL_II_CXX_FLAGS_DEBUG "${DEAL_II_CXX_FLAGS_DEBUG} -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-extra")
#set(DEAL_II_CXX_FLAGS_RELEASE "${DEAL_II_CXX_FLAGS_RELEASE} -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-extra")
set(DEAL_II_CXX_FLAGS_DEBUG "${DEAL_II_CXX_FLAGS_DEBUG} -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
set(DEAL_II_CXX_FLAGS_RELEASE "${DEAL_II_CXX_FLAGS_RELEASE} -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
#set(CMAKE_CXX_FLAGS "-Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
set(DEAL_II_CXX_FLAGS_DEBUG "${DEAL_II_CXX_FLAGS_DEBUG} -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
set(DEAL_II_CXX_FLAGS_RELEASE "${DEAL_II_CXX_FLAGS_RELEASE} -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
endif()

ADD_LIBRARY(${PROJECT_NAME} ${matrixfree_sources} ${userinputparameters_sources} ${solverparameters_sources} ${equationdependencyparser_sources} ${floodfiller_sources} ${orderparameterremapper_sources} ${simplifiedgrainrepresentation_sources} src/utilities/sortIndexEntryPairList.cc src/variableAttributeLoader/variableAttributeLoader.cc src/utilities/vectorBCFunction.cc src/inputFileReader/inputFileReader.cc src/parallelNucleationList/parallelNucleationList.cc src/variableContainer/variableContainer.cc)
Expand All @@ -67,11 +58,8 @@ SET(CMAKE_BUILD_TYPE Debug)

# Append extra flags for the GNU compiler to suppress some warnings
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
#set(DEAL_II_CXX_FLAGS_DEBUG "${DEAL_II_CXX_FLAGS_DEBUG} -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-extra")
#set(DEAL_II_CXX_FLAGS_RELEASE "${DEAL_II_CXX_FLAGS_RELEASE} -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-extra")
set(DEAL_II_CXX_FLAGS_DEBUG "${DEAL_II_CXX_FLAGS_DEBUG} -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
set(DEAL_II_CXX_FLAGS_RELEASE "${DEAL_II_CXX_FLAGS_RELEASE} -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
#set(CMAKE_CXX_FLAGS "-Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
set(DEAL_II_CXX_FLAGS_DEBUG "${DEAL_II_CXX_FLAGS_DEBUG} -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
set(DEAL_II_CXX_FLAGS_RELEASE "${DEAL_II_CXX_FLAGS_RELEASE} -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comment -Wno-unused-parameter -Wno-unused-variable -Wno-unused-but-set-variable")
endif()

ADD_LIBRARY(${PROJECT_NAME} ${matrixfree_sources} ${userinputparameters_sources} ${solverparameters_sources} ${equationdependencyparser_sources} ${floodfiller_sources} ${orderparameterremapper_sources} ${simplifiedgrainrepresentation_sources} src/utilities/sortIndexEntryPairList.cc src/variableAttributeLoader/variableAttributeLoader.cc src/utilities/vectorBCFunction.cc src/inputFileReader/inputFileReader.cc src/parallelNucleationList/parallelNucleationList.cc src/variableContainer/variableContainer.cc)
Expand Down
2 changes: 1 addition & 1 deletion applications/CHAC_anisotropy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/CHAC_anisotropyRegularized/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/CHAC_performance_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/CHiMaD_benchmark1a/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/CHiMaD_benchmark2a/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/CHiMaD_benchmark3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/CHiMaD_benchmark6a/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/CHiMaD_benchmark6b/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/CHiMaD_benchmark7/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/MgNd_precipitate_single_Bppp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/allenCahn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/allenCahn_conserved/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/alloySolidification/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/alloySolidification_uniform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/anisotropyFacet/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/cahnHilliard/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/corrosion/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/corrosion_microgalvanic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/coupledCahnHilliardAllenCahn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/dendriticSolidification/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/eshelbyInclusion/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/fickianDiffusion/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/grainGrowth/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/grainGrowth_dream3d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/mechanics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/nucleationModel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/nucleationModel_preferential/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/precipitateEvolution/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/precipitateEvolution_pfunction/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/spinodalDecomposition/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion applications/steadyStateAllenCahn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake script for the PRISMS-PF applications:
##

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)

# Find deal.II installation
FIND_PACKAGE(deal.II 9.2.0 REQUIRED
Expand Down
32 changes: 0 additions & 32 deletions tests/deprecated_tests/analytic_tests/diffusionAnalyticComparison/CMakeLists.txt
View file
Open in desktop

This file was deleted.

Loading
Loading