Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 28139)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 28140)
@@ -228,9 +228,4 @@
 fi
 
-# # Windows compilers
-# if [[ "${ISSM_ARCH}" == "cygwin-intel" ]]; then
-# 	source ${ISSM_DIR}/externalpackages/windows/windows_environment.sh
-# fi
-
 #########################
 # Command-line utilities
Index: sm/trunk-jpl/externalpackages/petsc/install-3.20-mac-intel.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.20-mac-intel.sh	(revision 28139)
+++ 	(revision )
@@ -1,61 +1,0 @@
-#!/bin/bash
-set -eu
-
-
-## Constants
-#
-VER="3.20.5"
-
-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
-
-# Download source
-$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${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}
-
-# Apply patches
-patch src/config/BuildSystem/config/setCompilers.py < configs/3.20/mac/intel/src/config/BuildSystem/config/setCompilers.py.patch
-
-# Configure
-#
-# NOTE:
-# - Added -Wno-error=implicit-function-declaration to CFLAGS for Clang >= 12. 
-#	(may need to remove it for earlier versions not using the C99 standard).
-#
-cd ${PETSC_DIR}
-./configure \
-	--prefix="${PREFIX}" \
-	--PETSC_DIR="${PETSC_DIR}" \
-	--CFLAGS="-Wno-error=implicit-function-declaration" \
-	--with-debugging=0 \
-	--with-valgrind=0 \
-	--with-x=0 \
-	--with-ssl=0 \
-	--with-pic=1 \
-	--download-fblaslapack=1 \
-	--download-mpich="https://www.mpich.org/static/downloads/4.2.0/mpich-4.2.0.tar.gz" \
-	--download-metis=1 \
-	--download-parmetis=1 \
-	--download-scalapack=1 \
-	--download-mumps=1 \
-	--download-zlib=1
-
-# Compile and install
-make
-make install
-
-# Need to make sure classic linker is used (should be able to remove this once MPICH fixes it)
-if [[ ${LDFLAGS} =~ "-Wl,-ld_classic" ]]; then
-	sed -i'' -e 's/-Wl,-commons,use_dylibs//g' ${PREFIX}/bin/mpicc
-	sed -i'' -e 's/-Wl,-commons,use_dylibs//g' ${PREFIX}/bin/mpicxx
-fi
Index: sm/trunk-jpl/externalpackages/petsc/install-3.20-mac-silicon.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.20-mac-silicon.sh	(revision 28139)
+++ 	(revision )
@@ -1,52 +1,0 @@
-#!/bin/bash
-set -eu
-
-
-## Constants
-#
-VER="3.20.5"
-
-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
-
-# 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 \
-	--download-fblaslapack=1 \
-	--download-mpich=1 \
-	--download-metis=1 \
-	--download-parmetis=1 \
-	--download-scalapack=1 \
-	--download-mumps=1 \
-	--download-zlib=1 
-
-# Compile and install
-make
-make install
-
-# Need to make sure classic linker is used (should be able to remove this once MPICH fixes it)
-if [[ ${LDFLAGS} =~ "-Wl,-ld_classic" ]]; then
-	sed -i'' -e 's/-Wl,-commons,use_dylibs//g' ${PREFIX}/bin/mpicc
-	sed -i'' -e 's/-Wl,-commons,use_dylibs//g' ${PREFIX}/bin/mpicxx
-fi
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.20-mac.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.20-mac.sh	(revision 28140)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.20-mac.sh	(revision 28140)
@@ -0,0 +1,60 @@
+#!/bin/bash
+set -eu
+
+
+## Constants
+#
+VER="3.20.5"
+
+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
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${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}
+
+# Apply patches
+patch src/config/BuildSystem/config/setCompilers.py < configs/3.20/mac/intel/src/config/BuildSystem/config/setCompilers.py.patch
+
+# Configure
+#
+# NOTE:
+# - Added -Wno-error=implicit-function-declaration to CFLAGS for Clang >= 12. 
+#	(may need to remove it for earlier versions not using the C99 standard).
+#
+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 \
+	--download-fblaslapack=1 \
+	--download-mpich="https://www.mpich.org/static/downloads/4.2.0/mpich-4.2.0.tar.gz" \
+	--download-metis=1 \
+	--download-parmetis=1 \
+	--download-scalapack=1 \
+	--download-mumps=1 \
+	--download-zlib=1
+
+# Compile and install
+make
+make install
+
+# Need to make sure classic linker is used (should be able to remove this once MPICH fixes it)
+if [[ ${LDFLAGS} =~ "-Wl,-ld_classic" ]]; then
+	sed -i'' -e 's/-Wl,-commons,use_dylibs//g' ${PREFIX}/bin/mpicc
+	sed -i'' -e 's/-Wl,-commons,use_dylibs//g' ${PREFIX}/bin/mpicxx
+fi
Index: /issm/trunk-jpl/jenkins/mac-intel-basic
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-basic	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-intel-basic	(revision 28140)
@@ -33,5 +33,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.14-mac.sh
+	petsc		install-3.20-mac.sh
 	triangle	install-mac.sh
 	m1qn3		install-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab	(revision 28140)
@@ -47,5 +47,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.14-mac-static.sh
+	petsc		install-3.20-mac-static.sh
 	gsl			install-static.sh
 	boost		install-1.7-mac-static.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-binaries-python-3
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-binaries-python-3	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-intel-binaries-python-3	(revision 28140)
@@ -47,5 +47,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.14-mac-static.sh
+	petsc		install-3.20-mac-static.sh
 	gsl			install-static.sh
 	boost		install-1.7-mac-static.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-dakota
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-dakota	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-intel-dakota	(revision 28140)
@@ -47,5 +47,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.14-mac.sh
+	petsc		install-3.20-mac.sh
 	gsl			install.sh
 	boost		install-1.7-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-examples
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-examples	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-intel-examples	(revision 28140)
@@ -47,5 +47,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.14-mac.sh
+	petsc		install-3.20-mac.sh
 	gsl			install.sh
 	boost		install-1.7-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-full
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-full	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-intel-full	(revision 28140)
@@ -51,5 +51,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.20-mac-intel.sh
+	petsc		install-3.20-mac.sh
 	gsl			install.sh
 	boost		install-1.7-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-solid_earth
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-solid_earth	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-intel-solid_earth	(revision 28140)
@@ -51,5 +51,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.14-mac.sh
+	petsc		install-3.20-mac.sh
 	gsl			install.sh
 	boost		install-1.7-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-basic
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-basic	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-silicon-basic	(revision 28140)
@@ -33,5 +33,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.17-mac-silicon.sh
+	petsc		install-3.20-mac.sh
 	triangle	install-mac.sh
 	m1qn3		install-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-binaries-matlab
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-binaries-matlab	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-silicon-binaries-matlab	(revision 28140)
@@ -1,3 +1,5 @@
 MATLAB_PATH="/Applications/MATLAB_R2023b.app"
+LIBGFORTRAN_PATH="/opt/homebrew/Cellar/gcc/13.2.0/lib/gcc/13"
+LIBGCC_PATH="${LIBGFORTRAN_PATH}/aarch64-apple-darwin22/13"
 
 #--------------------#
@@ -23,5 +25,5 @@
 	--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="/opt/homebrew/Cellar/gcc/13.1.0/lib/gcc/13/libgfortran.a /opt/homebrew/Cellar/gcc/13.1.0/lib/gcc/13/libquadmath.a /opt/homebrew/Cellar/gcc/13.1.0/lib/gcc/13/gcc/aarch64-apple-darwin22/13/libgcc.a" \
+	--with-fortran-lib="${LIBGFORTRAN_PATH}/libgfortran.a ${LIBGFORTRAN_PATH}/libquadmath.a ${LIBGCC_PATH}/libgcc.a" \
 	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
 	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -50,5 +52,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.17-mac-silicon-static.sh
+	petsc		install-3.20-mac-static.sh
 	gsl			install-static.sh
 	boost		install-1.7-mac-static.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-binaries-python-3
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-binaries-python-3	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-silicon-binaries-python-3	(revision 28140)
@@ -1,2 +1,5 @@
+LIBGFORTRAN_PATH="/opt/homebrew/Cellar/gcc/13.2.0/lib/gcc/13"
+LIBGCC_PATH="${LIBGFORTRAN_PATH}/aarch64-apple-darwin22/13"
+
 #--------------------#
 # ISSM Configuration #
@@ -21,5 +24,5 @@
 	--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="/opt/homebrew/Cellar/gcc/13.1.0/lib/gcc/13/libgfortran.a /opt/homebrew/Cellar/gcc/13.1.0/lib/gcc/13/libquadmath.a /opt/homebrew/Cellar/gcc/13.1.0/lib/gcc/13/gcc/aarch64-apple-darwin22/13/libgcc.a" \
+	--with-fortran-lib="${LIBGFORTRAN_PATH}/libgfortran.a ${LIBGFORTRAN_PATH}/libquadmath.a ${LIBGCC_PATH}/libgcc.a" \
 	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
 	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
@@ -48,5 +51,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.17-mac-silicon-static.sh
+	petsc		install-3.20-mac-static.sh
 	gsl			install-static.sh
 	boost		install-1.7-mac-static.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-dakota
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-dakota	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-silicon-dakota	(revision 28140)
@@ -42,5 +42,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.17-mac-silicon.sh
+	petsc		install-3.20-mac-silicon.sh
 	gsl			install.sh
 	boost		install-1.7-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-examples
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-examples	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-silicon-examples	(revision 28140)
@@ -39,5 +39,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.17-mac-silicon.sh
+	petsc		install-3.20-mac.sh
 	gsl			install.sh
 	boost		install-1.7-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-full
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-full	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-silicon-full	(revision 28140)
@@ -42,5 +42,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.17-mac-silicon.sh
+	petsc		install-3.20-mac.sh
 	gsl			install.sh
 	boost		install-1.7-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-python
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-python	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-silicon-python	(revision 28140)
@@ -33,5 +33,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.17-mac-silicon.sh
+	petsc		install-3.20-mac-silicon.sh
 	triangle	install-mac.sh
 	m1qn3		install-mac.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-solid_earth
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-solid_earth	(revision 28139)
+++ /issm/trunk-jpl/jenkins/mac-silicon-solid_earth	(revision 28140)
@@ -42,5 +42,5 @@
 	autotools	install-mac.sh
 	cmake		install.sh
-	petsc		install-3.17-mac-silicon.sh
+	petsc		install-3.20-mac.sh
 	gsl			install.sh
 	boost		install-1.7-mac.sh
