Unverified Commit 741a1d1f authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

move Input::expand_args() to utils::expand_args()

parent fcd0b9f7

src/compute_chunk_spread_atom.cpp

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ ComputeChunkSpreadAtom(LAMMPS *lmp, int narg, char **arg) : 
  int iarg = 4;

  int expand = 0;

  char **earg;

  int nargnew = input->expand_args(narg-iarg,&arg[iarg],1,earg);

  int nargnew = utils::expand_args(FLERR,narg-iarg,&arg[iarg],1,earg,lmp);



  if (earg != &arg[iarg]) expand = 1;

  arg = earg;

src/compute_global_atom.cpp

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "variable.h"

#include "memory.h"

#include "error.h"

#include "utils.h"



using namespace LAMMPS_NS;
@@ -80,7 +81,7 @@ ComputeGlobalAtom::ComputeGlobalAtom(LAMMPS *lmp, int narg, char **arg) : 


  int expand = 0;

  char **earg;

  int nargnew = input->expand_args(narg-iarg,&arg[iarg],1,earg);

  int nargnew = utils::expand_args(FLERR,narg-iarg,&arg[iarg],1,earg,lmp);



  if (earg != &arg[iarg]) expand = 1;

  arg = earg;

src/compute_reduce.cpp

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "variable.h"

#include "memory.h"

#include "error.h"

#include "utils.h"



using namespace LAMMPS_NS;
@@ -78,7 +79,7 @@ ComputeReduce::ComputeReduce(LAMMPS *lmp, int narg, char **arg) : 


  int expand = 0;

  char **earg;

  int nargnew = input->expand_args(narg-iarg,&arg[iarg],1,earg);

  int nargnew = utils::expand_args(FLERR,narg-iarg,&arg[iarg],1,earg,lmp);



  if (earg != &arg[iarg]) expand = 1;

  arg = earg;

src/compute_reduce_chunk.cpp

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "variable.h"

#include "memory.h"

#include "error.h"

#include "utils.h"



using namespace LAMMPS_NS;
@@ -64,7 +65,7 @@ ComputeReduceChunk::ComputeReduceChunk(LAMMPS *lmp, int narg, char **arg) : 


  int expand = 0;

  char **earg;

  int nargnew = input->expand_args(narg-iarg,&arg[iarg],1,earg);

  int nargnew = utils::expand_args(FLERR,narg-iarg,&arg[iarg],1,earg,lmp);



  if (earg != &arg[iarg]) expand = 1;

  arg = earg;

src/dump_custom.cpp

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "error.h"

#include "update.h"

#include "variable.h"

#include "utils.h"

#include "fmt/format.h"



using namespace LAMMPS_NS;
@@ -76,7 +77,7 @@ DumpCustom::DumpCustom(LAMMPS *lmp, int narg, char **arg) : 
  // nfield may be shrunk below if extra optional args exist



  expand = 0;

  nfield = nargnew = input->expand_args(narg-5,&arg[5],1,earg);

  nfield = nargnew = utils::expand_args(FLERR,narg-5,&arg[5],1,earg,lmp);

  if (earg != &arg[5]) expand = 1;



  // allocate field vectors

CRA Git | Maintained and supported by SUSTech CRA and CCSE