Skip to content

Commit c6adb44

Browse files
davidcortesortunodavidcortesortuno
committed
Updated gamma and alpha from the examples
1 parent 3be7608 commit c6adb44

File tree

44 files changed

+99
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+99
-99
lines changed

Diff for: ‎examples/atomic/PRL_108_017601/figure1.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ def relax_system(mesh):
2929

3030
sim = Sim(mesh, name='relax')
3131
# sim.set_options(rtol=1e-10,atol=1e-14)
32-
sim.alpha = 1.0
33-
sim.gamma = 1.0
32+
sim.driver.alpha = 1.0
33+
sim.driver.gamma = 1.0
3434
sim.mu_s = 1.0
3535

3636
sim.set_m(init_m)

Diff for: ‎examples/atomic/PRL_108_017601/figure2.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ def excite_system(mesh):
1818
sim = Sim(mesh, name='dyn')
1919

2020
# sim.set_options(rtol=1e-10,atol=1e-14)
21-
sim.alpha = 0.04
22-
sim.gamma = 1.0
21+
sim.driver.alpha = 0.04
22+
sim.driver.gamma = 1.0
2323
sim.mu_s = 1.0
2424

2525
sim.set_m(np.load('m0.npy'))

Diff for: ‎examples/atomic/PRL_111_067203/phase_script/phase.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def excite_system(T=0.1, H=0.15):
3939

4040
sim = Sim(mesh, name='dyn', driver='sllg')
4141
sim.set_options(dt=1e-14, gamma=const.gamma, k_B=const.k_B)
42-
sim.alpha = 0.1
42+
sim.driver.alpha = 0.1
4343
sim.mu_s = const.mu_s_1
4444

4545
sim.set_m(random_m)

Diff for: ‎examples/atomic/PRL_111_067203/single.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def relax_system(mesh):
3939

4040
sim = Sim(mesh, name='relax')
4141
sim.set_default_options(gamma=const.gamma)
42-
sim.alpha = 0.5
42+
sim.driver.alpha = 0.5
4343
sim.mu_s = const.mu_s_1
4444

4545
sim.set_m(init_m)
@@ -75,7 +75,7 @@ def excite_system(mesh):
7575

7676
sim = Sim(mesh, name='dyn', driver='sllg')
7777
sim.set_options(dt=1e-14, gamma=const.gamma, k_B=const.k_B)
78-
sim.alpha = 0.1
78+
sim.driver.alpha = 0.1
7979
sim.mu_s = const.mu_s_1
8080
sim.T = temperature_gradient
8181

Diff for: ‎examples/atomic/demag_field/demag_field.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def relax_system():
5454
sim = Sim(mesh, name='relax_skx')
5555
sim.set_default_options(gamma=const.gamma)
5656

57-
sim.alpha = 1.0
57+
sim.driver.alpha = 1.0
5858

5959
sim.mu_s = mu_s
6060

Diff for: ‎examples/atomic/dmi/dmi_1d.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def init_m(pos):
1515
def relax_system(mesh):
1616

1717
sim = Sim(mesh, name='relax')
18-
sim.alpha = 0.1
18+
sim.driver.alpha = 0.1
1919

2020
sim.set_m(init_m)
2121

Diff for: ‎examples/atomic/dmi/dmi_2d.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def init_m(pos):
1919
def relax_system(mesh):
2020

2121
sim = Sim(mesh, name='dmi_2d')
22-
sim.alpha = 0.1
23-
sim.gamma=1.76e11
22+
sim.driver.alpha = 0.1
23+
sim.driver.gamma=1.76e11
2424
sim.mu_s = 1e-22
2525

2626
J = 1e-20

Diff for: ‎examples/atomic/dmi/interfacial_dmi_dw/dw.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def relax_system(mesh):
3333

3434
sim = Sim(mesh, name='relax')
3535
sim.set_default_options(gamma=constant.gamma)
36-
sim.alpha = 0.5
36+
sim.driver.alpha = 0.5
3737
sim.mu_s = constant.mu_s_1
3838
sim.do_precession = False
3939

Diff for: ‎examples/atomic/dw_demag/dw_demag.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def relax_system(mesh):
2222

2323
sim = Sim(mesh, name='relax')
2424
sim.set_default_options(mu_s=1e-23, gamma=1.76e11)
25-
sim.alpha = 1.0
25+
sim.driver.alpha = 1.0
2626

2727
J = 1e-22
2828
exch = UniformExchange(J)

Diff for: ‎examples/atomic/dynamic_spectrum/dyn.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ def relax_system(mesh, Hy=0):
4545

4646
sim=Sim(mesh,name='relax')
4747
sim.set_options(rtol=1e-10,atol=1e-12)
48-
sim.alpha = 0.5
49-
sim.gamma = 1.0
48+
sim.driver.alpha = 0.5
49+
sim.driver.gamma = 1.0
5050
sim.mu_s = 1.0
5151

5252
sim.do_precession = False
@@ -75,8 +75,8 @@ def excite_system(mesh, Hy=0):
7575
sim=Sim(mesh,name='dyn')
7676

7777
sim.set_options(rtol=1e-10,atol=1e-12)
78-
sim.alpha = 0.04
79-
sim.gamma = 1.0
78+
sim.driver.alpha = 0.04
79+
sim.driver.gamma = 1.0
8080
sim.mu_s = 1.0
8181

8282
sim.set_m(np.load('m0.npy'))

Diff for: ‎examples/atomic/heat/macrospin.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ def single_spin(alpha=0.01):
2424
mesh = CuboidMesh(nx=1, ny=1, nz=1)
2525

2626
sim = Sim(mesh, driver='sllg')
27-
sim.alpha = alpha
28-
sim.gamma = mat.gamma
27+
sim.driver.alpha = alpha
28+
sim.driver.gamma = mat.gamma
2929
sim.mu_s = mat.mu_s
3030
sim.T = 10000
3131

Diff for: ‎examples/atomic/single_spin/test_single_spin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def relax_system(rtol=1e-10, atol=1e-12):
2727
mesh = CuboidMesh(nx=1, ny=1, nz=1)
2828
sim = Sim(mesh, name='relax')
2929
sim.driver.set_tols(rtol=rtol, atol=atol)
30-
sim.alpha = 0.5
30+
sim.driver.alpha = 0.5
3131
sim.driver.gamma = 2.21e5
3232
sim.mu_s = 1.0
3333

Diff for: ‎examples/atomic/skyrmion/skx_rotation/disk.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ def relax_system_stage1():
5252

5353
sim = Sim(mesh, name='relax', driver='llg')
5454
#sim.set_options(dt=1e-14, gamma=const.gamma, k_B=const.k_B)
55-
sim.alpha = 0.5
55+
sim.driver.alpha = 0.5
5656
sim.do_precession = False
57-
sim.gamma = const.gamma
57+
sim.driver.gamma = const.gamma
5858
sim.mu_s = spatial_mu
5959

6060
sim.set_m(init_m)
@@ -82,9 +82,9 @@ def relax_system_stage2():
8282
mesh = CuboidMesh(nx=140 , ny=140, nz=1)
8383

8484
sim = Sim(mesh, name='dyn', driver='llg')
85-
sim.alpha = 0.1
85+
sim.driver.alpha = 0.1
8686
sim.do_precession = True
87-
sim.gamma = const.gamma
87+
sim.driver.gamma = const.gamma
8888
sim.mu_s = spatial_mu
8989

9090
sim.set_m(np.load('skx.npy'))

Diff for: ‎examples/atomic/skyrmion_demag/single_ku.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def relax_system():
4444
sim = Sim(mesh, name='relax_skx')
4545
sim.set_options(gamma=const.gamma, k_B=const.k_B)
4646

47-
sim.alpha = 1.0
47+
sim.driver.alpha = 1.0
4848

4949
sim.mu_s = mu_s
5050

Diff for: ‎examples/atomic/stt/single_spin_stt.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def dynamic(mesh):
77

88
sim = Sim(mesh, name='dyn_spin', driver='slonczewski')
99
# sim.set_options(rtol=1e-10,atol=1e-14)
10-
sim.gamma = 1.0
10+
sim.driver.gamma = 1.0
1111
sim.mu_s = 1.0
1212

1313
sim.set_m((0.8,0,-1))
@@ -18,7 +18,7 @@ def dynamic(mesh):
1818
sim.p = (0,0,1)
1919

2020
sim.u0 = 0.005
21-
sim.alpha = 0.1
21+
sim.driver.alpha = 0.1
2222

2323
ts = np.linspace(0, 1200, 401)
2424
for t in ts:

Diff for: ‎examples/atomic/stt/stt.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def relax_system(mesh):
1717

1818
sim = Sim(mesh, name='relax')
1919
# sim.set_options(rtol=1e-10,atol=1e-14)
20-
sim.alpha = 1.0
21-
sim.gamma = 1.0
20+
sim.driver.alpha = 1.0
21+
sim.driver.gamma = 1.0
2222
sim.mu_s = 1.0
2323

2424
sim.set_m(init_m)
@@ -42,7 +42,7 @@ def dynamic(mesh):
4242

4343
sim = Sim(mesh, name='dyn', driver='slonczewski')
4444
# sim.set_options(rtol=1e-10,atol=1e-14)
45-
sim.gamma = 1.0
45+
sim.driver.gamma = 1.0
4646
sim.mu_s = 1.0
4747

4848
sim.set_m(np.load('m0.npy'))
@@ -57,7 +57,7 @@ def dynamic(mesh):
5757
sim.p = (0,0,1)
5858

5959
sim.u0 = 0.03
60-
sim.alpha = 0.1
60+
sim.driver.alpha = 0.1
6161

6262
ts = np.linspace(0, 1e3, 101)
6363
for t in ts:

Diff for: ‎examples/atomic/sw.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def pin_fun(t, mesh, spin):
3434

3535
def relax_system(mesh):
3636
sim = Sim(mesh, name='relax')
37-
sim.alpha = 0.5
38-
sim.gamma = 5
37+
sim.driver.alpha = 0.5
38+
sim.driver.gamma = 5
3939
sim.c = 2
4040

4141
exch = UniformExchange(1)
@@ -56,8 +56,8 @@ def relax_system(mesh):
5656

5757
def spin_wave(mesh, m0, H0=10):
5858
sim = Sim(mesh, name='sw')
59-
sim.alpha = 0.01
60-
sim.gamma = 5
59+
sim.driver.alpha = 0.01
60+
sim.driver.gamma = 5
6161
sim.c = 2
6262
sim.pin_fun = pin_fun
6363

Diff for: ‎examples/eigen/skx.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ def relax_system(mesh):
3939
sim=Sim(mesh,name='relax')
4040
sim.set_options(rtol=1e-12,atol=1e-14)
4141
sim.do_precession = False
42-
sim.alpha = 0.5
43-
sim.gamma = 1.0
42+
sim.driver.alpha = 0.5
43+
sim.driver.gamma = 1.0
4444
sim.mu_s = 1.0
4545

4646
sim.set_m(init_m)

Diff for: ‎examples/micromagnetic/PRB_88_184422/fidimag/prb.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def test_prb88_184422():
2525

2626
sim.driver.set_tols(rtol=1e-10, atol=1e-14)
2727

28-
sim.alpha = 0.5
29-
sim.gamma = 2.211e5
28+
sim.driver.alpha = 0.5
29+
sim.driver.gamma = 2.211e5
3030
sim.Ms = Ms
3131
sim.do_precession = False
3232

Diff for: ‎examples/micromagnetic/baryakhtar/relax_system.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ def relax_system(mesh):
1616

1717
sim.driver.set_tols(rtol=1e-7, atol=1e-7)
1818
sim.Ms = 8.0e5
19-
sim.alpha = 0.1
19+
sim.driver.alpha = 0.1
2020
sim.beta = 0
21-
sim.gamma = 2.211e5
21+
sim.driver.gamma = 2.211e5
2222

2323
sim.set_m((1, 0.25, 0.1))
2424
# sim.set_m(np.load('m0.npy'))

Diff for: ‎examples/micromagnetic/box_real_time/box_sim_fidimag.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ def irregular_state(pos):
282282
sim = Sim(mesh, name=args.sim_name)
283283

284284
# sim.driver.set_tols(rtol=1e-10, atol=1e-14)
285-
sim.alpha = args.alpha
286-
# sim.gamma = 2.211e5
285+
sim.driver.alpha = args.alpha
286+
# sim.driver.gamma = 2.211e5
287287

288288
if args.no_precession:
289289
sim.do_precession = False

Diff for: ‎examples/micromagnetic/domain_wall_simple_demag/dw.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ def relax_system(mesh):
3131
sim = Sim(mesh, name='relax')
3232

3333
sim.driver.set_tols(rtol=1e-8,atol=1e-8)
34-
sim.gamma = 2.211e5
34+
sim.driver.gamma = 2.211e5
3535
sim.Ms = Ms
36-
sim.alpha = 0.5
36+
sim.driver.alpha = 0.5
3737
sim.do_precession = False
3838

3939
sim.set_m(init_dw)
@@ -68,9 +68,9 @@ def excite_system_K(mesh, Hx=2000):
6868
sim = Sim(mesh, name='dyn_K')
6969

7070
sim.driver.set_tols(rtol=1e-8,atol=1e-8)
71-
sim.gamma = 2.211e5
71+
sim.driver.gamma = 2.211e5
7272
sim.Ms = Ms
73-
sim.alpha = 0.005
73+
sim.driver.alpha = 0.005
7474

7575
sim.set_m(np.load('m0.npy'))
7676

@@ -106,9 +106,9 @@ def excite_system_D(mesh, Hx=2000):
106106
sim = Sim(mesh, name='dyn_D')
107107

108108
sim.driver.set_tols(rtol=1e-8,atol=1e-8)
109-
sim.gamma = 2.211e5
109+
sim.driver.gamma = 2.211e5
110110
sim.Ms = Ms
111-
sim.alpha = 0.005
111+
sim.driver.alpha = 0.005
112112

113113
sim.set_m(np.load('m0.npy'))
114114

Diff for: ‎examples/micromagnetic/dw_stt/main.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ def relax_system(mesh):
3535

3636
# Simulation parameters
3737
sim.driver.set_tols(rtol=1e-8, atol=1e-10)
38-
sim.alpha = 0.5
39-
sim.gamma = 2.211e5
38+
sim.driver.alpha = 0.5
39+
sim.driver.gamma = 2.211e5
4040
sim.Ms = 8.6e5
4141
sim.do_precession = False
4242

@@ -143,8 +143,8 @@ def excite_system(mesh):
143143
sim = Sim(mesh, name='dyn', driver='llg_stt')
144144

145145
sim.driver.set_tols(rtol=1e-12, atol=1e-14)
146-
sim.alpha = 0.05
147-
sim.gamma = 2.211e5
146+
sim.driver.alpha = 0.05
147+
sim.driver.gamma = 2.211e5
148148
sim.Ms = 8.6e5
149149

150150
# sim.set_m(init_m)

Diff for: ‎examples/micromagnetic/dw_stt_cpp/main.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ def relax_system(mesh):
3939

4040
# Simulation parameters
4141
sim.driver.set_tols(rtol=1e-8, atol=1e-10)
42-
sim.alpha = 0.5
43-
sim.gamma = 2.211e5
42+
sim.driver.alpha = 0.5
43+
sim.driver.gamma = 2.211e5
4444
sim.Ms = 8.6e5
4545
sim.do_precession = False
4646

@@ -97,8 +97,8 @@ def excite_system(mesh, beta=0.0):
9797
sim = Sim(mesh, name='dyn_%g'%beta, driver='llg_stt_cpp')
9898

9999
sim.driver.set_tols(rtol=1e-12, atol=1e-12)
100-
sim.alpha = 0.1
101-
sim.gamma = 2.211e5
100+
sim.driver.alpha = 0.1
101+
sim.driver.gamma = 2.211e5
102102
sim.Ms = 8.6e5
103103

104104
# sim.set_m(init_m)

Diff for: ‎examples/micromagnetic/nmag_example_2_box/sim.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def run(integrator, jacobian):
1616
name += "_J1" if jacobian else "_J0"
1717
sim = Sim(mesh, name, integrator, use_jac=jacobian)
1818
sim.Ms = 0.86e6
19-
sim.alpha = 0.5
19+
sim.driver.alpha = 0.5
2020
sim.set_m((1, 0, 1))
2121
sim.add(UniformExchange(A=13e-12))
2222
sim.add(Demag())

Diff for: ‎examples/micromagnetic/pbc_2d/main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ def relax_system(mesh):
2727
sim = Sim(mesh, name='relax')
2828

2929
sim.driver.set_tols(rtol=1e-10, atol=1e-14)
30-
sim.alpha = 0.5
31-
sim.gamma = 2.211e5
30+
sim.driver.alpha = 0.5
31+
sim.driver.gamma = 2.211e5
3232
sim.Ms = 8.6e5
3333
sim.do_precession = False
3434

Diff for: ‎examples/micromagnetic/pbc_2d/rod.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def relax_system(mesh):
1717
sim = Sim(mesh, name='relax')
1818

1919
sim.driver.set_tols(rtol=1e-10, atol=1e-14)
20-
sim.alpha = 0.5
21-
sim.gamma = 2.211e5
20+
sim.driver.alpha = 0.5
21+
sim.driver.gamma = 2.211e5
2222
sim.Ms = 8.6e5
2323
sim.do_precession = False
2424

0 commit comments

Comments
 (0)