diff --git a/src/ATC/fix_atc.cpp b/src/ATC/fix_atc.cpp index e6be648c86..a7c0cf5ade 100644 --- a/src/ATC/fix_atc.cpp +++ b/src/ATC/fix_atc.cpp @@ -18,7 +18,6 @@ #include "comm.h" #include "error.h" #include "group.h" -#include "neigh_request.h" #include "neighbor.h" #include "ATC_Method.h" @@ -558,11 +557,7 @@ int FixATC::modify_param(int narg, char** arg) void FixATC::init() { // Guarantee construction of full neighborlist - int irequest = neighbor->request(this,instance_me); - neighbor->requests[irequest]->pair = 0; - neighbor->requests[irequest]->fix = 1; - neighbor->requests[irequest]->half = 0; - neighbor->requests[irequest]->full = 1; + neighbor->add_request(this, NeighConst::REQ_FULL); // create computes, if necessary atc_->init_computes(); diff --git a/src/BODY/pair_body_nparticle.cpp b/src/BODY/pair_body_nparticle.cpp index c3e146aff0..e893350c3e 100644 --- a/src/BODY/pair_body_nparticle.cpp +++ b/src/BODY/pair_body_nparticle.cpp @@ -422,7 +422,7 @@ void PairBodyNparticle::init_style() error->all(FLERR,"Pair body/nparticle requires body style nparticle"); bptr = (BodyNparticle *) avec->bptr; - neighbor->request(this,instance_me); + neighbor->add_request(this); } /* ---------------------------------------------------------------------- diff --git a/src/BODY/pair_body_rounded_polygon.cpp b/src/BODY/pair_body_rounded_polygon.cpp index 14f305e7d4..aa3a86a821 100644 --- a/src/BODY/pair_body_rounded_polygon.cpp +++ b/src/BODY/pair_body_rounded_polygon.cpp @@ -427,7 +427,7 @@ void PairBodyRoundedPolygon::init_style() error->all(FLERR,"Pair body/rounded/polygon requires " "ghost atoms store velocity"); - neighbor->request(this); + neighbor->add_request(this); // find the maximum enclosing radius for each atom type diff --git a/src/BODY/pair_body_rounded_polyhedron.cpp b/src/BODY/pair_body_rounded_polyhedron.cpp index 6deb06aafb..8136e82fd8 100644 --- a/src/BODY/pair_body_rounded_polyhedron.cpp +++ b/src/BODY/pair_body_rounded_polyhedron.cpp @@ -406,7 +406,7 @@ void PairBodyRoundedPolyhedron::init_style() error->all(FLERR,"Pair body/rounded/polyhedron requires " "ghost atoms store velocity"); - neighbor->request(this); + neighbor->add_request(this); // find the maximum enclosing radius for each atom type diff --git a/src/MEAM/pair_meam.cpp b/src/MEAM/pair_meam.cpp index 3d5730eac3..ffa94ca9fd 100644 --- a/src/MEAM/pair_meam.cpp +++ b/src/MEAM/pair_meam.cpp @@ -315,7 +315,7 @@ void PairMEAM::init_style() // need a full and a half neighbor list neighbor->add_request(this, NeighConst::REQ_FULL)->set_id(1); - neighbor->add_request(this, NeighConst::REQ_DEFAULT)->set_id(2); + neighbor->add_request(this)->set_id(2); } /* ---------------------------------------------------------------------- diff --git a/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp b/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp index dda09f62ce..b024afd575 100644 --- a/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp +++ b/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp @@ -490,17 +490,15 @@ void PairLJCutTIP4PCut::init_style() if (atom->tag_enable == 0) error->all(FLERR,"Pair style lj/cut/tip4p/cut requires atom IDs"); if (!force->newton_pair) - error->all(FLERR, - "Pair style lj/cut/tip4p/cut requires newton pair on"); + error->all(FLERR,"Pair style lj/cut/tip4p/cut requires newton pair on"); if (!atom->q_flag) - error->all(FLERR, - "Pair style lj/cut/tip4p/cut requires atom attribute q"); + error->all(FLERR,"Pair style lj/cut/tip4p/cut requires atom attribute q"); if (force->bond == nullptr) error->all(FLERR,"Must use a bond style with TIP4P potential"); if (force->angle == nullptr) error->all(FLERR,"Must use an angle style with TIP4P potential"); - neighbor->request(this,instance_me); + neighbor->add_request(this); // set alpha parameter diff --git a/src/MOLECULE/pair_tip4p_cut.cpp b/src/MOLECULE/pair_tip4p_cut.cpp index e0eeaa6e58..60f55ea70d 100644 --- a/src/MOLECULE/pair_tip4p_cut.cpp +++ b/src/MOLECULE/pair_tip4p_cut.cpp @@ -419,17 +419,15 @@ void PairTIP4PCut::init_style() if (atom->tag_enable == 0) error->all(FLERR,"Pair style tip4p/cut requires atom IDs"); if (!force->newton_pair) - error->all(FLERR, - "Pair style tip4p/cut requires newton pair on"); + error->all(FLERR,"Pair style tip4p/cut requires newton pair on"); if (!atom->q_flag) - error->all(FLERR, - "Pair style tip4p/cut requires atom attribute q"); + error->all(FLERR,"Pair style tip4p/cut requires atom attribute q"); if (force->bond == nullptr) error->all(FLERR,"Must use a bond style with TIP4P potential"); if (force->angle == nullptr) error->all(FLERR,"Must use an angle style with TIP4P potential"); - neighbor->request(this,instance_me); + neighbor->request(this); // set alpha parameter diff --git a/src/YAFF/pair_lj_switch3_coulgauss_long.cpp b/src/YAFF/pair_lj_switch3_coulgauss_long.cpp index 7d12ecbe04..5a3102a96f 100644 --- a/src/YAFF/pair_lj_switch3_coulgauss_long.cpp +++ b/src/YAFF/pair_lj_switch3_coulgauss_long.cpp @@ -341,7 +341,7 @@ void PairLJSwitch3CoulGaussLong::init_style() error->all(FLERR,"Pair style requires a KSpace style"); g_ewald = force->kspace->g_ewald; - neighbor->request(this,instance_me); + neighbor->add_request(this); // setup force tables diff --git a/src/YAFF/pair_mm3_switch3_coulgauss_long.cpp b/src/YAFF/pair_mm3_switch3_coulgauss_long.cpp index 84c33e6b9a..85908d4d81 100644 --- a/src/YAFF/pair_mm3_switch3_coulgauss_long.cpp +++ b/src/YAFF/pair_mm3_switch3_coulgauss_long.cpp @@ -343,7 +343,7 @@ void PairMM3Switch3CoulGaussLong::init_style() error->all(FLERR,"Pair style requires a KSpace style"); g_ewald = force->kspace->g_ewald; - neighbor->request(this,instance_me); + neighbor->add_request(this); // setup force tables diff --git a/src/pair.cpp b/src/pair.cpp index fe8e77c81c..aee89db49e 100644 --- a/src/pair.cpp +++ b/src/pair.cpp @@ -326,7 +326,7 @@ void Pair::reinit() void Pair::init_style() { - neighbor->add_request(this, NeighConst::REQ_DEFAULT); + neighbor->add_request(this); } /* ---------------------------------------------------------------------- diff --git a/src/pair_buck_coul_cut.cpp b/src/pair_buck_coul_cut.cpp index 065086ed2d..7926b01c91 100644 --- a/src/pair_buck_coul_cut.cpp +++ b/src/pair_buck_coul_cut.cpp @@ -264,7 +264,7 @@ void PairBuckCoulCut::init_style() { if (!atom->q_flag) error->all(FLERR, "Pair style buck/coul/cut requires atom attribute q"); - neighbor->add_request(this, NeighConst::REQ_DEFAULT); + neighbor->add_request(this); } /* ---------------------------------------------------------------------- diff --git a/src/pair_coul_cut.cpp b/src/pair_coul_cut.cpp index 628de8185e..daca6374c5 100644 --- a/src/pair_coul_cut.cpp +++ b/src/pair_coul_cut.cpp @@ -201,7 +201,7 @@ void PairCoulCut::init_style() { if (!atom->q_flag) error->all(FLERR, "Pair style coul/cut requires atom attribute q"); - neighbor->add_request(this, NeighConst::REQ_DEFAULT); + neighbor->add_request(this); } /* ---------------------------------------------------------------------- diff --git a/src/pair_coul_dsf.cpp b/src/pair_coul_dsf.cpp index c84a257107..9617cc1331 100644 --- a/src/pair_coul_dsf.cpp +++ b/src/pair_coul_dsf.cpp @@ -203,7 +203,7 @@ void PairCoulDSF::init_style() { if (!atom->q_flag) error->all(FLERR, "Pair style coul/dsf requires atom attribute q"); - neighbor->add_request(this, NeighConst::REQ_DEFAULT); + neighbor->add_request(this); cut_coulsq = cut_coul * cut_coul; double erfcc = erfc(alpha * cut_coul); diff --git a/src/pair_coul_wolf.cpp b/src/pair_coul_wolf.cpp index eb4947383f..3d8ade8110 100644 --- a/src/pair_coul_wolf.cpp +++ b/src/pair_coul_wolf.cpp @@ -205,7 +205,7 @@ void PairCoulWolf::init_style() { if (!atom->q_flag) error->all(FLERR, "Pair coul/wolf requires atom attribute q"); - neighbor->add_request(this, NeighConst::REQ_DEFAULT); + neighbor->add_request(this); cut_coulsq = cut_coul * cut_coul; } diff --git a/src/pair_lj_cut_coul_cut.cpp b/src/pair_lj_cut_coul_cut.cpp index dc796bc82f..264a31b2c6 100644 --- a/src/pair_lj_cut_coul_cut.cpp +++ b/src/pair_lj_cut_coul_cut.cpp @@ -254,7 +254,7 @@ void PairLJCutCoulCut::init_style() { if (!atom->q_flag) error->all(FLERR, "Pair style lj/cut/coul/cut requires atom attribute q"); - neighbor->add_request(this, NeighConst::REQ_DEFAULT); + neighbor->add_request(this); } /* ---------------------------------------------------------------------- diff --git a/src/pair_zbl.cpp b/src/pair_zbl.cpp index 53db3816fb..292b3e8ad0 100644 --- a/src/pair_zbl.cpp +++ b/src/pair_zbl.cpp @@ -236,7 +236,7 @@ void PairZBL::coeff(int narg, char **arg) void PairZBL::init_style() { - neighbor->add_request(this, NeighConst::REQ_DEFAULT); + neighbor->add_request(this); cut_innersq = cut_inner * cut_inner; cut_globalsq = cut_global * cut_global;