Skip to content

Commit ea2ab03

Browse files
author
davidcorteso
committed
Removed old minimisation class
1 parent 042fefa commit ea2ab03

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

fidimag/atomistic/sim.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from .llg_stt import LLG_STT
44
from .llg_stt_cpp import LLG_STT_CPP
55
from fidimag.common.steepest_descent import SteepestDescent
6-
from .minimiser import Minimiser
6+
# from .minimiser import Minimiser
77

88
import fidimag.common.skyrmion_number
99
import fidimag.common.helper as helper
@@ -17,7 +17,7 @@
1717
'llg_stt': LLG_STT,
1818
'llg_stt_cpp': LLG_STT_CPP,
1919
'steepest_descent': SteepestDescent,
20-
'minimiser': Minimiser
20+
# 'minimiser': Minimiser
2121
}
2222

2323

fidimag/micro/sim.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from . import llg_stt_cpp
66
from . import baryakhtar
77
from fidimag.common import steepest_descent
8-
from . import minimiser
98

109
import fidimag.extensions.micro_clib as micro_clib
1110
import fidimag.common.helper as helper
@@ -20,7 +19,6 @@
2019
'llbar': baryakhtar.LLBar,
2120
'llbar_full': baryakhtar.LLBarFull,
2221
'steepest_descent': steepest_descent.SteepestDescent,
23-
'minimiser': minimiser.Minimiser
2422
}
2523

2624

@@ -39,13 +37,19 @@ class Sim(SimBase):
3937
driver :: A string with one of the following drivers to evolve
4038
the micromagnetic system:
4139
42-
llg - (default) the Landau-Lifshitz-Gilbert
43-
equation
44-
llg_stt - LLG w. spin transfer torque
45-
llg_stt_cpp - LLG w. spin transfer torque perpendicular
46-
to the plane (?)
47-
llbar - Landau-Lifshitz-Baryakhtar equation
48-
llbar_full
40+
llg - (default) the Landau-Lifshitz-Gilbert
41+
equation
42+
43+
llg_stt - LLG w. spin transfer torque
44+
45+
llg_stt_cpp - LLG w. spin transfer torque perpendicular
46+
to the plane (?)
47+
48+
llbar - Landau-Lifshitz-Baryakhtar equation
49+
llbar_full
50+
51+
steepest_descent - Optimised steepest descent minimisation
52+
[JAP 115, 17D118 (2014)]
4953
5054
** Most of the methods inherit from the Base Simulation class that
5155
can be found in the common folder

0 commit comments

Comments
 (0)