Merge branch 'clean-master2' of github.com:julient31/lammps into gneb_spin
Conflicts: doc/src/min_modify.txt doc/src/min_spin.txt examples/SPIN/spinmin/in.spinmin.bfo examples/SPIN/spinmin/in.spinmin.iron src/SPIN/fix_precession_spin.cpp src/SPIN/min_spin.cpp src/SPIN/min_spin.h src/SPIN/pair_spin_dmi.cpp src/SPIN/pair_spin_exchange.cpp
This commit is contained in:
@ -30,8 +30,6 @@ neigh_modify every 10 check yes delay 20
|
||||
#fix 1 all precession/spin zeeman 0.001 0.0 0.0 1.0 anisotropy 0.01 1.0 0.0 0.0
|
||||
fix 1 all precession/spin anisotropy 0.0000033 0.0 0.0 1.0
|
||||
fix_modify 1 energy yes
|
||||
fix 2 all langevin/spin 0.0 0.1 21
|
||||
fix 3 all nve/spin lattice no
|
||||
|
||||
timestep 0.0001
|
||||
|
||||
@ -53,5 +51,5 @@ compute outsp all property/atom spx spy spz sp fmx fmy fmz
|
||||
dump 1 all custom 50 dump.lammpstrj type x y z c_outsp[1] c_outsp[2] c_outsp[3] c_outsp[4] c_outsp[5] c_outsp[6] c_outsp[7]
|
||||
|
||||
min_style spin
|
||||
min_modify alpha_damp 1.0 discret_factor 10.0
|
||||
minimize 0.0 0.0 10000 1000
|
||||
min_modify alpha_damp 1.0 discrete_factor 10.0
|
||||
minimize 1.0e-10 0.0 1000 100
|
||||
|
||||
@ -28,8 +28,6 @@ neigh_modify every 10 check yes delay 20
|
||||
#fix 1 all precession/spin zeeman 0.001 0.0 0.0 1.0 anisotropy 0.01 1.0 0.0 0.0
|
||||
fix 1 all precession/spin anisotropy 0.0001 0.0 0.0 1.0
|
||||
fix_modify 1 energy yes
|
||||
fix 2 all langevin/spin 0.0 0.1 21
|
||||
fix 3 all nve/spin lattice no
|
||||
|
||||
timestep 0.0001
|
||||
|
||||
@ -53,5 +51,5 @@ compute outsp all property/atom spx spy spz sp fmx fmy fmz
|
||||
dump 1 all custom 100 dump.lammpstrj type x y z c_outsp[1] c_outsp[2] c_outsp[3] c_outsp[4] c_outsp[5] c_outsp[6] c_outsp[7]
|
||||
|
||||
min_style spin
|
||||
min_modify alpha_damp 1.0 discret_factor 10.0
|
||||
min_modify alpha_damp 1.0 discrete_factor 10.0
|
||||
minimize 1.0e-10 1.0e-10 100000 1000
|
||||
|
||||
Reference in New Issue
Block a user