Commit ffa72cdd authored by sjplimp's avatar sjplimp
Browse files 

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10182 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 699154de

src/RIGID/fix_rigid_nh.cpp

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ void FixRigidNH::final_integrate() 
  

  // sum over atoms to get force and torque on rigid body

  

  tagint *image = atom->image;

  int *image = atom->image;

  double **x = atom->x;

  double **f = atom->f;

  int nlocal = atom->nlocal;

src/RIGID/fix_rigid_nh.h

+2 −2
Original line number Diff line number Diff line 
/* -*- c++ -*- ----------------------------------------------------------

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

   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator

   http://lammps.sandia.gov, Sandia National Laboratories

   Steve Plimpton, sjplimp@sandia.gov
@@ -72,7 +72,7 @@ class FixRigidNH : public FixRigid { 
  int tcomputeflag,pcomputeflag;



  void couple();

  virtual void remap();  

  void remap();  

  void nhc_temp_integrate();

  void nhc_press_integrate();

src/USER-MISC/pair_nb3b_harmonic.cpp

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ void PairNb3bHarmonic::read_file(char *file) 


  FILE *fp;

  if (comm->me == 0) {

    fp = fopen(file,"r");

    FILE *fp = open_potential(file);

    if (fp == NULL) {

      char str[128];

      sprintf(str,"Cannot open nb3b/harmonic potential file %s",file);

src/XTC/xdr_compat.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ extern "C" { 


typedef int bool_t;



#if defined(__MINGW32__)

#if defined(__MINGW32_VERSION)

typedef char * caddr_t;

typedef unsigned int u_int;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE