Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generalised zhang li #133

Merged
merged 7 commits into from
Aug 8, 2024
Merged

Generalised zhang li #133

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cbb8f1
Support for arbitrary current direction in ZhangLi
lang-m May 4, 2023
45d6288
Merge branch 'fix_schedule' into generalised-zhang-li
lang-m May 5, 2023
833711d
Merge branch 'master' into generalised-zhang-li
lang-m May 10, 2023
cb80068
Merge branch 'master' into generalised-zhang-li
lang-m Jun 9, 2024
cd85a8e
Fix handling of dict for Zhang Li u when creating the mif file
lang-m Jun 9, 2024
52bf30a
Remove debug print
lang-m Jul 14, 2024
5d59e57
Merge branch 'master' into generalised-zhang-li
lang-m Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions oommfc/scripts/evolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import numbers

import discretisedfield as df
import numpy as np

import oommfc as oc
Expand All @@ -22,7 +23,19 @@ def evolver_script(evolver, **kwargs):
evolver.alpha = alphaname
mif += alphamif
if hasattr(evolver, "u"):
umif, uname = oc.scripts.setup_scalar_parameter(evolver.u, "zl_u")
if (
isinstance(evolver.u, numbers.Real)
or (isinstance(evolver.u, df.Field) and evolver.u.nvdim == 1)
or (
isinstance(evolver.u, dict)
and isinstance(list(evolver.u.values())[0], numbers.Real)
)
):
scalar_u = True
umif, uname = oc.scripts.setup_scalar_parameter(evolver.u, "zl_u")
else:
scalar_u = False
umif, uname = oc.scripts.setup_vector_parameter(evolver.u, "zl_u")
evolver.u = uname
mif += umif

Expand Down Expand Up @@ -76,7 +89,6 @@ def evolver_script(evolver, **kwargs):
evolver.u_profile = "TimeFunction"
evolver.u_profile_args = "total_time"
if hasattr(evolver, "tcl_strings") and isinstance(evolver.tcl_strings, dict):
print(evolver.tcl_strings)
mif += evolver.tcl_strings["script"]
if isinstance(evolver, (oc.SpinXferEvolver, oc.Xf_ThermSpinXferEvolver)):
evolver.J_profile = evolver.tcl_strings["script_name"]
Expand All @@ -97,7 +109,10 @@ def evolver_script(evolver, **kwargs):
elif isinstance(evolver, oc.SpinTEvolver):
# time dependence
mif += "# Zhang-Li evolver\n"
mif += "Specify Anv_SpinTEvolve:evolver {\n"
if scalar_u:
mif += "Specify Anv_SpinTEvolve:evolver {\n"
else:
mif += "Specify Anv_SpinTEvolve_3d:evolver {\n"
elif isinstance(evolver, oc.SpinXferEvolver):
# time dependence
mif += "# Slonczewski evolver\n"
Expand Down
Loading