Merge branch 'ISSMteam:main' into main

MPoinelli · Oct 10, 2024 · a5ed13c · a5ed13c
2 parents 36b1220 + 4edb121
commit a5ed13c
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/externalpackages/petsc/install-3.14-discover.sh b/externalpackages/petsc/install-3.14-discover.sh
@@ -25,7 +25,7 @@ rm -rf petsc-${VER}
 
 # Configure
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	COPTFLAGS="-g -O3" CXXOPTFLAGS="-g -O3" FOPTFLAGS="-g -O3" \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \

diff --git a/externalpackages/petsc/install-3.14-greenplanet.sh b/externalpackages/petsc/install-3.14-greenplanet.sh
@@ -27,7 +27,7 @@ rm -rf petsc-${VER}
 
 #configure
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	COPTFLAGS="-g -O3" CXXOPTFLAGS="-g -O3" FOPTFLAGS="-g -O3" \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \

diff --git a/externalpackages/petsc/install-3.14-linux-static.sh b/externalpackages/petsc/install-3.14-linux-static.sh
@@ -33,7 +33,7 @@ rm -rf petsc-${VER}
 #		compiler PIC flag via CFLAGS, CXXXFLAGS, and FCFLAGS
 #
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \
 	--with-shared-libraries=0 \

diff --git a/externalpackages/petsc/install-3.14-linux.sh b/externalpackages/petsc/install-3.14-linux.sh
@@ -25,7 +25,7 @@ rm -rf petsc-${VER}
 
 # Configure
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \
 	--with-debugging=0 \

diff --git a/externalpackages/petsc/install-3.14-mac-static.sh b/externalpackages/petsc/install-3.14-mac-static.sh
@@ -44,7 +44,7 @@ sed -i'' 's|thread.isAlive|thread.is_alive|g' ${PETSC_DIR}/config/BuildSystem/sc
 #	work out of the box on Linux.
 #
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \
 	--with-shared-libraries=0 \

diff --git a/externalpackages/petsc/install-3.14-mac-with-hdf5-static.sh b/externalpackages/petsc/install-3.14-mac-with-hdf5-static.sh
@@ -41,7 +41,7 @@ sed -i'' 's|thread.isAlive|thread.is_alive|g' ${PETSC_DIR}/config/BuildSystem/sc
 #	work out of the box on Linux.
 #
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \
 	--with-shared-libraries=0 \

diff --git a/externalpackages/petsc/install-3.14-mac-with-hdf5.sh b/externalpackages/petsc/install-3.14-mac-with-hdf5.sh
@@ -36,7 +36,7 @@ sed -i'' 's|thread.isAlive|thread.is_alive|g' ${PETSC_DIR}/config/BuildSystem/sc
 #	(may need to remove it for earlier versions not using the C99 standard).
 #
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \
 	--CFLAGS="-Wno-error=implicit-function-declaration" \

diff --git a/externalpackages/petsc/install-3.14-mac.sh b/externalpackages/petsc/install-3.14-mac.sh
@@ -36,7 +36,7 @@ sed -i'' 's|thread.isAlive|thread.is_alive|g' ${PETSC_DIR}/config/BuildSystem/sc
 #	(may need to remove it for earlier versions not using the C99 standard).
 #
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \
 	--CFLAGS="-Wno-error=implicit-function-declaration" \

diff --git a/externalpackages/petsc/install-3.14-pleiades.sh b/externalpackages/petsc/install-3.14-pleiades.sh
@@ -25,7 +25,7 @@ rm -rf petsc-${VER}
 
 # Configure
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \
 	--CFLAGS="-g -O3" \

diff --git a/externalpackages/petsc/install-3.14-tetralith.sh b/externalpackages/petsc/install-3.14-tetralith.sh
@@ -25,7 +25,7 @@ rm -rf petsc-${VER}
 
 # Configure
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	COPTFLAGS="-g -O2" CXXOPTFLAGS="-g -O2" FOPTFLAGS="-g -O2" \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \

diff --git a/externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi-static.sh b/externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi-static.sh
@@ -58,7 +58,7 @@ sed -i 's|(MAKEFLAGS)|(MAKEFLAGS:w=)|' ${PETSC_DIR}/makefile ${PETSC_DIR}/lib/pe
 #	incorrectly
 #
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \
 	--PETSC_ARCH="${PETSC_ARCH}" \

diff --git a/externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi.sh b/externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi.sh
@@ -58,7 +58,7 @@ sed -i 's|(MAKEFLAGS)|(MAKEFLAGS:w=)|' ${PETSC_DIR}/makefile ${PETSC_DIR}/lib/pe
 #	incorrectly
 #
 cd ${PETSC_DIR}
-./configure \
+./config/configure.py \
 	--prefix="${PREFIX}" \
 	--PETSC_DIR="${PETSC_DIR}" \
 	--PETSC_ARCH="${PETSC_ARCH}" \

diff --git a/src/m/classes/clusters/ub_ccr.py b/src/m/classes/clusters/ub_ccr.py
@@ -253,5 +253,5 @@ def Download(self, dirname, filelist):  # {{{
         # NOTE: Replacement for issmscpin(self.name, self.login, self.port, directory, filelist)
         fileliststr = '{' + ','.join([str(x) for x in filelist]) + '}'
         downloadcommand = 'cp {} {}'.format(os.path.join(directory, fileliststr), os.getcwd())
-        subprocess.call(downloadcommand, shell=True) 
+        subprocess.call(downloadcommand, shell=True)
     # }}}