deal.II: Moved some variables for Trilinos versioning out of candi.sh

diff --git a/candi.sh b/candi.sh
index a974c6362fcb032c6865c13054f951675594c2b9..3a5ce5f896031624c7386144f2ae5b7b0e72e540 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -440,10 +440,6 @@ guess_architecture() {
 
 ###############################################################################
 # Start the build process
-
-# Set the default version of Trilinos to 12. This is overwritten for Ubuntu12
-TRILINOS_MAJOR_VERSION_AUTO=12
-
 export ORIG_DIR=`pwd`
 
 # Read configuration variables from candi.cfg
@@ -709,10 +705,6 @@ guess_architecture
 # Reset timings
 TIMINGS=""
 
-if [[ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]]; then
-  TRILINOS_MAJOR_VERSION=${TRILINOS_MAJOR_VERSION_AUTO}
-fi
-
 # Fetch and build individual packages
 for PACKAGE in ${PACKAGES[@]}; do
     # Start timer

diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index d6a4c924194cd2f28529df8472d907846ee8d30a..9422db8ad718902ffbf74e320b1637696d525030 100644 (file)
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -1,3 +1,7 @@
+if [ ${TRILINOS_MAJOR_VERSION} = "AUTO" ]; then
+  TRILINOS_MAJOR_VERSION=12
+fi
+
 if [ ${TRILINOS_MAJOR_VERSION} = "11" ]; then
   SOURCE=https://trilinos.org/oldsite/download/files/
   VERSION=11.6.2

diff --git a/deal.II/platforms/supported/ubuntu12.platform b/deal.II/platforms/supported/ubuntu12.platform
index a96d306ef0ff422f6cf5287486c3e5d5da7a3687..f4325d66a38cc95b5a6fcf8021a71373e68da3c4 100644 (file)
--- a/deal.II/platforms/supported/ubuntu12.platform
+++ b/deal.II/platforms/supported/ubuntu12.platform
@@ -24,5 +24,12 @@ once:slepc
 dealii
 )
 
+# The default compiler on ubuntu12 does not support Trilinos 12.
+# Anyhow, the user can decide to use Trilinos 11 or 12, if the
+# version number is not set to AUTO.
+# The last point is due to own compilers (e.g. intel) which support
+# Trilinos 12.
+if [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then
+  TRILINOS_MAJOR_VERSION=11
+fi
 
-TRILINOS_MAJOR_VERSION_AUTO=11

diff --git a/project-deal.II.cfg b/project-deal.II.cfg
index 633806f95f7ab121dda7df92b7b7f99ddf42bdde..4eaa54c9d89e9bf7eb5278c32b7c914f3908f341 100644 (file)
--- a/project-deal.II.cfg
+++ b/project-deal.II.cfg
@@ -72,7 +72,7 @@ fi
 
 #########################################################################
 
-# If you want to use Trilions, decide if you want v11.x.x or v12.x.x
+# If you want to use Trilions, decide if you want v12.x.x (AUTO) or v11.x.x
 TRILINOS_MAJOR_VERSION=AUTO
 #TRILINOS_MAJOR_VERSION=11
 #TRILINOS_MAJOR_VERSION=12