lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2013-06-28 21:26:50 +00:00
parent 699154de42
commit ffa72cdd10
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/RIGID/fix_rigid_nh.cpp
View File

@ -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;

4
src/RIGID/fix_rigid_nh.h
View File

@ -1,4 +1,4 @@
/* -*- 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();

2
src/USER-MISC/pair_nb3b_harmonic.cpp
View File

@ -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);

2
src/XTC/xdr_compat.h
View File

@ -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