fix openmpi switch

Author: QuantumMisaka

toolchain/install_abacus_toolchain.sh

@@ -504,15 +504,15 @@ while [ $# -ge 1 ]; do
         export MPI_MODE=mpich
       fi
       ;;
+    --with-4th-openmpi*)
+      openmpi_4th=$(read_with "${1}" "no") # default new openmpi
+      ;;
     --with-openmpi*)
       with_openmpi=$(read_with "${1}")
       if [ "${with_openmpi}" != "__DONTUSE__" ]; then
         export MPI_MODE=openmpi
       fi
       ;;
-    --with-openmpi-4th)
-      openmpi_4th=$(read_with "${1}" "no") # default new openmpi
-      ;;
     --with-intelmpi*)
       with_intelmpi=$(read_with "${1}" "__SYSTEM__")
       if [ "${with_intelmpi}" != "__DONTUSE__" ]; then
@@ -528,7 +528,7 @@ while [ $# -ge 1 ]; do
     --with-intel-mpi-clas*)
       intelmpi_classic=$(read_with "${1}" "no") # default new intel mpi compiler
       ;;
-    --with-intel*)
+    --with-intel*)  # must be read after items above
       with_intel=$(read_with "${1}" "__SYSTEM__")
       ;;
     --with-ifx*)

toolchain/toolchain_gnu.sh

@@ -26,6 +26,6 @@
 --with-libnpy=no \
 --with-libri=no \
 --with-libcomm=no \
---with-openmpi-4th=no \
+--with-4th-openmpi=no \
 | tee compile.log
-# if you want to use openmpi-version4: set --with-openmpi-4th=yes
+# if you want to use openmpi-version4: set --with-4th-openmpi=yes