Index: ../trunk-jpl/jenkins/linux64_ross =================================================================== --- ../trunk-jpl/jenkins/linux64_ross (revision 23105) +++ ../trunk-jpl/jenkins/linux64_ross (revision 23106) @@ -7,9 +7,11 @@ MATLAB_PATH="/usr/local/MATLAB/R2015a" #ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR\ +ISSM_CONFIG='--prefix=$ISSM_DIR \ --disable-static \ --with-matlab-dir=$MATLAB_PATH \ + --with-python-dir=/usr \ + --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \ @@ -16,12 +18,10 @@ --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-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-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \ - --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \ + --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \ --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \ --with-numthreads=4 \ --enable-development \ @@ -35,7 +35,7 @@ # 3: External packages installation # #-----------------------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES="autotools install.sh cmake install.sh mpich install-3.2-linux64.sh @@ -43,6 +43,8 @@ triangle install-linux64.sh chaco install.sh m1qn3 install.sh + hdf5 install.sh + netcdf install.sh shell2junit install.sh" #-----------------# Index: ../trunk-jpl/jenkins/linux64_ross_python =================================================================== --- ../trunk-jpl/jenkins/linux64_ross_python (revision 23105) +++ ../trunk-jpl/jenkins/linux64_ross_python (revision 23106) @@ -7,8 +7,10 @@ MATLAB_PATH="/usr/local/MATLAB/R2015a" #ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR\ +ISSM_CONFIG='--prefix=$ISSM_DIR \ --disable-static \ + --with-python-dir=/usr \ + --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpifort" \ @@ -15,10 +17,8 @@ --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-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-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 \ @@ -34,7 +34,7 @@ # 3: External packages installation # #-----------------------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES="mpich install-3.2-linux64.sh cmake install.sh petsc install-3.7-linux64.sh Index: ../trunk-jpl/jenkins/linux64_ross_se =================================================================== --- ../trunk-jpl/jenkins/linux64_ross_se (revision 23105) +++ ../trunk-jpl/jenkins/linux64_ross_se (revision 23106) @@ -7,10 +7,11 @@ MATLAB_PATH="/usr/local/MATLAB/R2015a" #ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR\ +ISSM_CONFIG='--prefix=$ISSM_DIR \ --disable-static \ --with-matlab-dir=$MATLAB_PATH \ --with-python-dir=/usr \ + --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \ @@ -17,12 +18,10 @@ --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-python-dir=/usr \ - --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \ - --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \ - --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \ + --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \ + --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \ --with-numthreads=4 \ --enable-development \ --enable-debugging ' @@ -35,7 +34,7 @@ # 3: External packages installation # #-----------------------------------# -#List of external pakages to be installed and their installation scripts +#List of external packages to be installed and their installation scripts EXTERNALPACKAGES="autotools install.sh cmake install.sh mpich install-3.2-linux64.sh @@ -44,6 +43,8 @@ boost install-1.55-linux.sh gshhg install.sh gdal install-1.10-linux64.sh + hdf5 install.sh + netcdf install.sh gmt install.sh gmsh install.sh shell2junit install.sh"