Merge pull request #2003 from stanmoore1/dpd_error

src/USER-CGDNA/*      @ohenrich

src/USER-CGSDK/*      @akohlmey

src/USER-COLVARS/*    @giacomofiorin

src/USER-DPD/*        @timattox

src/USER-INTEL/*      @wmbrownintel

src/USER-MANIFOLD/*   @Pakketeretet2

src/USER-MEAMC/*      @martok

#include "neigh_request.h"

#include "math_special.h"

#include "pair_dpd_fdt_energy.h"

#include "utils.h"

#include <vector> // std::vector<>

#include <algorithm> // std::max

  int nUniqueSpecies = 0;

  bool match;

  for (int i = 0; i < modify->nfix; i++)

    if (utils::strmatch(modify->fix[i]->style,"^property/atom") == 0)

      error->all(FLERR,"fix rx cannot be combined with fix property/atom");

  char **tmpspecies = new char*[maxspecies];

  int tmpmaxstrlen = 0;

  for(int jj=0; jj < maxspecies; jj++)