Commit 7df2ae38 authored by julient31's avatar julient31
Browse files

Merge branch 'OSO' of github.com:alxvov/lammps into OSO 

Conflicts:
	src/min.cpp
parents 13643294 7e5c293a

src/SPIN/min_spin_oso_lbfgs.cpp

+1 −2
Original line number Diff line number Diff line
@@ -628,7 +628,6 @@ void MinSpinOSO_LBFGS::rodrigues_rotation(const double *upp_tr, double *out) 
void MinSpinOSO_LBFGS::vm3(const double *m, const double *v, double *out)

{

  for(int i = 0; i < 3; i++){

    //out[i] *= 0.0;

    out[i] = 0.0;

    for(int j = 0; j < 3; j++)

    out[i] += *(m + 3 * j + i) * v[j];

CRA Git | Maintained and supported by SUSTech CRA and CCSE