updates copyright, indentation and some minor code cleanups

diff --git a/candi.sh b/candi.sh
index 67d9f2e0c3d38747d34ac5fb5f773c242986ec4d..ea0c07f085b91368b6d467a9facda6e761600b24 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -a
 
-#  Copyright (C) 2013-2015 by Uwe Koecher, the candi authors                   #
-#  AND by the DORSAL Authors, cf. the file AUTHORS for details                 #
+#  Copyright (C) 2013-2017 by Uwe Koecher, Bruno Turcksin, Timo Heister,       #
+#  the candi authors AND by the DORSAL Authors, cf. AUTHORS file for details.  #
 #                                                                              #
 #  This file is part of CANDI.                                                 #
 #                                                                              #
@@ -550,7 +550,7 @@ guess_platform() {
     # Try to guess the name of the platform we're running on
     if [ -f /usr/bin/cygwin1.dll ]; then
         echo cygwin
-
+    
     elif [ -f /etc/fedora-release ]; then
         local FEDORANAME=`gawk '{if (match($0,/\((.*)\)/,f)) print f[1]}' /etc/fedora-release`
         case ${FEDORANAME} in
@@ -566,17 +566,17 @@ guess_platform() {
     elif [ -f /etc/redhat-release ]; then
         local RHELNAME=`gawk '{if (match($0,/\((.*)\)/,f)) print f[1]}' /etc/redhat-release`
         case ${RHELNAME} in
-            "Tikanga"*) echo rhel5;;
-            "Santiago"*) echo rhel6;;
-            "Maipo"*) echo rhel7;;
-            "Core"*) echo centos7;;
+            "Tikanga"*)           echo rhel5;;
+            "Santiago"*)          echo rhel6;;
+            "Maipo"*)             echo rhel7;;
+            "Core"*)              echo centos7;;
         esac
     
     elif [ -x /usr/bin/sw_vers ]; then
         local MACOSVER=$(sw_vers -productVersion)
         case ${MACOSVER} in
-                   10.11*)   echo macosx;;
-            10.12*)   echo sierra;;
+            10.11*)                echo elcapitan;;
+            10.12*)                echo sierra;;
         esac
     
     elif [ -x /usr/bin/lsb_release ]; then
@@ -603,9 +603,9 @@ guess_ostype() {
     # Try to guess the operating system type (ostype)
     if [ -f /usr/bin/cygwin1.dll ]; then
         echo cygwin
-
+    
     elif [ -f /etc/fedora-release ]; then
-           echo linux
+        echo linux
     
     elif [ -f /etc/redhat-release ]; then
         echo linux
@@ -770,10 +770,10 @@ fi
 # Guess dynamic shared library file extension -> LDSUFFIX
 if [ ${PLATFORM_OSTYPE} == "linux" ]; then
     LDSUFFIX=so
-
+    
 elif [ ${PLATFORM_OSTYPE} == "macos" ]; then
     LDSUFFIX=dylib
-
+       
 elif [ ${PLATFORM_OSTYPE} == "cygwin" ]; then
     LDSUFFIX=dll
 fi

diff --git a/deal.II-toolchain/packages/parmetis.package b/deal.II-toolchain/packages/parmetis.package
index 18f7ae21dc9999a5c6b10ac4500287cca1844ec0..e322dcd2dd9993783b38747fda0a333875cfb5a0 100644 (file)
--- a/deal.II-toolchain/packages/parmetis.package
+++ b/deal.II-toolchain/packages/parmetis.package
@@ -7,12 +7,6 @@ BUILDCHAIN=custom
 
 INSTALL_PATH=${INSTALL_PATH}/${NAME}
 
-# check candi environment
-if [ -z "${PLATFORM_OSTYPE}" ]; then
-    cecho ${BAD} "Error: (internal): variable PLATFORM_OSTYPE not set or empty"
-       exit 1
-fi
-
 package_specific_build() {
     cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* .
     
@@ -45,9 +39,9 @@ package_specific_register () {
     export METIS_DIR=${INSTALL_PATH}
     export PARMETIS_DIR=${INSTALL_PATH}
 
-       if [ ${PLATFORM_OSTYPE} == macos ]; then
+    if [ ${PLATFORM_OSTYPE} == macos ]; then
         export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:${INSTALL_PATH}/lib
-       fi
+    fi
 }
 
 package_specific_conf () {
@@ -60,7 +54,7 @@ export PARMETIS_DIR=${INSTALL_PATH}
 " >> $CONFIG_FILE
 
     if [ ${PLATFORM_OSTYPE} == macos ]; then
-           echo "export DYLD_LIBRARY_PATH=\$DYLD_LIBRARY_PATH:${INSTALL_PATH}/lib
+        echo "export DYLD_LIBRARY_PATH=\$DYLD_LIBRARY_PATH:${INSTALL_PATH}/lib
 " >> $CONFIG_FILE
-       fi
+    fi
 }

diff --git a/deal.II-toolchain/packages/superlu_dist.package b/deal.II-toolchain/packages/superlu_dist.package
index 3c04d2b0ebfea7b29ea5f0c1ac35e083dd79bbb9..0b68d596ef4c216d94575f4c4c0b50a9dc54b341 100644 (file)
--- a/deal.II-toolchain/packages/superlu_dist.package
+++ b/deal.II-toolchain/packages/superlu_dist.package
@@ -8,18 +8,6 @@ CHECKSUM=0a99bbb5f6c26a9c1d7ab17ea35d4e6f
 BUILDCHAIN=cmake
 INSTALL_PATH=${INSTALL_PATH}/${NAME}
 
-# check candi environment
-if [ -z "${LDSUFFIX}" ]; then
-    cecho ${BAD} "Error: (internal): variable LDSUFFIX not set or empty"
-       exit 1
-fi
-
-if [ -z "${PLATFORM_OSTYPE}" ]; then
-    cecho ${BAD} "Error: (internal): variable PLATFORM_OSTYPE not set or empty"
-       exit 1
-fi
-
-# set up
 CONFOPTS=" \
     $CONFOPTS \
     -D TPL_PARMETIS_INCLUDE_DIRS:PATH=${PARMETIS_DIR}/include \
@@ -30,9 +18,9 @@ CONFOPTS=" \
 package_specific_register () {
     export SUPERLU_DIR=${INSTALL_PATH}
 
-       if [ ${PLATFORM_OSTYPE} == macos ]; then
+    if [ ${PLATFORM_OSTYPE} == macos ]; then
         export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:${INSTALL_PATH}/lib
-       fi
+    fi
 }
 
 package_specific_conf () {
@@ -44,7 +32,7 @@ export SUPERLU_DIR=${INSTALL_PATH}
 " >> $CONFIG_FILE
 
     if [ ${PLATFORM_OSTYPE} == macos ]; then
-           echo "export DYLD_LIBRARY_PATH=\$DYLD_LIBRARY_PATH:${INSTALL_PATH}/lib
+        echo "export DYLD_LIBRARY_PATH=\$DYLD_LIBRARY_PATH:${INSTALL_PATH}/lib
 " >> $CONFIG_FILE
-       fi
+    fi
 }

diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
index efae0b7a4b623729c12fd5cb65ae9c98c9b053a8..2c114be83217a942fd539c043738af094e66d77a 100644 (file)
--- a/deal.II-toolchain/packages/trilinos.package
+++ b/deal.II-toolchain/packages/trilinos.package
@@ -105,32 +105,24 @@ CONFOPTS="${CONFOPTS} \
 # Add ParMETIS, if present
 if [ ! -z "${PARMETIS_DIR}" ]; then
     cecho ${INFO} "trilinos: configuration with ParMETIS"
-
-    if [ -z "${LDSUFFIX}" ]; then
-        cecho ${BAD} "Error: (internal): variable LDSUFFIX not set or empty"
-           exit 1
-    fi
-
+    
+    # NOTE: if parmetis v4.0.3 is not found, but installed, add
+    #  -D HAVE_PARMETIS_VERSION_4_0_3=ON"
+       
     CONFOPTS="\
         ${CONFOPTS} \
         -D TPL_ENABLE_ParMETIS:BOOL=ON \
         -D TPL_ParMETIS_LIBRARIES:FILEPATH=${PARMETIS_DIR}/lib/libparmetis.${LDSUFFIX} \
         -D TPL_ParMETIS_INCLUDE_DIRS:PATH=${PARMETIS_DIR}/include"
-###### TODO?  -D HAVE_PARMETIS_VERSION_4_0_3=ON"
 fi
 
 # Add SuperLU_dist, if present
 if [ ! -z "${SUPERLU_DIR}" ]; then
     cecho ${INFO} "trilinos: configuration with SuperLU_dist"
-
-    if [ -z "${LDSUFFIX}" ]; then
-        cecho ${BAD} "Error: (internal): variable LDSUFFIX not set or empty"
-           exit 1
-    fi
-
+    
     # we need to disable complex support in teuchos, see
-       #   https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html
-
+    #   https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html
+    
     CONFOPTS="\
         ${CONFOPTS} \
           -D TPL_ENABLE_SuperLUDist:BOOL=ON \