From 35753b8f089e1f61301f69a58c2452fe908cf904 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer <akohlmey@gmail.com> Date: Wed, 26 Oct 2016 15:53:02 -0400 Subject: [PATCH] add error location propagation to force->bounds() and force->boundsbig() --- src/ASPHERE/pair_gayberne.cpp | 4 ++-- src/ASPHERE/pair_line_lj.cpp | 4 ++-- src/ASPHERE/pair_resquared.cpp | 4 ++-- src/ASPHERE/pair_tri_lj.cpp | 4 ++-- src/BODY/pair_body.cpp | 4 ++-- src/CLASS2/angle_class2.cpp | 2 +- src/CLASS2/bond_class2.cpp | 2 +- src/CLASS2/dihedral_class2.cpp | 2 +- src/CLASS2/improper_class2.cpp | 2 +- src/CLASS2/pair_lj_class2.cpp | 4 ++-- src/CLASS2/pair_lj_class2_coul_cut.cpp | 4 ++-- src/CLASS2/pair_lj_class2_coul_long.cpp | 4 ++-- src/COLLOID/pair_brownian.cpp | 4 ++-- src/COLLOID/pair_colloid.cpp | 4 ++-- src/COLLOID/pair_lubricate.cpp | 4 ++-- src/COLLOID/pair_lubricateU.cpp | 4 ++-- src/DIPOLE/pair_lj_cut_dipole_cut.cpp | 4 ++-- src/DIPOLE/pair_lj_cut_dipole_long.cpp | 4 ++-- src/DIPOLE/pair_lj_long_dipole_long.cpp | 4 ++-- src/GRANULAR/pair_gran_hooke_history.cpp | 4 ++-- src/KIM/pair_kim.cpp | 4 ++-- src/KOKKOS/pair_table_kokkos.cpp | 4 ++-- src/KSPACE/pair_born_coul_long.cpp | 4 ++-- src/KSPACE/pair_buck_coul_long.cpp | 4 ++-- src/KSPACE/pair_buck_long_coul_long.cpp | 4 ++-- src/KSPACE/pair_coul_long.cpp | 4 ++-- src/KSPACE/pair_lj_charmm_coul_long.cpp | 4 ++-- src/KSPACE/pair_lj_cut_coul_long.cpp | 4 ++-- src/KSPACE/pair_lj_long_coul_long.cpp | 4 ++-- src/MANYBODY/pair_eam.cpp | 4 ++-- src/MC/pair_dsmc.cpp | 4 ++-- src/MISC/compute_ti.cpp | 2 +- src/MISC/pair_nm_cut.cpp | 4 ++-- src/MISC/pair_nm_cut_coul_cut.cpp | 4 ++-- src/MISC/pair_nm_cut_coul_long.cpp | 4 ++-- src/MOLECULE/angle_charmm.cpp | 2 +- src/MOLECULE/angle_cosine.cpp | 2 +- src/MOLECULE/angle_cosine_periodic.cpp | 2 +- src/MOLECULE/angle_cosine_squared.cpp | 2 +- src/MOLECULE/angle_harmonic.cpp | 2 +- src/MOLECULE/angle_table.cpp | 2 +- src/MOLECULE/bond_fene.cpp | 2 +- src/MOLECULE/bond_fene_expand.cpp | 2 +- src/MOLECULE/bond_harmonic.cpp | 2 +- src/MOLECULE/bond_morse.cpp | 2 +- src/MOLECULE/bond_nonlinear.cpp | 2 +- src/MOLECULE/bond_quartic.cpp | 2 +- src/MOLECULE/bond_table.cpp | 2 +- src/MOLECULE/dihedral_charmm.cpp | 2 +- src/MOLECULE/dihedral_harmonic.cpp | 2 +- src/MOLECULE/dihedral_helix.cpp | 2 +- src/MOLECULE/dihedral_multi_harmonic.cpp | 2 +- src/MOLECULE/dihedral_opls.cpp | 2 +- src/MOLECULE/improper_cvff.cpp | 2 +- src/MOLECULE/improper_harmonic.cpp | 2 +- src/MOLECULE/improper_umbrella.cpp | 2 +- src/MOLECULE/pair_hbond_dreiding_lj.cpp | 6 +++--- src/MOLECULE/pair_hbond_dreiding_morse.cpp | 6 +++--- src/MOLECULE/pair_lj_charmm_coul_charmm.cpp | 4 ++-- src/MOLECULE/pair_lj_cut_tip4p_cut.cpp | 4 ++-- src/MOLECULE/pair_tip4p_cut.cpp | 4 ++-- src/PERI/pair_peri_eps.cpp | 4 ++-- src/PERI/pair_peri_lps.cpp | 4 ++-- src/PERI/pair_peri_pmb.cpp | 4 ++-- src/PERI/pair_peri_ves.cpp | 4 ++-- src/RIGID/fix_rigid.cpp | 4 ++-- src/USER-AWPMD/pair_awpmd_cut.cpp | 4 ++-- src/USER-CG-CMM/angle_sdk.cpp | 2 +- src/USER-CG-CMM/pair_lj_sdk.cpp | 4 ++-- src/USER-CG-CMM/pair_lj_sdk_coul_long.cpp | 4 ++-- src/USER-DPD/pair_dpd_fdt.cpp | 4 ++-- src/USER-DPD/pair_dpd_fdt_energy.cpp | 4 ++-- src/USER-DPD/pair_exp6_rx.cpp | 4 ++-- src/USER-DPD/pair_multi_lucy.cpp | 4 ++-- src/USER-DPD/pair_multi_lucy_rx.cpp | 4 ++-- src/USER-DPD/pair_table_rx.cpp | 4 ++-- src/USER-DRUDE/pair_lj_cut_thole_long.cpp | 4 ++-- src/USER-DRUDE/pair_thole.cpp | 4 ++-- src/USER-EFF/pair_eff_cut.cpp | 4 ++-- src/USER-FEP/compute_fep.cpp | 6 +++--- src/USER-FEP/fix_adapt_fep.cpp | 6 +++--- src/USER-FEP/pair_coul_cut_soft.cpp | 4 ++-- src/USER-FEP/pair_coul_long_soft.cpp | 4 ++-- src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp | 4 ++-- src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp | 4 ++-- src/USER-FEP/pair_lj_cut_coul_long_soft.cpp | 4 ++-- src/USER-FEP/pair_lj_cut_soft.cpp | 4 ++-- src/USER-FEP/pair_morse_soft.cpp | 4 ++-- src/USER-LB/fix_lb_rigid_pc_sphere.cpp | 4 ++-- src/USER-MISC/angle_cosine_shift.cpp | 2 +- src/USER-MISC/angle_cosine_shift_exp.cpp | 2 +- src/USER-MISC/angle_dipole.cpp | 2 +- src/USER-MISC/angle_fourier.cpp | 2 +- src/USER-MISC/angle_fourier_simple.cpp | 2 +- src/USER-MISC/angle_quartic.cpp | 2 +- src/USER-MISC/bond_harmonic_shift.cpp | 2 +- src/USER-MISC/bond_harmonic_shift_cut.cpp | 2 +- src/USER-MISC/dihedral_cosine_shift_exp.cpp | 2 +- src/USER-MISC/dihedral_fourier.cpp | 2 +- src/USER-MISC/dihedral_nharmonic.cpp | 2 +- src/USER-MISC/dihedral_quadratic.cpp | 2 +- src/USER-MISC/dihedral_spherical.cpp | 2 +- src/USER-MISC/dihedral_table.cpp | 2 +- src/USER-MISC/improper_cossq.cpp | 2 +- src/USER-MISC/improper_distance.cpp | 2 +- src/USER-MISC/improper_fourier.cpp | 2 +- src/USER-MISC/improper_ring.cpp | 2 +- src/USER-MISC/pair_buck_mdf.cpp | 4 ++-- src/USER-MISC/pair_coul_diel.cpp | 4 ++-- src/USER-MISC/pair_gauss_cut.cpp | 4 ++-- src/USER-MISC/pair_lennard_mdf.cpp | 4 ++-- src/USER-MISC/pair_list.cpp | 4 ++-- src/USER-MISC/pair_lj_mdf.cpp | 4 ++-- src/USER-MISC/pair_lj_sf.cpp | 4 ++-- src/USER-MISC/pair_lj_sf_dipole_sf.cpp | 4 ++-- src/USER-MISC/pair_morse_smooth_linear.cpp | 4 ++-- src/USER-MISC/pair_srp.cpp | 4 ++-- src/USER-SMD/pair_smd_hertz.cpp | 4 ++-- src/USER-SMD/pair_smd_triangulated_surface.cpp | 4 ++-- src/USER-SPH/pair_sph_heatconduction.cpp | 4 ++-- src/USER-SPH/pair_sph_idealgas.cpp | 4 ++-- src/USER-SPH/pair_sph_lj.cpp | 4 ++-- src/USER-SPH/pair_sph_rhosum.cpp | 4 ++-- src/USER-SPH/pair_sph_taitwater.cpp | 4 ++-- src/USER-SPH/pair_sph_taitwater_morris.cpp | 4 ++-- src/angle_hybrid.cpp | 2 +- src/angle_zero.cpp | 2 +- src/bond_hybrid.cpp | 2 +- src/bond_zero.cpp | 2 +- src/comm.cpp | 2 +- src/compute_coord_atom.cpp | 2 +- src/compute_rdf.cpp | 4 ++-- src/delete_bonds.cpp | 4 ++-- src/dihedral_hybrid.cpp | 2 +- src/dihedral_zero.cpp | 2 +- src/dump_image.cpp | 8 ++++---- src/fix_adapt.cpp | 4 ++-- src/force.cpp | 11 ++++++----- src/force.h | 4 ++-- src/improper_hybrid.cpp | 2 +- src/improper_zero.cpp | 2 +- src/input.cpp | 4 ++-- src/pair_beck.cpp | 4 ++-- src/pair_born.cpp | 4 ++-- src/pair_born_coul_wolf.cpp | 4 ++-- src/pair_buck.cpp | 4 ++-- src/pair_buck_coul_cut.cpp | 4 ++-- src/pair_coul_cut.cpp | 4 ++-- src/pair_coul_dsf.cpp | 4 ++-- src/pair_coul_wolf.cpp | 4 ++-- src/pair_dpd.cpp | 4 ++-- src/pair_dpd_tstat.cpp | 4 ++-- src/pair_gauss.cpp | 4 ++-- src/pair_hybrid.cpp | 4 ++-- src/pair_hybrid_overlay.cpp | 4 ++-- src/pair_lj96_cut.cpp | 4 ++-- src/pair_lj_cubic.cpp | 4 ++-- src/pair_lj_cut.cpp | 4 ++-- src/pair_lj_cut_coul_cut.cpp | 4 ++-- src/pair_lj_cut_coul_dsf.cpp | 4 ++-- src/pair_lj_expand.cpp | 4 ++-- src/pair_lj_gromacs.cpp | 4 ++-- src/pair_lj_gromacs_coul_gromacs.cpp | 4 ++-- src/pair_lj_smooth.cpp | 4 ++-- src/pair_lj_smooth_linear.cpp | 4 ++-- src/pair_mie_cut.cpp | 4 ++-- src/pair_morse.cpp | 4 ++-- src/pair_soft.cpp | 4 ++-- src/pair_table.cpp | 4 ++-- src/pair_yukawa.cpp | 4 ++-- src/pair_zbl.cpp | 4 ++-- src/pair_zero.cpp | 4 ++-- src/set.cpp | 6 +++--- 173 files changed, 302 insertions(+), 301 deletions(-) diff --git a/src/ASPHERE/pair_gayberne.cpp b/src/ASPHERE/pair_gayberne.cpp index 4aae7177da..bdff7a5cd6 100644 --- a/src/ASPHERE/pair_gayberne.cpp +++ b/src/ASPHERE/pair_gayberne.cpp @@ -297,8 +297,8 @@ void PairGayBerne::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/ASPHERE/pair_line_lj.cpp b/src/ASPHERE/pair_line_lj.cpp index aa3493ef47..4e3df473a3 100644 --- a/src/ASPHERE/pair_line_lj.cpp +++ b/src/ASPHERE/pair_line_lj.cpp @@ -371,8 +371,8 @@ void PairLineLJ::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double size_itype = force->numeric(FLERR,arg[2]); double size_jtype = force->numeric(FLERR,arg[3]); diff --git a/src/ASPHERE/pair_resquared.cpp b/src/ASPHERE/pair_resquared.cpp index 870ec95740..172516aa49 100644 --- a/src/ASPHERE/pair_resquared.cpp +++ b/src/ASPHERE/pair_resquared.cpp @@ -269,8 +269,8 @@ void PairRESquared::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/ASPHERE/pair_tri_lj.cpp b/src/ASPHERE/pair_tri_lj.cpp index ef5123dc11..773ad2d6a3 100644 --- a/src/ASPHERE/pair_tri_lj.cpp +++ b/src/ASPHERE/pair_tri_lj.cpp @@ -442,8 +442,8 @@ void PairTriLJ::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/BODY/pair_body.cpp b/src/BODY/pair_body.cpp index 86fea7e859..2a9edb37cc 100644 --- a/src/BODY/pair_body.cpp +++ b/src/BODY/pair_body.cpp @@ -388,8 +388,8 @@ void PairBody::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/CLASS2/angle_class2.cpp b/src/CLASS2/angle_class2.cpp index ceeba55678..0315e6601f 100644 --- a/src/CLASS2/angle_class2.cpp +++ b/src/CLASS2/angle_class2.cpp @@ -271,7 +271,7 @@ void AngleClass2::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); int count = 0; diff --git a/src/CLASS2/bond_class2.cpp b/src/CLASS2/bond_class2.cpp index b87deed5a6..f358720e7f 100644 --- a/src/CLASS2/bond_class2.cpp +++ b/src/CLASS2/bond_class2.cpp @@ -132,7 +132,7 @@ void BondClass2::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double r0_one = force->numeric(FLERR,arg[1]); double k2_one = force->numeric(FLERR,arg[2]); diff --git a/src/CLASS2/dihedral_class2.cpp b/src/CLASS2/dihedral_class2.cpp index d18d75b155..78be10fbca 100644 --- a/src/CLASS2/dihedral_class2.cpp +++ b/src/CLASS2/dihedral_class2.cpp @@ -640,7 +640,7 @@ void DihedralClass2::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); int count = 0; diff --git a/src/CLASS2/improper_class2.cpp b/src/CLASS2/improper_class2.cpp index 6c599276ca..618e20f6c3 100644 --- a/src/CLASS2/improper_class2.cpp +++ b/src/CLASS2/improper_class2.cpp @@ -529,7 +529,7 @@ void ImproperClass2::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); int count = 0; diff --git a/src/CLASS2/pair_lj_class2.cpp b/src/CLASS2/pair_lj_class2.cpp index 0974769b9c..ee61aaae1f 100644 --- a/src/CLASS2/pair_lj_class2.cpp +++ b/src/CLASS2/pair_lj_class2.cpp @@ -189,8 +189,8 @@ void PairLJClass2::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/CLASS2/pair_lj_class2_coul_cut.cpp b/src/CLASS2/pair_lj_class2_coul_cut.cpp index c7c4738689..45f0ccfe27 100644 --- a/src/CLASS2/pair_lj_class2_coul_cut.cpp +++ b/src/CLASS2/pair_lj_class2_coul_cut.cpp @@ -220,8 +220,8 @@ void PairLJClass2CoulCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/CLASS2/pair_lj_class2_coul_long.cpp b/src/CLASS2/pair_lj_class2_coul_long.cpp index 62ffdab6e1..b58094713f 100644 --- a/src/CLASS2/pair_lj_class2_coul_long.cpp +++ b/src/CLASS2/pair_lj_class2_coul_long.cpp @@ -256,8 +256,8 @@ void PairLJClass2CoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/COLLOID/pair_brownian.cpp b/src/COLLOID/pair_brownian.cpp index c1cc523d32..84fda485a0 100644 --- a/src/COLLOID/pair_brownian.cpp +++ b/src/COLLOID/pair_brownian.cpp @@ -423,8 +423,8 @@ void PairBrownian::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double cut_inner_one = cut_inner_global; double cut_one = cut_global; diff --git a/src/COLLOID/pair_colloid.cpp b/src/COLLOID/pair_colloid.cpp index b5d83233ab..440d6f9d4f 100644 --- a/src/COLLOID/pair_colloid.cpp +++ b/src/COLLOID/pair_colloid.cpp @@ -272,8 +272,8 @@ void PairColloid::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a12_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/COLLOID/pair_lubricate.cpp b/src/COLLOID/pair_lubricate.cpp index ea398c340a..71e08f3f19 100644 --- a/src/COLLOID/pair_lubricate.cpp +++ b/src/COLLOID/pair_lubricate.cpp @@ -509,8 +509,8 @@ void PairLubricate::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double cut_inner_one = cut_inner_global; double cut_one = cut_global; diff --git a/src/COLLOID/pair_lubricateU.cpp b/src/COLLOID/pair_lubricateU.cpp index 214bc3c2f3..eafa57973c 100644 --- a/src/COLLOID/pair_lubricateU.cpp +++ b/src/COLLOID/pair_lubricateU.cpp @@ -1739,8 +1739,8 @@ void PairLubricateU::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double cut_inner_one = cut_inner_global; double cut_one = cut_global; diff --git a/src/DIPOLE/pair_lj_cut_dipole_cut.cpp b/src/DIPOLE/pair_lj_cut_dipole_cut.cpp index 53c977f876..c57eb09e52 100644 --- a/src/DIPOLE/pair_lj_cut_dipole_cut.cpp +++ b/src/DIPOLE/pair_lj_cut_dipole_cut.cpp @@ -326,8 +326,8 @@ void PairLJCutDipoleCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/DIPOLE/pair_lj_cut_dipole_long.cpp b/src/DIPOLE/pair_lj_cut_dipole_long.cpp index 3f44579b8f..ae85b55ff7 100644 --- a/src/DIPOLE/pair_lj_cut_dipole_long.cpp +++ b/src/DIPOLE/pair_lj_cut_dipole_long.cpp @@ -376,8 +376,8 @@ void PairLJCutDipoleLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/DIPOLE/pair_lj_long_dipole_long.cpp b/src/DIPOLE/pair_lj_long_dipole_long.cpp index 248865ef72..ef865b66cd 100644 --- a/src/DIPOLE/pair_lj_long_dipole_long.cpp +++ b/src/DIPOLE/pair_lj_long_dipole_long.cpp @@ -194,8 +194,8 @@ void PairLJLongDipoleLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/GRANULAR/pair_gran_hooke_history.cpp b/src/GRANULAR/pair_gran_hooke_history.cpp index 2652381c96..edd12b4b27 100644 --- a/src/GRANULAR/pair_gran_hooke_history.cpp +++ b/src/GRANULAR/pair_gran_hooke_history.cpp @@ -371,8 +371,8 @@ void PairGranHookeHistory::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int count = 0; for (int i = ilo; i <= ihi; i++) { diff --git a/src/KIM/pair_kim.cpp b/src/KIM/pair_kim.cpp index 9140b73f3b..b35e90511f 100644 --- a/src/KIM/pair_kim.cpp +++ b/src/KIM/pair_kim.cpp @@ -343,8 +343,8 @@ void PairKIM::coeff(int narg, char **arg) error->all(FLERR,"Incorrect args for pair coefficients"); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); // read args that map atom species to KIM elements // lmps_map_species_to_unique[i] = diff --git a/src/KOKKOS/pair_table_kokkos.cpp b/src/KOKKOS/pair_table_kokkos.cpp index fec6512a33..278c5b0a2f 100644 --- a/src/KOKKOS/pair_table_kokkos.cpp +++ b/src/KOKKOS/pair_table_kokkos.cpp @@ -488,8 +488,8 @@ void PairTableKokkos<DeviceType>::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int me; MPI_Comm_rank(world,&me); diff --git a/src/KSPACE/pair_born_coul_long.cpp b/src/KSPACE/pair_born_coul_long.cpp index 15bcd1081b..14d43f4c63 100644 --- a/src/KSPACE/pair_born_coul_long.cpp +++ b/src/KSPACE/pair_born_coul_long.cpp @@ -265,8 +265,8 @@ void PairBornCoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a_one = force->numeric(FLERR,arg[2]); double rho_one = force->numeric(FLERR,arg[3]); diff --git a/src/KSPACE/pair_buck_coul_long.cpp b/src/KSPACE/pair_buck_coul_long.cpp index 683e5bf004..9cd8485e5c 100644 --- a/src/KSPACE/pair_buck_coul_long.cpp +++ b/src/KSPACE/pair_buck_coul_long.cpp @@ -256,8 +256,8 @@ void PairBuckCoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a_one = force->numeric(FLERR,arg[2]); double rho_one = force->numeric(FLERR,arg[3]); diff --git a/src/KSPACE/pair_buck_long_coul_long.cpp b/src/KSPACE/pair_buck_long_coul_long.cpp index 52d250fbe1..7b42bb47d8 100644 --- a/src/KSPACE/pair_buck_long_coul_long.cpp +++ b/src/KSPACE/pair_buck_long_coul_long.cpp @@ -197,8 +197,8 @@ void PairBuckLongCoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(*(arg++),atom->ntypes,ilo,ihi); - force->bounds(*(arg++),atom->ntypes,jlo,jhi); + force->bounds(FLERR,*(arg++),atom->ntypes,ilo,ihi); + force->bounds(FLERR,*(arg++),atom->ntypes,jlo,jhi); double buck_a_one = force->numeric(FLERR,*(arg++)); double buck_rho_one = force->numeric(FLERR,*(arg++)); diff --git a/src/KSPACE/pair_coul_long.cpp b/src/KSPACE/pair_coul_long.cpp index c1cd14523e..988694153a 100644 --- a/src/KSPACE/pair_coul_long.cpp +++ b/src/KSPACE/pair_coul_long.cpp @@ -215,8 +215,8 @@ void PairCoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int count = 0; for (int i = ilo; i <= ihi; i++) { diff --git a/src/KSPACE/pair_lj_charmm_coul_long.cpp b/src/KSPACE/pair_lj_charmm_coul_long.cpp index 7fad9c5eef..bd020a439a 100644 --- a/src/KSPACE/pair_lj_charmm_coul_long.cpp +++ b/src/KSPACE/pair_lj_charmm_coul_long.cpp @@ -650,8 +650,8 @@ void PairLJCharmmCoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/KSPACE/pair_lj_cut_coul_long.cpp b/src/KSPACE/pair_lj_cut_coul_long.cpp index 866db6ba65..0d0649fe6a 100644 --- a/src/KSPACE/pair_lj_cut_coul_long.cpp +++ b/src/KSPACE/pair_lj_cut_coul_long.cpp @@ -624,8 +624,8 @@ void PairLJCutCoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/KSPACE/pair_lj_long_coul_long.cpp b/src/KSPACE/pair_lj_long_coul_long.cpp index 3675ea76dc..3b4ed79786 100644 --- a/src/KSPACE/pair_lj_long_coul_long.cpp +++ b/src/KSPACE/pair_lj_long_coul_long.cpp @@ -192,8 +192,8 @@ void PairLJLongCoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/MANYBODY/pair_eam.cpp b/src/MANYBODY/pair_eam.cpp index 53fbef60e8..880b8f62fc 100644 --- a/src/MANYBODY/pair_eam.cpp +++ b/src/MANYBODY/pair_eam.cpp @@ -366,8 +366,8 @@ void PairEAM::coeff(int narg, char **arg) // parse pair of atom types int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); // read funcfl file if hasn't already been read // store filename in Funcfl data struct diff --git a/src/MC/pair_dsmc.cpp b/src/MC/pair_dsmc.cpp index 7aa0237a91..344faf87f6 100644 --- a/src/MC/pair_dsmc.cpp +++ b/src/MC/pair_dsmc.cpp @@ -245,8 +245,8 @@ void PairDSMC::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double sigma_one = force->numeric(FLERR,arg[2]); diff --git a/src/MISC/compute_ti.cpp b/src/MISC/compute_ti.cpp index 02f1608505..eca136c935 100644 --- a/src/MISC/compute_ti.cpp +++ b/src/MISC/compute_ti.cpp @@ -79,7 +79,7 @@ ComputeTI::ComputeTI(LAMMPS *lmp, int narg, char **arg) : int n = strlen(arg[iarg]) + 1; pstyle[nterms] = new char[n]; strcpy(pstyle[nterms],arg[iarg]); - force->bounds(arg[iarg+1],atom->ntypes,ilo[nterms],ihi[nterms]); + force->bounds(FLERR,arg[iarg+1],atom->ntypes,ilo[nterms],ihi[nterms]); iarg += 1; if (strstr(arg[iarg+1],"v_") == arg[iarg+1]) { diff --git a/src/MISC/pair_nm_cut.cpp b/src/MISC/pair_nm_cut.cpp index f0c9806fb8..467be1b7be 100644 --- a/src/MISC/pair_nm_cut.cpp +++ b/src/MISC/pair_nm_cut.cpp @@ -203,8 +203,8 @@ void PairNMCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double e0_one = force->numeric(FLERR,arg[2]); double r0_one = force->numeric(FLERR,arg[3]); diff --git a/src/MISC/pair_nm_cut_coul_cut.cpp b/src/MISC/pair_nm_cut_coul_cut.cpp index 61326ee1eb..86fa09f176 100644 --- a/src/MISC/pair_nm_cut_coul_cut.cpp +++ b/src/MISC/pair_nm_cut_coul_cut.cpp @@ -232,8 +232,8 @@ void PairNMCutCoulCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double e0_one = force->numeric(FLERR,arg[2]); double r0_one = force->numeric(FLERR,arg[3]); diff --git a/src/MISC/pair_nm_cut_coul_long.cpp b/src/MISC/pair_nm_cut_coul_long.cpp index 0cd12ac035..c186d19539 100644 --- a/src/MISC/pair_nm_cut_coul_long.cpp +++ b/src/MISC/pair_nm_cut_coul_long.cpp @@ -271,8 +271,8 @@ void PairNMCutCoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double e0_one = force->numeric(FLERR,arg[2]); double r0_one = force->numeric(FLERR,arg[3]); diff --git a/src/MOLECULE/angle_charmm.cpp b/src/MOLECULE/angle_charmm.cpp index c2d44b26dd..c7284add8c 100644 --- a/src/MOLECULE/angle_charmm.cpp +++ b/src/MOLECULE/angle_charmm.cpp @@ -196,7 +196,7 @@ void AngleCharmm::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double theta0_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/angle_cosine.cpp b/src/MOLECULE/angle_cosine.cpp index 135d4bbf8f..f064a34f20 100644 --- a/src/MOLECULE/angle_cosine.cpp +++ b/src/MOLECULE/angle_cosine.cpp @@ -156,7 +156,7 @@ void AngleCosine::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); diff --git a/src/MOLECULE/angle_cosine_periodic.cpp b/src/MOLECULE/angle_cosine_periodic.cpp index dbd93b3b7b..77fb335b78 100644 --- a/src/MOLECULE/angle_cosine_periodic.cpp +++ b/src/MOLECULE/angle_cosine_periodic.cpp @@ -201,7 +201,7 @@ void AngleCosinePeriodic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double c_one = force->numeric(FLERR,arg[1]); int b_one = force->inumeric(FLERR,arg[2]); diff --git a/src/MOLECULE/angle_cosine_squared.cpp b/src/MOLECULE/angle_cosine_squared.cpp index 6d073f156e..bc38d76dcd 100644 --- a/src/MOLECULE/angle_cosine_squared.cpp +++ b/src/MOLECULE/angle_cosine_squared.cpp @@ -168,7 +168,7 @@ void AngleCosineSquared::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double theta0_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/angle_harmonic.cpp b/src/MOLECULE/angle_harmonic.cpp index cffc3182dd..7e8b57b04f 100644 --- a/src/MOLECULE/angle_harmonic.cpp +++ b/src/MOLECULE/angle_harmonic.cpp @@ -168,7 +168,7 @@ void AngleHarmonic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double theta0_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/angle_table.cpp b/src/MOLECULE/angle_table.cpp index 9dd9925725..4d9007adb7 100644 --- a/src/MOLECULE/angle_table.cpp +++ b/src/MOLECULE/angle_table.cpp @@ -215,7 +215,7 @@ void AngleTable::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); int me; MPI_Comm_rank(world,&me); diff --git a/src/MOLECULE/bond_fene.cpp b/src/MOLECULE/bond_fene.cpp index 66c5c08174..5d58f2683a 100644 --- a/src/MOLECULE/bond_fene.cpp +++ b/src/MOLECULE/bond_fene.cpp @@ -154,7 +154,7 @@ void BondFENE::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double r0_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/bond_fene_expand.cpp b/src/MOLECULE/bond_fene_expand.cpp index f65632cc3f..033f8d6502 100644 --- a/src/MOLECULE/bond_fene_expand.cpp +++ b/src/MOLECULE/bond_fene_expand.cpp @@ -160,7 +160,7 @@ void BondFENEExpand::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double r0_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/bond_harmonic.cpp b/src/MOLECULE/bond_harmonic.cpp index 8c5663bf79..f164a51de4 100644 --- a/src/MOLECULE/bond_harmonic.cpp +++ b/src/MOLECULE/bond_harmonic.cpp @@ -121,7 +121,7 @@ void BondHarmonic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double r0_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/bond_morse.cpp b/src/MOLECULE/bond_morse.cpp index da2717899a..3204a0ca61 100644 --- a/src/MOLECULE/bond_morse.cpp +++ b/src/MOLECULE/bond_morse.cpp @@ -126,7 +126,7 @@ void BondMorse::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double d0_one = force->numeric(FLERR,arg[1]); double alpha_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/bond_nonlinear.cpp b/src/MOLECULE/bond_nonlinear.cpp index 9da2993c54..edd9dcd4e5 100644 --- a/src/MOLECULE/bond_nonlinear.cpp +++ b/src/MOLECULE/bond_nonlinear.cpp @@ -123,7 +123,7 @@ void BondNonlinear::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double epsilon_one = force->numeric(FLERR,arg[1]); double r0_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/bond_quartic.cpp b/src/MOLECULE/bond_quartic.cpp index c92048b2ca..2a3e395a77 100644 --- a/src/MOLECULE/bond_quartic.cpp +++ b/src/MOLECULE/bond_quartic.cpp @@ -203,7 +203,7 @@ void BondQuartic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double b1_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/bond_table.cpp b/src/MOLECULE/bond_table.cpp index 858bc83a36..38cbe7e406 100644 --- a/src/MOLECULE/bond_table.cpp +++ b/src/MOLECULE/bond_table.cpp @@ -168,7 +168,7 @@ void BondTable::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); int me; MPI_Comm_rank(world,&me); diff --git a/src/MOLECULE/dihedral_charmm.cpp b/src/MOLECULE/dihedral_charmm.cpp index 8b6909f1ad..b9d1c440d4 100644 --- a/src/MOLECULE/dihedral_charmm.cpp +++ b/src/MOLECULE/dihedral_charmm.cpp @@ -330,7 +330,7 @@ void DihedralCharmm::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); // require integer values of shift for backwards compatibility // arbitrary phase angle shift could be allowed, but would break diff --git a/src/MOLECULE/dihedral_harmonic.cpp b/src/MOLECULE/dihedral_harmonic.cpp index f9ea31ac7c..82c5fe3150 100644 --- a/src/MOLECULE/dihedral_harmonic.cpp +++ b/src/MOLECULE/dihedral_harmonic.cpp @@ -276,7 +276,7 @@ void DihedralHarmonic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); int sign_one = force->inumeric(FLERR,arg[2]); diff --git a/src/MOLECULE/dihedral_helix.cpp b/src/MOLECULE/dihedral_helix.cpp index b0565e29fb..43794bd6aa 100644 --- a/src/MOLECULE/dihedral_helix.cpp +++ b/src/MOLECULE/dihedral_helix.cpp @@ -284,7 +284,7 @@ void DihedralHelix::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); double aphi_one = force->numeric(FLERR,arg[1]); double bphi_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/dihedral_multi_harmonic.cpp b/src/MOLECULE/dihedral_multi_harmonic.cpp index 0842595fba..3a4be46fc7 100644 --- a/src/MOLECULE/dihedral_multi_harmonic.cpp +++ b/src/MOLECULE/dihedral_multi_harmonic.cpp @@ -273,7 +273,7 @@ void DihedralMultiHarmonic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); double a1_one = force->numeric(FLERR,arg[1]); double a2_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/dihedral_opls.cpp b/src/MOLECULE/dihedral_opls.cpp index 609fac74bd..c3a7ee6aa7 100644 --- a/src/MOLECULE/dihedral_opls.cpp +++ b/src/MOLECULE/dihedral_opls.cpp @@ -289,7 +289,7 @@ void DihedralOPLS::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); double k1_one = force->numeric(FLERR,arg[1]); double k2_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/improper_cvff.cpp b/src/MOLECULE/improper_cvff.cpp index 28b3612c78..45740d7880 100644 --- a/src/MOLECULE/improper_cvff.cpp +++ b/src/MOLECULE/improper_cvff.cpp @@ -298,7 +298,7 @@ void ImproperCvff::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); int sign_one = force->inumeric(FLERR,arg[2]); diff --git a/src/MOLECULE/improper_harmonic.cpp b/src/MOLECULE/improper_harmonic.cpp index 56ddce6f5b..c482055c76 100644 --- a/src/MOLECULE/improper_harmonic.cpp +++ b/src/MOLECULE/improper_harmonic.cpp @@ -240,7 +240,7 @@ void ImproperHarmonic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double chi_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/improper_umbrella.cpp b/src/MOLECULE/improper_umbrella.cpp index a2f176e732..8a9b0b4434 100644 --- a/src/MOLECULE/improper_umbrella.cpp +++ b/src/MOLECULE/improper_umbrella.cpp @@ -278,7 +278,7 @@ void ImproperUmbrella::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double w_one = force->numeric(FLERR,arg[2]); diff --git a/src/MOLECULE/pair_hbond_dreiding_lj.cpp b/src/MOLECULE/pair_hbond_dreiding_lj.cpp index af54c9bdfa..ecb4883cb3 100644 --- a/src/MOLECULE/pair_hbond_dreiding_lj.cpp +++ b/src/MOLECULE/pair_hbond_dreiding_lj.cpp @@ -321,9 +321,9 @@ void PairHbondDreidingLJ::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi,klo,khi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); - force->bounds(arg[2],atom->ntypes,klo,khi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[2],atom->ntypes,klo,khi); int donor_flag; if (strcmp(arg[3],"i") == 0) donor_flag = 0; diff --git a/src/MOLECULE/pair_hbond_dreiding_morse.cpp b/src/MOLECULE/pair_hbond_dreiding_morse.cpp index ab793405dd..5c61ea4a45 100644 --- a/src/MOLECULE/pair_hbond_dreiding_morse.cpp +++ b/src/MOLECULE/pair_hbond_dreiding_morse.cpp @@ -245,9 +245,9 @@ void PairHbondDreidingMorse::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi,klo,khi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); - force->bounds(arg[2],atom->ntypes,klo,khi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[2],atom->ntypes,klo,khi); int donor_flag; if (strcmp(arg[3],"i") == 0) donor_flag = 0; diff --git a/src/MOLECULE/pair_lj_charmm_coul_charmm.cpp b/src/MOLECULE/pair_lj_charmm_coul_charmm.cpp index f12bc8f3b8..3700de00b0 100644 --- a/src/MOLECULE/pair_lj_charmm_coul_charmm.cpp +++ b/src/MOLECULE/pair_lj_charmm_coul_charmm.cpp @@ -247,8 +247,8 @@ void PairLJCharmmCoulCharmm::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp b/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp index 0f5a1f68d1..a9e00e80b4 100644 --- a/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp +++ b/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp @@ -447,8 +447,8 @@ void PairLJCutTIP4PCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/MOLECULE/pair_tip4p_cut.cpp b/src/MOLECULE/pair_tip4p_cut.cpp index 47aa773047..dd48637f23 100644 --- a/src/MOLECULE/pair_tip4p_cut.cpp +++ b/src/MOLECULE/pair_tip4p_cut.cpp @@ -387,8 +387,8 @@ void PairTIP4PCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int count = 0; for (int i = ilo; i <= ihi; i++) { diff --git a/src/PERI/pair_peri_eps.cpp b/src/PERI/pair_peri_eps.cpp index ecf6f0a3fa..b5807c0e3c 100644 --- a/src/PERI/pair_peri_eps.cpp +++ b/src/PERI/pair_peri_eps.cpp @@ -450,8 +450,8 @@ void PairPeriEPS::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double bulkmodulus_one = atof(arg[2]); double shearmodulus_one = atof(arg[3]); diff --git a/src/PERI/pair_peri_lps.cpp b/src/PERI/pair_peri_lps.cpp index 7b2ccec92c..cd88b41825 100644 --- a/src/PERI/pair_peri_lps.cpp +++ b/src/PERI/pair_peri_lps.cpp @@ -375,8 +375,8 @@ void PairPeriLPS::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double bulkmodulus_one = force->numeric(FLERR,arg[2]); double shearmodulus_one = force->numeric(FLERR,arg[3]); diff --git a/src/PERI/pair_peri_pmb.cpp b/src/PERI/pair_peri_pmb.cpp index bc971cb244..9e598289bd 100644 --- a/src/PERI/pair_peri_pmb.cpp +++ b/src/PERI/pair_peri_pmb.cpp @@ -312,8 +312,8 @@ void PairPeriPMB::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double kspring_one = force->numeric(FLERR,arg[2]); double cut_one = force->numeric(FLERR,arg[3]); diff --git a/src/PERI/pair_peri_ves.cpp b/src/PERI/pair_peri_ves.cpp index c34fb87e20..87213b5b59 100644 --- a/src/PERI/pair_peri_ves.cpp +++ b/src/PERI/pair_peri_ves.cpp @@ -426,8 +426,8 @@ void PairPeriVES::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double bulkmodulus_one = atof(arg[2]); double shearmodulus_one = atof(arg[3]); diff --git a/src/RIGID/fix_rigid.cpp b/src/RIGID/fix_rigid.cpp index 2f2f84570e..8c1ecdacc9 100644 --- a/src/RIGID/fix_rigid.cpp +++ b/src/RIGID/fix_rigid.cpp @@ -282,7 +282,7 @@ FixRigid::FixRigid(LAMMPS *lmp, int narg, char **arg) : if (iarg+5 > narg) error->all(FLERR,"Illegal fix rigid command"); int mlo,mhi; - force->bounds(arg[iarg+1],nbody,mlo,mhi); + force->bounds(FLERR,arg[iarg+1],nbody,mlo,mhi); double xflag,yflag,zflag; if (strcmp(arg[iarg+2],"off") == 0) xflag = 0.0; @@ -313,7 +313,7 @@ FixRigid::FixRigid(LAMMPS *lmp, int narg, char **arg) : if (iarg+5 > narg) error->all(FLERR,"Illegal fix rigid command"); int mlo,mhi; - force->bounds(arg[iarg+1],nbody,mlo,mhi); + force->bounds(FLERR,arg[iarg+1],nbody,mlo,mhi); double xflag,yflag,zflag; if (strcmp(arg[iarg+2],"off") == 0) xflag = 0.0; diff --git a/src/USER-AWPMD/pair_awpmd_cut.cpp b/src/USER-AWPMD/pair_awpmd_cut.cpp index 29feb37ca1..cd89c3984d 100644 --- a/src/USER-AWPMD/pair_awpmd_cut.cpp +++ b/src/USER-AWPMD/pair_awpmd_cut.cpp @@ -494,8 +494,8 @@ void PairAWPMDCut::coeff(int narg, char **arg) } int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double cut_one = cut_global; if (narg == 3) cut_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-CG-CMM/angle_sdk.cpp b/src/USER-CG-CMM/angle_sdk.cpp index 31136e5cd9..cc54985991 100644 --- a/src/USER-CG-CMM/angle_sdk.cpp +++ b/src/USER-CG-CMM/angle_sdk.cpp @@ -240,7 +240,7 @@ void AngleSDK::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double theta0_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-CG-CMM/pair_lj_sdk.cpp b/src/USER-CG-CMM/pair_lj_sdk.cpp index 1ab93447f4..665f188ce9 100644 --- a/src/USER-CG-CMM/pair_lj_sdk.cpp +++ b/src/USER-CG-CMM/pair_lj_sdk.cpp @@ -263,8 +263,8 @@ void PairLJSDK::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int lj_type_one = find_lj_type(arg[2],lj_type_list); if (lj_type_one == LJ_NOT_SET) diff --git a/src/USER-CG-CMM/pair_lj_sdk_coul_long.cpp b/src/USER-CG-CMM/pair_lj_sdk_coul_long.cpp index 1549acfc28..5e4a0db31c 100644 --- a/src/USER-CG-CMM/pair_lj_sdk_coul_long.cpp +++ b/src/USER-CG-CMM/pair_lj_sdk_coul_long.cpp @@ -324,8 +324,8 @@ void PairLJSDKCoulLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int lj_type_one = find_lj_type(arg[2],lj_type_list); if (lj_type_one == LJ_NOT_SET) diff --git a/src/USER-DPD/pair_dpd_fdt.cpp b/src/USER-DPD/pair_dpd_fdt.cpp index d151b77c85..3b5804ff8e 100644 --- a/src/USER-DPD/pair_dpd_fdt.cpp +++ b/src/USER-DPD/pair_dpd_fdt.cpp @@ -280,8 +280,8 @@ void PairDPDfdt::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a0_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-DPD/pair_dpd_fdt_energy.cpp b/src/USER-DPD/pair_dpd_fdt_energy.cpp index 902ca00525..84fa352a45 100644 --- a/src/USER-DPD/pair_dpd_fdt_energy.cpp +++ b/src/USER-DPD/pair_dpd_fdt_energy.cpp @@ -364,8 +364,8 @@ void PairDPDfdtEnergy::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a0_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-DPD/pair_exp6_rx.cpp b/src/USER-DPD/pair_exp6_rx.cpp index ad2dbf1465..9af28026ae 100644 --- a/src/USER-DPD/pair_exp6_rx.cpp +++ b/src/USER-DPD/pair_exp6_rx.cpp @@ -558,8 +558,8 @@ void PairExp6rx::coeff(int narg, char **arg) int ilo,ihi,jlo,jhi; int n; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); nspecies = atom->nspecies_dpd; if(nspecies==0) error->all(FLERR,"There are no rx species specified."); diff --git a/src/USER-DPD/pair_multi_lucy.cpp b/src/USER-DPD/pair_multi_lucy.cpp index a063eff195..a4ea8cad22 100644 --- a/src/USER-DPD/pair_multi_lucy.cpp +++ b/src/USER-DPD/pair_multi_lucy.cpp @@ -267,8 +267,8 @@ void PairMultiLucy::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int me; MPI_Comm_rank(world,&me); diff --git a/src/USER-DPD/pair_multi_lucy_rx.cpp b/src/USER-DPD/pair_multi_lucy_rx.cpp index cf10a70756..586e58908d 100644 --- a/src/USER-DPD/pair_multi_lucy_rx.cpp +++ b/src/USER-DPD/pair_multi_lucy_rx.cpp @@ -353,8 +353,8 @@ void PairMultiLucyRX::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int me; MPI_Comm_rank(world,&me); diff --git a/src/USER-DPD/pair_table_rx.cpp b/src/USER-DPD/pair_table_rx.cpp index 74b9222a0b..902d0e5bb4 100644 --- a/src/USER-DPD/pair_table_rx.cpp +++ b/src/USER-DPD/pair_table_rx.cpp @@ -326,8 +326,8 @@ void PairTableRX::coeff(int narg, char **arg) if (!rx_flag) error->all(FLERR,"PairTableRX requires a fix rx command."); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int me; MPI_Comm_rank(world,&me); diff --git a/src/USER-DRUDE/pair_lj_cut_thole_long.cpp b/src/USER-DRUDE/pair_lj_cut_thole_long.cpp index efa11c6c5e..726baae240 100644 --- a/src/USER-DRUDE/pair_lj_cut_thole_long.cpp +++ b/src/USER-DRUDE/pair_lj_cut_thole_long.cpp @@ -314,8 +314,8 @@ void PairLJCutTholeLong::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-DRUDE/pair_thole.cpp b/src/USER-DRUDE/pair_thole.cpp index 13b1265a7e..0ed94ebbc9 100644 --- a/src/USER-DRUDE/pair_thole.cpp +++ b/src/USER-DRUDE/pair_thole.cpp @@ -218,8 +218,8 @@ void PairThole::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double polar_one = force->numeric(FLERR,arg[2]); double thole_one = thole_global; diff --git a/src/USER-EFF/pair_eff_cut.cpp b/src/USER-EFF/pair_eff_cut.cpp index b12e1f43b3..66f59c86c3 100644 --- a/src/USER-EFF/pair_eff_cut.cpp +++ b/src/USER-EFF/pair_eff_cut.cpp @@ -891,8 +891,8 @@ void PairEffCut::coeff(int narg, char **arg) if ((strcmp(arg[0],"*") == 0) || (strcmp(arg[1],"*") == 0)) { int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double cut_one = cut_global; if (narg == 3) cut_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-FEP/compute_fep.cpp b/src/USER-FEP/compute_fep.cpp index d3c3bf9409..bfa3bf7e2c 100644 --- a/src/USER-FEP/compute_fep.cpp +++ b/src/USER-FEP/compute_fep.cpp @@ -95,9 +95,9 @@ ComputeFEP::ComputeFEP(LAMMPS *lmp, int narg, char **arg) : n = strlen(arg[iarg+2]) + 1; perturb[npert].pparam = new char[n]; strcpy(perturb[npert].pparam,arg[iarg+2]); - force->bounds(arg[iarg+3],atom->ntypes, + force->bounds(FLERR,arg[iarg+3],atom->ntypes, perturb[npert].ilo,perturb[npert].ihi); - force->bounds(arg[iarg+4],atom->ntypes, + force->bounds(FLERR,arg[iarg+4],atom->ntypes, perturb[npert].jlo,perturb[npert].jhi); if (strstr(arg[iarg+5],"v_") == arg[iarg+5]) { n = strlen(&arg[iarg+5][2]) + 1; @@ -112,7 +112,7 @@ ComputeFEP::ComputeFEP(LAMMPS *lmp, int narg, char **arg) : perturb[npert].aparam = CHARGE; chgflag = 1; } else error->all(FLERR,"Illegal atom argument in compute fep"); - force->bounds(arg[iarg+2],atom->ntypes, + force->bounds(FLERR,arg[iarg+2],atom->ntypes, perturb[npert].ilo,perturb[npert].ihi); if (strstr(arg[iarg+3],"v_") == arg[iarg+3]) { int n = strlen(&arg[iarg+3][2]) + 1; diff --git a/src/USER-FEP/fix_adapt_fep.cpp b/src/USER-FEP/fix_adapt_fep.cpp index 3e0e950cb7..1b7fc55942 100644 --- a/src/USER-FEP/fix_adapt_fep.cpp +++ b/src/USER-FEP/fix_adapt_fep.cpp @@ -95,9 +95,9 @@ FixAdaptFEP::FixAdaptFEP(LAMMPS *lmp, int narg, char **arg) : n = strlen(arg[iarg+2]) + 1; adapt[nadapt].pparam = new char[n]; strcpy(adapt[nadapt].pparam,arg[iarg+2]); - force->bounds(arg[iarg+3],atom->ntypes, + force->bounds(FLERR,arg[iarg+3],atom->ntypes, adapt[nadapt].ilo,adapt[nadapt].ihi); - force->bounds(arg[iarg+4],atom->ntypes, + force->bounds(FLERR,arg[iarg+4],atom->ntypes, adapt[nadapt].jlo,adapt[nadapt].jhi); if (strstr(arg[iarg+5],"v_") == arg[iarg+5]) { n = strlen(&arg[iarg+5][2]) + 1; @@ -126,7 +126,7 @@ FixAdaptFEP::FixAdaptFEP(LAMMPS *lmp, int narg, char **arg) : adapt[nadapt].aparam = CHARGE; chgflag = 1; } else error->all(FLERR,"Illegal fix adapt/fep command"); - force->bounds(arg[iarg+2],atom->ntypes, + force->bounds(FLERR,arg[iarg+2],atom->ntypes, adapt[nadapt].ilo,adapt[nadapt].ihi); if (strstr(arg[iarg+3],"v_") == arg[iarg+3]) { int n = strlen(&arg[iarg+3][2]) + 1; diff --git a/src/USER-FEP/pair_coul_cut_soft.cpp b/src/USER-FEP/pair_coul_cut_soft.cpp index b82abc1ed1..2c675c607f 100644 --- a/src/USER-FEP/pair_coul_cut_soft.cpp +++ b/src/USER-FEP/pair_coul_cut_soft.cpp @@ -184,8 +184,8 @@ void PairCoulCutSoft::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double lambda_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-FEP/pair_coul_long_soft.cpp b/src/USER-FEP/pair_coul_long_soft.cpp index d209628104..3d24a997dd 100644 --- a/src/USER-FEP/pair_coul_long_soft.cpp +++ b/src/USER-FEP/pair_coul_long_soft.cpp @@ -206,8 +206,8 @@ void PairCoulLongSoft::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double lambda_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp b/src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp index d2a9a04ba6..81b82e9774 100644 --- a/src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp +++ b/src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp @@ -651,8 +651,8 @@ void PairLJCharmmCoulLongSoft::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp b/src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp index 631d608afb..16da07a657 100644 --- a/src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp +++ b/src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp @@ -230,8 +230,8 @@ void PairLJCutCoulCutSoft::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-FEP/pair_lj_cut_coul_long_soft.cpp b/src/USER-FEP/pair_lj_cut_coul_long_soft.cpp index 1b3c2b5ece..6636e72715 100644 --- a/src/USER-FEP/pair_lj_cut_coul_long_soft.cpp +++ b/src/USER-FEP/pair_lj_cut_coul_long_soft.cpp @@ -598,8 +598,8 @@ void PairLJCutCoulLongSoft::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-FEP/pair_lj_cut_soft.cpp b/src/USER-FEP/pair_lj_cut_soft.cpp index 7f04158c17..3798b27936 100644 --- a/src/USER-FEP/pair_lj_cut_soft.cpp +++ b/src/USER-FEP/pair_lj_cut_soft.cpp @@ -478,8 +478,8 @@ void PairLJCutSoft::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-FEP/pair_morse_soft.cpp b/src/USER-FEP/pair_morse_soft.cpp index 877fa74d69..6c86d8916f 100644 --- a/src/USER-FEP/pair_morse_soft.cpp +++ b/src/USER-FEP/pair_morse_soft.cpp @@ -178,8 +178,8 @@ void PairMorseSoft::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double d0_one = force->numeric(FLERR,arg[2]); double alpha_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-LB/fix_lb_rigid_pc_sphere.cpp b/src/USER-LB/fix_lb_rigid_pc_sphere.cpp index 54637ce349..b5383fe1a6 100644 --- a/src/USER-LB/fix_lb_rigid_pc_sphere.cpp +++ b/src/USER-LB/fix_lb_rigid_pc_sphere.cpp @@ -235,7 +235,7 @@ FixLbRigidPCSphere::FixLbRigidPCSphere(LAMMPS *lmp, int narg, char **arg) : if (iarg+5 > narg) error->all(FLERR,"Illegal fix lb/rigid/pc/sphere command"); int mlo,mhi; - force->bounds(arg[iarg+1],nbody,mlo,mhi); + force->bounds(FLERR,arg[iarg+1],nbody,mlo,mhi); double xflag,yflag,zflag; if (strcmp(arg[iarg+2],"off") == 0) xflag = 0.0; @@ -262,7 +262,7 @@ FixLbRigidPCSphere::FixLbRigidPCSphere(LAMMPS *lmp, int narg, char **arg) : if (iarg+5 > narg) error->all(FLERR,"Illegal fix lb/rigid/pc/sphere command"); int mlo,mhi; - force->bounds(arg[iarg+1],nbody,mlo,mhi); + force->bounds(FLERR,arg[iarg+1],nbody,mlo,mhi); double xflag,yflag,zflag; if (strcmp(arg[iarg+2],"off") == 0) xflag = 0.0; diff --git a/src/USER-MISC/angle_cosine_shift.cpp b/src/USER-MISC/angle_cosine_shift.cpp index 8e7c67fd70..66f5c82c84 100644 --- a/src/USER-MISC/angle_cosine_shift.cpp +++ b/src/USER-MISC/angle_cosine_shift.cpp @@ -172,7 +172,7 @@ void AngleCosineShift::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double umin = force->numeric(FLERR,arg[1]); double theta0 = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/angle_cosine_shift_exp.cpp b/src/USER-MISC/angle_cosine_shift_exp.cpp index e19b9e20ef..6d11c6894e 100644 --- a/src/USER-MISC/angle_cosine_shift_exp.cpp +++ b/src/USER-MISC/angle_cosine_shift_exp.cpp @@ -194,7 +194,7 @@ void AngleCosineShiftExp::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double umin_ = force->numeric(FLERR,arg[1]); double theta0_ = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/angle_dipole.cpp b/src/USER-MISC/angle_dipole.cpp index 52e94ad3f9..990096ae7f 100644 --- a/src/USER-MISC/angle_dipole.cpp +++ b/src/USER-MISC/angle_dipole.cpp @@ -156,7 +156,7 @@ void AngleDipole::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double gamma0_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/angle_fourier.cpp b/src/USER-MISC/angle_fourier.cpp index dee6ed1301..c4dbf3f08b 100644 --- a/src/USER-MISC/angle_fourier.cpp +++ b/src/USER-MISC/angle_fourier.cpp @@ -173,7 +173,7 @@ void AngleFourier::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double C0_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/angle_fourier_simple.cpp b/src/USER-MISC/angle_fourier_simple.cpp index 63991f320e..bd4322fe78 100644 --- a/src/USER-MISC/angle_fourier_simple.cpp +++ b/src/USER-MISC/angle_fourier_simple.cpp @@ -188,7 +188,7 @@ void AngleFourierSimple::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double C_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/angle_quartic.cpp b/src/USER-MISC/angle_quartic.cpp index a1a3e4cf3f..f9801edb0e 100644 --- a/src/USER-MISC/angle_quartic.cpp +++ b/src/USER-MISC/angle_quartic.cpp @@ -183,7 +183,7 @@ void AngleQuartic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double theta0_one = force->numeric(FLERR,arg[1]); double k2_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/bond_harmonic_shift.cpp b/src/USER-MISC/bond_harmonic_shift.cpp index 6f1b67e245..c4ee00cb27 100644 --- a/src/USER-MISC/bond_harmonic_shift.cpp +++ b/src/USER-MISC/bond_harmonic_shift.cpp @@ -129,7 +129,7 @@ void BondHarmonicShift::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double Umin = force->numeric(FLERR,arg[1]); // energy at minimum double r0_one = force->numeric(FLERR,arg[2]); // position of minimum diff --git a/src/USER-MISC/bond_harmonic_shift_cut.cpp b/src/USER-MISC/bond_harmonic_shift_cut.cpp index 1a1be16999..26fd32c1b5 100644 --- a/src/USER-MISC/bond_harmonic_shift_cut.cpp +++ b/src/USER-MISC/bond_harmonic_shift_cut.cpp @@ -131,7 +131,7 @@ void BondHarmonicShiftCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double Umin = force->numeric(FLERR,arg[1]); // energy at minimum double r0_one = force->numeric(FLERR,arg[2]); // position of minimum diff --git a/src/USER-MISC/dihedral_cosine_shift_exp.cpp b/src/USER-MISC/dihedral_cosine_shift_exp.cpp index 8706b5fb1a..85ff4b2719 100644 --- a/src/USER-MISC/dihedral_cosine_shift_exp.cpp +++ b/src/USER-MISC/dihedral_cosine_shift_exp.cpp @@ -274,7 +274,7 @@ void DihedralCosineShiftExp::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); double umin_ = force->numeric(FLERR,arg[1]); double theta0_ = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/dihedral_fourier.cpp b/src/USER-MISC/dihedral_fourier.cpp index 93e818183d..86ab8894d8 100644 --- a/src/USER-MISC/dihedral_fourier.cpp +++ b/src/USER-MISC/dihedral_fourier.cpp @@ -297,7 +297,7 @@ void DihedralFourier::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); // require integer values of shift for backwards compatibility // arbitrary phase angle shift could be allowed, but would break diff --git a/src/USER-MISC/dihedral_nharmonic.cpp b/src/USER-MISC/dihedral_nharmonic.cpp index 67b363f552..ba8af7e65b 100644 --- a/src/USER-MISC/dihedral_nharmonic.cpp +++ b/src/USER-MISC/dihedral_nharmonic.cpp @@ -279,7 +279,7 @@ void DihedralNHarmonic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); int count = 0; for (int i = ilo; i <= ihi; i++) { diff --git a/src/USER-MISC/dihedral_quadratic.cpp b/src/USER-MISC/dihedral_quadratic.cpp index 3a5eac6fa0..ac261153b4 100644 --- a/src/USER-MISC/dihedral_quadratic.cpp +++ b/src/USER-MISC/dihedral_quadratic.cpp @@ -285,7 +285,7 @@ void DihedralQuadratic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double phi0_one= force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/dihedral_spherical.cpp b/src/USER-MISC/dihedral_spherical.cpp index e6b431b63a..c3345453c9 100644 --- a/src/USER-MISC/dihedral_spherical.cpp +++ b/src/USER-MISC/dihedral_spherical.cpp @@ -681,7 +681,7 @@ void DihedralSpherical::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); int nterms_one = force->inumeric(FLERR,arg[1]); diff --git a/src/USER-MISC/dihedral_table.cpp b/src/USER-MISC/dihedral_table.cpp index 4e3b05bc4b..f84814cc5e 100644 --- a/src/USER-MISC/dihedral_table.cpp +++ b/src/USER-MISC/dihedral_table.cpp @@ -813,7 +813,7 @@ void DihedralTable::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); int me; MPI_Comm_rank(world,&me); diff --git a/src/USER-MISC/improper_cossq.cpp b/src/USER-MISC/improper_cossq.cpp index 77033381e9..223df4a76d 100644 --- a/src/USER-MISC/improper_cossq.cpp +++ b/src/USER-MISC/improper_cossq.cpp @@ -271,7 +271,7 @@ void ImproperCossq::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double chi_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/improper_distance.cpp b/src/USER-MISC/improper_distance.cpp index a98005a247..ce6441d674 100644 --- a/src/USER-MISC/improper_distance.cpp +++ b/src/USER-MISC/improper_distance.cpp @@ -213,7 +213,7 @@ void ImproperDistance::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double chi_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/improper_fourier.cpp b/src/USER-MISC/improper_fourier.cpp index ea5f78662e..b139fdad56 100644 --- a/src/USER-MISC/improper_fourier.cpp +++ b/src/USER-MISC/improper_fourier.cpp @@ -282,7 +282,7 @@ void ImproperFourier::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double C0_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/improper_ring.cpp b/src/USER-MISC/improper_ring.cpp index 4134b4b172..5b5341f506 100644 --- a/src/USER-MISC/improper_ring.cpp +++ b/src/USER-MISC/improper_ring.cpp @@ -291,7 +291,7 @@ void ImproperRing ::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); double k_one = force->numeric(FLERR,arg[1]); double chi_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-MISC/pair_buck_mdf.cpp b/src/USER-MISC/pair_buck_mdf.cpp index 96f49e42dd..3a433b16bd 100644 --- a/src/USER-MISC/pair_buck_mdf.cpp +++ b/src/USER-MISC/pair_buck_mdf.cpp @@ -212,8 +212,8 @@ void PairBuckMDF::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a_one = force->numeric(FLERR,arg[2]); double rho_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-MISC/pair_coul_diel.cpp b/src/USER-MISC/pair_coul_diel.cpp index 1913e48b67..a732ace1a0 100644 --- a/src/USER-MISC/pair_coul_diel.cpp +++ b/src/USER-MISC/pair_coul_diel.cpp @@ -183,8 +183,8 @@ void PairCoulDiel::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); eps_s = force->numeric(FLERR,arg[2]); double rme_one =force->numeric(FLERR,arg[3]); diff --git a/src/USER-MISC/pair_gauss_cut.cpp b/src/USER-MISC/pair_gauss_cut.cpp index f9cdcb96e6..f44b1bbd2d 100644 --- a/src/USER-MISC/pair_gauss_cut.cpp +++ b/src/USER-MISC/pair_gauss_cut.cpp @@ -190,8 +190,8 @@ void PairGaussCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double hgauss_one = force->numeric(FLERR,arg[2]); double rmh_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-MISC/pair_lennard_mdf.cpp b/src/USER-MISC/pair_lennard_mdf.cpp index 81c4435963..3a81955199 100644 --- a/src/USER-MISC/pair_lennard_mdf.cpp +++ b/src/USER-MISC/pair_lennard_mdf.cpp @@ -216,8 +216,8 @@ void PairLJ_AB_MDF::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double aparm_one = force->numeric(FLERR,arg[2]); double bparm_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-MISC/pair_list.cpp b/src/USER-MISC/pair_list.cpp index 5f05392631..3adbe8b69d 100644 --- a/src/USER-MISC/pair_list.cpp +++ b/src/USER-MISC/pair_list.cpp @@ -349,8 +349,8 @@ void PairList::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int count = 0; for (int i = ilo; i <= ihi; i++) { diff --git a/src/USER-MISC/pair_lj_mdf.cpp b/src/USER-MISC/pair_lj_mdf.cpp index 7c3b8d586e..3b52cf0b86 100644 --- a/src/USER-MISC/pair_lj_mdf.cpp +++ b/src/USER-MISC/pair_lj_mdf.cpp @@ -216,8 +216,8 @@ void PairLJMDF::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-MISC/pair_lj_sf.cpp b/src/USER-MISC/pair_lj_sf.cpp index 69a7efcfde..32f45ff48d 100644 --- a/src/USER-MISC/pair_lj_sf.cpp +++ b/src/USER-MISC/pair_lj_sf.cpp @@ -197,8 +197,8 @@ void PairLJShiftedForce::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-MISC/pair_lj_sf_dipole_sf.cpp b/src/USER-MISC/pair_lj_sf_dipole_sf.cpp index b88f72bac0..33f10f2f12 100644 --- a/src/USER-MISC/pair_lj_sf_dipole_sf.cpp +++ b/src/USER-MISC/pair_lj_sf_dipole_sf.cpp @@ -361,8 +361,8 @@ void PairLJSFDipoleSF::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-MISC/pair_morse_smooth_linear.cpp b/src/USER-MISC/pair_morse_smooth_linear.cpp index 844d0113be..ea33510b58 100644 --- a/src/USER-MISC/pair_morse_smooth_linear.cpp +++ b/src/USER-MISC/pair_morse_smooth_linear.cpp @@ -186,8 +186,8 @@ void PairMorseSmoothLinear::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double d0_one = force->numeric(FLERR,arg[2]); double alpha_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-MISC/pair_srp.cpp b/src/USER-MISC/pair_srp.cpp index 5e254b74b7..18ea4dc332 100644 --- a/src/USER-MISC/pair_srp.cpp +++ b/src/USER-MISC/pair_srp.cpp @@ -425,8 +425,8 @@ void PairSRP::coeff(int narg, char **arg) // set ij bond-bond cutoffs int ilo, ihi, jlo, jhi; - force->bounds(arg[0], bptype, ilo, ihi); - force->bounds(arg[1], bptype, jlo, jhi); + force->bounds(FLERR,arg[0], bptype, ilo, ihi); + force->bounds(FLERR,arg[1], bptype, jlo, jhi); double a0_one = force->numeric(FLERR,arg[2]); double cut_one = cut_global; diff --git a/src/USER-SMD/pair_smd_hertz.cpp b/src/USER-SMD/pair_smd_hertz.cpp index 0bcf2c8a3e..3c7d7cffb9 100644 --- a/src/USER-SMD/pair_smd_hertz.cpp +++ b/src/USER-SMD/pair_smd_hertz.cpp @@ -266,8 +266,8 @@ void PairHertz::coeff(int narg, char **arg) { allocate(); int ilo, ihi, jlo, jhi; - force->bounds(arg[0], atom->ntypes, ilo, ihi); - force->bounds(arg[1], atom->ntypes, jlo, jhi); + force->bounds(FLERR,arg[0], atom->ntypes, ilo, ihi); + force->bounds(FLERR,arg[1], atom->ntypes, jlo, jhi); double bulkmodulus_one = atof(arg[2]); diff --git a/src/USER-SMD/pair_smd_triangulated_surface.cpp b/src/USER-SMD/pair_smd_triangulated_surface.cpp index f5db6acd8e..8410f2ec05 100644 --- a/src/USER-SMD/pair_smd_triangulated_surface.cpp +++ b/src/USER-SMD/pair_smd_triangulated_surface.cpp @@ -350,8 +350,8 @@ void PairTriSurf::coeff(int narg, char **arg) { allocate(); int ilo, ihi, jlo, jhi; - force->bounds(arg[0], atom->ntypes, ilo, ihi); - force->bounds(arg[1], atom->ntypes, jlo, jhi); + force->bounds(FLERR,arg[0], atom->ntypes, ilo, ihi); + force->bounds(FLERR,arg[1], atom->ntypes, jlo, jhi); double bulkmodulus_one = atof(arg[2]); diff --git a/src/USER-SPH/pair_sph_heatconduction.cpp b/src/USER-SPH/pair_sph_heatconduction.cpp index 0b3716658c..02e667e437 100644 --- a/src/USER-SPH/pair_sph_heatconduction.cpp +++ b/src/USER-SPH/pair_sph_heatconduction.cpp @@ -172,8 +172,8 @@ void PairSPHHeatConduction::coeff(int narg, char **arg) { allocate(); int ilo, ihi, jlo, jhi; - force->bounds(arg[0], atom->ntypes, ilo, ihi); - force->bounds(arg[1], atom->ntypes, jlo, jhi); + force->bounds(FLERR,arg[0], atom->ntypes, ilo, ihi); + force->bounds(FLERR,arg[1], atom->ntypes, jlo, jhi); double alpha_one = force->numeric(FLERR,arg[2]); double cut_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-SPH/pair_sph_idealgas.cpp b/src/USER-SPH/pair_sph_idealgas.cpp index caea8eb3e4..2ba0d9bfbe 100644 --- a/src/USER-SPH/pair_sph_idealgas.cpp +++ b/src/USER-SPH/pair_sph_idealgas.cpp @@ -214,8 +214,8 @@ void PairSPHIdealGas::coeff(int narg, char **arg) { allocate(); int ilo, ihi, jlo, jhi; - force->bounds(arg[0], atom->ntypes, ilo, ihi); - force->bounds(arg[1], atom->ntypes, jlo, jhi); + force->bounds(FLERR,arg[0], atom->ntypes, ilo, ihi); + force->bounds(FLERR,arg[1], atom->ntypes, jlo, jhi); double viscosity_one = force->numeric(FLERR,arg[2]); double cut_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-SPH/pair_sph_lj.cpp b/src/USER-SPH/pair_sph_lj.cpp index f0f3e3df33..98752ac126 100644 --- a/src/USER-SPH/pair_sph_lj.cpp +++ b/src/USER-SPH/pair_sph_lj.cpp @@ -222,8 +222,8 @@ void PairSPHLJ::coeff(int narg, char **arg) { allocate(); int ilo, ihi, jlo, jhi; - force->bounds(arg[0], atom->ntypes, ilo, ihi); - force->bounds(arg[1], atom->ntypes, jlo, jhi); + force->bounds(FLERR,arg[0], atom->ntypes, ilo, ihi); + force->bounds(FLERR,arg[1], atom->ntypes, jlo, jhi); double viscosity_one = force->numeric(FLERR,arg[2]); double cut_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-SPH/pair_sph_rhosum.cpp b/src/USER-SPH/pair_sph_rhosum.cpp index 4b7b028ad2..4bff0ec27c 100644 --- a/src/USER-SPH/pair_sph_rhosum.cpp +++ b/src/USER-SPH/pair_sph_rhosum.cpp @@ -243,8 +243,8 @@ void PairSPHRhoSum::coeff(int narg, char **arg) { allocate(); int ilo, ihi, jlo, jhi; - force->bounds(arg[0], atom->ntypes, ilo, ihi); - force->bounds(arg[1], atom->ntypes, jlo, jhi); + force->bounds(FLERR,arg[0], atom->ntypes, ilo, ihi); + force->bounds(FLERR,arg[1], atom->ntypes, jlo, jhi); double cut_one = force->numeric(FLERR,arg[2]); diff --git a/src/USER-SPH/pair_sph_taitwater.cpp b/src/USER-SPH/pair_sph_taitwater.cpp index 846ec11893..b1887c6164 100644 --- a/src/USER-SPH/pair_sph_taitwater.cpp +++ b/src/USER-SPH/pair_sph_taitwater.cpp @@ -243,8 +243,8 @@ void PairSPHTaitwater::coeff(int narg, char **arg) { allocate(); int ilo, ihi, jlo, jhi; - force->bounds(arg[0], atom->ntypes, ilo, ihi); - force->bounds(arg[1], atom->ntypes, jlo, jhi); + force->bounds(FLERR,arg[0], atom->ntypes, ilo, ihi); + force->bounds(FLERR,arg[1], atom->ntypes, jlo, jhi); double rho0_one = force->numeric(FLERR,arg[2]); double soundspeed_one = force->numeric(FLERR,arg[3]); diff --git a/src/USER-SPH/pair_sph_taitwater_morris.cpp b/src/USER-SPH/pair_sph_taitwater_morris.cpp index d6a94f51cd..76b538e46b 100644 --- a/src/USER-SPH/pair_sph_taitwater_morris.cpp +++ b/src/USER-SPH/pair_sph_taitwater_morris.cpp @@ -243,8 +243,8 @@ void PairSPHTaitwaterMorris::coeff(int narg, char **arg) { allocate(); int ilo, ihi, jlo, jhi; - force->bounds(arg[0], atom->ntypes, ilo, ihi); - force->bounds(arg[1], atom->ntypes, jlo, jhi); + force->bounds(FLERR,arg[0], atom->ntypes, ilo, ihi); + force->bounds(FLERR,arg[1], atom->ntypes, jlo, jhi); double rho0_one = force->numeric(FLERR,arg[2]); double soundspeed_one = force->numeric(FLERR,arg[3]); diff --git a/src/angle_hybrid.cpp b/src/angle_hybrid.cpp index 42b6860b6c..a477d7f8f6 100644 --- a/src/angle_hybrid.cpp +++ b/src/angle_hybrid.cpp @@ -245,7 +245,7 @@ void AngleHybrid::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); // 2nd arg = angle sub-style name // allow for "none" or "skip" as valid sub-style name diff --git a/src/angle_zero.cpp b/src/angle_zero.cpp index 375d5ad813..ba84295ca7 100644 --- a/src/angle_zero.cpp +++ b/src/angle_zero.cpp @@ -88,7 +88,7 @@ void AngleZero::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nangletypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nangletypes,ilo,ihi); double theta0_one = 0.0; if (coeffflag && (narg == 2)) diff --git a/src/bond_hybrid.cpp b/src/bond_hybrid.cpp index 519a1a3008..1244c2822b 100644 --- a/src/bond_hybrid.cpp +++ b/src/bond_hybrid.cpp @@ -243,7 +243,7 @@ void BondHybrid::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); // 2nd arg = bond sub-style name // allow for "none" as valid sub-style name diff --git a/src/bond_zero.cpp b/src/bond_zero.cpp index 0a354a758e..f38b7754f8 100644 --- a/src/bond_zero.cpp +++ b/src/bond_zero.cpp @@ -86,7 +86,7 @@ void BondZero::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nbondtypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nbondtypes,ilo,ihi); double r0_one = 0.0; if (coeffflag && (narg == 2)) diff --git a/src/comm.cpp b/src/comm.cpp index a47807b410..b558b3fd8c 100644 --- a/src/comm.cpp +++ b/src/comm.cpp @@ -287,7 +287,7 @@ void Comm::modify_params(int narg, char **arg) for (i=0; i < ntypes+1; ++i) cutusermulti[i] = -1.0; } - force->bounds(arg[iarg+1],ntypes,nlo,nhi,1); + force->bounds(FLERR,arg[iarg+1],ntypes,nlo,nhi,1); cut = force->numeric(FLERR,arg[iarg+2]); cutghostuser = MAX(cutghostuser,cut); if (cut < 0.0) diff --git a/src/compute_coord_atom.cpp b/src/compute_coord_atom.cpp index 5747c869dc..21744dcc93 100644 --- a/src/compute_coord_atom.cpp +++ b/src/compute_coord_atom.cpp @@ -53,7 +53,7 @@ ComputeCoordAtom::ComputeCoordAtom(LAMMPS *lmp, int narg, char **arg) : ncol = 0; int iarg = 4; while (iarg < narg) { - force->bounds(arg[iarg],ntypes,typelo[ncol],typehi[ncol]); + force->bounds(FLERR,arg[iarg],ntypes,typelo[ncol],typehi[ncol]); if (typelo[ncol] > typehi[ncol]) error->all(FLERR,"Illegal compute coord/atom command"); ncol++; diff --git a/src/compute_rdf.cpp b/src/compute_rdf.cpp index 8624508017..0886394068 100644 --- a/src/compute_rdf.cpp +++ b/src/compute_rdf.cpp @@ -72,8 +72,8 @@ ComputeRDF::ComputeRDF(LAMMPS *lmp, int narg, char **arg) : npairs = 0; int iarg = 4; while (iarg < narg) { - force->bounds(arg[iarg],atom->ntypes,ilo[npairs],ihi[npairs]); - force->bounds(arg[iarg+1],atom->ntypes,jlo[npairs],jhi[npairs]); + force->bounds(FLERR,arg[iarg],atom->ntypes,ilo[npairs],ihi[npairs]); + force->bounds(FLERR,arg[iarg+1],atom->ntypes,jlo[npairs],jhi[npairs]); if (ilo[npairs] > ihi[npairs] || jlo[npairs] > jhi[npairs]) error->all(FLERR,"Illegal compute rdf command"); npairs++; diff --git a/src/delete_bonds.cpp b/src/delete_bonds.cpp index 3871641e0e..97eb1c09a8 100644 --- a/src/delete_bonds.cpp +++ b/src/delete_bonds.cpp @@ -74,7 +74,7 @@ void DeleteBonds::command(int narg, char **arg) else error->all(FLERR,"Illegal delete_bonds command"); // setup list of types (atom,bond,etc) to consider - // use force->bounds() to allow setting of range of types + // use force->bounds(FLERR,) to allow setting of range of types // range can be 0 to ntypes inclusive int *tlist = NULL; @@ -93,7 +93,7 @@ void DeleteBonds::command(int narg, char **arg) tlist = new int[n+1]; for (int i = 0; i <= n; i++) tlist[i] = 0; int nlo,nhi; - force->bounds(arg[2],n,nlo,nhi,0); + force->bounds(FLERR,arg[2],n,nlo,nhi,0); for (int i = nlo; i <= nhi; i++) tlist[i] = 1; iarg++; diff --git a/src/dihedral_hybrid.cpp b/src/dihedral_hybrid.cpp index ed73351b3a..0ae396b887 100644 --- a/src/dihedral_hybrid.cpp +++ b/src/dihedral_hybrid.cpp @@ -247,7 +247,7 @@ void DihedralHybrid::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); // 2nd arg = dihedral sub-style name // allow for "none" or "skip" as valid sub-style name diff --git a/src/dihedral_zero.cpp b/src/dihedral_zero.cpp index 1e4a4ab3ae..9b0c569fca 100644 --- a/src/dihedral_zero.cpp +++ b/src/dihedral_zero.cpp @@ -84,7 +84,7 @@ void DihedralZero::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ndihedraltypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ndihedraltypes,ilo,ihi); int count = 0; for (int i = ilo; i <= ihi; i++) { diff --git a/src/dump_image.cpp b/src/dump_image.cpp index fd3dbed9e9..6d971d016a 100644 --- a/src/dump_image.cpp +++ b/src/dump_image.cpp @@ -1241,7 +1241,7 @@ int DumpImage::modify_param(int narg, char **arg) if (strcmp(arg[0],"acolor") == 0) { if (narg < 3) error->all(FLERR,"Illegal dump_modify command"); int nlo,nhi; - force->bounds(arg[1],atom->ntypes,nlo,nhi); + force->bounds(FLERR,arg[1],atom->ntypes,nlo,nhi); // ptrs = list of ncount colornames separated by '/' @@ -1275,7 +1275,7 @@ int DumpImage::modify_param(int narg, char **arg) if (strcmp(arg[0],"adiam") == 0) { if (narg < 3) error->all(FLERR,"Illegal dump_modify command"); int nlo,nhi; - force->bounds(arg[1],atom->ntypes,nlo,nhi); + force->bounds(FLERR,arg[1],atom->ntypes,nlo,nhi); double diam = force->numeric(FLERR,arg[2]); if (diam <= 0.0) error->all(FLERR,"Illegal dump_modify command"); for (int i = nlo; i <= nhi; i++) diamtype[i] = diam; @@ -1304,7 +1304,7 @@ int DumpImage::modify_param(int narg, char **arg) if (atom->nbondtypes == 0) error->all(FLERR,"Dump modify bcolor not allowed with no bond types"); int nlo,nhi; - force->bounds(arg[1],atom->nbondtypes,nlo,nhi); + force->bounds(FLERR,arg[1],atom->nbondtypes,nlo,nhi); // ptrs = list of ncount colornames separated by '/' @@ -1340,7 +1340,7 @@ int DumpImage::modify_param(int narg, char **arg) if (atom->nbondtypes == 0) error->all(FLERR,"Dump modify bdiam not allowed with no bond types"); int nlo,nhi; - force->bounds(arg[1],atom->ntypes,nlo,nhi); + force->bounds(FLERR,arg[1],atom->ntypes,nlo,nhi); double diam = force->numeric(FLERR,arg[2]); if (diam <= 0.0) error->all(FLERR,"Illegal dump_modify command"); for (int i = nlo; i <= nhi; i++) bdiamtype[i] = diam; diff --git a/src/fix_adapt.cpp b/src/fix_adapt.cpp index 2a3f7db1f1..4c7eb5f218 100644 --- a/src/fix_adapt.cpp +++ b/src/fix_adapt.cpp @@ -92,9 +92,9 @@ nadapt(0), id_fix_diam(NULL), id_fix_chg(NULL), adapt(NULL) adapt[nadapt].pparam = new char[n]; adapt[nadapt].pair = NULL; strcpy(adapt[nadapt].pparam,arg[iarg+2]); - force->bounds(arg[iarg+3],atom->ntypes, + force->bounds(FLERR,arg[iarg+3],atom->ntypes, adapt[nadapt].ilo,adapt[nadapt].ihi); - force->bounds(arg[iarg+4],atom->ntypes, + force->bounds(FLERR,arg[iarg+4],atom->ntypes, adapt[nadapt].jlo,adapt[nadapt].jhi); if (strstr(arg[iarg+5],"v_") == arg[iarg+5]) { n = strlen(&arg[iarg+5][2]) + 1; diff --git a/src/force.cpp b/src/force.cpp index dbc71b49a9..3154139d54 100644 --- a/src/force.cpp +++ b/src/force.cpp @@ -835,7 +835,8 @@ void Force::set_special(int narg, char **arg) return nlo,nhi ------------------------------------------------------------------------- */ -void Force::bounds(char *str, int nmax, int &nlo, int &nhi, int nmin) +void Force::bounds(const char *file, int line, char *str, + int nmax, int &nlo, int &nhi, int nmin) { char *ptr = strchr(str,'*'); @@ -856,7 +857,7 @@ void Force::bounds(char *str, int nmax, int &nlo, int &nhi, int nmin) } if (nlo < nmin || nhi > nmax || nlo > nhi) - error->all(FLERR,"Numeric index is out of bounds"); + error->all(file,line,"Numeric index is out of bounds"); } /* ---------------------------------------------------------------------- @@ -868,8 +869,8 @@ void Force::bounds(char *str, int nmax, int &nlo, int &nhi, int nmin) return nlo,nhi ------------------------------------------------------------------------- */ -void Force::boundsbig(char *str, bigint nmax, bigint &nlo, bigint &nhi, - bigint nmin) +void Force::boundsbig(const char *file, int line, char *str, + bigint nmax, bigint &nlo, bigint &nhi, bigint nmin) { char *ptr = strchr(str,'*'); @@ -890,7 +891,7 @@ void Force::boundsbig(char *str, bigint nmax, bigint &nlo, bigint &nhi, } if (nlo < nmin || nhi > nmax || nlo > nhi) - error->all(FLERR,"Numeric index is out of bounds"); + error->all(file,line,"Numeric index is out of bounds"); } /* ---------------------------------------------------------------------- diff --git a/src/force.h b/src/force.h index 78788826a4..f2d9abc7dd 100644 --- a/src/force.h +++ b/src/force.h @@ -125,8 +125,8 @@ class Force : protected Pointers { void store_style(char *&, const char *, int); void set_special(int, char **); - void bounds(char *, int, int &, int &, int nmin=1); - void boundsbig(char *, bigint, bigint &, bigint &, bigint nmin=1); + void bounds(const char *, int, char *, int, int &, int &, int nmin=1); + void boundsbig(const char *, int, char *, bigint, bigint &, bigint &, bigint nmin=1); double numeric(const char *, int, char *); int inumeric(const char *, int, char *); bigint bnumeric(const char *, int, char *); diff --git a/src/improper_hybrid.cpp b/src/improper_hybrid.cpp index d819365b74..78ee69569e 100644 --- a/src/improper_hybrid.cpp +++ b/src/improper_hybrid.cpp @@ -256,7 +256,7 @@ void ImproperHybrid::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); // 2nd arg = improper sub-style name // allow for "none" as valid sub-style name diff --git a/src/improper_zero.cpp b/src/improper_zero.cpp index 958f662162..556e427ff8 100644 --- a/src/improper_zero.cpp +++ b/src/improper_zero.cpp @@ -84,7 +84,7 @@ void ImproperZero::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->nimpropertypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->nimpropertypes,ilo,ihi); int count = 0; for (int i = ilo; i <= ihi; i++) { diff --git a/src/input.cpp b/src/input.cpp index 905e7f0590..d1343ee38d 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -683,7 +683,7 @@ int Input::expand_args(int narg, char **arg, int mode, char **&earg) if (expandflag) { *ptr2 = '\0'; - force->bounds(ptr1+1,nmax,nlo,nhi); + force->bounds(FLERR,ptr1+1,nmax,nlo,nhi); *ptr2 = ']'; if (newarg+nhi-nlo+1 > maxarg) { maxarg += nhi-nlo+1; @@ -1130,7 +1130,7 @@ void Input::partition() else error->all(FLERR,"Illegal partition command"); int ilo,ihi; - force->bounds(arg[1],universe->nworlds,ilo,ihi); + force->bounds(FLERR,arg[1],universe->nworlds,ilo,ihi); // copy original line to copy, since will use strtok() on it // ptr = start of 4th word diff --git a/src/pair_beck.cpp b/src/pair_beck.cpp index 0e05afb43b..e3e8b0c5cc 100644 --- a/src/pair_beck.cpp +++ b/src/pair_beck.cpp @@ -199,8 +199,8 @@ void PairBeck::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double AA_one = force->numeric(FLERR,arg[2]); double BB_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_born.cpp b/src/pair_born.cpp index d925af1030..5fc26e2529 100644 --- a/src/pair_born.cpp +++ b/src/pair_born.cpp @@ -200,8 +200,8 @@ void PairBorn::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a_one = force->numeric(FLERR,arg[2]); double rho_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_born_coul_wolf.cpp b/src/pair_born_coul_wolf.cpp index 48066fc43e..31c0cc715c 100644 --- a/src/pair_born_coul_wolf.cpp +++ b/src/pair_born_coul_wolf.cpp @@ -245,8 +245,8 @@ void PairBornCoulWolf::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a_one = force->numeric(FLERR,arg[2]); double rho_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_buck.cpp b/src/pair_buck.cpp index baaea7ccdd..78a5321cf0 100644 --- a/src/pair_buck.cpp +++ b/src/pair_buck.cpp @@ -191,8 +191,8 @@ void PairBuck::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a_one = force->numeric(FLERR,arg[2]); double rho_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_buck_coul_cut.cpp b/src/pair_buck_coul_cut.cpp index 06aeea3083..7c948f58a8 100644 --- a/src/pair_buck_coul_cut.cpp +++ b/src/pair_buck_coul_cut.cpp @@ -224,8 +224,8 @@ void PairBuckCoulCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a_one = force->numeric(FLERR,arg[2]); double rho_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_coul_cut.cpp b/src/pair_coul_cut.cpp index 4f21ba5ac1..fec592bb19 100644 --- a/src/pair_coul_cut.cpp +++ b/src/pair_coul_cut.cpp @@ -171,8 +171,8 @@ void PairCoulCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double cut_one = cut_global; if (narg == 3) cut_one = force->numeric(FLERR,arg[2]); diff --git a/src/pair_coul_dsf.cpp b/src/pair_coul_dsf.cpp index a72b8d72d3..3595f9cbee 100644 --- a/src/pair_coul_dsf.cpp +++ b/src/pair_coul_dsf.cpp @@ -185,8 +185,8 @@ void PairCoulDSF::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int count = 0; for (int i = ilo; i <= ihi; i++) { diff --git a/src/pair_coul_wolf.cpp b/src/pair_coul_wolf.cpp index 320eed3e9f..1a7f477260 100644 --- a/src/pair_coul_wolf.cpp +++ b/src/pair_coul_wolf.cpp @@ -187,8 +187,8 @@ void PairCoulWolf::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int count = 0; for (int i = ilo; i <= ihi; i++) { diff --git a/src/pair_dpd.cpp b/src/pair_dpd.cpp index 99166918c7..b5b959f85b 100644 --- a/src/pair_dpd.cpp +++ b/src/pair_dpd.cpp @@ -223,8 +223,8 @@ void PairDPD::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a0_one = force->numeric(FLERR,arg[2]); double gamma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_dpd_tstat.cpp b/src/pair_dpd_tstat.cpp index 2c51bb8d85..6d8f75d95d 100644 --- a/src/pair_dpd_tstat.cpp +++ b/src/pair_dpd_tstat.cpp @@ -175,8 +175,8 @@ void PairDPDTstat::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a0_one = 0.0; double gamma_one = force->numeric(FLERR,arg[2]); diff --git a/src/pair_gauss.cpp b/src/pair_gauss.cpp index 1b922a215f..c7b77c3270 100644 --- a/src/pair_gauss.cpp +++ b/src/pair_gauss.cpp @@ -189,8 +189,8 @@ void PairGauss::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a_one = force->numeric(FLERR,arg[2]); double b_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_hybrid.cpp b/src/pair_hybrid.cpp index 90b847339e..3f4392d02a 100644 --- a/src/pair_hybrid.cpp +++ b/src/pair_hybrid.cpp @@ -365,8 +365,8 @@ void PairHybrid::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); // 3rd arg = pair sub-style name // 4th arg = pair sub-style index if name used multiple times diff --git a/src/pair_hybrid_overlay.cpp b/src/pair_hybrid_overlay.cpp index 30c1d7d54e..6ffd6a19d6 100644 --- a/src/pair_hybrid_overlay.cpp +++ b/src/pair_hybrid_overlay.cpp @@ -37,8 +37,8 @@ void PairHybridOverlay::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); // 3rd arg = pair sub-style name // 4th arg = pair sub-style index if name used multiple times diff --git a/src/pair_lj96_cut.cpp b/src/pair_lj96_cut.cpp index cba6fdbdb4..1579a9fbf4 100644 --- a/src/pair_lj96_cut.cpp +++ b/src/pair_lj96_cut.cpp @@ -458,8 +458,8 @@ void PairLJ96Cut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_lj_cubic.cpp b/src/pair_lj_cubic.cpp index 68b664fe21..633c12019e 100644 --- a/src/pair_lj_cubic.cpp +++ b/src/pair_lj_cubic.cpp @@ -200,8 +200,8 @@ void PairLJCubic::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_lj_cut.cpp b/src/pair_lj_cut.cpp index ab1710b2fc..b8ea4a72b6 100644 --- a/src/pair_lj_cut.cpp +++ b/src/pair_lj_cut.cpp @@ -452,8 +452,8 @@ void PairLJCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_lj_cut_coul_cut.cpp b/src/pair_lj_cut_coul_cut.cpp index 79d3fa12a8..0d2bff3c9f 100644 --- a/src/pair_lj_cut_coul_cut.cpp +++ b/src/pair_lj_cut_coul_cut.cpp @@ -217,8 +217,8 @@ void PairLJCutCoulCut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_lj_cut_coul_dsf.cpp b/src/pair_lj_cut_coul_dsf.cpp index d80c7e74c0..538336d8e6 100644 --- a/src/pair_lj_cut_coul_dsf.cpp +++ b/src/pair_lj_cut_coul_dsf.cpp @@ -241,8 +241,8 @@ void PairLJCutCoulDSF::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_lj_expand.cpp b/src/pair_lj_expand.cpp index 237ee91cce..90f1ae0df2 100644 --- a/src/pair_lj_expand.cpp +++ b/src/pair_lj_expand.cpp @@ -194,8 +194,8 @@ void PairLJExpand::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_lj_gromacs.cpp b/src/pair_lj_gromacs.cpp index d5b24b733e..bb0a6e647e 100644 --- a/src/pair_lj_gromacs.cpp +++ b/src/pair_lj_gromacs.cpp @@ -223,8 +223,8 @@ void PairLJGromacs::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_lj_gromacs_coul_gromacs.cpp b/src/pair_lj_gromacs_coul_gromacs.cpp index b68a557dcb..26e433b381 100644 --- a/src/pair_lj_gromacs_coul_gromacs.cpp +++ b/src/pair_lj_gromacs_coul_gromacs.cpp @@ -247,8 +247,8 @@ void PairLJGromacsCoulGromacs::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_lj_smooth.cpp b/src/pair_lj_smooth.cpp index b73545f57b..c59b35aebf 100644 --- a/src/pair_lj_smooth.cpp +++ b/src/pair_lj_smooth.cpp @@ -225,8 +225,8 @@ void PairLJSmooth::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_lj_smooth_linear.cpp b/src/pair_lj_smooth_linear.cpp index fa41bcae4b..189475aa71 100644 --- a/src/pair_lj_smooth_linear.cpp +++ b/src/pair_lj_smooth_linear.cpp @@ -192,8 +192,8 @@ void PairLJSmoothLinear::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_mie_cut.cpp b/src/pair_mie_cut.cpp index 7cb67b9437..b79c6c9bf9 100644 --- a/src/pair_mie_cut.cpp +++ b/src/pair_mie_cut.cpp @@ -463,8 +463,8 @@ void PairMIECut::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double epsilon_one = force->numeric(FLERR,arg[2]); double sigma_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_morse.cpp b/src/pair_morse.cpp index 4e2d47be5c..503a882595 100644 --- a/src/pair_morse.cpp +++ b/src/pair_morse.cpp @@ -180,8 +180,8 @@ void PairMorse::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double d0_one = force->numeric(FLERR,arg[2]); double alpha_one = force->numeric(FLERR,arg[3]); diff --git a/src/pair_soft.cpp b/src/pair_soft.cpp index d9b9bb819b..8ffd139307 100644 --- a/src/pair_soft.cpp +++ b/src/pair_soft.cpp @@ -174,8 +174,8 @@ void PairSoft::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double prefactor_one = force->numeric(FLERR,arg[2]); diff --git a/src/pair_table.cpp b/src/pair_table.cpp index f83e499a23..c4bc3e7dd2 100644 --- a/src/pair_table.cpp +++ b/src/pair_table.cpp @@ -263,8 +263,8 @@ void PairTable::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); int me; MPI_Comm_rank(world,&me); diff --git a/src/pair_yukawa.cpp b/src/pair_yukawa.cpp index 2cc309d949..a38e2aa880 100644 --- a/src/pair_yukawa.cpp +++ b/src/pair_yukawa.cpp @@ -178,8 +178,8 @@ void PairYukawa::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double a_one = force->numeric(FLERR,arg[2]); diff --git a/src/pair_zbl.cpp b/src/pair_zbl.cpp index 6962200982..86c6c64d77 100644 --- a/src/pair_zbl.cpp +++ b/src/pair_zbl.cpp @@ -211,10 +211,10 @@ void PairZBL::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); int jlo,jhi; - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); z_one = force->numeric(FLERR,arg[2]); z_two = force->numeric(FLERR,arg[3]); diff --git a/src/pair_zero.cpp b/src/pair_zero.cpp index 787ed29935..ab6d713cc4 100644 --- a/src/pair_zero.cpp +++ b/src/pair_zero.cpp @@ -111,8 +111,8 @@ void PairZero::coeff(int narg, char **arg) if (!allocated) allocate(); int ilo,ihi,jlo,jhi; - force->bounds(arg[0],atom->ntypes,ilo,ihi); - force->bounds(arg[1],atom->ntypes,jlo,jhi); + force->bounds(FLERR,arg[0],atom->ntypes,ilo,ihi); + force->bounds(FLERR,arg[1],atom->ntypes,jlo,jhi); double cut_one = cut_global; if (coeffflag && (narg == 3)) cut_one = force->numeric(FLERR,arg[2]); diff --git a/src/set.cpp b/src/set.cpp index 56fbf42e54..82d0bce129 100644 --- a/src/set.cpp +++ b/src/set.cpp @@ -498,7 +498,7 @@ void Set::selection(int n) if (atom->tag_enable == 0) error->all(FLERR,"Cannot use set atom with no atom IDs defined"); bigint nlobig,nhibig; - force->boundsbig(id,MAXTAGINT,nlobig,nhibig); + force->boundsbig(FLERR,id,MAXTAGINT,nlobig,nhibig); tagint *tag = atom->tag; for (int i = 0; i < n; i++) @@ -509,7 +509,7 @@ void Set::selection(int n) if (atom->molecule_flag == 0) error->all(FLERR,"Cannot use set mol with no molecule IDs defined"); bigint nlobig,nhibig; - force->boundsbig(id,MAXTAGINT,nlobig,nhibig); + force->boundsbig(FLERR,id,MAXTAGINT,nlobig,nhibig); tagint *molecule = atom->molecule; for (int i = 0; i < n; i++) @@ -517,7 +517,7 @@ void Set::selection(int n) else select[i] = 0; } else if (style == TYPE_SELECT) { - force->bounds(id,atom->ntypes,nlo,nhi); + force->bounds(FLERR,id,atom->ntypes,nlo,nhi); int *type = atom->type; for (int i = 0; i < n; i++) -- GitLab