Changeset 23106

Timestamp:

08/17/18 11:10:52 (7 years ago)

Author:

jdquinn

Message:

CHG: Added netCDF back into build config scripts

Location:

issm/trunk-jpl/jenkins

Files:

• linux64_ross (modified) (4 diffs)
• linux64_ross_python (modified) (3 diffs)
• linux64_ross_se (modified) (4 diffs)

issm/trunk-jpl/jenkins/linux64_ross

@@ -8 +8 @@
 
 #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  \
@@ -17 +19 @@
         --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 \
@@ -36 +36 @@
 #-----------------------------------#
 
-#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
@@ -44 +44 @@
                                                 chaco         install.sh
                                                 m1qn3         install.sh
+                                                hdf5          install.sh
+                                                netcdf        install.sh
                                                 shell2junit   install.sh"
 

issm/trunk-jpl/jenkins/linux64_ross_python

@@ -8 +8 @@
 
 #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  \
@@ -16 +18 @@
         --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" \
@@ -35 +35 @@
 #-----------------------------------#
 
-#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

issm/trunk-jpl/jenkins/linux64_ross_se

@@ -8 +8 @@
 
 #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  \
@@ -18 +19 @@
         --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 \
@@ -36 +35 @@
 #-----------------------------------#
 
-#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
@@ -45 +44 @@
                                                 gshhg         install.sh
                                                 gdal          install-1.10-linux64.sh
+                                                hdf5          install.sh
+                                                netcdf        install.sh
                                                 gmt           install.sh
                                                 gmsh          install.sh