Misc patches and missed changes
This commit is contained in:
@ -597,4 +597,4 @@ Related commands
|
|||||||
Default
|
Default
|
||||||
"""""""
|
"""""""
|
||||||
|
|
||||||
The option defaults are remap = x, flip = yes, units = lattice
|
The option defaults are remap = x, flip = yes, and units = lattice.
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
|
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
|
||||||
https://www.lammps.org/, Sandia National Laboratories
|
https://www.lammps.org/, Sandia National Laboratories
|
||||||
Steve Plimpton, sjplimp@sandia.gov
|
LAMMPS development team: developers@lammps.org
|
||||||
|
|
||||||
Copyright (2003) Sandia Corporation. Under the terms of Contract
|
Copyright (2003) Sandia Corporation. Under the terms of Contract
|
||||||
DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
|
DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
/* -*- c++ -*- ----------------------------------------------------------
|
/* -*- c++ -*- ----------------------------------------------------------
|
||||||
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
|
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
|
||||||
https://www.lammps.org/, Sandia National Laboratories
|
https://www.lammps.org/, Sandia National Laboratories
|
||||||
Steve Plimpton, sjplimp@sandia.gov
|
LAMMPS development team: developers@lammps.org
|
||||||
|
|
||||||
Copyright (2003) Sandia Corporation. Under the terms of Contract
|
Copyright (2003) Sandia Corporation. Under the terms of Contract
|
||||||
DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
|
DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
|
||||||
@ -35,7 +35,7 @@ class FixDeformPressure : public FixDeform {
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
int pcouple, dimension;
|
int pcouple, dimension;
|
||||||
double *h_rate, *h_ratelo, max_h_rate;
|
double max_h_rate;
|
||||||
int strain_flag; // 1 if strain-based option is used, 0 if not
|
int strain_flag; // 1 if strain-based option is used, 0 if not
|
||||||
int pressure_flag; // 1 if pressure tensor used, 0 if not
|
int pressure_flag; // 1 if pressure tensor used, 0 if not
|
||||||
int volume_flag; // 1 if VOLUME option is used, 0 if not
|
int volume_flag; // 1 if VOLUME option is used, 0 if not
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
------------------------------------------------------------------------- */
|
------------------------------------------------------------------------- */
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------
|
/* ----------------------------------------------------------------------
|
||||||
Contributing author: Pieter in 't Veld (SNL), Joel Clemmer (SNL)
|
Contributing author: Pieter in 't Veld (SNL)
|
||||||
------------------------------------------------------------------------- */
|
------------------------------------------------------------------------- */
|
||||||
|
|
||||||
#include "fix_deform.h"
|
#include "fix_deform.h"
|
||||||
@ -759,7 +759,7 @@ void FixDeform::apply_deformation()
|
|||||||
if (mask[i] & groupbit)
|
if (mask[i] & groupbit)
|
||||||
domain->x2lamda(x[i], x[i]);
|
domain->x2lamda(x[i], x[i]);
|
||||||
|
|
||||||
for (auto ifix : rfix)
|
for (auto &ifix : rfix)
|
||||||
ifix->deform(0);
|
ifix->deform(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -798,7 +798,7 @@ void FixDeform::apply_deformation()
|
|||||||
if (mask[i] & groupbit)
|
if (mask[i] & groupbit)
|
||||||
domain->lamda2x(x[i], x[i]);
|
domain->lamda2x(x[i], x[i]);
|
||||||
|
|
||||||
for (auto ifix : rfix)
|
for (auto &ifix : rfix)
|
||||||
ifix->deform(1);
|
ifix->deform(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user