Fix merge conflict for compile

2e35361e · Cedric Jourdain · 2a1e952f · c8fbc69a · 2a1e952f · 2a1e952f
Commit 2e35361e authored Nov 25, 2021 by Cedric Jourdain 🐵
--- a/gpaw/build/examples/juwels/python/setup/juwels-mkl.cfg
+++ b/gpaw/build/examples/juwels/python/setup/juwels-mkl.cfg
--- a/gpaw/build/examples/juwels/python/setup/load-python.sh
+++ b/gpaw/build/examples/juwels/python/setup/load-python.sh
--- a/gpaw/build/examples/juwels/python/setup/patch-intel-ccompiler.diff
+++ b/gpaw/build/examples/juwels/python/setup/patch-intel-ccompiler.diff
--- a/gpaw/build/examples/juwels/python/setup/patch-intel-fcompiler.diff
+++ b/gpaw/build/examples/juwels/python/setup/patch-intel-fcompiler.diff
--- a/gpaw/build/patch-rmmdiis.diff
+++ b/gpaw/build/patch-rmmdiis.diff
--- a/gpaw/build/examples/davide/gpaw-cpu/setup/patch-rmmdiis.diff
+++ b/gpaw/build/examples/davide/gpaw-cpu/setup/patch-rmmdiis.diff
--- a/gpaw/scripts/affinity-wrapper.sh
+++ b/gpaw/scripts/affinity-wrapper.sh
--- a/gpaw/scripts/job-BSC-MareNostrum4-skylake.slurm
+++ b/gpaw/scripts/job-BSC-MareNostrum4-skylake.slurm
--- a/gpaw/scripts/job-HLRS-Hawk-rome.pbs
+++ b/gpaw/scripts/job-HLRS-Hawk-rome.pbs
--- a/gpaw/scripts/job-JSC-JUWELS-skylake.slurm
+++ b/gpaw/scripts/job-JSC-JUWELS-skylake.slurm
--- a/gpaw/scripts/job-LRZ-SuperMUCng-skylake.slurm
+++ b/gpaw/scripts/job-LRZ-SuperMUCng-skylake.slurm
--- a/gpaw/scripts/job-TGCC-irene-rome.slurm
+++ b/gpaw/scripts/job-TGCC-irene-rome.slurm
--- a/gpaw/scripts/job-davide.sh
+++ b/gpaw/scripts/job-davide.sh
--- a/gpaw/scripts/job-juwels.sh
+++ b/gpaw/scripts/job-juwels.sh
--- a/gpaw/scripts/job-marenostrum.sh
+++ b/gpaw/scripts/job-marenostrum.sh
--- a/specfem3d/compile.sh
+++ b/specfem3d/compile.sh
--- a/specfem3d/env/env/env_supermuc-ng
+++ b/specfem3d/env/env/env_supermuc-ng
--- a/specfem3d/env/env_marconi100
+++ b/specfem3d/env/env_marconi100
--- a/specfem3d/env/env_vega-cpu
+++ b/specfem3d/env/env_vega-cpu
--- a/specfem3d/env/env_vega-gpu
+++ b/specfem3d/env/env_vega-gpu