Rework gmx-solvate to use analysis nbsearch