Changeset 25544

Timestamp:

09/09/20 11:27:56 (5 years ago)

Author:

jdquinn

Message:

CHG: Added configuration for compiling on Amazon Linux (RHEL) and modified LD_LIBRARY_PATH setting to that end.

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• jenkins/aws-amazon_linux-solid_earth (copied) (copied from issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth ) (2 diffs)

issm/trunk-jpl/etc/environment.sh

@@ -197 +197 @@
 if [ -d "$PETSC_DIR" ]; then
         export PETSC_DIR
-        ld_library_path_append "${PETSC_DIR}/lib"
+        ld_library_path_prepend "${PETSC_DIR}/lib"
 
         # In case we have installed MPICH via PETSc

issm/trunk-jpl/jenkins/aws-amazon_linux-solid_earth

@@ -3 +3 @@
 #--------------------#
 
-MATLAB_PATH="/usr/local/MATLAB/R2019b"
+MATLAB_PATH="/usr/local/MATLAB/R2020a"
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
@@ -12 +12 @@
         --with-matlab-dir=${MATLAB_PATH} \
         --with-python-dir=/usr \
-        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
-        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
+        --with-python-numpy-dir=/usr/lib64/python2.7/site-packages/numpy/core/include/numpy \
+        --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/7 -lgfortran" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
-        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpifort -lmpi" \
         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \