Changeset 24233

Timestamp:

10/15/19 21:23:47 (5 years ago)

Author:

jdquinn

Message:

CHG: Configuration changes for AMPION/OFF.

Location:

issm/trunk-jpl/jenkins

Files:

• linux64_ross_ad (modified) (1 diff)
• linux64_ross_ampi (modified) (2 diffs)

issm/trunk-jpl/jenkins/linux64_ross_ad

@@ -27 +27 @@
                                 --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
                                 --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
+                                --with-numthreads=4 \
                                 --enable-development \
                                 --enable-debugging'

issm/trunk-jpl/jenkins/linux64_ross_ampi

@@ -8 +8 @@
 
 #ISSM CONFIGURATION
-ISSM_CONFIG='--prefix=$ISSM_DIR\
+ISSM_CONFIG='--prefix=$ISSM_DIR \
                                 --disable-static \
                                 --without-kriging \
                                 --without-kml \
                                 --without-GiaIvins \
-                                --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
-                                --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
-                                --with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
+                                --without-Love \
                                 --with-matlab-dir=$MATLAB_PATH \
                                 --with-python-dir=/usr \
                                 --with-python-numpy-dir=/var/lib/jenkins/.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 -lmpicxx -lmpifort" \
+                                --with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
                                 --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 -lmpifort -lmpi" \
-                                --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
                                 --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-                                --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
-                                --with-numthreads=4  \
+                                --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+                                --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
                                 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-                                --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
+                                --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
+                                --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
+                                --with-numthreads=4 \
                                 --enable-development \
-                                --enable-debugging '
+                                --enable-debugging'
 
 #PYTHON and MATLAB testing
@@ -59 +60 @@
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=3
+NUMCPUS_RUN=4
 
 #Nightly run options. The matlab routine runme.m will be called