Index: /issm/trunk-jpl/jenkins/pine_island-mac-binaries-matlab =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-binaries-matlab (revision 27010) +++ /issm/trunk-jpl/jenkins/pine_island-mac-binaries-matlab (revision 27011) @@ -19,5 +19,5 @@ --disable-dependency-tracking \ --with-matlab-dir=${MATLAB_PATH} \ - --with-fortran-lib="/usr/local/Cellar/gcc/10.3.0/lib/gcc/10/libgfortran.a /usr/local/Cellar/gcc/10.3.0/lib/gcc/10/libquadmath.a /usr/local/Cellar/gcc/10.3.0/lib/gcc/10/gcc/x86_64-apple-darwin15/10.3.0/libgcc.a" \ + --with-fortran-lib="/usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libgfortran.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libquadmath.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/gcc/x86_64-apple-darwin15/11/libgcc.a" \ --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ Index: sm/trunk-jpl/jenkins/pine_island-mac-binaries-python =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python (revision 27010) +++ (revision ) @@ -1,89 +1,0 @@ -#--------------------# -# ISSM Configuration # -#--------------------# - -# NOTE: -# - We can disable dependency tracking in the Autotools because the binaries -# should always be a one-time build. -# - -# ISSM CONFIGURATION -ISSM_CONFIG='\ - --prefix=${ISSM_DIR} \ - --enable-standalone-executables \ - --enable-standalone-modules \ - --enable-standalone-libraries \ - --disable-dependency-tracking \ - --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \ - --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \ - --with-fortran-lib="/usr/local/Cellar/gcc/10.3.0/lib/gcc/10/libgfortran.a /usr/local/Cellar/gcc/10.3.0/lib/gcc/10/libquadmath.a /usr/local/Cellar/gcc/10.3.0/lib/gcc/10/gcc/x86_64-apple-darwin15/10.3.0/libgcc.a" \ - --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/petsc/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.12-mac-static.sh - gsl install-static.sh - boost install-1.7-mac-static.sh - dakota install-6.2-mac-static.sh - curl install-7-mac-static.sh - netcdf install-4.7-parallel-static.sh - proj install-6-static.sh - gdal install-3-python-static.sh - gshhg install.sh - gmt install-6-mac-static.sh - gmsh install-4-static.sh - triangle install-mac-static.sh - chaco install.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 -# -# See documentation in test/NightlyRun/runme.* for more information. -# -PYTHON_NROPTIONS="" -MATLAB_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python-2 =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python-2 (revision 27011) +++ /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python-2 (revision 27011) @@ -0,0 +1,89 @@ +#--------------------# +# ISSM Configuration # +#--------------------# + +# NOTE: +# - We can disable dependency tracking in the Autotools because the binaries +# should always be a one-time build. +# + +# ISSM CONFIGURATION +ISSM_CONFIG='\ + --prefix=${ISSM_DIR} \ + --enable-standalone-executables \ + --enable-standalone-modules \ + --enable-standalone-libraries \ + --disable-dependency-tracking \ + --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \ + --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \ + --with-fortran-lib="/usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libgfortran.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libquadmath.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/gcc/x86_64-apple-darwin15/11/libgcc.a" \ + --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/petsc/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.12-mac-static.sh + gsl install-static.sh + boost install-1.7-mac-static.sh + dakota install-6.2-mac-static.sh + curl install-7-mac-static.sh + netcdf install-4.7-parallel-static.sh + proj install-6-static.sh + gdal install-3-python-static.sh + gshhg install.sh + gmt install-6-mac-static.sh + gmsh install-4-static.sh + triangle install-mac-static.sh + chaco install.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 +# +# See documentation in test/NightlyRun/runme.* for more information. +# +PYTHON_NROPTIONS="" +MATLAB_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python-3 =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python-3 (revision 27011) +++ /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python-3 (revision 27011) @@ -0,0 +1,90 @@ +#--------------------# +# ISSM Configuration # +#--------------------# + +# NOTE: +# - We can disable dependency tracking in the Autotools because the binaries +# should always be a one-time build. +# + +# ISSM CONFIGURATION +ISSM_CONFIG='\ + --prefix=${ISSM_DIR} \ + --enable-standalone-executables \ + --enable-standalone-modules \ + --enable-standalone-libraries \ + --disable-dependency-tracking \ + --with-python-version=3.4 \ + --with-python-dir=/Library/Frameworks/Python.framework/Versions/3.4 \ + --with-python-numpy-dir=/Library/Frameworks/Python.framework/Versions/3.4/lib/python3.4/site-packages/numpy \ + --with-fortran-lib="/usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libgfortran.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libquadmath.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/gcc/x86_64-apple-darwin15/11/libgcc.a" \ + --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/petsc/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.12-mac-static.sh + gsl install-static.sh + boost install-1.7-mac-static.sh + dakota install-6.2-mac-static.sh + curl install-7-mac-static.sh + netcdf install-4.7-parallel-static.sh + proj install-6-static.sh + gdal install-3-python-static.sh + gshhg install.sh + gmt install-6-mac-static.sh + gmsh install-4-static.sh + triangle install-mac-static.sh + chaco install.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 +# +# See documentation in test/NightlyRun/runme.* for more information. +# +PYTHON_NROPTIONS="" +MATLAB_NROPTIONS="" Index: sm/trunk-jpl/jenkins/pine_island-mac-python =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-python (revision 27010) +++ (revision ) @@ -1,90 +1,0 @@ -#--------------------# -# ISSM Configuration # -#--------------------# - -ISSM_CONFIG='\ - --prefix=${ISSM_DIR} \ - --disable-static \ - --enable-development \ - --enable-debugging \ - --with-numthreads=4 \ - --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \ - --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \ - --with-fortran-lib="-L/usr/local/Cellar/gcc/10.3.0/lib/gcc/10 -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/petsc/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 # -#-------------------# - -# List of external pakages to be installed and their installation scripts -EXTERNALPACKAGES=" - autotools install-mac.sh - cmake install.sh - petsc install-3.12-mac.sh - gsl install.sh - boost install-1.7-mac.sh - dakota install-6.2-mac.sh - curl install-7-mac.sh - netcdf install-4.7-parallel.sh - proj install-6.sh - gdal install-3-python.sh - gshhg install.sh - gmt install-6-mac.sh - gmsh install-4.sh - triangle install-mac.sh - chaco install.sh - m1qn3 install.sh - semic install.sh - shell2junit install.sh -" - -#---------# -# Testing # -#---------# - -# Test suites -MATLAB_TEST=0 -PYTHON_TEST=1 -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=4 - -# Number of CPUs used in the nightly runs -NUMCPUS_RUN=2 - -# Nightly run options -# -# See documentation in test/NightlyRun/runme.* for more information. -# -# NOTE: -# - Errors are large for tests 234 418 and 420 under Python -# - See test417.py for why it is excluded -# - Test 444 fails intermittently under Python with "IndexError: list index out of range" -# - Tests 701, 702, and 703 are skipped because they use full Stokes equations -# -MATLAB_NROPTIONS="" -PYTHON_NROPTIONS="--exclude 234 417 418 420 435 444 445 701 702 703" Index: /issm/trunk-jpl/test/NightlyRun/runme.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/runme.py (revision 27010) +++ /issm/trunk-jpl/test/NightlyRun/runme.py (revision 27011) @@ -184,5 +184,5 @@ os.chdir(root) id_string = IdToName(id) - print(("----------------runing-----------------------")) + print(("----------------running-----------------------")) if procedure == 'runFromNC': Tmod = import_module('test{}'.format(id))