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

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10532 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2013-08-02 16:14:13 +00:00
parent c4f9a6fff3
commit 8c443c7613
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/GRANULAR/pair_gran_hooke_history.cpp
View File

@ -28,6 +28,7 @@
#include "modify.h"
#include "fix.h"
#include "fix_pour.h"
#include "fix_deposit.h"
#include "fix_shear_history.h"
#include "comm.h"
#include "neighbor.h"
@ -450,7 +451,7 @@ void PairGranHookeHistory::init_style()
if (i < modify->nfix) freeze_group_bit = modify->fix[i]->groupbit;
else freeze_group_bit = 0;
// check for FixPour and set pour_type and pour_maxdiam
// check for FixPour and set pour_type and pour_maxrad
int pour_type = 0;
double pour_maxrad = 0.0;
@ -461,6 +462,17 @@ void PairGranHookeHistory::init_style()
pour_maxrad = ((FixPour *) modify->fix[i])->radius_max;
}
// check for FixDeposit and set deposit_type and deposit_maxrad
int deposit_type = 0;
double deposit_maxrad = 0.0;
for (i = 0; i < modify->nfix; i++)
if (strcmp(modify->fix[i]->style,"deposit") == 0) break;
if (i < modify->nfix) {
deposit_type = ((FixDeposit *) modify->fix[i])->ntype;
deposit_maxrad = 0.5;
}
// check for FixRigid
fix_rigid = NULL;
@ -469,11 +481,13 @@ void PairGranHookeHistory::init_style()
if (i < modify->nfix) fix_rigid = modify->fix[i];
// set maxrad_dynamic and maxrad_frozen for each type
// include future Fix pour particles as dynamic
// include future FixPour and FixDeposit particles as dynamic
for (i = 1; i <= atom->ntypes; i++)
onerad_dynamic[i] = onerad_frozen[i] = 0.0;
if (pour_type) onerad_dynamic[pour_type] = pour_maxrad;
if (deposit_type) onerad_dynamic[deposit_type] =
MAX(onerad_dynamic[deposit_type],deposit_maxrad);
double *radius = atom->radius;
int *mask = atom->mask;