jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix initialization order (#1076)

This commit is contained in:
Daniel Schwen 2018-08-23 11:13:52 -06:00
parent e9bc939098
commit 1abeec3a43
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/USER-MANIFOLD/manifold_gaussian_bump.cpp
View File

@ -25,7 +25,6 @@ public:
cubic_hermite( double x0, double x1, double y0, double y1, cubic_hermite( double x0, double x1, double y0, double y1,
double yp0, double yp1, LAMMPS_NS::Error *err ) : double yp0, double yp1, LAMMPS_NS::Error *err ) :
x0(x0), x1(x1), y0(y0), y1(y1), yp0(yp0), yp1(yp1),
a( 2*x0 + 2 - 2*x1 ), a( 2*x0 + 2 - 2*x1 ),
b( -3*x0 - 3 + 3*x1 ), b( -3*x0 - 3 + 3*x1 ),
c( 1.0 ), c( 1.0 ),
@ -34,6 +33,7 @@ public:
u( -3*y0 + 3*y1 - 2*yp0 - yp1 ), u( -3*y0 + 3*y1 - 2*yp0 - yp1 ),
v( yp0 ), v( yp0 ),
w( y0 ), w( y0 ),
x0(x0), x1(x1), y0(y0), y1(y1), yp0(yp0), yp1(yp1),
err(err) err(err)
{ {
test(); test();

2
src/fix_neigh_history.cpp
View File

@ -35,7 +35,7 @@ enum{DEFAULT,NPARTNER,PERPARTNER}; // also set in fix neigh/history/omp
FixNeighHistory::FixNeighHistory(LAMMPS *lmp, int narg, char **arg) : FixNeighHistory::FixNeighHistory(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg), Fix(lmp, narg, arg),
npartner(NULL), partner(NULL), valuepartner(NULL), pair(NULL), pair(NULL), npartner(NULL), partner(NULL), valuepartner(NULL),
ipage_atom(NULL), dpage_atom(NULL), ipage_neigh(NULL), dpage_neigh(NULL) ipage_atom(NULL), dpage_atom(NULL), ipage_neigh(NULL), dpage_neigh(NULL)
{ {
if (narg != 4) error->all(FLERR,"Illegal fix NEIGH_HISTORY command"); if (narg != 4) error->all(FLERR,"Illegal fix NEIGH_HISTORY command");