Unverified Commit 4725d4be authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1255 from stanmoore1/sllod 

Change fix nvt/sllod to allow suffix styles of fix deform
parents 9355e7e5 5362b1cf

src/USER-EFF/fix_nvt_sllod_eff.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ void FixNVTSllodEff::init() 


  int i;

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

    if (strcmp(modify->fix[i]->style,"deform") == 0) {

    if (strncmp(modify->fix[i]->style,"deform",6) == 0) {

      if (((FixDeform *) modify->fix[i])->remapflag != Domain::V_REMAP)

        error->all(FLERR,"Using fix nvt/sllod/eff with inconsistent fix deform "

                   "remap option");

src/USER-INTEL/fix_nvt_sllod_intel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void FixNVTSllodIntel::init() 


  int i;

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

    if (strcmp(modify->fix[i]->style,"deform") == 0) {

    if (strncmp(modify->fix[i]->style,"deform",6) == 0) {

      if (((FixDeform *) modify->fix[i])->remapflag != Domain::V_REMAP)

        error->all(FLERR,"Using fix nvt/sllod with inconsistent fix deform "

                   "remap option");

src/USER-OMP/fix_nvt_sllod_omp.cpp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void FixNVTSllodOMP::init() 


  int i;

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

    if (strcmp(modify->fix[i]->style,"deform") == 0) {

    if (strncmp(modify->fix[i]->style,"deform",6) == 0) {

      if (((FixDeform *) modify->fix[i])->remapflag != Domain::V_REMAP)

        error->all(FLERR,"Using fix nvt/sllod/omp with inconsistent fix "

                   "deform remap option");

src/fix_nvt_sllod.cpp

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void FixNVTSllod::init() 


  int i;

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

    if (strcmp(modify->fix[i]->style,"deform") == 0) {

    if (strncmp(modify->fix[i]->style,"deform",6) == 0) {

      if (((FixDeform *) modify->fix[i])->remapflag != Domain::V_REMAP)

        error->all(FLERR,"Using fix nvt/sllod with inconsistent fix deform "

                   "remap option");

CRA Git | Maintained and supported by SUSTech CRA and CCSE