Merge pull request #3571 from tjhei/cherry2.2-1

gassmoeller · web-flow · commit c64f2e4b5c6c · 2020-06-30T07:59:30.000-07:00
[2.2] cherry-picks
diff --git a/benchmarks/advection_in_annulus/CMakeLists.txt b/benchmarks/advection_in_annulus/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/annulus/CMakeLists.txt b/benchmarks/annulus/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/blankenbach/plugin/CMakeLists.txt b/benchmarks/blankenbach/plugin/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/burstedde/CMakeLists.txt b/benchmarks/burstedde/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/check.mk b/benchmarks/check.mk
@@ -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"
diff --git a/benchmarks/compressibility_formulations/plugins/CMakeLists.txt b/benchmarks/compressibility_formulations/plugins/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/crameri_et_al/case_1/CMakeLists.txt b/benchmarks/crameri_et_al/case_1/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/davies_et_al/case-2.3-plugin/CMakeLists.txt b/benchmarks/davies_et_al/case-2.3-plugin/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/doneahuerta/CMakeLists.txt b/benchmarks/doneahuerta/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/finite_strain/CMakeLists.txt b/benchmarks/finite_strain/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/hollow_sphere/CMakeLists.txt b/benchmarks/hollow_sphere/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/inclusion/CMakeLists.txt b/benchmarks/inclusion/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/inclusion/compositional_fields/CMakeLists.txt b/benchmarks/inclusion/compositional_fields/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/king2dcompressible/CMakeLists.txt b/benchmarks/king2dcompressible/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/layeredflow/CMakeLists.txt b/benchmarks/layeredflow/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/CMakeLists.txt b/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/nonlinear_channel_flow/CMakeLists.txt b/benchmarks/nonlinear_channel_flow/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/nsinker/CMakeLists.txt b/benchmarks/nsinker/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/operator_splitting/advection_reaction/CMakeLists.txt b/benchmarks/operator_splitting/advection_reaction/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/operator_splitting/exponential_decay/CMakeLists.txt b/benchmarks/operator_splitting/exponential_decay/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/rayleigh_taylor_instability/CMakeLists.txt b/benchmarks/rayleigh_taylor_instability/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/rigid_shear/plugin/CMakeLists.txt b/benchmarks/rigid_shear/plugin/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/shear_bands/CMakeLists.txt b/benchmarks/shear_bands/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/sinking_block/CMakeLists.txt b/benchmarks/sinking_block/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/solcx/CMakeLists.txt b/benchmarks/solcx/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/solcx/compositional_fields/CMakeLists.txt b/benchmarks/solcx/compositional_fields/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/solitary_wave/CMakeLists.txt b/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")
diff --git a/benchmarks/solkz/CMakeLists.txt b/benchmarks/solkz/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/solkz/compositional_fields/CMakeLists.txt b/benchmarks/solkz/compositional_fields/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/tangurnis/code/CMakeLists.txt b/benchmarks/tangurnis/code/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/time_dependent_annulus/plugin/CMakeLists.txt b/benchmarks/time_dependent_annulus/plugin/CMakeLists.txt
@@ -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"
diff --git a/benchmarks/tosi_et_al_2015_gcubed/CMakeLists.txt b/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})
diff --git a/benchmarks/viscosity_grooves/CMakeLists.txt b/benchmarks/viscosity_grooves/CMakeLists.txt
diff --git a/benchmarks/viscosity_grooves/viscosity_grooves.cc b/benchmarks/viscosity_grooves/viscosity_grooves.cc
diff --git a/benchmarks/yamauchi_takei_2016_anelasticity/CMakeLists.txt b/benchmarks/yamauchi_takei_2016_anelasticity/CMakeLists.txt
diff --git a/cmake/AspectConfig.cmake.in b/cmake/AspectConfig.cmake.in
diff --git a/cookbooks/anisotropic_viscosity/CMakeLists.txt b/cookbooks/anisotropic_viscosity/CMakeLists.txt
diff --git a/cookbooks/finite_strain/CMakeLists.txt b/cookbooks/finite_strain/CMakeLists.txt
diff --git a/cookbooks/free-surface-with-crust/plugin/CMakeLists.txt b/cookbooks/free-surface-with-crust/plugin/CMakeLists.txt
diff --git a/cookbooks/inner_core_convection/CMakeLists.txt b/cookbooks/inner_core_convection/CMakeLists.txt
diff --git a/cookbooks/morency_doin_2004/CMakeLists.txt b/cookbooks/morency_doin_2004/CMakeLists.txt
diff --git a/cookbooks/prescribed_velocity/CMakeLists.txt b/cookbooks/prescribed_velocity/CMakeLists.txt
diff --git a/doc/plugin-CMakeLists.txt b/doc/plugin-CMakeLists.txt
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
