Changeset 22892 for issm/branches/trunk-larour-NatGeoScience2016/jenkins/linux64_ross_dakota

Timestamp:

07/02/18 10:50:37 (7 years ago)

Author:

Eric.Larour

Message:

CHG: jenkins from trunk

File:

• issm/branches/trunk-larour-NatGeoScience2016/jenkins/linux64_ross_dakota (modified) (4 diffs)

issm/branches/trunk-larour-NatGeoScience2016/jenkins/linux64_ross_dakota

@@ -7 +7 @@
 MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
-#ISSM CONFIGURATION 
+#ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR\
         --disable-static \
@@ -13 +13 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
+        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
+        --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-        --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
-        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
+        --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
+        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-numthreads=4 \
         --enable-development \
-        --enable-debugging '
+        --enable-debugging'
 
 #PYTHON and MATLAB testing
@@ -37 +37 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools     install.sh                
-                                                mpich         install-3.2-linux64.sh    
-                                                petsc         install-3.7-linux64.sh    
-                                                triangle      install-linux64.sh        
-                                                boost         install-1.55-linux.sh                
-                                                dakota        install-6.2-linux64.sh  
-                                                chaco         install.sh 
-                                                m1qn3         install.sh          
+EXTERNALPACKAGES="autotools     install.sh
+                                                cmake        install.sh
+                                                mpich         install-3.2-linux64.sh
+                                                petsc         install-3.7-linux64.sh
+                                                triangle      install-linux64.sh
+                                                boost         install-1.55-linux.sh
+                                                dakota        install-6.2-linux64.sh
+                                                chaco         install.sh
+                                                m1qn3         install.sh
                                                 shell2junit   install.sh"
 
@@ -62 +63 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-PYTHON_NROPTIONS=""
-MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,435]"
+PYTHON_NROPTIONS="--exclude 243 701 702 435"
+MATLAB_NROPTIONS="'exclude',[243,701,702,435]"