tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix whitespace

Browse Source
This commit is contained in:
Sachith Dunatunga
2024-12-17 08:31:29 -08:00
parent 6fe5f373d9
commit 9732efa32c
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GRANULAR/fix_wall_gran.h
View File

@ -51,8 +51,8 @@ class FixWallGran : public Fix {
void reset_dt() override;
// for granular model choices
class Granular_NS::GranularModel *model;
void clear_stored_contacts();
class Granular_NS::GranularModel *model;
void clear_stored_contacts();
protected:
int wallstyle, wiggle, wshear, axis;

4
src/GRANULAR/fix_wall_gran_region.cpp
View File

@ -228,8 +228,8 @@ void FixWallGranRegion::post_force(int /*vflag*/)
model->radi = radius[i];
model->radj = region->contact[ic].radius;
model->r = region->contact[ic].r;
model->i = i;
model->j = ic;
model->i = i;
model->j = ic;
if (model->beyond_contact) model->touch = history_many[i][c2r[ic]][0];

4
src/GRANULAR/fix_wall_gran_region.h
View File

@ -44,8 +44,8 @@ class FixWallGranRegion : public FixWallGran {
int size_restart(int) override;
int maxsize_restart() override;
class Region *region;
void update_contacts(int, int);
class Region *region;
void update_contacts(int, int);
int tmax; // max # of region walls one particle can touch
int *ncontact; // # of shear contacts per particle
int **walls; // which wall each contact is with

8
src/GRANULAR/gran_sub_mod_normal.cpp
View File

@ -410,7 +410,7 @@ GranSubModNormalMDR::GranSubModNormalMDR(GranularModel *gm, LAMMPS *lmp) :
GranSubModNormal(gm, lmp)
{
if (lmp->citeme) lmp->citeme->add(cite_mdr);
num_coeffs = 6; // Young's Modulus, Poisson's ratio, yield stress, effective surface energy, psi_b, coefficent of restitution
contact_radius_flag = 1;
size_history = 26;
@ -453,7 +453,7 @@ double GranSubModNormalMDR::calculate_forces()
// The MDR contact model was developed by imagining individual particles being
// squished between a number of rigid flats (references below). To allow
// for many interacting particles, we extend the idea of isolated particles surrounded
// by rigid flats. In particular, we imagine placing rigid flats at the overlaps
// by rigid flats. In particular, we imagine placing rigid flats at the overlaps
// between particles. The force is calculated seperately on both sides
// of the contact assuming interaction with a rigid flat. The two forces are then
// averaged on either side of the contact to determine the final force. If the
@ -461,7 +461,7 @@ double GranSubModNormalMDR::calculate_forces()
//
// Zunker and Kamrin, 2024, Part I: https://doi.org/10.1016/j.jmps.2023.105492
// Zunker and Kamrin, 2024, Part II: https://doi.org/10.1016/j.jmps.2023.105493
// Zunker, Dunatunga, Thakur, Tang, and Kamrin, 2025:
// Zunker, Dunatunga, Thakur, Tang, and Kamrin, 2025:
const int itag_true = atom->tag[gm->i]; // true i particle tag
const int jtag_true = atom->tag[gm->j]; // true j particle tag
@ -861,7 +861,7 @@ double GranSubModNormalMDR::calculate_forces()
const double eps_bar_contact = (1.0/(3*kappa*Velas[i]))*(fx*bx + fy*by + fz*bz);
eps_bar[i] += eps_bar_contact;
double desp_bar_contact = eps_bar_contact - *eps_bar_offset;
double desp_bar_contact = eps_bar_contact - *eps_bar_offset;
if(delta_MDR == deltamax_MDR && *Yflag_offset > 0.0 && F_MDR > 0.0){
const double Vo = (4.0/3.0)*MY_PI*pow(Ro,3.0);
dRnumerator[i] += -Vo*(eps_bar_contact - *eps_bar_offset) - wij*MY_PI*ddeltao*( 2.0*deltao*Ro - pow(deltao,2.0) + pow(R,2.0) - pow(Ro,2.0) );

6
src/fix_mdr_mean_surf_disp.cpp
View File

@ -173,7 +173,7 @@ void FixMDRmeanSurfDisp::pre_force(int)
history_ik = &allhistory[size_history * kk];
double * pik = &history_ik[22]; // penalty for contact i and k
// we don't know if who owns the contact ahead of time, k might be in j's neigbor list or vice versa,
// we don't know if who owns the contact ahead of time, k might be in j's neigbor list or vice versa,
// so we need to manually search to figure out the owner check if k is in the neighbor list of j
double * pjk = NULL;
int * const jklist = firstneigh[j];
@ -369,7 +369,7 @@ void FixMDRmeanSurfDisp::pre_force(int)
if (Acon0[i0] != 0.0) {
const double Ac_offset0 = history[Ac_offset_0];
ddelta_bar[i0] += Ac_offset0/Acon0[i0]*ddel0;
ddelta_bar[i0] += Ac_offset0/Acon0[i0]*ddel0;
}
if (Acon0[i1] != 0.0) {
@ -458,7 +458,7 @@ void FixMDRmeanSurfDisp::pre_force(int)
const double delta_offset0 = fix->history_many[i][fix->c2r[ic]][0];
const double ddelta = delta - delta_offset0;
const double Ac_offset0 = fix->history_many[i][fix->c2r[ic]][18];
ddelta_bar[i] += wij*Ac_offset0/Acon0[i]*ddelta;
ddelta_bar[i] += wij*Ac_offset0/Acon0[i]*ddelta;
}
}
}