Index: /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab (revision 27697) +++ /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab (revision 27698) @@ -28,4 +28,5 @@ --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \ --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ @@ -51,4 +52,5 @@ dakota install-6.2-mac-static.sh curl install-7-mac-static.sh + hdf5 install-1-parallel-static.sh netcdf install-4.7-parallel-static.sh proj install-6-static.sh Index: /issm/trunk-jpl/jenkins/mac-intel-binaries-python-3 =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-binaries-python-3 (revision 27697) +++ /issm/trunk-jpl/jenkins/mac-intel-binaries-python-3 (revision 27698) @@ -28,4 +28,5 @@ --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \ --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ @@ -51,4 +52,5 @@ dakota install-6.2-mac-static.sh curl install-7-mac-static.sh + hdf5 install-1-parallel-static.sh netcdf install-4.7-parallel-static.sh proj install-6-static.sh Index: /issm/trunk-jpl/jenkins/mac-intel-dakota =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 27697) +++ /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 27698) @@ -27,4 +27,5 @@ --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \ --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ @@ -51,4 +52,5 @@ dakota install-6.2-mac.sh curl install-7-mac.sh + hdf5 install-1-parallel.sh netcdf install-4.7-parallel.sh proj install-6.sh Index: /issm/trunk-jpl/jenkins/mac-intel-examples =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-examples (revision 27697) +++ /issm/trunk-jpl/jenkins/mac-intel-examples (revision 27698) @@ -29,4 +29,5 @@ --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \ --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ @@ -52,4 +53,5 @@ dakota install-6.2-mac.sh curl install-7-mac.sh + hdf5 install-1-parallel.sh netcdf install-4.7-parallel.sh proj install-6.sh Index: /issm/trunk-jpl/jenkins/mac-intel-full =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-full (revision 27698) +++ /issm/trunk-jpl/jenkins/mac-intel-full (revision 27698) @@ -0,0 +1,95 @@ +# NOTE: +# - This configuration adds solid earth and Dakota capabilities to the basic +# build. +# - Currently, this configuration does not compile the MATLAB API. After compiling, you will need to download the ISSM pre-compiled +# binaries from https://issm.jpl.nasa.gov/download/binaries, copy the +# contents of lib/ to $ISSM_DIR/lib-precompiled, then add +# $ISSM_DIR/lib-precompiled to the path in MATLAB. +# +# TODO: Change PROJ installation script to latest version once Jenkins macOS +# build node has been upgraded. +# + +#--------------------# +# ISSM Configuration # +#--------------------# + +ISSM_CONFIG='\ + --prefix=${ISSM_DIR} \ + --disable-static \ + --enable-development \ + --enable-debugging \ + --with-numthreads=4 \ + --with-matlab-dir=${MATLAB_PATH} \ + --with-python-version=3.9 \ + --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \ + --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \ + --with-fortran-lib="-L/opt/homebrew/Cellar/gcc/12.2.0/lib/gcc/12 -lgfortran" \ + --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ + --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ + --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \ + --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ + --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \ + --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \ + --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \ + --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \ + --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \ + --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \ + --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \ +' + +#-------------------# +# External Packages # +#-------------------# + +EXTERNALPACKAGES=" + autotools install-mac.sh + cmake install.sh + petsc install-3.14-mac.sh + gsl install.sh + boost install-1.7-mac.sh + dakota install-6.2-mac.sh + curl install-7-mac.sh + hdf5 install-1-parallel.sh + netcdf install-4.7-parallel.sh + proj install-6.sh + gdal install-3-python.sh + gshhg install.sh + gmt install-6-mac-silicon.sh + gmsh install-4-mac.sh + triangle install-mac.sh + chaco install-mac.sh + m1qn3 install.sh + semic install.sh + shell2junit install.sh +" + +#---------# +# Testing # +#---------# + +# Test suites +MATLAB_TEST=0 +PYTHON_TEST=0 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 + +# Number of CPUs used in ISSM compilation +# +# NOTE: One is usually safer as some packages are very sensitive to parallel +# compilation +# +NUMCPUS_INSTALL=8 + +# Number of CPUs used in the nightly runs +NUMCPUS_RUN=1 + +# Nightly run options +MATLAB_NROPTIONS="" +PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/mac-intel-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 27697) +++ /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 27698) @@ -27,4 +27,5 @@ --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \ --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ @@ -51,4 +52,5 @@ dakota install-6.2-mac.sh curl install-7-mac.sh + hdf5 install-1-parallel.sh netcdf install-4.7-parallel.sh proj install-6.sh Index: /issm/trunk-jpl/jenkins/mac-silicon-examples =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-examples (revision 27697) +++ /issm/trunk-jpl/jenkins/mac-silicon-examples (revision 27698) @@ -24,21 +24,21 @@ --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \ --with-fortran-lib="-L/opt/homebrew/Cellar/gcc/12.2.0/lib/gcc/12 -lgfortran" \ - --with-mpi-include=${ISSM_EXT_DIR}/shared/petsc/install/include \ - --with-mpi-libflags="-L${ISSM_EXT_DIR}/shared/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ - --with-blas-lapack-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-metis-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-parmetis-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-scalapack-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-mumps-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-hdf5-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-petsc-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-gsl-dir=${ISSM_EXT_DIR}/shared/gsl/install \ - --with-boost-dir=${ISSM_EXT_DIR}/shared/boost/install \ - --with-dakota-dir=${ISSM_EXT_DIR}/shared/dakota/install \ - --with-proj-dir=${ISSM_EXT_DIR}/shared/proj/install \ - --with-triangle-dir=${ISSM_EXT_DIR}/shared/triangle/install \ - --with-chaco-dir=${ISSM_EXT_DIR}/chaco/install \ - --with-m1qn3-dir=${ISSM_EXT_DIR}/m1qn3/install \ - --with-semic-dir=${ISSM_EXT_DIR}/semic/install \ + --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ + --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ + --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \ + --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ + --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \ + --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \ + --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \ + --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \ + --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \ + --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \ + --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \ ' @@ -55,4 +55,5 @@ dakota install-6.2-mac.sh curl install-7-mac.sh + hdf5 install-1-parallel.sh netcdf install-4.7-parallel.sh proj install-6.sh Index: /issm/trunk-jpl/jenkins/mac-silicon-full =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-full (revision 27697) +++ /issm/trunk-jpl/jenkins/mac-silicon-full (revision 27698) @@ -25,21 +25,21 @@ --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \ --with-fortran-lib="-L/opt/homebrew/Cellar/gcc/12.2.0/lib/gcc/12 -lgfortran" \ - --with-mpi-include=${ISSM_EXT_DIR}/shared/petsc/install/include \ - --with-mpi-libflags="-L${ISSM_EXT_DIR}/shared/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ - --with-blas-lapack-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-metis-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-parmetis-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-scalapack-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-mumps-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-hdf5-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-petsc-dir=${ISSM_EXT_DIR}/shared/petsc/install \ - --with-gsl-dir=${ISSM_EXT_DIR}/shared/gsl/install \ - --with-boost-dir=${ISSM_EXT_DIR}/shared/boost/install \ - --with-dakota-dir=${ISSM_EXT_DIR}/shared/dakota/install \ - --with-proj-dir=${ISSM_EXT_DIR}/shared/proj/install \ - --with-triangle-dir=${ISSM_EXT_DIR}/shared/triangle/install \ - --with-chaco-dir=${ISSM_EXT_DIR}/chaco/install \ - --with-m1qn3-dir=${ISSM_EXT_DIR}/m1qn3/install \ - --with-semic-dir=${ISSM_EXT_DIR}/semic/install \ + --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ + --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ + --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \ + --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \ + --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \ + --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \ + --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \ + --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \ + --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \ + --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \ + --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \ ' @@ -56,4 +56,5 @@ dakota install-6.2-mac.sh curl install-7-mac.sh + hdf5 install-1-parallel.sh netcdf install-4.7-parallel.sh proj install-6.sh