← Back to branch summary

~ubuntu-branches/debian/sid/lammps/sid

« back to all changes in this revision

Viewing changes to src/USER-MISC/pair_meam_sw_spline.cpp

  • Committer: Package Import Robot
  • Author(s): Anton Gladky
  • Date: 2015-04-29 23:44:49 UTC
  • mfrom: (5.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20150429234449-mbhy9utku6hp6oq8
Tags: 0~20150313.gitfa668e1-1
Upload into unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/USER-MISC/pair_meam_sw_spline.cpp
531
531
                error->all(FLERR,"Pair style meam/sw/spline requires newton pair on");
532
532
 
533
533
        // Need both full and half neighbor list.
534
 
        int irequest_full = neighbor->request(this);
 
534
        int irequest_full = neighbor->request(this,instance_me);
535
535
        neighbor->requests[irequest_full]->id = 1;
536
536
        neighbor->requests[irequest_full]->half = 0;
537
537
        neighbor->requests[irequest_full]->full = 1;
538
 
        int irequest_half = neighbor->request(this);
 
538
        int irequest_half = neighbor->request(this,instance_me);
539
539
        neighbor->requests[irequest_half]->id = 2;
540
540
        neighbor->requests[irequest_half]->half = 0;
541
541
        neighbor->requests[irequest_half]->half_from_full = 1;
562
562
 
563
563
/* ---------------------------------------------------------------------- */
564
564
 
565
 
int PairMEAMSWSpline::pack_comm(int n, int *list, double *buf, int pbc_flag, int *pbc)
 
565
int PairMEAMSWSpline::pack_forward_comm(int n, int *list, double *buf, 
 
566
                                        int pbc_flag, int *pbc)
566
567
{
567
568
        int* list_iter = list;
568
569
        int* list_iter_end = list + n;
569
570
        while(list_iter != list_iter_end)
570
571
                *buf++ = Uprime_values[*list_iter++];
571
 
        return 1;
 
572
        return n;
572
573
}
573
574
 
574
575
/* ---------------------------------------------------------------------- */
575
576
 
576
 
void PairMEAMSWSpline::unpack_comm(int n, int first, double *buf)
 
577
void PairMEAMSWSpline::unpack_forward_comm(int n, int first, double *buf)
577
578
{
578
579
        memcpy(&Uprime_values[first], buf, n * sizeof(buf[0]));
579
580
}