fixup! v56 support to the 56.0.2 release, added Intel OneAPI support …

…on Debian For merge: Resolves to #1386 Resolves to #1383 Resolves to #1361 Resolves to #1311 Related to #1384 (may prove viable solution, if applied to all patchesets for all supported ADCIRC versions.
StormSurgeLive · Sep 19, 2024 · 634c657 · 634c657
1 parent ffdae29
commit 634c657
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/bin/init-adcirc.sh b/bin/init-adcirc.sh
@@ -311,7 +311,7 @@ echo
 
 if [[ -d "${ADCIRCBASE}" ]]; then
   _delete=no
-  echo "$W '$ADCIRCBASE' exists!"
+  echo "$W \"$ADCIRCBASE\" exists!"
   echo $W
   read -p "${W} Delete this directory and continue? [$_delete] " delete
   echo

diff --git a/patches/ADCIRC/v56.0.2/02-macros-inc-gfortran.patch b/patches/ADCIRC/v56.0.2/02-macros-inc-gfortran.patch
@@ -0,0 +1,13 @@
+diff --git a/thirdparty/swan/macros.inc.gfortran b/thirdparty/swan/macros.inc.gfortran
+index ef13f34..2c6fbdf 100644
+--- a/thirdparty/swan/macros.inc.gfortran
++++ b/thirdparty/swan/macros.inc.gfortran
+@@ -5,7 +5,7 @@ F90_SER = gfortran
+ F90_OMP = gfortran
+ F90_MPI = mpif90
+ FLAGS_OPT = -O
+-FLAGS_MSC = -w -fno-second-underscore -ffree-line-length-none -fallow-argument-mismatch
++FLAGS_MSC = -w -fno-second-underscore -ffree-line-length-none
+ FLAGS90_MSC = $(FLAGS_MSC) -ffree-line-length-none
+ FLAGS_SER =
+ FLAGS_OMP = -fopenmp