Changeset 21341 for issm/trunk/jenkins/linux64_ross

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

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

issm/trunk/jenkins/linux64_ross

@@ -19 +19 @@
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-python-dir=/usr\
-        --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy\
+        --with-python-dir=$ISSM_DIR/externalpackages/python/install \
+        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
@@ -43 +43 @@
                                                 chaco         install.sh 
                                                 m1qn3         install.sh          
+                                                python        install-2.7.3-linux64.sh
+                  nose          install-linux64-python2.sh
+                  numpy         install-linux64.sh
+                  hdf5          install.sh
+                                                netcdf        install.sh
+                                                netcdf-cxx    install.sh
+                                                netcdf-python install.sh
                                                 shell2junit   install.sh"
 
@@ -61 +68 @@
 #ex: "'id',[101 102 103]"
 PYTHON_NROPTIONS="--exclude 119 243 514 701 702 435"
-MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,435,IdFromString('Dakota')]"
+MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"