git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9913 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp
2013-05-24 18:55:24 +00:00
parent 3452583172
commit db8eda0253
26 changed files with 24 additions and 99 deletions

View File

@ -378,20 +378,14 @@ void Velocity::set(int narg, char **arg)
xscale = yscale = zscale = 1.0;
if (xstyle && !xstr) {
if (scale_flag && domain->lattice == NULL)
error->all(FLERR,"Use of velocity with undefined lattice");
if (scale_flag) xscale = domain->lattice->xlattice;
vx *= xscale;
}
if (ystyle && !ystr) {
if (scale_flag && domain->lattice == NULL)
error->all(FLERR,"Use of velocity with undefined lattice");
if (scale_flag) yscale = domain->lattice->ylattice;
vy *= yscale;
}
if (zstyle && !zstr) {
if (scale_flag && domain->lattice == NULL)
error->all(FLERR,"Use of velocity with undefined lattice");
if (scale_flag) zscale = domain->lattice->zlattice;
vz *= zscale;
}
@ -552,9 +546,6 @@ void Velocity::ramp(int narg, char **arg)
{
// set scale factors
if (scale_flag && domain->lattice == NULL)
error->all(FLERR,"Use of velocity with undefined lattice");
if (scale_flag) {
xscale = domain->lattice->xlattice;
yscale = domain->lattice->ylattice;