changes for next patch, 2d disc options for spheres, fix external upgrade, bug fixes for fix ave/chunk for density calcs, Aidan doc page citation deconvolution

This commit is contained in:
Steve Plimpton
2017-03-21 08:56:37 -06:00
parent 145e682ad3
commit dcede304df
112 changed files with 912 additions and 534 deletions

View File

@ -155,31 +155,31 @@ RegBlock::RegBlock(LAMMPS *lmp, int narg, char **arg) : Region(lmp, narg, arg)
// face[2]
MathExtra::copy3(corners[2][0],corners[0][0]);
MathExtra::copy3(corners[2][1],corners[1][0]);
MathExtra::copy3(corners[2][2],corners[1][1]);
MathExtra::copy3(corners[2][3],corners[0][1]);
MathExtra::copy3(corners[0][0], corners[2][0]);
MathExtra::copy3(corners[1][0], corners[2][1]);
MathExtra::copy3(corners[1][1], corners[2][2]);
MathExtra::copy3(corners[0][1], corners[2][3]);
// face[3]
MathExtra::copy3(corners[3][0],corners[0][3]);
MathExtra::copy3(corners[3][1],corners[0][2]);
MathExtra::copy3(corners[3][2],corners[1][2]);
MathExtra::copy3(corners[3][3],corners[1][3]);
MathExtra::copy3(corners[0][3], corners[3][0]);
MathExtra::copy3(corners[0][2], corners[3][1]);
MathExtra::copy3(corners[1][2], corners[3][2]);
MathExtra::copy3(corners[1][3], corners[3][3]);
// face[4]
MathExtra::copy3(corners[4][0],corners[0][0]);
MathExtra::copy3(corners[4][1],corners[0][3]);
MathExtra::copy3(corners[4][2],corners[1][3]);
MathExtra::copy3(corners[4][3],corners[1][0]);
MathExtra::copy3(corners[0][0], corners[4][0]);
MathExtra::copy3(corners[0][3], corners[4][1]);
MathExtra::copy3(corners[1][3], corners[4][2]);
MathExtra::copy3(corners[1][0], corners[4][3]);
// face[5]
MathExtra::copy3(corners[5][0],corners[0][1]);
MathExtra::copy3(corners[5][1],corners[1][1]);
MathExtra::copy3(corners[5][2],corners[1][2]);
MathExtra::copy3(corners[5][3],corners[0][2]);
MathExtra::copy3(corners[0][1], corners[5][0]);
MathExtra::copy3(corners[1][1], corners[5][1]);
MathExtra::copy3(corners[1][2], corners[5][2]);
MathExtra::copy3(corners[0][2], corners[5][3]);
}
/* ---------------------------------------------------------------------- */