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

This commit is contained in:
sjplimp
2015-02-04 22:06:13 +00:00
parent f3cf3cf588
commit 1f77a147c3
2 changed files with 51 additions and 48 deletions

View File

@ -69,6 +69,7 @@ PairEAM::PairEAM(LAMMPS *lmp) : Pair(lmp)
PairEAM::~PairEAM() PairEAM::~PairEAM()
{ {
if (!copymode) {
memory->destroy(rho); memory->destroy(rho);
memory->destroy(fp); memory->destroy(fp);
@ -118,6 +119,7 @@ PairEAM::~PairEAM()
memory->destroy(frho_spline); memory->destroy(frho_spline);
memory->destroy(rhor_spline); memory->destroy(rhor_spline);
memory->destroy(z2r_spline); memory->destroy(z2r_spline);
}
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

View File

@ -25,6 +25,7 @@ PairStyle(eam,PairEAM)
namespace LAMMPS_NS { namespace LAMMPS_NS {
class PairEAM : public Pair { class PairEAM : public Pair {
public: public:
friend class FixSemiGrandCanonicalMC; // Alex Stukowski option friend class FixSemiGrandCanonicalMC; // Alex Stukowski option
@ -100,8 +101,8 @@ class PairEAM : public Pair {
}; };
Fs *fs; Fs *fs;
void allocate(); virtual void allocate();
void array2spline(); virtual void array2spline();
void interpolate(int, double, double *, double **); void interpolate(int, double, double *, double **);
void grab(FILE *, int, double *); void grab(FILE *, int, double *);