git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
@ -16,6 +16,7 @@
|
||||
#include "string.h"
|
||||
#include "compute_temp_ramp.h"
|
||||
#include "atom.h"
|
||||
#include "update.h"
|
||||
#include "force.h"
|
||||
#include "group.h"
|
||||
#include "modify.h"
|
||||
@ -30,9 +31,6 @@ using namespace LAMMPS_NS;
|
||||
#define MIN(A,B) ((A) < (B)) ? (A) : (B)
|
||||
#define MAX(A,B) ((A) > (B)) ? (A) : (B)
|
||||
|
||||
#define INVOKED_SCALAR 1
|
||||
#define INVOKED_VECTOR 2
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
ComputeTempRamp::ComputeTempRamp(LAMMPS *lmp, int narg, char **arg) :
|
||||
@ -151,7 +149,7 @@ double ComputeTempRamp::compute_scalar()
|
||||
{
|
||||
double fraction,vramp,vthermal[3];
|
||||
|
||||
invoked |= INVOKED_SCALAR;
|
||||
invoked_scalar = update->ntimestep;
|
||||
|
||||
double **x = atom->x;
|
||||
double **v = atom->v;
|
||||
@ -193,7 +191,7 @@ void ComputeTempRamp::compute_vector()
|
||||
int i;
|
||||
double fraction,vramp,vthermal[3];
|
||||
|
||||
invoked |= INVOKED_VECTOR;
|
||||
invoked_vector = update->ntimestep;
|
||||
|
||||
double **x = atom->x;
|
||||
double **v = atom->v;
|
||||
|
||||
Reference in New Issue
Block a user