From c6adb443db59905c14d5700a89557f0e08adc5fe Mon Sep 17 00:00:00 2001 From: davidcorteso Date: Sun, 13 Nov 2016 19:56:29 +0000 Subject: [PATCH] Updated gamma and alpha from the examples --- examples/atomic/PRL_108_017601/figure1.py | 4 ++-- examples/atomic/PRL_108_017601/figure2.py | 4 ++-- examples/atomic/PRL_111_067203/phase_script/phase.py | 2 +- examples/atomic/PRL_111_067203/single.py | 4 ++-- examples/atomic/demag_field/demag_field.py | 2 +- examples/atomic/dmi/dmi_1d.py | 2 +- examples/atomic/dmi/dmi_2d.py | 4 ++-- examples/atomic/dmi/interfacial_dmi_dw/dw.py | 2 +- examples/atomic/dw_demag/dw_demag.py | 2 +- examples/atomic/dynamic_spectrum/dyn.py | 8 ++++---- examples/atomic/heat/macrospin.py | 4 ++-- examples/atomic/single_spin/test_single_spin.py | 2 +- examples/atomic/skyrmion/skx_rotation/disk.py | 8 ++++---- examples/atomic/skyrmion_demag/single_ku.py | 2 +- examples/atomic/stt/single_spin_stt.py | 4 ++-- examples/atomic/stt/stt.py | 8 ++++---- examples/atomic/sw.py | 8 ++++---- examples/eigen/skx.py | 4 ++-- examples/micromagnetic/PRB_88_184422/fidimag/prb.py | 4 ++-- examples/micromagnetic/baryakhtar/relax_system.py | 4 ++-- .../micromagnetic/box_real_time/box_sim_fidimag.py | 4 ++-- .../micromagnetic/domain_wall_simple_demag/dw.py | 12 ++++++------ examples/micromagnetic/dw_stt/main.py | 8 ++++---- examples/micromagnetic/dw_stt_cpp/main.py | 8 ++++---- examples/micromagnetic/nmag_example_2_box/sim.py | 2 +- examples/micromagnetic/pbc_2d/main.py | 4 ++-- examples/micromagnetic/pbc_2d/rod.py | 4 ++-- examples/micromagnetic/pbc_2d/single_cube.py | 4 ++-- examples/micromagnetic/single_spin/single_spin.py | 2 +- .../single_spin_microwave/single_spin.py | 2 +- .../micromagnetic/skyrmion/Belavin_Polyakov/main.py | 8 ++++---- examples/micromagnetic/skyrmion/Ku_H/main.py | 4 ++-- examples/micromagnetic/skyrmion/lattice/main.py | 4 ++-- examples/micromagnetic/skyrmion/main.py | 4 ++-- examples/micromagnetic/skyrmion_stt/main.py | 8 ++++---- examples/micromagnetic/spatial_dmi/main.py | 4 ++-- examples/micromagnetic/std4/main.py | 8 ++++---- examples/micromagnetic/vortex/main.py | 8 ++++---- .../skyrmion/relaxation/skyrmion_down_relax.py | 2 +- .../skyrmion/relaxation/skyrmion_relax.py | 2 +- .../nebm_atomistic/1D_spin_chain/neb_helicoid-fm.py | 2 +- .../1D_spin_chain/relaxation/1D_spin_chain.py | 4 ++-- .../1D_spin_chain/relaxation/1D_spin_chain_fm.py | 4 ++-- examples/nebm_atomistic/skyrmion_reduced/relax.py | 4 ++-- 44 files changed, 99 insertions(+), 99 deletions(-) diff --git a/examples/atomic/PRL_108_017601/figure1.py b/examples/atomic/PRL_108_017601/figure1.py index bf3ea94a..be038358 100644 --- a/examples/atomic/PRL_108_017601/figure1.py +++ b/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) diff --git a/examples/atomic/PRL_108_017601/figure2.py b/examples/atomic/PRL_108_017601/figure2.py index 0dc97f03..a2b31033 100644 --- a/examples/atomic/PRL_108_017601/figure2.py +++ b/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')) diff --git a/examples/atomic/PRL_111_067203/phase_script/phase.py b/examples/atomic/PRL_111_067203/phase_script/phase.py index 45a56f47..c01c09c1 100644 --- a/examples/atomic/PRL_111_067203/phase_script/phase.py +++ b/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) diff --git a/examples/atomic/PRL_111_067203/single.py b/examples/atomic/PRL_111_067203/single.py index 05fdaba2..50441ea4 100644 --- a/examples/atomic/PRL_111_067203/single.py +++ b/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 diff --git a/examples/atomic/demag_field/demag_field.py b/examples/atomic/demag_field/demag_field.py index f293d996..08e5b186 100644 --- a/examples/atomic/demag_field/demag_field.py +++ b/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 diff --git a/examples/atomic/dmi/dmi_1d.py b/examples/atomic/dmi/dmi_1d.py index c06eec58..99ab0967 100644 --- a/examples/atomic/dmi/dmi_1d.py +++ b/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) diff --git a/examples/atomic/dmi/dmi_2d.py b/examples/atomic/dmi/dmi_2d.py index 754d7eea..b71fc4d7 100644 --- a/examples/atomic/dmi/dmi_2d.py +++ b/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 diff --git a/examples/atomic/dmi/interfacial_dmi_dw/dw.py b/examples/atomic/dmi/interfacial_dmi_dw/dw.py index 9ca06ca2..63062187 100644 --- a/examples/atomic/dmi/interfacial_dmi_dw/dw.py +++ b/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 diff --git a/examples/atomic/dw_demag/dw_demag.py b/examples/atomic/dw_demag/dw_demag.py index 3c000f0d..6728c225 100644 --- a/examples/atomic/dw_demag/dw_demag.py +++ b/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) diff --git a/examples/atomic/dynamic_spectrum/dyn.py b/examples/atomic/dynamic_spectrum/dyn.py index cc9824b6..3c6fb7e3 100644 --- a/examples/atomic/dynamic_spectrum/dyn.py +++ b/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')) diff --git a/examples/atomic/heat/macrospin.py b/examples/atomic/heat/macrospin.py index 1b2f8718..523185f8 100644 --- a/examples/atomic/heat/macrospin.py +++ b/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 diff --git a/examples/atomic/single_spin/test_single_spin.py b/examples/atomic/single_spin/test_single_spin.py index 1943c11a..ff6f63ce 100644 --- a/examples/atomic/single_spin/test_single_spin.py +++ b/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 diff --git a/examples/atomic/skyrmion/skx_rotation/disk.py b/examples/atomic/skyrmion/skx_rotation/disk.py index aed7a58d..70aeaf02 100644 --- a/examples/atomic/skyrmion/skx_rotation/disk.py +++ b/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')) diff --git a/examples/atomic/skyrmion_demag/single_ku.py b/examples/atomic/skyrmion_demag/single_ku.py index a14c1502..bf7ae55b 100644 --- a/examples/atomic/skyrmion_demag/single_ku.py +++ b/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 diff --git a/examples/atomic/stt/single_spin_stt.py b/examples/atomic/stt/single_spin_stt.py index f74f6931..6307f29a 100644 --- a/examples/atomic/stt/single_spin_stt.py +++ b/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: diff --git a/examples/atomic/stt/stt.py b/examples/atomic/stt/stt.py index e4d8d418..eee947a3 100644 --- a/examples/atomic/stt/stt.py +++ b/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: diff --git a/examples/atomic/sw.py b/examples/atomic/sw.py index 8d4dda7b..34a5fe86 100644 --- a/examples/atomic/sw.py +++ b/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 diff --git a/examples/eigen/skx.py b/examples/eigen/skx.py index f0f56bd9..1f005adb 100644 --- a/examples/eigen/skx.py +++ b/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) diff --git a/examples/micromagnetic/PRB_88_184422/fidimag/prb.py b/examples/micromagnetic/PRB_88_184422/fidimag/prb.py index d270bd1c..90b94aeb 100644 --- a/examples/micromagnetic/PRB_88_184422/fidimag/prb.py +++ b/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 diff --git a/examples/micromagnetic/baryakhtar/relax_system.py b/examples/micromagnetic/baryakhtar/relax_system.py index 0f2f6029..b530e98d 100644 --- a/examples/micromagnetic/baryakhtar/relax_system.py +++ b/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')) diff --git a/examples/micromagnetic/box_real_time/box_sim_fidimag.py b/examples/micromagnetic/box_real_time/box_sim_fidimag.py index b5a8b420..a6bbf933 100644 --- a/examples/micromagnetic/box_real_time/box_sim_fidimag.py +++ b/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 diff --git a/examples/micromagnetic/domain_wall_simple_demag/dw.py b/examples/micromagnetic/domain_wall_simple_demag/dw.py index bd98c255..7dd902cf 100644 --- a/examples/micromagnetic/domain_wall_simple_demag/dw.py +++ b/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')) diff --git a/examples/micromagnetic/dw_stt/main.py b/examples/micromagnetic/dw_stt/main.py index 465859ba..7fc320b8 100644 --- a/examples/micromagnetic/dw_stt/main.py +++ b/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) diff --git a/examples/micromagnetic/dw_stt_cpp/main.py b/examples/micromagnetic/dw_stt_cpp/main.py index 6f2d2440..6ed6d0d0 100644 --- a/examples/micromagnetic/dw_stt_cpp/main.py +++ b/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) diff --git a/examples/micromagnetic/nmag_example_2_box/sim.py b/examples/micromagnetic/nmag_example_2_box/sim.py index 6d42a845..32026177 100644 --- a/examples/micromagnetic/nmag_example_2_box/sim.py +++ b/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()) diff --git a/examples/micromagnetic/pbc_2d/main.py b/examples/micromagnetic/pbc_2d/main.py index 938f27cd..8cc89e1a 100644 --- a/examples/micromagnetic/pbc_2d/main.py +++ b/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 diff --git a/examples/micromagnetic/pbc_2d/rod.py b/examples/micromagnetic/pbc_2d/rod.py index 7d5ee1b5..45909ee4 100644 --- a/examples/micromagnetic/pbc_2d/rod.py +++ b/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 diff --git a/examples/micromagnetic/pbc_2d/single_cube.py b/examples/micromagnetic/pbc_2d/single_cube.py index a66b6f3d..0146f57a 100644 --- a/examples/micromagnetic/pbc_2d/single_cube.py +++ b/examples/micromagnetic/pbc_2d/single_cube.py @@ -19,8 +19,8 @@ def compute_field(): 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 diff --git a/examples/micromagnetic/single_spin/single_spin.py b/examples/micromagnetic/single_spin/single_spin.py index a55b3c36..874a84ce 100644 --- a/examples/micromagnetic/single_spin/single_spin.py +++ b/examples/micromagnetic/single_spin/single_spin.py @@ -25,7 +25,7 @@ def relax_system(): mesh = CuboidMesh(nx=1, ny=1, nz=1) sim = Sim(mesh, name='relax') sim.driver.set_tols(rtol=1e-10, atol=1e-10) - sim.alpha = 0.5 + sim.driver.alpha = 0.5 sim.set_m((1.0, 0, 0)) diff --git a/examples/micromagnetic/single_spin_microwave/single_spin.py b/examples/micromagnetic/single_spin_microwave/single_spin.py index e864513d..9270ba0a 100644 --- a/examples/micromagnetic/single_spin_microwave/single_spin.py +++ b/examples/micromagnetic/single_spin_microwave/single_spin.py @@ -25,7 +25,7 @@ def relax_system(): mesh = CuboidMesh(nx=1, ny=1, nz=1) sim = Sim(mesh, name='relax') sim.driver.set_tols(rtol=1e-10, atol=1e-10) - sim.alpha = 0.1 + sim.driver.alpha = 0.1 sim.set_m((0, 0, 1)) diff --git a/examples/micromagnetic/skyrmion/Belavin_Polyakov/main.py b/examples/micromagnetic/skyrmion/Belavin_Polyakov/main.py index 698ec5da..dc3cfcb2 100644 --- a/examples/micromagnetic/skyrmion/Belavin_Polyakov/main.py +++ b/examples/micromagnetic/skyrmion/Belavin_Polyakov/main.py @@ -27,8 +27,8 @@ def relax_system(mesh): sim = Sim(mesh, name='relax') sim.driver.set_tols(rtol=1e-6, atol=1e-6) - 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 @@ -74,8 +74,8 @@ def relax_system_only_exchange(mesh): sim = Sim(mesh, name='relax_exchange_only') sim.driver.set_tols(rtol=1e-6, atol=1e-6) - 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 diff --git a/examples/micromagnetic/skyrmion/Ku_H/main.py b/examples/micromagnetic/skyrmion/Ku_H/main.py index 8ca95245..4f63f260 100644 --- a/examples/micromagnetic/skyrmion/Ku_H/main.py +++ b/examples/micromagnetic/skyrmion/Ku_H/main.py @@ -27,8 +27,8 @@ def relax_system(mesh): sim = Sim(mesh, name='relax') sim.driver.set_tols(rtol=1e-6, atol=1e-6) - 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 diff --git a/examples/micromagnetic/skyrmion/lattice/main.py b/examples/micromagnetic/skyrmion/lattice/main.py index e1ac1a1c..fc9d0641 100644 --- a/examples/micromagnetic/skyrmion/lattice/main.py +++ b/examples/micromagnetic/skyrmion/lattice/main.py @@ -51,8 +51,8 @@ def relax_system(mesh): sim = Sim(mesh, name='relax') sim.driver.set_tols(rtol=1e-6, atol=1e-6) - 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 diff --git a/examples/micromagnetic/skyrmion/main.py b/examples/micromagnetic/skyrmion/main.py index 938f27cd..8cc89e1a 100644 --- a/examples/micromagnetic/skyrmion/main.py +++ b/examples/micromagnetic/skyrmion/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 diff --git a/examples/micromagnetic/skyrmion_stt/main.py b/examples/micromagnetic/skyrmion_stt/main.py index b54c759d..7c8d6ae5 100644 --- a/examples/micromagnetic/skyrmion_stt/main.py +++ b/examples/micromagnetic/skyrmion_stt/main.py @@ -21,8 +21,8 @@ def relax_system(mesh): sim = Sim(mesh, name='relax') sim.driver.set_tols(rtol=1e-6, atol=1e-6) - 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 @@ -46,8 +46,8 @@ def relax_system(mesh): def excite_system(mesh): sim = Sim(mesh, name='dyn', driver='llg_stt') 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.set_m(np.load('m0.npy')) diff --git a/examples/micromagnetic/spatial_dmi/main.py b/examples/micromagnetic/spatial_dmi/main.py index 837e19c7..5ac83e62 100644 --- a/examples/micromagnetic/spatial_dmi/main.py +++ b/examples/micromagnetic/spatial_dmi/main.py @@ -30,8 +30,8 @@ def dmi_variance(pos): # Dynamics parameters. sim.driver.set_tols(rtol=1e-6, atol=1e-6) -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 diff --git a/examples/micromagnetic/std4/main.py b/examples/micromagnetic/std4/main.py index 05ccc4f8..04f7ccab 100644 --- a/examples/micromagnetic/std4/main.py +++ b/examples/micromagnetic/std4/main.py @@ -29,8 +29,8 @@ def relax_system(mesh): sim = Sim(mesh, name='relax') sim.driver.set_tols(rtol=1e-10, atol=1e-10) - sim.alpha = 0.5 - sim.gamma = 2.211e5 + sim.driver.alpha = 0.5 + sim.driver.gamma = 2.211e5 sim.Ms = 8.0e5 sim.do_precession = False @@ -55,8 +55,8 @@ def apply_field1(mesh): sim = Sim(mesh, name='dyn') sim.driver.set_tols(rtol=1e-10, atol=1e-10) - sim.alpha = 0.02 - sim.gamma = 2.211e5 + sim.driver.alpha = 0.02 + sim.driver.gamma = 2.211e5 sim.Ms = 8.0e5 sim.set_m(np.load('m0.npy')) diff --git a/examples/micromagnetic/vortex/main.py b/examples/micromagnetic/vortex/main.py index fbc47c52..d7aa6d3c 100644 --- a/examples/micromagnetic/vortex/main.py +++ b/examples/micromagnetic/vortex/main.py @@ -43,8 +43,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 = spatial_Ms sim.do_precession = False @@ -73,8 +73,8 @@ def excite_system(mesh): sim = Sim(mesh, name='dyn') sim.driver.set_tols(rtol=1e-10, atol=1e-14) - sim.alpha = 0.01 - sim.gamma = 2.211e5 + sim.driver.alpha = 0.01 + sim.driver.gamma = 2.211e5 sim.Ms = spatial_Ms # sim.set_m(init_m) diff --git a/examples/neb_micromagnetic/skyrmion/relaxation/skyrmion_down_relax.py b/examples/neb_micromagnetic/skyrmion/relaxation/skyrmion_down_relax.py index 1f79451f..d9252a6c 100644 --- a/examples/neb_micromagnetic/skyrmion/relaxation/skyrmion_down_relax.py +++ b/examples/neb_micromagnetic/skyrmion/relaxation/skyrmion_down_relax.py @@ -65,7 +65,7 @@ def init_m(pos): # To get a faster relaxation, we tune the LLG equation parameters sim.do_precession = False -sim.alpha = 0.5 +sim.driver.alpha = 0.5 # Initial magnetisation: sim.set_m(init_m) diff --git a/examples/neb_micromagnetic/skyrmion/relaxation/skyrmion_relax.py b/examples/neb_micromagnetic/skyrmion/relaxation/skyrmion_relax.py index f0a2963f..9b64483c 100644 --- a/examples/neb_micromagnetic/skyrmion/relaxation/skyrmion_relax.py +++ b/examples/neb_micromagnetic/skyrmion/relaxation/skyrmion_relax.py @@ -66,7 +66,7 @@ def init_m(pos): # To get a faster relaxation, we tune the LLG equation parameters sim.do_precession = False -sim.alpha = 0.5 +sim.driver.alpha = 0.5 # Initial magnetisation: sim.set_m(init_m) diff --git a/examples/nebm_atomistic/1D_spin_chain/neb_helicoid-fm.py b/examples/nebm_atomistic/1D_spin_chain/neb_helicoid-fm.py index a26f72fd..ac928c6b 100644 --- a/examples/nebm_atomistic/1D_spin_chain/neb_helicoid-fm.py +++ b/examples/nebm_atomistic/1D_spin_chain/neb_helicoid-fm.py @@ -90,7 +90,7 @@ def relax_neb(k, maxst, simname, init_im, interp, save_every=10000): # Prepare simulation sim = Sim(mesh, name=simname) - sim.gamma = const.gamma + sim.driver.gamma = const.gamma # magnetisation in units of Bohr's magneton sim.mu_s = 2. * const.mu_B diff --git a/examples/nebm_atomistic/1D_spin_chain/relaxation/1D_spin_chain.py b/examples/nebm_atomistic/1D_spin_chain/relaxation/1D_spin_chain.py index ac83dc24..071eaad0 100644 --- a/examples/nebm_atomistic/1D_spin_chain/relaxation/1D_spin_chain.py +++ b/examples/nebm_atomistic/1D_spin_chain/relaxation/1D_spin_chain.py @@ -41,7 +41,7 @@ def relax_system(): # Initiate the simulation sim = Sim(mesh, name=sim_name) - sim.gamma = const.gamma + sim.driver.gamma = const.gamma # magnetisation in units of Bohr's magneton sim.mu_s = 2 * const.mu_B @@ -68,7 +68,7 @@ def relax_system(): sim.add(ku) # Faster convergence - sim.alpha = 0.5 + sim.driver.alpha = 0.5 sim.do_precession = False sim.relax(dt=1e-13, stopping_dmdt=0.05, diff --git a/examples/nebm_atomistic/1D_spin_chain/relaxation/1D_spin_chain_fm.py b/examples/nebm_atomistic/1D_spin_chain/relaxation/1D_spin_chain_fm.py index e23e2c67..de9818b8 100644 --- a/examples/nebm_atomistic/1D_spin_chain/relaxation/1D_spin_chain_fm.py +++ b/examples/nebm_atomistic/1D_spin_chain/relaxation/1D_spin_chain_fm.py @@ -26,7 +26,7 @@ def relax_system(): # Initiate the simulation. PBCs are specified in the mesh sim = Sim(mesh, name=sim_name) - sim.gamma = const.gamma + sim.driver.gamma = const.gamma # magnetisation in units of Bohr's magneton sim.mu_s = 2. * const.mu_B @@ -53,7 +53,7 @@ def relax_system(): sim.add(ku) # Faster convergence - sim.alpha = 0.5 + sim.driver.alpha = 0.5 sim.do_precession = False sim.relax(dt=1e-13, stopping_dmdt=0.05, diff --git a/examples/nebm_atomistic/skyrmion_reduced/relax.py b/examples/nebm_atomistic/skyrmion_reduced/relax.py index 745ff17f..243724d4 100644 --- a/examples/nebm_atomistic/skyrmion_reduced/relax.py +++ b/examples/nebm_atomistic/skyrmion_reduced/relax.py @@ -43,8 +43,8 @@ def create_sim(): mesh = CuboidMesh(nx=121,ny=121,nz=1) sim=Sim(mesh,name='relax') - sim.alpha = 1.0 - sim.gamma = 0.5 + sim.driver.alpha = 1.0 + sim.driver.gamma = 0.5 sim.mu_s = mu_s sim.set_m(init_m)