Updated gamma and alpha from the examples

examples/atomic/PRL_108_017601/figure1.py

@@ -29,8 +29,8 @@ def relax_system(mesh):
 
     sim = Sim(mesh, name='relax')
     # sim.set_options(rtol=1e-10,atol=1e-14)
-    sim.alpha = 1.0
-    sim.gamma = 1.0
+    sim.driver.alpha = 1.0
+    sim.driver.gamma = 1.0
     sim.mu_s = 1.0
 
     sim.set_m(init_m)

examples/atomic/PRL_108_017601/figure2.py

@@ -18,8 +18,8 @@ def excite_system(mesh):
     sim = Sim(mesh, name='dyn')
 
     # sim.set_options(rtol=1e-10,atol=1e-14)
-    sim.alpha = 0.04
-    sim.gamma = 1.0
+    sim.driver.alpha = 0.04
+    sim.driver.gamma = 1.0
     sim.mu_s = 1.0
 
     sim.set_m(np.load('m0.npy'))

examples/atomic/PRL_111_067203/phase_script/phase.py

@@ -39,7 +39,7 @@ def excite_system(T=0.1, H=0.15):
 
     sim = Sim(mesh, name='dyn', driver='sllg')
     sim.set_options(dt=1e-14, gamma=const.gamma, k_B=const.k_B)
-    sim.alpha = 0.1
+    sim.driver.alpha = 0.1
     sim.mu_s = const.mu_s_1
 
     sim.set_m(random_m)

examples/atomic/PRL_111_067203/single.py

@@ -39,7 +39,7 @@ def relax_system(mesh):
 
     sim = Sim(mesh, name='relax')
     sim.set_default_options(gamma=const.gamma)
-    sim.alpha = 0.5
+    sim.driver.alpha = 0.5
     sim.mu_s = const.mu_s_1
 
     sim.set_m(init_m)
@@ -75,7 +75,7 @@ def excite_system(mesh):
 
     sim = Sim(mesh, name='dyn', driver='sllg')
     sim.set_options(dt=1e-14, gamma=const.gamma, k_B=const.k_B)
-    sim.alpha = 0.1
+    sim.driver.alpha = 0.1
     sim.mu_s = const.mu_s_1
     sim.T = temperature_gradient
 

examples/atomic/demag_field/demag_field.py

@@ -54,7 +54,7 @@ def relax_system():
     sim = Sim(mesh, name='relax_skx')
     sim.set_default_options(gamma=const.gamma)
 
-    sim.alpha = 1.0
+    sim.driver.alpha = 1.0
 
     sim.mu_s = mu_s
 

examples/atomic/dmi/dmi_1d.py

@@ -15,7 +15,7 @@ def init_m(pos):
 def relax_system(mesh):
 
     sim = Sim(mesh, name='relax')
-    sim.alpha = 0.1
+    sim.driver.alpha = 0.1
 
     sim.set_m(init_m)
 

examples/atomic/dmi/dmi_2d.py

@@ -19,8 +19,8 @@ def init_m(pos):
 def relax_system(mesh):
 
     sim = Sim(mesh, name='dmi_2d')
-    sim.alpha = 0.1
-    sim.gamma=1.76e11
+    sim.driver.alpha = 0.1
+    sim.driver.gamma=1.76e11
     sim.mu_s = 1e-22
 
     J = 1e-20

examples/atomic/dmi/interfacial_dmi_dw/dw.py

@@ -33,7 +33,7 @@ def relax_system(mesh):
 
     sim = Sim(mesh, name='relax')
     sim.set_default_options(gamma=constant.gamma)
-    sim.alpha = 0.5
+    sim.driver.alpha = 0.5
     sim.mu_s = constant.mu_s_1
     sim.do_precession = False
 

examples/atomic/dw_demag/dw_demag.py

@@ -22,7 +22,7 @@ def relax_system(mesh):
 
     sim = Sim(mesh, name='relax')
     sim.set_default_options(mu_s=1e-23, gamma=1.76e11)
-    sim.alpha = 1.0
+    sim.driver.alpha = 1.0
 
     J = 1e-22
     exch = UniformExchange(J)

examples/atomic/dynamic_spectrum/dyn.py

@@ -45,8 +45,8 @@ def relax_system(mesh, Hy=0):
 
     sim=Sim(mesh,name='relax')
     sim.set_options(rtol=1e-10,atol=1e-12)
-    sim.alpha = 0.5
-    sim.gamma = 1.0
+    sim.driver.alpha = 0.5
+    sim.driver.gamma = 1.0
     sim.mu_s = 1.0
 
     sim.do_precession = False
@@ -75,8 +75,8 @@ def excite_system(mesh, Hy=0):
     sim=Sim(mesh,name='dyn')
 
     sim.set_options(rtol=1e-10,atol=1e-12)
-    sim.alpha = 0.04
-    sim.gamma = 1.0
+    sim.driver.alpha = 0.04
+    sim.driver.gamma = 1.0
     sim.mu_s = 1.0
 
     sim.set_m(np.load('m0.npy'))

examples/atomic/heat/macrospin.py

@@ -24,8 +24,8 @@ def single_spin(alpha=0.01):
     mesh = CuboidMesh(nx=1, ny=1, nz=1)
 
     sim = Sim(mesh, driver='sllg')
-    sim.alpha = alpha
-    sim.gamma = mat.gamma
+    sim.driver.alpha = alpha
+    sim.driver.gamma = mat.gamma
     sim.mu_s = mat.mu_s
     sim.T = 10000
 

examples/atomic/single_spin/test_single_spin.py

@@ -27,7 +27,7 @@ def relax_system(rtol=1e-10, atol=1e-12):
     mesh = CuboidMesh(nx=1, ny=1, nz=1)
     sim = Sim(mesh, name='relax')
     sim.driver.set_tols(rtol=rtol, atol=atol)
-    sim.alpha = 0.5
+    sim.driver.alpha = 0.5
     sim.driver.gamma = 2.21e5
     sim.mu_s = 1.0
 

examples/atomic/skyrmion/skx_rotation/disk.py

@@ -52,9 +52,9 @@ def relax_system_stage1():
 
     sim = Sim(mesh, name='relax', driver='llg')
     #sim.set_options(dt=1e-14, gamma=const.gamma, k_B=const.k_B)
-    sim.alpha = 0.5
+    sim.driver.alpha = 0.5
     sim.do_precession = False
-    sim.gamma = const.gamma
+    sim.driver.gamma = const.gamma
     sim.mu_s = spatial_mu
 
     sim.set_m(init_m)
@@ -82,9 +82,9 @@ def relax_system_stage2():
     mesh = CuboidMesh(nx=140 , ny=140, nz=1)
 
     sim = Sim(mesh, name='dyn', driver='llg')
-    sim.alpha = 0.1
+    sim.driver.alpha = 0.1
     sim.do_precession = True
-    sim.gamma = const.gamma
+    sim.driver.gamma = const.gamma
     sim.mu_s = spatial_mu
 
     sim.set_m(np.load('skx.npy'))

examples/atomic/skyrmion_demag/single_ku.py

@@ -44,7 +44,7 @@ def relax_system():
     sim = Sim(mesh, name='relax_skx')
     sim.set_options(gamma=const.gamma, k_B=const.k_B)
 
-    sim.alpha = 1.0
+    sim.driver.alpha = 1.0
 
     sim.mu_s = mu_s
 

examples/atomic/stt/single_spin_stt.py

@@ -7,7 +7,7 @@ def dynamic(mesh):
 
     sim = Sim(mesh, name='dyn_spin', driver='slonczewski')
     # sim.set_options(rtol=1e-10,atol=1e-14)
-    sim.gamma = 1.0
+    sim.driver.gamma = 1.0
     sim.mu_s = 1.0
 
     sim.set_m((0.8,0,-1))
@@ -18,7 +18,7 @@ def dynamic(mesh):
     sim.p = (0,0,1)
 
     sim.u0 = 0.005
-    sim.alpha = 0.1
+    sim.driver.alpha = 0.1
 
     ts = np.linspace(0, 1200, 401)
     for t in ts:

examples/atomic/stt/stt.py

@@ -17,8 +17,8 @@ def relax_system(mesh):
 
     sim = Sim(mesh, name='relax')
     # sim.set_options(rtol=1e-10,atol=1e-14)
-    sim.alpha = 1.0
-    sim.gamma = 1.0
+    sim.driver.alpha = 1.0
+    sim.driver.gamma = 1.0
     sim.mu_s = 1.0
 
     sim.set_m(init_m)
@@ -42,7 +42,7 @@ def dynamic(mesh):
 
     sim = Sim(mesh, name='dyn', driver='slonczewski')
     # sim.set_options(rtol=1e-10,atol=1e-14)
-    sim.gamma = 1.0
+    sim.driver.gamma = 1.0
     sim.mu_s = 1.0
 
     sim.set_m(np.load('m0.npy'))
@@ -57,7 +57,7 @@ def dynamic(mesh):
     sim.p = (0,0,1)
 
     sim.u0 = 0.03
-    sim.alpha = 0.1
+    sim.driver.alpha = 0.1
 
     ts = np.linspace(0, 1e3, 101)
     for t in ts:

examples/atomic/sw.py

@@ -34,8 +34,8 @@ def pin_fun(t, mesh, spin):
 
 def relax_system(mesh):
     sim = Sim(mesh, name='relax')
-    sim.alpha = 0.5
-    sim.gamma = 5
+    sim.driver.alpha = 0.5
+    sim.driver.gamma = 5
     sim.c = 2
 
     exch = UniformExchange(1)
@@ -56,8 +56,8 @@ def relax_system(mesh):
 
 def spin_wave(mesh, m0, H0=10):
     sim = Sim(mesh, name='sw')
-    sim.alpha = 0.01
-    sim.gamma = 5
+    sim.driver.alpha = 0.01
+    sim.driver.gamma = 5
     sim.c = 2
     sim.pin_fun = pin_fun
 

examples/eigen/skx.py

@@ -39,8 +39,8 @@ def relax_system(mesh):
     sim=Sim(mesh,name='relax')
     sim.set_options(rtol=1e-12,atol=1e-14)
     sim.do_precession = False
-    sim.alpha = 0.5
-    sim.gamma = 1.0
+    sim.driver.alpha = 0.5
+    sim.driver.gamma = 1.0
     sim.mu_s = 1.0
 
     sim.set_m(init_m)

examples/micromagnetic/PRB_88_184422/fidimag/prb.py

@@ -25,8 +25,8 @@ def test_prb88_184422():
 
     sim.driver.set_tols(rtol=1e-10, atol=1e-14)
 
-    sim.alpha = 0.5
-    sim.gamma = 2.211e5
+    sim.driver.alpha = 0.5
+    sim.driver.gamma = 2.211e5
     sim.Ms = Ms
     sim.do_precession = False
 

examples/micromagnetic/baryakhtar/relax_system.py

@@ -16,9 +16,9 @@ def relax_system(mesh):
 
     sim.driver.set_tols(rtol=1e-7, atol=1e-7)
     sim.Ms = 8.0e5
-    sim.alpha = 0.1
+    sim.driver.alpha = 0.1
     sim.beta = 0
-    sim.gamma = 2.211e5
+    sim.driver.gamma = 2.211e5
 
     sim.set_m((1, 0.25, 0.1))
     # sim.set_m(np.load('m0.npy'))

examples/micromagnetic/box_real_time/box_sim_fidimag.py

@@ -282,8 +282,8 @@ def irregular_state(pos):
 sim = Sim(mesh, name=args.sim_name)
 
 # sim.driver.set_tols(rtol=1e-10, atol=1e-14)
-sim.alpha = args.alpha
-# sim.gamma = 2.211e5
+sim.driver.alpha = args.alpha
+# sim.driver.gamma = 2.211e5
 
 if args.no_precession:
     sim.do_precession = False

examples/micromagnetic/domain_wall_simple_demag/dw.py

@@ -31,9 +31,9 @@ def relax_system(mesh):
     sim = Sim(mesh, name='relax')
 
     sim.driver.set_tols(rtol=1e-8,atol=1e-8)
-    sim.gamma = 2.211e5
+    sim.driver.gamma = 2.211e5
     sim.Ms = Ms
-    sim.alpha = 0.5
+    sim.driver.alpha = 0.5
     sim.do_precession = False
 
     sim.set_m(init_dw)
@@ -68,9 +68,9 @@ def excite_system_K(mesh, Hx=2000):
     sim = Sim(mesh, name='dyn_K')
 
     sim.driver.set_tols(rtol=1e-8,atol=1e-8)
-    sim.gamma = 2.211e5
+    sim.driver.gamma = 2.211e5
     sim.Ms = Ms
-    sim.alpha = 0.005
+    sim.driver.alpha = 0.005
 
     sim.set_m(np.load('m0.npy'))
 
@@ -106,9 +106,9 @@ def excite_system_D(mesh, Hx=2000):
     sim = Sim(mesh, name='dyn_D')
 
     sim.driver.set_tols(rtol=1e-8,atol=1e-8)
-    sim.gamma = 2.211e5
+    sim.driver.gamma = 2.211e5
     sim.Ms = Ms
-    sim.alpha = 0.005
+    sim.driver.alpha = 0.005
 
     sim.set_m(np.load('m0.npy'))
 

examples/micromagnetic/dw_stt/main.py

@@ -35,8 +35,8 @@ def relax_system(mesh):
 
     # Simulation parameters
     sim.driver.set_tols(rtol=1e-8, atol=1e-10)
-    sim.alpha = 0.5
-    sim.gamma = 2.211e5
+    sim.driver.alpha = 0.5
+    sim.driver.gamma = 2.211e5
     sim.Ms = 8.6e5
     sim.do_precession = False
 
@@ -143,8 +143,8 @@ def excite_system(mesh):
     sim = Sim(mesh, name='dyn', driver='llg_stt')
 
     sim.driver.set_tols(rtol=1e-12, atol=1e-14)
-    sim.alpha = 0.05
-    sim.gamma = 2.211e5
+    sim.driver.alpha = 0.05
+    sim.driver.gamma = 2.211e5
     sim.Ms = 8.6e5
 
     # sim.set_m(init_m)

examples/micromagnetic/dw_stt_cpp/main.py

@@ -39,8 +39,8 @@ def relax_system(mesh):
 
     # Simulation parameters
     sim.driver.set_tols(rtol=1e-8, atol=1e-10)
-    sim.alpha = 0.5
-    sim.gamma = 2.211e5
+    sim.driver.alpha = 0.5
+    sim.driver.gamma = 2.211e5
     sim.Ms = 8.6e5
     sim.do_precession = False
 
@@ -97,8 +97,8 @@ def excite_system(mesh, beta=0.0):
     sim = Sim(mesh, name='dyn_%g'%beta, driver='llg_stt_cpp')
 
     sim.driver.set_tols(rtol=1e-12, atol=1e-12)
-    sim.alpha = 0.1
-    sim.gamma = 2.211e5
+    sim.driver.alpha = 0.1
+    sim.driver.gamma = 2.211e5
     sim.Ms = 8.6e5
 
     # sim.set_m(init_m)

examples/micromagnetic/nmag_example_2_box/sim.py

@@ -16,7 +16,7 @@ def run(integrator, jacobian):
         name += "_J1" if jacobian else "_J0"
     sim = Sim(mesh, name, integrator, use_jac=jacobian)
     sim.Ms = 0.86e6
-    sim.alpha = 0.5
+    sim.driver.alpha = 0.5
     sim.set_m((1, 0, 1))
     sim.add(UniformExchange(A=13e-12))
     sim.add(Demag())

examples/micromagnetic/pbc_2d/main.py

@@ -27,8 +27,8 @@ def relax_system(mesh):
     sim = Sim(mesh, name='relax')
 
     sim.driver.set_tols(rtol=1e-10, atol=1e-14)
-    sim.alpha = 0.5
-    sim.gamma = 2.211e5
+    sim.driver.alpha = 0.5
+    sim.driver.gamma = 2.211e5
     sim.Ms = 8.6e5
     sim.do_precession = False
 

examples/micromagnetic/pbc_2d/rod.py

@@ -17,8 +17,8 @@ def relax_system(mesh):
     sim = Sim(mesh, name='relax')
 
     sim.driver.set_tols(rtol=1e-10, atol=1e-14)
-    sim.alpha = 0.5
-    sim.gamma = 2.211e5
+    sim.driver.alpha = 0.5
+    sim.driver.gamma = 2.211e5
     sim.Ms = 8.6e5
     sim.do_precession = False