Unverified Commit 6d9064f9 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Revert "fix bug in pair styles lubricate and lubricate/poly"

This reverts commit e368ae9f.
As it contradicts the comments in the code above the segment.
parent 92462953
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,7 @@ void PairLubricate::compute(int eflag, int vflag)
    Ef[2][2] = h_rate[2]/domain->zprd;
    Ef[2][2] = h_rate[2]/domain->zprd;
    Ef[0][1] = Ef[1][0] = 0.5 * h_rate[5]/domain->yprd;
    Ef[0][1] = Ef[1][0] = 0.5 * h_rate[5]/domain->yprd;
    Ef[0][2] = Ef[2][0] = 0.5 * h_rate[4]/domain->zprd;
    Ef[0][2] = Ef[2][0] = 0.5 * h_rate[4]/domain->zprd;
    Ef[1][2] = Ef[2][1] = 0.5 * h_rate[3]/domain->xprd;
    Ef[1][2] = Ef[2][1] = 0.5 * h_rate[3]/domain->zprd;


    // copy updated velocity/omega/angmom to the ghost particles
    // copy updated velocity/omega/angmom to the ghost particles
    // no need to do this if not shearing since comm->ghost_velocity is set
    // no need to do this if not shearing since comm->ghost_velocity is set
+1 −1
Original line number Original line Diff line number Diff line
@@ -124,7 +124,7 @@ void PairLubricatePoly::compute(int eflag, int vflag)
    Ef[2][2] = h_rate[2]/domain->zprd;
    Ef[2][2] = h_rate[2]/domain->zprd;
    Ef[0][1] = Ef[1][0] = 0.5 * h_rate[5]/domain->yprd;
    Ef[0][1] = Ef[1][0] = 0.5 * h_rate[5]/domain->yprd;
    Ef[0][2] = Ef[2][0] = 0.5 * h_rate[4]/domain->zprd;
    Ef[0][2] = Ef[2][0] = 0.5 * h_rate[4]/domain->zprd;
    Ef[1][2] = Ef[2][1] = 0.5 * h_rate[3]/domain->xprd;
    Ef[1][2] = Ef[2][1] = 0.5 * h_rate[3]/domain->zprd;


    // copy updated omega to the ghost particles
    // copy updated omega to the ghost particles
    // no need to do this if not shearing since comm->ghost_velocity is set
    // no need to do this if not shearing since comm->ghost_velocity is set