@@ -41,7 +41,7 @@ void sd_update_spin (double *spin, double *spin_last,
41
41
normalise (spin , pins , n );
42
42
}
43
43
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 ,
45
45
double * mxH , double * mxmxH , double * mxmxH_last , double * tau ,
46
46
int * pins , int n , int counter , double tmin , double tmax ) {
47
47
@@ -62,19 +62,19 @@ void sd_compute_step (double *spin, double *spin_last, double *field, double *sc
62
62
// Compute the torques
63
63
64
64
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 ]);
68
68
69
69
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 ]);
73
73
74
74
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 ]);
78
78
79
79
mxmxH [spin_idx ] = cross_x (spin [spin_idx ], spin [spin_idx + 1 ], spin [spin_idx + 2 ],
80
80
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
115
115
116
116
sign = (res > 0 ) ? 1 : ((res < 0 ) ? -1 : 0 );
117
117
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;
118
122
}
119
123
}
0 commit comments