From 237743e6fd0bfca03ea6367f62434421370d2db6 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Thu, 28 Jan 2016 21:22:58 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14513 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/USER-SPH/compute_meso_e_atom.cpp | 4 ++-- src/USER-SPH/compute_meso_e_atom.h | 2 +- src/USER-SPH/compute_meso_rho_atom.cpp | 4 ++-- src/USER-SPH/compute_meso_rho_atom.h | 2 +- src/USER-SPH/compute_meso_t_atom.cpp | 8 ++++---- src/USER-SPH/compute_meso_t_atom.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/USER-SPH/compute_meso_e_atom.cpp b/src/USER-SPH/compute_meso_e_atom.cpp index 5db9dbbedf..51035decf8 100644 --- a/src/USER-SPH/compute_meso_e_atom.cpp +++ b/src/USER-SPH/compute_meso_e_atom.cpp @@ -28,8 +28,8 @@ using namespace LAMMPS_NS; ComputeMesoEAtom::ComputeMesoEAtom(LAMMPS *lmp, int narg, char **arg) : Compute(lmp, narg, arg) { - if (narg != 3) error->all(FLERR,"Number of arguments for compute meso_e/atom command != 3"); - if (atom->e_flag != 1) error->all(FLERR,"compute meso_e/atom command requires atom_style with energy (e.g. meso)"); + if (narg != 3) error->all(FLERR,"Number of arguments for compute meso/e/atom command != 3"); + if (atom->e_flag != 1) error->all(FLERR,"compute meso/e/atom command requires atom_style with energy (e.g. meso)"); peratom_flag = 1; size_peratom_cols = 0; diff --git a/src/USER-SPH/compute_meso_e_atom.h b/src/USER-SPH/compute_meso_e_atom.h index 4113bb6120..3cdbfa7aa8 100644 --- a/src/USER-SPH/compute_meso_e_atom.h +++ b/src/USER-SPH/compute_meso_e_atom.h @@ -13,7 +13,7 @@ #ifdef COMPUTE_CLASS -ComputeStyle(meso_e/atom,ComputeMesoEAtom) +ComputeStyle(meso/e/atom,ComputeMesoEAtom) #else diff --git a/src/USER-SPH/compute_meso_rho_atom.cpp b/src/USER-SPH/compute_meso_rho_atom.cpp index fa286d7e05..d30d62c82e 100644 --- a/src/USER-SPH/compute_meso_rho_atom.cpp +++ b/src/USER-SPH/compute_meso_rho_atom.cpp @@ -28,8 +28,8 @@ using namespace LAMMPS_NS; ComputeMesoRhoAtom::ComputeMesoRhoAtom(LAMMPS *lmp, int narg, char **arg) : Compute(lmp, narg, arg) { - if (narg != 3) error->all(FLERR,"Illegal compute meso_rho/atom command"); - if (atom->rho_flag != 1) error->all(FLERR,"compute meso_rho/atom command requires atom_style with density (e.g. meso)"); + if (narg != 3) error->all(FLERR,"Illegal compute meso/rho/atom command"); + if (atom->rho_flag != 1) error->all(FLERR,"compute meso/rho/atom command requires atom_style with density (e.g. meso)"); peratom_flag = 1; size_peratom_cols = 0; diff --git a/src/USER-SPH/compute_meso_rho_atom.h b/src/USER-SPH/compute_meso_rho_atom.h index de7b4c857a..ec4942ef92 100644 --- a/src/USER-SPH/compute_meso_rho_atom.h +++ b/src/USER-SPH/compute_meso_rho_atom.h @@ -13,7 +13,7 @@ #ifdef COMPUTE_CLASS -ComputeStyle(meso_rho/atom,ComputeMesoRhoAtom) +ComputeStyle(meso/rho/atom,ComputeMesoRhoAtom) #else diff --git a/src/USER-SPH/compute_meso_t_atom.cpp b/src/USER-SPH/compute_meso_t_atom.cpp index ce594cdff2..f14e0c8302 100644 --- a/src/USER-SPH/compute_meso_t_atom.cpp +++ b/src/USER-SPH/compute_meso_t_atom.cpp @@ -28,9 +28,9 @@ using namespace LAMMPS_NS; ComputeMesoTAtom::ComputeMesoTAtom(LAMMPS *lmp, int narg, char **arg) : Compute(lmp, narg, arg) { - if (narg != 3) error->all(FLERR,"Number of arguments for compute meso_t/atom command != 3"); + if (narg != 3) error->all(FLERR,"Number of arguments for compute meso/t/atom command != 3"); if ((atom->e_flag != 1) || (atom->cv_flag != 1)) - error->all(FLERR,"compute meso_e/atom command requires atom_style with both energy and heat capacity (e.g. meso)"); + error->all(FLERR,"Compute meso/t/atom command requires atom_style with both energy and heat capacity (e.g. meso)"); peratom_flag = 1; size_peratom_cols = 0; @@ -53,9 +53,9 @@ void ComputeMesoTAtom::init() int count = 0; for (int i = 0; i < modify->ncompute; i++) - if (strcmp(modify->compute[i]->style,"meso_t/atom") == 0) count++; + if (strcmp(modify->compute[i]->style,"meso/t/atom") == 0) count++; if (count > 1 && comm->me == 0) - error->warning(FLERR,"More than one compute meso_t/atom"); + error->warning(FLERR,"More than one compute meso/t/atom"); } /* ---------------------------------------------------------------------- */ diff --git a/src/USER-SPH/compute_meso_t_atom.h b/src/USER-SPH/compute_meso_t_atom.h index 14bae61b2e..9e4b253712 100644 --- a/src/USER-SPH/compute_meso_t_atom.h +++ b/src/USER-SPH/compute_meso_t_atom.h @@ -13,7 +13,7 @@ #ifdef COMPUTE_CLASS -ComputeStyle(meso_t/atom,ComputeMesoTAtom) +ComputeStyle(meso/t/atom,ComputeMesoTAtom) #else