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

This commit is contained in:
sjplimp 2014-05-01 14:21:37 +00:00
parent 191c90e48e
commit f22af06e02
1 changed files with 4 additions and 18 deletions

View File

@ -27,6 +27,8 @@
#ifndef __REAX_TYPES_H_
#define __REAX_TYPES_H_
#include "lmptype.h"
#include "ctype.h"
#include "math.h"
#include "mpi.h"
@ -67,24 +69,9 @@ typedef real rtensor[3][3];
typedef real rvec2[2];
typedef real rvec4[4];
// NOTE: this is needed for REAX/C to repsect LAMMPS
// choice of 32-bit vs 64-bit atom IDs
// cannot just typedef to tagint,
// or get conflicts when compiling force.cpp
// better way to do this would be in include lmptype.h,
// but that requires USER-REAXC to live in LAMMPS_NS
// import LAMMPS' definition of tagint
#ifdef LAMMPS_SMALLSMALL
typedef int rc_tagint;
#endif
#ifdef LAMMPS_SMALLBIG
typedef int rc_tagint;
#endif
#ifdef LAMMPS_BIGBIG
typedef int64_t rc_tagint;
#endif
typedef LAMMPS_NS::tagint rc_tagint;
typedef struct {
int step, bigN;
@ -113,7 +100,6 @@ typedef struct
rvec4 s, t; // for calculating q
} mpi_atom;
typedef struct
{
rc_tagint orig_id;