Unverified Commit cd08dc84 authored by Richard Berger's avatar Richard Berger
Browse files

Simplify by using next_values() helper

parent 4a6d3bc0

src/GPU/pair_eam_alloy_gpu.cpp

+3 −8
Original line number Diff line number Diff line
@@ -374,15 +374,12 @@ void PairEAMAlloyGPU::read_file(char *filename) 
    PotentialFileReader reader(lmp, filename, "EAM");



    try {

      char * line = nullptr;



      reader.skip_line();

      reader.skip_line();

      reader.skip_line();



      // extract element names from nelements line

      line = reader.next_line(1);

      ValueTokenizer values(line);

      ValueTokenizer values = reader.next_values(1);

      file->nelements = values.next_int();



      if (values.count() != file->nelements + 1)
@@ -398,8 +395,7 @@ void PairEAMAlloyGPU::read_file(char *filename) 


      //



      line = reader.next_line(5);

      values = ValueTokenizer(line);

      values = reader.next_values(5);

      file->nrho = values.next_int();

      file->drho = values.next_double();

      file->nr   = values.next_int();
@@ -415,8 +411,7 @@ void PairEAMAlloyGPU::read_file(char *filename) 
      memory->create(file->z2r, file->nelements, file->nelements, file->nr + 1, "pair:z2r");



      for (int i = 0; i < file->nelements; i++) {

        line = reader.next_line(2);

        values = ValueTokenizer(line);

        values = reader.next_values(2);

        values.next_int(); // ignore

        file->mass[i] = values.next_double();

src/GPU/pair_eam_fs_gpu.cpp

+3 −8
Original line number Diff line number Diff line
@@ -374,15 +374,12 @@ void PairEAMFSGPU::read_file(char *filename) 
    PotentialFileReader reader(lmp, filename, "EAM");



    try {

      char * line = nullptr;



      reader.skip_line();

      reader.skip_line();

      reader.skip_line();



      // extract element names from nelements line

      line = reader.next_line(1);

      ValueTokenizer values(line);

      ValueTokenizer values = reader.next_values(1);

      file->nelements = values.next_int();



      if (values.count() != file->nelements + 1)
@@ -398,8 +395,7 @@ void PairEAMFSGPU::read_file(char *filename) 


      //



      line = reader.next_line(5);

      values = ValueTokenizer(line);

      values = reader.next_values(5);

      file->nrho = values.next_int();

      file->drho = values.next_double();

      file->nr   = values.next_int();
@@ -415,8 +411,7 @@ void PairEAMFSGPU::read_file(char *filename) 
      memory->create(file->z2r, file->nelements, file->nelements, file->nr + 1, "pair:z2r");



      for (int i = 0; i < file->nelements; i++) {

        line = reader.next_line(2);

        values = ValueTokenizer(line);

        values = reader.next_values(2);

        values.next_int(); // ignore

        file->mass[i] = values.next_double();

src/KOKKOS/pair_eam_alloy_kokkos.cpp

+3 −8
Original line number Diff line number Diff line
@@ -988,15 +988,12 @@ void PairEAMAlloyKokkos<DeviceType>::read_file(char *filename) 
    PotentialFileReader reader(lmp, filename, "EAM");



    try {

      char * line = nullptr;



      reader.skip_line();

      reader.skip_line();

      reader.skip_line();



      // extract element names from nelements line

      line = reader.next_line(1);

      ValueTokenizer values(line);

      ValueTokenizer values = reader.next_values(1);

      file->nelements = values.next_int();



      if (values.count() != file->nelements + 1)
@@ -1012,8 +1009,7 @@ void PairEAMAlloyKokkos<DeviceType>::read_file(char *filename) 


      //



      line = reader.next_line(5);

      values = ValueTokenizer(line);

      values = reader.next_values(5);

      file->nrho = values.next_int();

      file->drho = values.next_double();

      file->nr   = values.next_int();
@@ -1029,8 +1025,7 @@ void PairEAMAlloyKokkos<DeviceType>::read_file(char *filename) 
      memory->create(file->z2r, file->nelements, file->nelements, file->nr + 1, "pair:z2r");



      for (int i = 0; i < file->nelements; i++) {

        line = reader.next_line(2);

        values = ValueTokenizer(line);

        values = reader.next_values(2);

        values.next_int(); // ignore

        file->mass[i] = values.next_double();

src/KOKKOS/pair_eam_fs_kokkos.cpp

+3 −8
Original line number Diff line number Diff line
@@ -988,15 +988,12 @@ void PairEAMFSKokkos<DeviceType>::read_file(char *filename) 
    PotentialFileReader reader(lmp, filename, "EAM");



    try {

      char * line = nullptr;



      reader.skip_line();

      reader.skip_line();

      reader.skip_line();



      // extract element names from nelements line

      line = reader.next_line(1);

      ValueTokenizer values(line);

      ValueTokenizer values = reader.next_values(1);

      file->nelements = values.next_int();



      if (values.count() != file->nelements + 1)
@@ -1012,8 +1009,7 @@ void PairEAMFSKokkos<DeviceType>::read_file(char *filename) 


      //



      line = reader.next_line(5);

      values = ValueTokenizer(line);

      values = reader.next_values(5);

      file->nrho = values.next_int();

      file->drho = values.next_double();

      file->nr   = values.next_int();
@@ -1029,8 +1025,7 @@ void PairEAMFSKokkos<DeviceType>::read_file(char *filename) 
      memory->create(file->z2r, file->nelements, file->nelements, file->nr + 1, "pair:z2r");



      for (int i = 0; i < file->nelements; i++) {

        line = reader.next_line(2);

        values = ValueTokenizer(line);

        values = reader.next_values(2);

        values.next_int(); // ignore

        file->mass[i] = values.next_double();

src/MANYBODY/pair_adp.cpp

+3 −8
Original line number Diff line number Diff line
@@ -546,15 +546,12 @@ void PairADP::read_file(char *filename) 
    PotentialFileReader reader(lmp, filename, "ADP");



    try {

      char * line = nullptr;



      reader.skip_line();

      reader.skip_line();

      reader.skip_line();



      // extract element names from nelements line

      line = reader.next_line(1);

      ValueTokenizer values(line);

      ValueTokenizer values = reader.next_values(1);

      file->nelements = values.next_int();



      if (values.count() != file->nelements + 1)
@@ -570,8 +567,7 @@ void PairADP::read_file(char *filename) 


      //



      line = reader.next_line(5);

      values = ValueTokenizer(line);

      values = reader.next_values(5);

      file->nrho = values.next_int();

      file->drho = values.next_double();

      file->nr   = values.next_int();
@@ -589,8 +585,7 @@ void PairADP::read_file(char *filename) 
      memory->create(file->w2r, file->nelements, file->nelements, file->nr + 1, "pair:w2r");



      for (int i = 0; i < file->nelements; i++) {

        line = reader.next_line(2);

        values = ValueTokenizer(line);

        values = reader.next_values(2);

        values.next_int(); // ignore

        file->mass[i] = values.next_double();

CRA Git | Maintained and supported by SUSTech CRA and CCSE