diff --git a/src/DIPOLE/atom_vec_dipole.cpp b/src/DIPOLE/atom_vec_dipole.cpp index 47fff1d4c5..a6f454dc98 100644 --- a/src/DIPOLE/atom_vec_dipole.cpp +++ b/src/DIPOLE/atom_vec_dipole.cpp @@ -781,7 +781,7 @@ void AtomVecDipole::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/KOKKOS/atom_vec_dpd_kokkos.cpp b/src/KOKKOS/atom_vec_dpd_kokkos.cpp index 93ca976892..317914e4f8 100644 --- a/src/KOKKOS/atom_vec_dpd_kokkos.cpp +++ b/src/KOKKOS/atom_vec_dpd_kokkos.cpp @@ -1724,7 +1724,7 @@ void AtomVecDPDKokkos::data_atom(double *coord, tagint imagetmp, int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - h_tag[nlocal] = ATOTAGINT(values[0]); + h_tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); h_type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/KOKKOS/atom_vec_hybrid_kokkos.cpp b/src/KOKKOS/atom_vec_hybrid_kokkos.cpp index 54dd89bfb3..c4dd90ce05 100644 --- a/src/KOKKOS/atom_vec_hybrid_kokkos.cpp +++ b/src/KOKKOS/atom_vec_hybrid_kokkos.cpp @@ -976,7 +976,7 @@ void AtomVecHybridKokkos::data_atom(double *coord, imageint imagetmp, char **val int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - h_tag[nlocal] = ATOTAGINT(values[0]); + h_tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); h_type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (h_type[nlocal] <= 0 || h_type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom h_type in Atoms section of data file"); diff --git a/src/KOKKOS/atom_vec_sphere_kokkos.cpp b/src/KOKKOS/atom_vec_sphere_kokkos.cpp index bc72bcbf5e..3b64ceeb42 100644 --- a/src/KOKKOS/atom_vec_sphere_kokkos.cpp +++ b/src/KOKKOS/atom_vec_sphere_kokkos.cpp @@ -2549,7 +2549,7 @@ void AtomVecSphereKokkos::data_atom(double *coord, imageint imagetmp, char **val int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/MOLECULE/atom_vec_angle.cpp b/src/MOLECULE/atom_vec_angle.cpp index 87220bfad6..bdafdae148 100644 --- a/src/MOLECULE/atom_vec_angle.cpp +++ b/src/MOLECULE/atom_vec_angle.cpp @@ -793,8 +793,8 @@ void AtomVecAngle::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); - molecule[nlocal] = ATOTAGINT(values[1]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); + molecule[nlocal] = utils::tnumeric(FLERR,values[1],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[2],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); @@ -822,7 +822,7 @@ void AtomVecAngle::data_atom(double *coord, imageint imagetmp, char **values) int AtomVecAngle::data_atom_hybrid(int nlocal, char **values) { - molecule[nlocal] = ATOTAGINT(values[0]); + molecule[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); num_bond[nlocal] = 0; num_angle[nlocal] = 0; diff --git a/src/MOLECULE/atom_vec_bond.cpp b/src/MOLECULE/atom_vec_bond.cpp index 6f0c63529b..275c424941 100644 --- a/src/MOLECULE/atom_vec_bond.cpp +++ b/src/MOLECULE/atom_vec_bond.cpp @@ -739,8 +739,8 @@ void AtomVecBond::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); - molecule[nlocal] = ATOTAGINT(values[1]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); + molecule[nlocal] = utils::tnumeric(FLERR,values[1],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[2],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); @@ -767,7 +767,7 @@ void AtomVecBond::data_atom(double *coord, imageint imagetmp, char **values) int AtomVecBond::data_atom_hybrid(int nlocal, char **values) { - molecule[nlocal] = ATOTAGINT(values[0]); + molecule[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); num_bond[nlocal] = 0; diff --git a/src/MOLECULE/atom_vec_full.cpp b/src/MOLECULE/atom_vec_full.cpp index 0cb95254e3..036324cb2c 100644 --- a/src/MOLECULE/atom_vec_full.cpp +++ b/src/MOLECULE/atom_vec_full.cpp @@ -942,8 +942,8 @@ void AtomVecFull::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); - molecule[nlocal] = ATOTAGINT(values[1]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); + molecule[nlocal] = utils::tnumeric(FLERR,values[1],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[2],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); @@ -975,7 +975,7 @@ void AtomVecFull::data_atom(double *coord, imageint imagetmp, char **values) int AtomVecFull::data_atom_hybrid(int nlocal, char **values) { - molecule[nlocal] = ATOTAGINT(values[0]); + molecule[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); q[nlocal] = utils::numeric(FLERR,values[1],true,lmp); num_bond[nlocal] = 0; diff --git a/src/MOLECULE/atom_vec_molecular.cpp b/src/MOLECULE/atom_vec_molecular.cpp index 28766fa67d..49606f0a69 100644 --- a/src/MOLECULE/atom_vec_molecular.cpp +++ b/src/MOLECULE/atom_vec_molecular.cpp @@ -926,8 +926,8 @@ void AtomVecMolecular::data_atom(double *coord, imageint imagetmp, int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); - molecule[nlocal] = ATOTAGINT(values[1]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); + molecule[nlocal] = utils::tnumeric(FLERR,values[1],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[2],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); @@ -957,7 +957,7 @@ void AtomVecMolecular::data_atom(double *coord, imageint imagetmp, int AtomVecMolecular::data_atom_hybrid(int nlocal, char **values) { - molecule[nlocal] = ATOTAGINT(values[0]); + molecule[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); num_bond[nlocal] = 0; num_angle[nlocal] = 0; diff --git a/src/MOLECULE/atom_vec_template.cpp b/src/MOLECULE/atom_vec_template.cpp index f7cf5f96db..14e7736b50 100644 --- a/src/MOLECULE/atom_vec_template.cpp +++ b/src/MOLECULE/atom_vec_template.cpp @@ -742,11 +742,11 @@ void AtomVecTemplate::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); if (tag[nlocal] <= 0) error->one(FLERR,"Invalid atom ID in Atoms section of data file"); - molecule[nlocal] = ATOTAGINT(values[1]); + molecule[nlocal] = utils::tnumeric(FLERR,values[1],true,lmp); molindex[nlocal] = utils::inumeric(FLERR,values[2],true,lmp) - 1; molatom[nlocal] = utils::inumeric(FLERR,values[3],true,lmp) - 1; @@ -781,7 +781,7 @@ void AtomVecTemplate::data_atom(double *coord, imageint imagetmp, char **values) int AtomVecTemplate::data_atom_hybrid(int nlocal, char **values) { - molecule[nlocal] = ATOTAGINT(values[0]); + molecule[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); molindex[nlocal] = utils::inumeric(FLERR,values[1],true,lmp) - 1; molatom[nlocal] = utils::inumeric(FLERR,values[2],true,lmp) - 1; return 3; diff --git a/src/PERI/atom_vec_peri.cpp b/src/PERI/atom_vec_peri.cpp index 25a0b8a933..64ce323a3f 100644 --- a/src/PERI/atom_vec_peri.cpp +++ b/src/PERI/atom_vec_peri.cpp @@ -793,7 +793,7 @@ void AtomVecPeri::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/SPIN/atom_vec_spin.cpp b/src/SPIN/atom_vec_spin.cpp index 63c55759be..5b4173509f 100644 --- a/src/SPIN/atom_vec_spin.cpp +++ b/src/SPIN/atom_vec_spin.cpp @@ -813,7 +813,7 @@ void AtomVecSpin::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/USER-AWPMD/atom_vec_wavepacket.cpp b/src/USER-AWPMD/atom_vec_wavepacket.cpp index 0edaf7ac02..bffe49e6c5 100644 --- a/src/USER-AWPMD/atom_vec_wavepacket.cpp +++ b/src/USER-AWPMD/atom_vec_wavepacket.cpp @@ -916,7 +916,7 @@ void AtomVecWavepacket::data_atom(double *coord, imageint imagetmp, if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/USER-DPD/atom_vec_dpd.cpp b/src/USER-DPD/atom_vec_dpd.cpp index 2aef55ff9f..de673caec0 100644 --- a/src/USER-DPD/atom_vec_dpd.cpp +++ b/src/USER-DPD/atom_vec_dpd.cpp @@ -815,7 +815,7 @@ void AtomVecDPD::data_atom(double *coord, tagint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/USER-EFF/atom_vec_electron.cpp b/src/USER-EFF/atom_vec_electron.cpp index e62519d223..cf4555f02e 100644 --- a/src/USER-EFF/atom_vec_electron.cpp +++ b/src/USER-EFF/atom_vec_electron.cpp @@ -799,7 +799,7 @@ void AtomVecElectron::data_atom(double *coord, imageint imagetmp, char **values) if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/USER-MESO/atom_vec_edpd.cpp b/src/USER-MESO/atom_vec_edpd.cpp index ff8515abc6..eee8ae25b0 100644 --- a/src/USER-MESO/atom_vec_edpd.cpp +++ b/src/USER-MESO/atom_vec_edpd.cpp @@ -760,7 +760,7 @@ void AtomVecEDPD::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/USER-MESO/atom_vec_mdpd.cpp b/src/USER-MESO/atom_vec_mdpd.cpp index 965891a283..fd3c01f0c6 100644 --- a/src/USER-MESO/atom_vec_mdpd.cpp +++ b/src/USER-MESO/atom_vec_mdpd.cpp @@ -799,7 +799,7 @@ void AtomVecMDPD::data_atom(double *coord, imageint imagetmp, char **values) { int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/USER-MESO/atom_vec_tdpd.cpp b/src/USER-MESO/atom_vec_tdpd.cpp index def0a8ad7b..f91731f8ac 100644 --- a/src/USER-MESO/atom_vec_tdpd.cpp +++ b/src/USER-MESO/atom_vec_tdpd.cpp @@ -792,7 +792,7 @@ void AtomVecTDPD::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/USER-SMD/atom_vec_smd.cpp b/src/USER-SMD/atom_vec_smd.cpp index 278652bf43..9c634be091 100644 --- a/src/USER-SMD/atom_vec_smd.cpp +++ b/src/USER-SMD/atom_vec_smd.cpp @@ -1028,13 +1028,13 @@ void AtomVecSMD::data_atom(double *coord, imageint imagetmp, char **values) { if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR, "Invalid atom type in Atoms section of data file"); - molecule[nlocal] = ATOTAGINT(values[2]); + molecule[nlocal] = utils::tnumeric(FLERR,values[2],true,lmp); if (molecule[nlocal] <= 0) error->one(FLERR, "Invalid molecule in Atoms section of data file"); diff --git a/src/USER-SPH/atom_vec_meso.cpp b/src/USER-SPH/atom_vec_meso.cpp index 0960141ae2..aa3e680c61 100644 --- a/src/USER-SPH/atom_vec_meso.cpp +++ b/src/USER-SPH/atom_vec_meso.cpp @@ -844,7 +844,7 @@ void AtomVecMeso::data_atom(double *coord, imageint imagetmp, char **values) { int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/atom_vec_atomic.cpp b/src/atom_vec_atomic.cpp index 0574db1d8e..af4b4e617d 100644 --- a/src/atom_vec_atomic.cpp +++ b/src/atom_vec_atomic.cpp @@ -613,7 +613,7 @@ void AtomVecAtomic::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/atom_vec_body.cpp b/src/atom_vec_body.cpp index 4b22933881..96cf0ec909 100644 --- a/src/atom_vec_body.cpp +++ b/src/atom_vec_body.cpp @@ -1279,7 +1279,7 @@ void AtomVecBody::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/atom_vec_charge.cpp b/src/atom_vec_charge.cpp index 1a78ba0e2d..fa3c99ca34 100644 --- a/src/atom_vec_charge.cpp +++ b/src/atom_vec_charge.cpp @@ -664,7 +664,7 @@ void AtomVecCharge::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/atom_vec_ellipsoid.cpp b/src/atom_vec_ellipsoid.cpp index 0b94359c55..455e4f192f 100644 --- a/src/atom_vec_ellipsoid.cpp +++ b/src/atom_vec_ellipsoid.cpp @@ -1141,7 +1141,7 @@ void AtomVecEllipsoid::data_atom(double *coord, imageint imagetmp, int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/atom_vec_hybrid.cpp b/src/atom_vec_hybrid.cpp index a7816efbed..18f6fb567d 100644 --- a/src/atom_vec_hybrid.cpp +++ b/src/atom_vec_hybrid.cpp @@ -864,7 +864,7 @@ void AtomVecHybrid::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/atom_vec_line.cpp b/src/atom_vec_line.cpp index 6bffc1b0de..ba59b3d17a 100644 --- a/src/atom_vec_line.cpp +++ b/src/atom_vec_line.cpp @@ -1036,8 +1036,8 @@ void AtomVecLine::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); - molecule[nlocal] = ATOTAGINT(values[1]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); + molecule[nlocal] = utils::tnumeric(FLERR,values[1],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[2],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); @@ -1081,7 +1081,7 @@ void AtomVecLine::data_atom(double *coord, imageint imagetmp, char **values) int AtomVecLine::data_atom_hybrid(int nlocal, char **values) { - molecule[nlocal] = ATOTAGINT(values[0]); + molecule[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); line[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (line[nlocal] == 0) line[nlocal] = -1; diff --git a/src/atom_vec_sphere.cpp b/src/atom_vec_sphere.cpp index b37b853c86..2a77ec418b 100644 --- a/src/atom_vec_sphere.cpp +++ b/src/atom_vec_sphere.cpp @@ -965,7 +965,7 @@ void AtomVecSphere::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); diff --git a/src/atom_vec_tri.cpp b/src/atom_vec_tri.cpp index 4070c6795e..45418b35fd 100644 --- a/src/atom_vec_tri.cpp +++ b/src/atom_vec_tri.cpp @@ -1435,8 +1435,8 @@ void AtomVecTri::data_atom(double *coord, imageint imagetmp, char **values) int nlocal = atom->nlocal; if (nlocal == nmax) grow(0); - tag[nlocal] = ATOTAGINT(values[0]); - molecule[nlocal] = ATOTAGINT(values[1]); + tag[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); + molecule[nlocal] = utils::tnumeric(FLERR,values[1],true,lmp); type[nlocal] = utils::inumeric(FLERR,values[2],true,lmp); if (type[nlocal] <= 0 || type[nlocal] > atom->ntypes) error->one(FLERR,"Invalid atom type in Atoms section of data file"); @@ -1483,7 +1483,7 @@ void AtomVecTri::data_atom(double *coord, imageint imagetmp, char **values) int AtomVecTri::data_atom_hybrid(int nlocal, char **values) { - molecule[nlocal] = ATOTAGINT(values[0]); + molecule[nlocal] = utils::tnumeric(FLERR,values[0],true,lmp); tri[nlocal] = utils::inumeric(FLERR,values[1],true,lmp); if (tri[nlocal] == 0) tri[nlocal] = -1;