Changeset 23121

Timestamp:

08/17/18 16:46:41 (7 years ago)

Author:

jdquinn

Message:

CHG: Needed to make similar changes to Linux_Ubuntu_AD

File:

• issm/trunk-jpl/jenkins/linux64_ross_ad (modified) (3 diffs)

issm/trunk-jpl/jenkins/linux64_ross_ad

@@ -7 +7 @@
 MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
-#ISSM CONFIGURATION 
+#ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR\
                                 --disable-static \
-                                --prefix=$ISSM_DIR \
                                 --without-kriging \
                                 --without-kml \
@@ -18 +17 @@
                                 --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
                                 --with-matlab-dir=$MATLAB_PATH \
-                                --with-python-dir=/usr\
-                                --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy\
+                                --with-python-dir=/usr \
+                                --with-python-numpy-dir=/var/lib/jenkins/.local/lib/python2.7/site-packages/numpy \
                                 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
                                 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
@@ -35 +34 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools install.sh
-                                         cmake install.sh                
+                                         cmake install.sh
                                          mpich install-3.2-linux64.sh
                                          petsc install-3.7-linux64.sh
                                          metis install-5.0.1-linux64.sh
-                                         triangle install-linux64.sh 
-                                         gsl install-linux64.sh 
+                                         triangle install-linux64.sh
+                                         gsl install-linux64.sh
                                          adolc install.sh
                                          shell2junit install.sh"