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

This commit is contained in:
sjplimp 2015-03-18 23:44:20 +00:00
parent 996a18cb83
commit acfc16d41a
3 changed files with 51 additions and 50 deletions

View File

@ -26,6 +26,7 @@ action () {
touch ../accelerator_kokkos.h touch ../accelerator_kokkos.h
touch ../memory.h touch ../memory.h
touch ../special.cpp
# list of files with optional dependcies # list of files with optional dependcies

View File

@ -1,4 +1,4 @@
/* ---------------------------------------------------------------------- </* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
http://lammps.sandia.gov, Sandia National Laboratories http://lammps.sandia.gov, Sandia National Laboratories
Steve Plimpton, sjplimp@sandia.gov Steve Plimpton, sjplimp@sandia.gov
@ -69,7 +69,8 @@ PairEAM::PairEAM(LAMMPS *lmp) : Pair(lmp)
PairEAM::~PairEAM() PairEAM::~PairEAM()
{ {
if (!copymode) { if (copymode) return;
memory->destroy(rho); memory->destroy(rho);
memory->destroy(fp); memory->destroy(fp);
@ -120,7 +121,6 @@ PairEAM::~PairEAM()
memory->destroy(rhor_spline); memory->destroy(rhor_spline);
memory->destroy(z2r_spline); memory->destroy(z2r_spline);
} }
}
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

View File

@ -1,4 +1,4 @@
</* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
http://lammps.sandia.gov, Sandia National Laboratories http://lammps.sandia.gov, Sandia National Laboratories
Steve Plimpton, sjplimp@sandia.gov Steve Plimpton, sjplimp@sandia.gov