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.

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

[2.2] cherry-picks #3571

Merged
merged 3 commits into from Jun 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/advection_in_annulus/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/annulus/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/blankenbach/plugin/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/burstedde/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
3 changes: 0 additions & 3 deletions benchmarks/check.mk
Expand Up @@ -173,6 +173,3 @@ compressibility_formulations/: dummy
@$(def); run_prm $@/lateral_pipe_transient lateral_pipe.prm
@$(def); run_prm $@/vertical_pipe vertical_pipe.prm

#https://github.com/geodynamics/aspect/issues/3534
viscosity_grooves/: dummy
echo "TODO"
13 changes: 1 addition & 12 deletions benchmarks/compressibility_formulations/plugins/CMakeLists.txt
Expand Up @@ -16,20 +16,9 @@
# along with ASPECT; see the file doc/COPYING. If not see
# <http://www.gnu.org/licenses/>.


# -----------------------------------------------------------------
# This file is a sample CMakeLists.txt file that plugins can use to
# configure and build a shared library that can then be loaded via
# the input file. For more information, see the manual.
#
# For actual use, you may want to use a different name than
# <my_plugin> for the project, and for the names of the source files
# below.
# -----------------------------------------------------------------

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/crameri_et_al/case_1/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/davies_et_al/case-2.3-plugin/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/doneahuerta/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/finite_strain/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/hollow_sphere/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/inclusion/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/inclusion/compositional_fields/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/king2dcompressible/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect QUIET HINTS ${Aspect_DIR} ../ ../../ ../../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ ../../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/layeredflow/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ ../../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ ../../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/nonlinear_channel_flow/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/nsinker/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/rayleigh_taylor_instability/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/rigid_shear/plugin/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/shear_bands/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/sinking_block/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/solcx/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/solcx/compositional_fields/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
31 changes: 30 additions & 1 deletion benchmarks/solitary_wave/CMakeLists.txt
@@ -1,6 +1,35 @@
# Copyright (C) 2015 - 2019 by the authors of the ASPECT code.
#
# This file is part of ASPECT.
#
# ASPECT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# ASPECT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ASPECT; see the file LICENSE. If not see
# <http://www.gnu.org/licenses/>.

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect REQUIRED HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
"Could not find a valid ASPECT build/installation directory. "
"Please specify the directory where you are building ASPECT by passing\n"
" -D Aspect_DIR=<path to ASPECT>\n"
"to cmake or by setting the environment variable ASPECT_DIR in your shell "
"before calling cmake. See the section 'How to write a plugin' in the "
"manual for more information.")
ENDIF ()

DEAL_II_INITIALIZE_CACHED_VARIABLES()

SET(TARGET "solitary_wave")
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/solkz/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/solkz/compositional_fields/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/tangurnis/code/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.1.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/time_dependent_annulus/plugin/CMakeLists.txt
Expand Up @@ -18,7 +18,7 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect 2.0.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
Expand Down
34 changes: 31 additions & 3 deletions benchmarks/tosi_et_al_2015_gcubed/CMakeLists.txt
@@ -1,11 +1,39 @@
# Copyright (C) 2015 - 2019 by the authors of the ASPECT code.
#
# This file is part of ASPECT.
#
# ASPECT is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# ASPECT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with ASPECT; see the file LICENSE. If not see
# <http://www.gnu.org/licenses/>.

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

FIND_PACKAGE(Aspect REQUIRED HINTS ${ASPECT_DIR} ../ ../../ $ENV{ASPECT_DIR})
FIND_PACKAGE(Aspect 2.2.0 QUIET HINTS ${Aspect_DIR} ../ ../../ $ENV{ASPECT_DIR})

IF (NOT Aspect_FOUND)
MESSAGE(FATAL_ERROR "\n"
"Could not find a valid ASPECT build/installation directory. "
"Please specify the directory where you are building ASPECT by passing\n"
" -D Aspect_DIR=<path to ASPECT>\n"
"to cmake or by setting the environment variable ASPECT_DIR in your shell "
"before calling cmake. See the section 'How to write a plugin' in the "
"manual for more information.")
ENDIF ()

DEAL_II_INITIALIZE_CACHED_VARIABLES()

SET(TARGET "tosi_benchmark")
PROJECT(${TARGET})

#ADD_LIBRARY(${TARGET} SHARED tosi.cc tosi_dissipation_statistics.cc)
ADD_LIBRARY(${TARGET} SHARED tosi.cc )
ADD_LIBRARY(${TARGET} SHARED tosi.cc)
ASPECT_SETUP_PLUGIN(${TARGET})