Skip to content
Snippets Groups Projects
Commit 44285f81 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

more cleanup and respa code removal

parent 98bcf51a
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "update.h" #include "update.h"
#include "integrate.h" #include "integrate.h"
#include "math_const.h" #include "math_const.h"
#include "math_special.h"
#include "memory.h" #include "memory.h"
#include "error.h" #include "error.h"
...@@ -95,8 +94,8 @@ void PairLJCutCoulWolf::compute(int eflag, int vflag) ...@@ -95,8 +94,8 @@ void PairLJCutCoulWolf::compute(int eflag, int vflag)
e_self = v_sh = 0.0; e_self = v_sh = 0.0;
e_shift = erfc(alf*cut_coul)/cut_coul; e_shift = erfc(alf*cut_coul)/cut_coul;
f_shift = -(e_shift+ 2.0*alf/MY_PIS * exp(-alf*alf*cut_coul*cut_coul)) / f_shift = -(e_shift+ 2.0*alf/MY_PIS
cut_coul; * exp(-alf*alf*cut_coul*cut_coul)) / cut_coul;
inum = list->inum; inum = list->inum;
ilist = list->ilist; ilist = list->ilist;
...@@ -167,6 +166,7 @@ void PairLJCutCoulWolf::compute(int eflag, int vflag) ...@@ -167,6 +166,7 @@ void PairLJCutCoulWolf::compute(int eflag, int vflag)
offset[itype][jtype]; offset[itype][jtype];
evdwl *= factor_lj; evdwl *= factor_lj;
} else evdwl = 0.0; } else evdwl = 0.0;
if (rsq < cut_coulsq) { if (rsq < cut_coulsq) {
ecoul = v_sh; ecoul = v_sh;
if (factor_coul < 1.0) ecoul -= (1.0-factor_coul)*prefactor; if (factor_coul < 1.0) ecoul -= (1.0-factor_coul)*prefactor;
...@@ -311,11 +311,6 @@ double PairLJCutCoulWolf::init_one(int i, int j) ...@@ -311,11 +311,6 @@ double PairLJCutCoulWolf::init_one(int i, int j)
lj4[j][i] = lj4[i][j]; lj4[j][i] = lj4[i][j];
offset[j][i] = offset[i][j]; offset[j][i] = offset[i][j];
// check interior rRESPA cutoff
if (cut_respa && cut_lj[i][j] < cut_respa[3])
error->all(FLERR,"Pair cutoff < Respa interior cutoff");
// compute I,J contribution to long-range tail correction // compute I,J contribution to long-range tail correction
// count total # of atoms of type I and J via Allreduce // count total # of atoms of type I and J via Allreduce
......
...@@ -45,7 +45,6 @@ class PairLJCutCoulWolf : public Pair { ...@@ -45,7 +45,6 @@ class PairLJCutCoulWolf : public Pair {
double **cut_lj,**cut_ljsq; double **cut_lj,**cut_ljsq;
double **epsilon,**sigma; double **epsilon,**sigma;
double **lj1,**lj2,**lj3,**lj4,**offset; double **lj1,**lj2,**lj3,**lj4,**offset;
double *cut_respa;
double cut_coul,cut_coulsq,alf; double cut_coul,cut_coulsq,alf;
virtual void allocate(); virtual void allocate();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment