Unverified Commit 4396dbd9 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

move Force::open_potential() to utils::open_potential()

parent 79822696

src/KOKKOS/pair_exp6_rx_kokkos.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1723,7 +1723,7 @@ void PairExp6rxKokkos<DeviceType>::read_file(char *file) 
  FILE *fp;

  fp = NULL;

  if (comm->me == 0) {

    fp = force->open_potential(file);

    fp = utils::open_potential(file,lmp,nullptr);

    if (fp == NULL) {

      char str[128];

      snprintf(str,128,"Cannot open exp6/rx potential file %s",file);

src/MANYBODY/pair_eam_cd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ void PairEAMCD::read_h_coeff(char *filename) 
    char line[MAXLINE];

    char nextline[MAXLINE];

    int convert_flag = unit_convert_flag;

    fptr = force->open_potential(filename, &convert_flag);

    fptr = utils::open_potential(filename, lmp, &convert_flag);

    if (fptr == NULL)

      error->one(FLERR,fmt::format("Cannot open EAMCD potential file {}",

                                   filename));

src/MANYBODY/pair_eim.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ EIMPotentialFileReader::EIMPotentialFileReader(LAMMPS *lmp, 
  }



  int unit_convert = auto_convert;

  FILE *fp = force->open_potential(filename.c_str(), &unit_convert);

  FILE *fp = utils::open_potential(filename, lmp, &unit_convert);

  conversion_factor = utils::get_conversion_factor(utils::ENERGY,unit_convert);



  if (fp == NULL) {

src/MANYBODY/pair_lcbop.cpp

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ void PairLCBOP::read_file(char *filename) 
  // read file on proc 0



  if (me == 0) {

    FILE *fp = force->open_potential(filename);

    FILE *fp = utils::open_potential(filename,lmp,nullptr);

    if (fp == NULL) {

      char str[128];

      snprintf(str,128,"Cannot open LCBOP potential file %s",filename);

src/MLIAP/mliap_descriptor_snap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ void MLIAPDescriptorSNAP::read_paramfile(char *paramfilename) 


  FILE *fpparam;

  if (comm->me == 0) {

    fpparam = force->open_potential(paramfilename);

    fpparam = utils::open_potential(paramfilename,lmp,nullptr);

    if (fpparam == NULL)

      error->one(FLERR,fmt::format("Cannot open SNAP parameter file {}: {}",

                                   paramfilename, utils::getsyserror()));

CRA Git | Maintained and supported by SUSTech CRA and CCSE