zhyang-dev/LIGGGHTS-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/LIGGGHTS-PFM.git synced 2025-12-08 06:47:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add check for number of insert/stream fixes for integration of ms

Browse Source
This commit is contained in:
danielque
2024-01-11 15:00:37 +01:00
parent 85f926fa3e
commit a54dee2063
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/fix_multisphere.cpp
View File

@ -414,10 +414,11 @@ void FixMultisphere::initial_integrate(int vflag)
/*NL*/ //if(screen) fprintf(screen,"nbody_all %d\n",n_body_all());
/*NL*/ //if(screen && map(7833) >= 0) fprintf(screen,"proc %d has body %d at step %d\n",comm->me,7833,update->ntimestep);
bool has_stream = modify->n_fixes_style("insert/stream") > 0;
for (int ibody = 0; ibody < nbody; ibody++) {
if(timestep < start_step[ibody])
if(has_stream && timestep < start_step[ibody])
{
vectorCopy3D(v_integrate[ibody],vcm[ibody]);
@ -541,10 +542,12 @@ void FixMultisphere::final_integrate()
if(strstr(style,"nointegration"))
return;
bool has_stream = modify->n_fixes_style("insert/stream") > 0;
// resume integration
for (int ibody = 0; ibody < nbody; ibody++)
{
if(timestep < start_step[ibody]) continue;
if(has_stream && timestep < start_step[ibody]) continue;
/*NL*/ //bool eval = 13500 < update->ntimestep && 14000 > update->ntimestep;