Skip to content

Commit

Permalink
Update deal.II minimum version (#370)
Browse files Browse the repository at this point in the history 
* Updating min deal.II to 9.6

* removing ifdef for old deal.II versions
  • Loading branch information
@landinjm
landinjm authored Dec 20, 2024
1 parent 0710491 commit 28d406d
Show file tree
Hide file tree
Showing 54 changed files with 101 additions and 176 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(prisms_pf)

Expand Down Expand Up @@ -71,7 +71,7 @@ message(STATUS "=========================================================")
message(STATUS "")

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ For detailed instructions on how to download and use PRISMS-PF, please consult t

### Install:

Install CMake, p4est, and deal.II (version 9.6 recommended).
Install CMake, p4est, and deal.II (version 9.6.0 or above required).

Clone the PRISMS-PF GitHub repository and navigate its folder.
```bash
Expand Down Expand Up @@ -98,7 +98,7 @@ following open source applications:

## Version information:

This version of the code, v2.4, contains moderate changes from v2.3. It was released in November 2024. See [version_changes.md](version_changes.md) for details.
This version of the code, v3.0, is still under development. See [version_changes.md](version_changes.md) for details of previous releases.

## Contributors
Thanks to everyone who has contributed to the project!
Expand Down
4 changes: 2 additions & 2 deletions applications/CHAC_anisotropy/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHAC_anisotropyRegularized/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHAC_performance_test/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHiMaD_benchmarks/CHiMaD_benchmark1a/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHiMaD_benchmarks/CHiMaD_benchmark1b/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHiMaD_benchmarks/CHiMaD_benchmark1c/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHiMaD_benchmarks/CHiMaD_benchmark2a/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHiMaD_benchmarks/CHiMaD_benchmark3a/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHiMaD_benchmarks/CHiMaD_benchmark6a/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHiMaD_benchmarks/CHiMaD_benchmark6b/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/CHiMaD_benchmarks/CHiMaD_benchmark7a/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/MgNd_precipitate_single_Bppp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/allenCahn/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/allenCahn_conserved/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/alloySolidification/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/alloySolidification_uniform/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/anisotropyFacet/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/cahnHilliard/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/corrosion/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
4 changes: 2 additions & 2 deletions applications/corrosion_microgalvanic/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from the ASPECT CMake file
##

cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.3.0)

project(myapp)

Expand Down Expand Up @@ -47,7 +47,7 @@ else()
endif()

# Find deal.II installation
find_package(deal.II 9.2.0 QUIET
find_package(deal.II 9.6.0 QUIET
HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}
)
if(NOT ${deal.II_FOUND})
Expand Down
Loading

0 comments on commit 28d406d

Please sign in to comment.