Commit 69f212d0 authored by sjplimp's avatar sjplimp
Browse files

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@266 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 4d65cd25
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
/* ----------------------------------------------------------------------
   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
   http://lammps.sandia.gov, Sandia National Laboratories
   Steve Plimpton, sjplimp@sandia.gov

   Copyright (2003) Sandia Corporation.  Under the terms of Contract
   DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
   certain rights in this software.  This software is distributed under 
   the GNU General Public License.

   See the README file in the top-level LAMMPS directory.
------------------------------------------------------------------------- */

#ifdef PairInclude
#include "pair_meam.h"
#endif

#ifdef PairClass
PairStyle(meam,PairMEAM)
#endif
+2 −10
Original line number Diff line number Diff line
@@ -16,16 +16,8 @@

#include "pointers.h"

#define TIME_N           8

#define TIME_TOTAL       0
#define TIME_LOOP        1
#define TIME_PAIR        2
#define TIME_BOND        3
#define TIME_KSPACE      4
#define TIME_NEIGHBOR    5
#define TIME_COMM        6
#define TIME_OUTPUT      7
enum{TIME_LOOP,TIME_PAIR,TIME_BOND,TIME_KSPACE,TIME_NEIGHBOR,
     TIME_COMM,TIME_OUTPUT,TIME_N};

namespace LAMMPS_NS {

+1 −2
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ void Update::init()

void Update::set_units(char *style)
{

  // physical constants from:
  // http://physics.nist.gov/cuu/Constants/Table/allascii.txt
  // using thermochemical calorie = 4.184 J