Changeset 22758 for issm/trunk/jenkins/linux64_ross_ampi

Timestamp:

05/10/18 10:24:27 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

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

issm/trunk/jenkins/linux64_ross_ampi

@@ -21 +21 @@
                                 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/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 -lmpifort -lmpi" \
                                 --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
                                 --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -40 +40 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools install.sh 
+EXTERNALPACKAGES="autotools install.sh
+                                         cmake install.sh 
                                          mpich install-3.2-linux64.sh
                                          petsc install-3.7-linux64.sh