Changeset 24953

Timestamp:

06/02/20 19:24:44 (5 years ago)

Author:

jdquinn

Message:

BUG: Correct path to MPICH

Location:

issm/trunk-jpl

Files:

• externalpackages/adjoinablempi/install-linux.sh (copied) (copied from issm/trunk-jpl/externalpackages/adjoinablempi/install.sh ) (3 diffs)
• jenkins/ross-debian_linux-adolc-ampion (modified) (1 diff)

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

@@ -2 +2 @@
 set -eu
 
-
-# Keeping this for potential future use
-#Mercurial cloning:
-#hg clone -r 268 http://mercurial.mcs.anl.gov//ad/AdjoinableMPI src
-
-# Cleanup
-rm -rf install src
-mkdir install src
 
 # Download source
@@ -17 +9 @@
 tar -zxvf adjoinablempi.tar.gz
 
+# Cleanup
+rm -rf install src
+mkdir install src
+
 # Configure
 cd src
@@ -22 +18 @@
         --prefix="${ISSM_DIR}/externalpackages/adjoinablempi/install" \
         --libdir="${ISSM_DIR}/externalpackages/adjoinablempi/install/lib" \
-        --with-mpi-root="${ISSM_DIR}/externalpackages/mpich/install" \
+        --with-mpi-root="${ISSM_DIR}/externalpackages/petsc/install" \
         --enable-requestOnTrace
 
-# Clean
-make clean
-
-# Compile
+# Compile and install
 if [ $# -eq 0 ]; then
         make
+        make install
 else
         make -j $1
+        make -j $1 install
 fi
-
-# Install
-make install

issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion ¶

@@ -44 +44 @@
         gsl                             install.sh
         triangle                install-linux.sh
-        adjoinablempi   install.sh
+        adjoinablempi   install-linux.sh
         adolc                   install-withampi.sh
         shell2junit             install.sh