forked from lijiext/lammps
Merge pull request #2003 from stanmoore1/dpd_error
Remove unnecessary error check in USER-DPD fix rx
This commit is contained in:
commit
0766350838
|
@ -22,7 +22,6 @@ src/SPIN/* @julient31
|
|||
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
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#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
|
||||
|
@ -256,10 +255,6 @@ void FixRX::post_constructor()
|
|||
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++)
|
||||
|
|
Loading…
Reference in New Issue