Changeset 23196

Timestamp:

08/28/18 13:39:06 (7 years ago)

Author:

jdquinn

Message:

CHG: Committed wrong file :(

Location:

issm/trunk/jenkins

Files:

• linux64_ross_static (modified) (3 diffs)
• macosx_pine-island_static (modified) (3 diffs)

issm/trunk/jenkins/linux64_ross_static

@@ -7 +7 @@
 MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
-#ISSM CONFIGURATION 
+#ISSM CONFIGURATION
 ISSM_CONFIG='--prefix=$ISSM_DIR \
         --disable-static \
@@ -16 +16 @@
         --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 -lmpifort" \
+        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
@@ -61 +61 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-##                           FS                    
+##                           FS
 #PYTHON_NROPTIONS="--exclude_name 'Dakota'"
 #MATLAB_NROPTIONS="'exclude',[243,701,702,703,435,IdFromString('Dakota')]"

issm/trunk/jenkins/macosx_pine-island_static

@@ -5 +5 @@
 
 #MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2017b.app/"
+MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
 
 #ISSM CONFIGURATION
@@ -23 +23 @@
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
-        --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin15/6.1.0/libgcc.a" \
+        --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a" \
         --with-numthreads=4'
 
@@ -39 +39 @@
                                                 mpich        install-3.0-macosx64-static.sh
                                                 m1qn3        install.sh
-                                                petsc        install-3.7-macosx64-static.sh
+                                                petsc        install-3.6-macosx64-static.sh
                                                 triangle     install-macosx64.sh
                                                 math77        install.sh