Merge branch 'main' of github.com:ISSMteam/ISSM

Author: MathieuMorlighem

README.md

@@ -32,7 +32,7 @@ Note that checkout via HTTPS does not require credentials, but does not allow co
 ## Committing Changes to the Repository
 A good basic workflow for committing changes to the repository is,
 
-```
+```bash
 #1. Stash your local changes
 git stash
 

externalpackages/petsc/install-3.23-mac.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+set -eu
+
+## Constants
+#
+VER="3.23.4"
+
+PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS
+PREFIX="${ISSM_DIR}/externalpackages/petsc/install" # Set to location where external package should be installed
+
+# Environment
+if [ -z ${LDFLAGS+x} ]; then
+	LDFLAGS=""
+fi
+
+# Download source
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${VER}.tar.gz" "petsc-${VER}.tar.gz"
+
+# Unpack source
+tar -zxvf petsc-${VER}.tar.gz
+
+# Cleanup
+rm -rf ${PREFIX} ${PETSC_DIR}
+mkdir -p ${PETSC_DIR}
+
+# Move source to $PETSC_DIR
+mv petsc-${VER}/* ${PETSC_DIR}
+rm -rf petsc-${VER}
+
+# Configure
+cd ${PETSC_DIR}
+./configure \
+	--prefix="${PREFIX}" \
+	--PETSC_DIR="${PETSC_DIR}" \
+	--with-debugging=0 \
+	--with-valgrind=0 \
+	--with-x=0 \
+	--with-ssl=0 \
+	--with-pic=1 \
+	--LDFLAGS="-Wl,-ld_classic" \
+	--download-metis=1 \
+	--download-mpich=1 \
+	--download-mumps=1 \
+	--download-parmetis=1 \
+	--download-scalapack=1 \
+	--download-zlib=1
+
+# Compile and install
+make
+make install

externalpackages/vim/addons/vimrc

@@ -1,3 +1,13 @@
+" =================
+" ISSM vim settings
+" =================
+" Many files in ISSM rely on vim's folds. The option below
+" make ISSM development easier by highlighting ISSM classes
+" and Enums.
+" For dark  background select colorscheme issm_black
+" For light background select colorscheme issm_white
+" Report problems to:
+"    Mathieu Morlighem [email protected]
 
 " General setup{{{
 " ----------------------------------------------------------------------
@@ -79,7 +89,6 @@ set su=.h,.bak,~,.o,.info,.swp,.obj
 " Colors and theme {{{
 " ----------------------------------------------------------------------
 " use 256 colors
-"set t_Co=8
 set t_Co=256
 " backgrounb color
 "set background=light

jenkins/mac-silicon-binaries-matlab

@@ -1,6 +1,6 @@
 MATLAB_PATH="/Applications/MATLAB_R2023b.app"
 LIBGFORTRAN_PATH="/opt/homebrew/lib/gcc/current"
-LIBGCC_PATH="${LIBGFORTRAN_PATH}/gcc/aarch64-apple-darwin23/13"
+LIBGCC_PATH="${LIBGFORTRAN_PATH}/gcc/aarch64-apple-darwin24/15"
 
 #--------------------#
 # ISSM Configuration #

jenkins/mac-silicon-binaries-python-3

@@ -1,5 +1,5 @@
 LIBGFORTRAN_PATH="/opt/homebrew/lib/gcc/current"
-LIBGCC_PATH="${LIBGFORTRAN_PATH}/gcc/aarch64-apple-darwin23/13"
+LIBGCC_PATH="${LIBGFORTRAN_PATH}/gcc/aarch64-apple-darwin24/15"
 
 #--------------------#
 # ISSM Configuration #

packagers/linux/package-issm-linux-binaries-matlab.sh

@@ -40,6 +40,8 @@ LIBPSL="${ISSM_DIR}/externalpackages/gmt/install/lib/libpostscriptlight.so.6.5.0
 LIBPSL_DIST="${ISSM_DIR}/lib/libpostscriptlight.so.6" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
 LIBQUADMATH="/usr/lib/x86_64-linux-gnu/libquadmath.so.0.0.0" # Important that this is the library itself
 LIBQUADMATH_DIST="${ISSM_DIR}/lib/libquadmath.so.0" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
+LIBSTDCXX="/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.30" # Important that this is the library itself
+LIBSTDCXX_DIST="${ISSM_DIR}/lib/libstdc++.so.6.0.30" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
 
 ## Environment
 #
@@ -85,6 +87,7 @@ cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2>/dev/null
 cp ${LIBQUADMATH} ${LIBQUADMATH_DIST} 2>/dev/null
 cp ${LIBGMT} ${LIBGMT_DIST} 2>/dev/null
 cp ${LIBPSL} ${LIBPSL_DIST} 2>/dev/null
+cp ${LIBSTDCXX} ${LIBSTDCXX_DIST} 2>/dev/null
 
 echo "Moving MPICH binaries to bin/"
 if [ -f ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec ]; then