Unverified Commit 45f28517 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1174 from akohlmey/fix-kspace-refactor

Bug fix for Kspace refactoring in USER-INTEL package
parents fccc2675 b6b62707
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ enum{FORWARD_IK, FORWARD_AD, FORWARD_IK_PERATOM, FORWARD_AD_PERATOM,

/* ---------------------------------------------------------------------- */

PPPMDispIntel::PPPMDispIntel(LAMMPS *lmp, int narg, char **arg) :
  PPPMDisp(lmp, narg, arg)
PPPMDispIntel::PPPMDispIntel(LAMMPS *lmp) : PPPMDisp(lmp)
{
  suffix_flag |= Suffix::INTEL;

@@ -97,13 +96,10 @@ PPPMDispIntel::~PPPMDispIntel()
  memory->destroy(drho6_lookup);
}



/* ----------------------------------------------------------------------
   called once before run
------------------------------------------------------------------------- */


void PPPMDispIntel::init()
{

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ namespace LAMMPS_NS {

  class PPPMDispIntel : public PPPMDisp {
  public:
    PPPMDispIntel(class LAMMPS *, int, char **);
    PPPMDispIntel(class LAMMPS *);
    virtual ~PPPMDispIntel();
    virtual void init();
    virtual void compute(int, int);
+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ enum{FORWARD_IK,FORWARD_AD,FORWARD_IK_PERATOM,FORWARD_AD_PERATOM};

/* ---------------------------------------------------------------------- */

PPPMIntel::PPPMIntel(LAMMPS *lmp, int narg, char **arg) : PPPM(lmp, narg, arg)
PPPMIntel::PPPMIntel(LAMMPS *lmp) : PPPM(lmp)
{
  suffix_flag |= Suffix::INTEL;

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ namespace LAMMPS_NS {

class PPPMIntel : public PPPM {
 public:
  PPPMIntel(class LAMMPS *, int, char **);
  PPPMIntel(class LAMMPS *);
  virtual ~PPPMIntel();
  virtual void init();
  virtual void compute(int, int);