Changeset 24265

Timestamp:

10/21/19 12:40:18 (5 years ago)

Author:

jdquinn

Message:

CHG: Added lib flag for MPI C++ back into build config (for consistency with ampioff configuration); updated archives using ampion configuration

Location:

issm/trunk-jpl

Files:

• jenkins/linux64_ross_ampi (modified) (3 diffs)
• test/Archives/Archive3010.arch (modified) ( previous)

issm/trunk-jpl/jenkins/linux64_ross_ampi

@@ -16 +16 @@
                                 --with-matlab-dir=$MATLAB_PATH \
                                 --with-python-dir=/usr \
-                                --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
+                                --with-python-numpy-dir=/home/jdq/.local/lib/python2.7/site-packages/numpy \
                                 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
                                 --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-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
                                 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -41 +41 @@
 
 #List of external pakages to be installed and their installation scripts
+#
+# NOTE: The PETSc libraries are compiled but not used as they conflict with
+#               ADOL-C: PETSc is really just being used as an installer for other
+#               external packages.
 EXTERNALPACKAGES="autotools install.sh
                                          cmake install.sh
@@ -67 +71 @@
 #ex: "'id',[101 102 103]"
 MATLAB_NROPTIONS="'benchmark','adolc','id',[3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3119]"
-PYTHON_NROPTIONS="--benchmark='adolc' -i 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3101 3102 3103 3104 3105 3106 3107 3108 3109 3119"
+PYTHON_NROPTIONS="--benchmark 'adolc' -i 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3101 3102 3103 3104 3105 3106 3107 3108 3109 3119"