Unverified Commit 40f1662c authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

reduce compiler warnings

parent 6cb120d6
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ FixClientMD::~FixClientMD()

  int nfield;
  int *fieldID,*fieldtype,*fieldlen;
  int msgID = cs->recv(nfield,fieldID,fieldtype,fieldlen);
  cs->recv(nfield,fieldID,fieldtype,fieldlen);

  // clean-up

@@ -173,8 +173,6 @@ void FixClientMD::min_setup(int vflag)

void FixClientMD::post_force(int vflag)
{
  int i,j,m;

  // energy and virial setup

  if (vflag) v_setup(vflag);
@@ -286,7 +284,7 @@ void FixClientMD::receive_fev(int vflag)
  int nfield;
  int *fieldID,*fieldtype,*fieldlen;

  int msgID = cs->recv(nfield,fieldID,fieldtype,fieldlen);
  cs->recv(nfield,fieldID,fieldtype,fieldlen);

  double *forces = (double *) cs->unpack(FORCES);
  double **f = atom->f;
+3 −9
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@
using namespace LAMMPS_NS;
using namespace CSLIB_NS;

// customize by adding a new server protocol enum

enum{MD,MC};

/* ---------------------------------------------------------------------- */

void Message::command(int narg, char **arg)
@@ -38,12 +34,10 @@ void Message::command(int narg, char **arg)
  else error->all(FLERR,"Illegal message command");
  lmp->clientserver = clientserver;

  // customize by adding a new server protocol
  // validate supported protocols

  int protocol;
  if (strcmp(arg[1],"md") == 0) protocol = MD;
  else if (strcmp(arg[1],"mc") == 0) protocol = MC;
  else error->all(FLERR,"Unknown message protocol");
  if ((strcmp(arg[1],"md") != 0) && (strcmp(arg[1],"mc") != 0))
    error->all(FLERR,"Unknown message protocol");

  // instantiate CSlib with chosen communication mode

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ ServerMC::ServerMC(LAMMPS *lmp) : Pointers(lmp) {}

void ServerMC::loop()
{
  int i,j,m;
  double xold[3],xnew[3];
  int m;
  double xold[3];
  tagint atomid;

  CSlib *cs = (CSlib *) lmp->cslib;
+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ ServerMD::~ServerMD()

void ServerMD::loop()
{
  int i,j,m;
  int j,m;

  // cs = instance of CSlib

+1 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ void Special::dihedral_trim()
------------------------------------------------------------------------- */

int Special::rendezvous_ids(int n, char *inbuf,
                            int &flag, int *&proclist, char *&outbuf,
                            int &flag, int *& /*proclist*/, char *& /*outbuf*/,
                            void *ptr)
{
  Special *sptr = (Special *) ptr;