Changeset 24313 for issm/trunk/jenkins/linux64_ross

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• jenkins/linux64_ross (modified) (4 diffs)

issm/trunk/jenkins/linux64_ross

@@ -11 +11 @@
         --disable-static \
         --with-matlab-dir=$MATLAB_PATH \
-        --with-python-dir=/usr \
-        --with-python-numpy-dir=/var/lib/jenkins/.local/lib/python2.7/site-packages/numpy \
-        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+        --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" \
+        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
+        --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
         --with-numthreads=4 \
         --enable-development \
@@ -30 +29 @@
 #PYTHON and MATLAB testing
 MATLAB_TEST=1
-PYTHON_TEST=1
+PYTHON_TEST=0
 
 #-----------------------------------#
@@ -46 +45 @@
                                                 hdf5          install.sh
                                                 netcdf        install.sh
+                                                semic         install.sh
                                                 shell2junit   install.sh"
 
@@ -63 +63 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-PYTHON_NROPTIONS="--exclude_name 'Dakota'"
+PYTHON_NROPTIONS=""
 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"