Changeset 24610

Timestamp:

02/27/20 12:36:56 (5 years ago)

Author:

jdquinn

Message:

CHG: Fixes for ADOL-C build; cleanup

Location:

issm/trunk-jpl/externalpackages

Files:

• adjoinablempi/install.sh (modified) (1 diff)
• adolc/install-withampi.sh (modified) (2 diffs)
• petsc/install-3.7-linux.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/adjoinablempi/install.sh

@@ -2 +2 @@
 set -eu
 
-#Some cleanup
-rm -rf src  install
 
 # Keeping this for potential future use
-#Mercurial cloning: 
+#Mercurial cloning:
 #hg clone -r 268 http://mercurial.mcs.anl.gov//ad/AdjoinableMPI src
 
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/adjoinablempi' 'adjoinablempi.tar.gz'
+# Cleanup
+rm -rf install src
+mkdir install src
 
-#Untar ADOL-C
-tar -zxf  adjoinablempi.tar.gz
+# Download source
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/adjoinablempi.tar.gz" "adjoinablempi.tar.gz"
 
-#Configure adjoinablempi
+# Unpack source
+tar -zxvf adjoinablempi.tar.gz
+
+# Configure
 cd src
 ./configure \
-        --prefix="$ISSM_DIR/externalpackages/adjoinablempi/install" \
-        --libdir="$ISSM_DIR/externalpackages/adjoinablempi/install/lib" \
-        --with-mpi-root="$ISSM_DIR/externalpackages/mpich/install" \
+        --prefix="${ISSM_DIR}/externalpackages/adjoinablempi/install" \
+        --libdir="${ISSM_DIR}/externalpackages/adjoinablempi/install/lib" \
+        --with-mpi-root="${ISSM_DIR}/externalpackages/mpich/install" \
         --enable-requestOnTrace
 
-#Compile adjoinablempi 
+# Clean
 make clean
+
+# Compile
 if [ $# -eq 0 ]; then
-        make 
+        make
 else
         make -j $1
 fi
+
+# Install
 make install

issm/trunk-jpl/externalpackages/adolc/install-withampi.sh

@@ -1 +1 @@
 #!/bin/bash
 set -eu
- 
-#Some cleanup
-rm -rf install src
+
 
 # Keeping the following commented line for potential future use.
 #git clone https://gitlab.com/adol-c/adol-c.git src
 
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/ADOL-C' 'ADOL-C.tar.gz'
+## Environment
+#
+export CFLAGS="-O2 -L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi"
+export CXXFLAGS="-O2 -std=c++11 -L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi"
 
-#Untar ADOL-C
-tar -zxf  ADOL-C.tar.gz
+# Cleanup
+rm -rf install src
+mkdir install src
 
-#Compile ADOL-C
-export CFLAGS="-O2 -L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi"
-export CXXFLAGS="-O2 -std=c++11 -L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi"
+# Download source
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/ADOL-C.tar.gz" "ADOL-C.tar.gz"
+
+# Unpack source
+tar -zxvf ADOL-C.tar.gz
+
+# Configure
 cd src
-./configure --prefix=$ISSM_DIR/externalpackages/adolc/install  \
-        --libdir=$ISSM_DIR/externalpackages/adolc/install/lib \
-        --with-mpi-root=$ISSM_DIR/externalpackages/mpich/install \
+./configure \
+        --prefix=${ISSM_DIR}/externalpackages/adolc/install \
+        --libdir=${ISSM_DIR}/externalpackages/adolc/install/lib \
+        --with-mpi-root=${ISSM_DIR}/externalpackages/mpich/install \
         --enable-ampi \
-        --with-ampi=$ISSM_DIR/externalpackages/adjoinablempi/install \
+        --with-ampi=${ISSM_DIR}/externalpackages/adjoinablempi/install \
         --with-soname=adolc \
         --disable-tapedoc-values
 
+# Clean
 make clean
+
+# Compile
 if [ $# -eq 0 ]; then
         make V=1
@@ -32 +41 @@
         make -j $1 V=1
 fi
+
+# Install
 make V=1 install

issm/trunk-jpl/externalpackages/petsc/install-3.7-linux.sh

@@ -11 +11 @@
 
 # Unpack source
-tar -zxvf  petsc-$VER.tar.gz
+tar -zxvf petsc-$VER.tar.gz
 
 # Cleanup
@@ -53 +53 @@
         make -j $1 install
 fi
-
-# Return to initial directory
-cd ..