ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up pair body rounded/polyhedron

Browse Source
This commit is contained in:
Trung Nguyen
2018-05-30 00:04:48 -05:00
parent f5e9b1e021
commit 82b1ab2ac4
3 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BODY/fix_wall_body_polygon.cpp
View File

@ -12,7 +12,7 @@
------------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
Contributing authors: Trung Dac Nguyen (ndactrung@gmail.com)
Contributing author: Trung Dac Nguyen (ndactrung@gmail.com)
------------------------------------------------------------------------- */
#include <cmath>

2
src/BODY/fix_wall_body_polyhedron.cpp
View File

@ -12,7 +12,7 @@
------------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
Contributing authors: Trung Dac Nguyen (ndactrung@gmail.com)
Contributing author: Trung Dac Nguyen (ndactrung@gmail.com)
------------------------------------------------------------------------- */
#include <cmath>

44
src/BODY/pair_body_rounded_polyhedron.cpp
View File

@ -609,15 +609,6 @@ void PairBodyRoundedPolyhedron::sphere_against_sphere(int ibody, int jbody,
energy = 0;
kernel_force(R, itype, jtype, energy, fpair);
/*
if (R <= 0) { // deformation occurs
fpair = -k_n * R - shift;
energy = (0.5 * k_n * R + shift) * R;
} else if (R <= cut_inner) { // not deforming but cohesive ranges overlap
fpair = k_na * R - shift;
energy = (-0.5 * k_na * R + shift) * R;
} else fpair = 0.0;
*/
fx = delx*fpair/rij;
fy = dely*fpair/rij;
@ -756,16 +747,6 @@ void PairBodyRoundedPolyhedron::sphere_against_edge(int ibody, int jbody,
energy = 0;
kernel_force(R, itype, jtype, energy, fpair);
/*
if (R <= 0) { // deformation occurs
fpair = -k_n * R - shift;
energy = (0.5 * k_n * R + shift) * R;
} else if (R <= cut_inner) { // not deforming but cohesive ranges overlap
fpair = k_na * R - shift;
energy = (-0.5 * k_na * R + shift) * R;
} else fpair = 0.0;
*/
fx = delx*fpair/rij;
fy = dely*fpair/rij;
@ -908,15 +889,6 @@ void PairBodyRoundedPolyhedron::sphere_against_face(int ibody, int jbody,
energy = 0;
kernel_force(R, itype, jtype, energy, fpair);
/*
if (R <= 0) { // deformation occurs
fpair = -k_n * R - shift;
energy = (0.5 * k_n * R + shift) * R;
} else if (R <= cut_inner) { // not deforming but cohesive ranges overlap
fpair = k_na * R - shift;
energy = (-0.5 * k_na * R + shift) * R;
} else fpair = 0.0;
*/
fx = delx*fpair/rij;
fy = dely*fpair/rij;
@ -1506,15 +1478,6 @@ void PairBodyRoundedPolyhedron::pair_force_and_torque(int ibody, int jbody,
R = r - contact_dist;
kernel_force(R, itype, jtype, energy, fpair);
/*
if (R <= 0) { // deformation occurs
fpair = -k_n * R - shift;
energy += (0.5 * k_n * R + shift) * R;
} else if (R <= cut_inner) { // not deforming but cohesive ranges overlap
fpair = k_na * R - shift;
energy += (-0.5 * k_na * R + shift) * R;
} else fpair = 0.0;
*/
fx = delx*fpair/r;
fy = dely*fpair/r;
@ -1743,13 +1706,6 @@ void PairBodyRoundedPolyhedron::rescale_cohesive_forces(double** x,
double energy = 0;
kernel_force(R, itype, jtype, energy, fpair);
/*
if (R <= 0) { // deformation occurs
fpair = -k_n * R - shift;
} else if (R <= cut_inner) { // not deforming but cohesive ranges overlap
fpair = k_na * R - shift;
} else fpair = 0.0;
*/
fpair *= j_a;
fx = delx*fpair/r;