Index: /issm/trunk-jpl/jenkins/pine_island-mac =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac (revision 25711) +++ /issm/trunk-jpl/jenkins/pine_island-mac (revision 25712) @@ -34,5 +34,5 @@ autotools install.sh cmake install.sh - petsc install-3.14-mac.sh + petsc install-3.12-mac.sh triangle install-mac.sh chaco install.sh Index: /issm/trunk-jpl/jenkins/pine_island-mac-dakota =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-dakota (revision 25711) +++ /issm/trunk-jpl/jenkins/pine_island-mac-dakota (revision 25712) @@ -40,5 +40,5 @@ autotools install.sh cmake install.sh - petsc install-3.14-mac.sh + petsc install-3.12-mac.sh gsl install.sh boost install-1.7-mac.sh Index: sm/trunk-jpl/jenkins/pine_island-mac-matlab =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-matlab (revision 25711) +++ (revision ) @@ -1,88 +1,0 @@ -#--------------------# -# ISSM Configuration # -#--------------------# - -MATLAB_PATH="/Applications/MATLAB_R2018a.app" - -ISSM_CONFIG='\ - --prefix=${ISSM_DIR} \ - --disable-static \ - --enable-development \ - --enable-debugging \ - --with-numthreads=4 \ - --with-matlab-dir=${MATLAB_PATH} \ - --with-fortran-lib="-L/usr/local/Cellar/gcc/10.2.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-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-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.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.67.sh - netcdf install-4.7-parallel.sh - proj install-6.2.sh - gdal install-3-netcdf.sh - gshhg install.sh - gmt install-6.0-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=1 -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=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, 235, 418, and 420 under MATLAB -# - Tests 444 and 445 fail intermittently under MATLAB with "Index exceeds array bounds."\ -# - Tests 701, 702, and 703 are skipped because they use full Stokes equations -# -MATLAB_NROPTIONS="'exclude',[234 235 418 420 435 444 445 701 702 703]" -PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/pine_island-mac-python =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-python (revision 25711) +++ /issm/trunk-jpl/jenkins/pine_island-mac-python (revision 25712) @@ -37,5 +37,5 @@ autotools install.sh cmake install.sh - petsc install-3.14-mac.sh + petsc install-3.12-mac.sh gsl install.sh boost install-1.7-mac.sh Index: /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth (revision 25711) +++ /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth (revision 25712) @@ -40,5 +40,5 @@ autotools install.sh cmake install.sh - petsc install-3.14-mac.sh + petsc install-3.12-mac.sh gsl install.sh boost install-1.7-mac.sh Index: sm/trunk-jpl/jenkins/ross-debian_linux-matlab =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-matlab (revision 25711) +++ (revision ) @@ -1,87 +1,0 @@ -#--------------------# -# ISSM Configuration # -#--------------------# - -MATLAB_PATH="/usr/local/MATLAB/R2019b" - -ISSM_CONFIG='\ - --prefix=${ISSM_DIR} \ - --disable-static \ - --enable-development \ - --enable-debugging \ - --with-numthreads=4 \ - --with-matlab-dir=${MATLAB_PATH} \ - --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -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-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-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-debian-linux.sh - cmake install.sh - petsc install-3.14-linux.sh - gsl install.sh - boost install-1.7-linux.sh - dakota install-6.2-linux.sh - curl install-7.67.sh - netcdf install-4.7-parallel.sh - proj install-6.2.sh - gdal install-3-netcdf.sh - gshhg install.sh - gmt install-6.0-linux.sh - gmsh install-4.sh - triangle install-linux.sh - chaco install.sh - m1qn3 install.sh - semic install.sh - shell2junit install.sh -" - -#---------# -# Testing # -#---------# - -# Test suites -MATLAB_TEST=1 -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=2 - -# Nightly run options -# -# See documentation in test/NightlyRun/runme.* for more information. -# -# NOTE: -# - Tests 2002, 2003, 2010, 2101, and 2021 are excluded as Gmsh produces -# different-sized meshes on macOS and Linux for 3d objects (archives are -# generated on macOS). -# -MATLAB_NROPTIONS="'exclude',[2002 2003 2010 2021 2101]" -PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py =================================================================== --- /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py (revision 25711) +++ /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py (revision 25712) @@ -34,6 +34,6 @@ raise OSError(err_msg) - # # Initialize md.results if not a structure yet - if not isinstance(md.results, struct): + # Initialize md.results if not a results structure yet + if not isinstance(md.results, results): md.results = results()