Skip to content

Commit fc1539e

Browse files
author
davidcorteso
committed
Forgot to add main SD file
1 parent 903ce90 commit fc1539e

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

fidimag/common/lib/steepest_descent.c

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void sd_update_spin (double *spin, double *spin_last,
4141
normalise(spin, pins, n);
4242
}
4343

44-
void sd_compute_step (double *spin, double *spin_last, double *field, double *scale,
44+
void sd_compute_step (double *spin, double *spin_last, double *field,
4545
double *mxH, double *mxmxH, double *mxmxH_last, double *tau,
4646
int *pins, int n, int counter, double tmin, double tmax) {
4747

@@ -62,19 +62,19 @@ void sd_compute_step (double *spin, double *spin_last, double *field, double *sc
6262
// Compute the torques
6363

6464
mxH[spin_idx] = cross_x(spin[spin_idx], spin[spin_idx + 1], spin[spin_idx + 2],
65-
field[spin_idx] * scale[i],
66-
field[spin_idx + 1] * scale[i],
67-
field[spin_idx + 2] * scale[i]);
65+
field[spin_idx],
66+
field[spin_idx + 1],
67+
field[spin_idx + 2]);
6868

6969
mxH[spin_idx + 1] = cross_y(spin[spin_idx], spin[spin_idx + 1], spin[spin_idx + 2],
70-
field[spin_idx] * scale[i],
71-
field[spin_idx + 1] * scale[i],
72-
field[spin_idx + 2] * scale[i]);
70+
field[spin_idx],
71+
field[spin_idx + 1],
72+
field[spin_idx + 2]);
7373

7474
mxH[spin_idx + 2] = cross_z(spin[spin_idx], spin[spin_idx + 1], spin[spin_idx + 2],
75-
field[spin_idx] * scale[i],
76-
field[spin_idx + 1] * scale[i],
77-
field[spin_idx + 2] * scale[i]);
75+
field[spin_idx],
76+
field[spin_idx + 1],
77+
field[spin_idx + 2]);
7878

7979
mxmxH[spin_idx] = cross_x(spin[spin_idx], spin[spin_idx + 1], spin[spin_idx + 2],
8080
mxH[spin_idx], mxH[spin_idx + 1], mxH[spin_idx + 2]);
@@ -115,5 +115,9 @@ void sd_compute_step (double *spin, double *spin_last, double *field, double *sc
115115

116116
sign = (res > 0) ? 1 : ((res < 0) ? -1 : 0);
117117
tau[i] = fmax(fmin(fabs(res), tmax), tmin) * sign;
118+
119+
// In MuMax3 they only define a specific value:
120+
// https://github.com/mumax/3/blob/master/engine/minimizer.go
121+
// tau[i] = res;
118122
}
119123
}

0 commit comments

Comments
 (0)