From 8bd776525c5bd4cabe47abc259f2906b759c428c Mon Sep 17 00:00:00 2001 From: Sam Holt Date: Wed, 15 Jun 2022 18:25:11 +0100 Subject: [PATCH 1/6] S4 DMI --- micromagneticmodel/energy/dmi.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/micromagneticmodel/energy/dmi.py b/micromagneticmodel/energy/dmi.py index fe3d43a..cd674af 100644 --- a/micromagneticmodel/energy/dmi.py +++ b/micromagneticmodel/energy/dmi.py @@ -20,6 +20,9 @@ "D2d_x", "D2d_y", "D2d_z", + "S4_x", + "S4_y", + "S4_z" }, unpack=False, ), @@ -113,7 +116,7 @@ class DMI(EnergyTerm): TypeError: ... """ - _allowed_attributes = ["D", "crystalclass"] + _allowed_attributes = ["D", "D1", "D2", "crystalclass"] @property def _reprlatex(self): From 23f9dfdaa4699642a958e04d7062a1890038472d Mon Sep 17 00:00:00 2001 From: Sam Holt Date: Thu, 16 Jun 2022 09:53:07 +0100 Subject: [PATCH 2/6] Add Dn adn Cn DMI --- micromagneticmodel/energy/dmi.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/micromagneticmodel/energy/dmi.py b/micromagneticmodel/energy/dmi.py index cd674af..038b098 100644 --- a/micromagneticmodel/energy/dmi.py +++ b/micromagneticmodel/energy/dmi.py @@ -22,7 +22,13 @@ "D2d_z", "S4_x", "S4_y", - "S4_z" + "S4_z", + "Dn_x", + "Dn_y", + "Dn_z", + "Cn_x", + "Cn_y", + "Cn_z" }, unpack=False, ), @@ -116,7 +122,7 @@ class DMI(EnergyTerm): TypeError: ... """ - _allowed_attributes = ["D", "D1", "D2", "crystalclass"] + _allowed_attributes = ["D", "D1", "D2", "D3", "crystalclass"] @property def _reprlatex(self): From ca4cf329643d2a3006b798568c083e00fe9d41b1 Mon Sep 17 00:00:00 2001 From: Sam Holt Date: Wed, 27 Jul 2022 13:50:36 +0100 Subject: [PATCH 3/6] Dx Dy --- micromagneticmodel/energy/dmi.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/micromagneticmodel/energy/dmi.py b/micromagneticmodel/energy/dmi.py index 038b098..b774954 100644 --- a/micromagneticmodel/energy/dmi.py +++ b/micromagneticmodel/energy/dmi.py @@ -28,7 +28,8 @@ "Dn_z", "Cn_x", "Cn_y", - "Cn_z" + "Cn_z", + "C2v" }, unpack=False, ), @@ -122,7 +123,7 @@ class DMI(EnergyTerm): TypeError: ... """ - _allowed_attributes = ["D", "D1", "D2", "D3", "crystalclass"] + _allowed_attributes = ["D", "D1", "D2", "D3", "Dx", "Dy", "crystalclass"] @property def _reprlatex(self): From 885e36af34d41ec0c9e30b797835c39be307a7d0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 16:00:23 +0000 Subject: [PATCH 4/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- micromagneticmodel/energy/dmi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/micromagneticmodel/energy/dmi.py b/micromagneticmodel/energy/dmi.py index 6ae085d..cbd8c62 100644 --- a/micromagneticmodel/energy/dmi.py +++ b/micromagneticmodel/energy/dmi.py @@ -29,7 +29,7 @@ "Cn_x", "Cn_y", "Cn_z", - "C2v" + "C2v", }, unpack=False, ), From 1b611c3ef5423af0ca9d9d16ddc28d2560e0b07a Mon Sep 17 00:00:00 2001 From: Sam Holt Date: Tue, 27 Aug 2024 17:52:23 +0200 Subject: [PATCH 5/6] allow bc --- micromagneticmodel/energy/dmi.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/micromagneticmodel/energy/dmi.py b/micromagneticmodel/energy/dmi.py index 5b77690..eefa4d4 100644 --- a/micromagneticmodel/energy/dmi.py +++ b/micromagneticmodel/energy/dmi.py @@ -8,6 +8,12 @@ @uu.inherit_docs @ts.typesystem( D=ts.Parameter(descriptor=ts.Scalar(), otherwise=df.Field), + BC=ts.Subset( + sample_set={ + "Robin", + }, + unpack=False, + ), crystalclass=ts.Subset( sample_set={ "Cnv", @@ -124,7 +130,7 @@ class DMI(EnergyTerm): """ - _allowed_attributes = ["D", "D1", "D2", "D3", "Dx", "Dy", "crystalclass"] + _allowed_attributes = ["D", "D1", "D2", "D3", "Dx", "Dy", "crystalclass", "BC"] @property def _reprlatex(self): From 44418c0652d9b62b1eac547c82a853594214310d Mon Sep 17 00:00:00 2001 From: Sam Holt Date: Wed, 28 Aug 2024 20:20:38 +0200 Subject: [PATCH 6/6] suffix --- micromagneticmodel/energy/dmi.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/micromagneticmodel/energy/dmi.py b/micromagneticmodel/energy/dmi.py index eefa4d4..4587756 100644 --- a/micromagneticmodel/energy/dmi.py +++ b/micromagneticmodel/energy/dmi.py @@ -8,12 +8,7 @@ @uu.inherit_docs @ts.typesystem( D=ts.Parameter(descriptor=ts.Scalar(), otherwise=df.Field), - BC=ts.Subset( - sample_set={ - "Robin", - }, - unpack=False, - ), + suffix=ts.Typed(expected_type=str), crystalclass=ts.Subset( sample_set={ "Cnv", @@ -130,7 +125,7 @@ class DMI(EnergyTerm): """ - _allowed_attributes = ["D", "D1", "D2", "D3", "Dx", "Dy", "crystalclass", "BC"] + _allowed_attributes = ["D", "D1", "D2", "D3", "Dx", "Dy", "crystalclass", "suffix"] @property def _reprlatex(self):