Merge branch 'v2.3' into v2.4

CHANGES/v2.3.md

@@ -235,4 +235,7 @@ For users:
 
 For developers:
 - Fixed small issue in debug options of \ref driver (see \issue{245}).
+- `plumed patch -e` now accepts a name closely matching the patch name (e.g. `plumed patch -e gromacs2016.5` will try to patch
+  even if the stored patch is for `gromacs-2016.4`). This simplifies managing Portfiles. Nothing changes when picking the patch
+  from the interactive menu.
 

patches/patch.sh

@@ -176,6 +176,25 @@ then
   done
 fi
 
+if [[ "$action" == patch || "$action" == revert ]]
+then
+  found=no
+  for engine_try in $mdlist ; do
+    if [[ "$engine" == "$engine_try" ]] ; then
+      found=yes
+    fi
+  done
+  if [[ "$found" == no ]] ; then
+    echo "WARNING: engine $engine not found, I will search for a close match"
+    for engine_try in $mdlist ; do
+      if [[ "${engine%.*}" == "${engine_try%.*}" ]] ; then
+        echo "WARNING: found $engine_try"
+        engine="$engine_try"
+      fi
+    done
+  fi
+fi
+
 if [ -z "$diff" ]
 then
   diff="$PLUMED_ROOT/patches/${engine}.diff"