Changeset 21729 for issm/trunk/jenkins/linux64_caladan

Timestamp:

05/19/17 14:48:02 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21727

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• jenkins/linux64_caladan (modified) (2 diffs)

issm/trunk/jenkins/linux64_caladan

@@ -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 -lmpich" \
+        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -40 +40 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh                
-                                                mpich         install-3.0-linux64.sh    
-                                                petsc         install-3.6-linux64.sh    
+                                                mpich         install-3.2-linux64.sh    
+                                                petsc         install-3.7-linux64.sh    
                                                 triangle      install-linux64.sh        
                                                 boost         install.sh