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

This commit is contained in:
sjplimp
2012-08-04 19:30:28 +00:00
parent c4f8d2d110
commit bb9541993c
3 changed files with 482 additions and 1627 deletions

File diff suppressed because it is too large Load Diff

View File

@ -51,7 +51,7 @@ class PPPM : public KSpace {
int me,nprocs;
int nfactors;
int *factors;
double qsum,qsqsum,q2;
double qsum,qsqsum;
double cutoff;
double volume;
double delxinv,delyinv,delzinv,delvolinv;
@ -79,9 +79,7 @@ class PPPM : public KSpace {
FFT_SCALAR *buf1,*buf2,*buf3,*buf4;
double *gf_b;
FFT_SCALAR **rho1d,**rho_coeff,**drho1d,**drho_coeff;
double sf_coeff[6]; // coefficients for calculating ad self-forces
double **acons;
FFT_SCALAR **rho1d,**rho_coeff;
// group-group interactions
@ -103,55 +101,28 @@ class PPPM : public KSpace {
double qdist; // distance from O site to negative charge
double alpha; // geometric factor
void set_fft_parameters();
void adjust_gewald();
double newton_raphson_f();
double derivf();
double final_accuracy();
void set_grid();
virtual void allocate();
virtual void allocate_peratom();
virtual void deallocate();
virtual void deallocate_peratom();
int factorable(int);
double compute_df_kspace();
double rms(double, double, bigint, double, double **);
double diffpr(double, double, double, double, double **);
double compute_qopt();
void compute_gf_denom();
void compute_gf_ik();
void compute_gf_ad();
void compute_sf_coeff();
virtual void particle_map();
virtual void make_rho();
virtual void brick2fft();
void set_grid();
virtual void fillbrick();
void fillbrick_ik();
void fillbrick_ad();
virtual void fillbrick_peratom();
void fillbrick_peratom_ik();
void fillbrick_peratom_ad();
virtual void poisson();
void poisson_ik();
void poisson_ad();
virtual void fieldforce();
void fieldforce_ik();
void fieldforce_ad();
virtual void poisson_peratom();
virtual void fieldforce();
virtual void fieldforce_peratom();
void procs2grid2d(int,int,int,int *, int*);
void compute_rho1d(const FFT_SCALAR &, const FFT_SCALAR &,
const FFT_SCALAR &);
void compute_drho1d(const FFT_SCALAR &, const FFT_SCALAR &,
const FFT_SCALAR &);
void compute_rho_coeff();
void slabcorr();

View File

@ -429,7 +429,7 @@ void Finish::end(int flag)
int nsteps = update->nsteps;
int nsample = 100;
int nsample = 5;
double time3d,time1d;
force->kspace->timing(nsample,time3d,time1d);