From b0392b857a54ec1f6d413b02bde398c7ef90c2d1 Mon Sep 17 00:00:00 2001
From: LemurPwned <jakub.mojsiejuk@gmail.com>
Date: Fri, 13 Dec 2024 23:16:58 +0100
Subject: [PATCH] updating iDMI formula

---
 .github/workflows/main.yml | 14 +-------------
 core/junction.hpp          | 12 ++++++++----
 setup.py                   |  2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4396eae..ee6a5bd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,20 +11,9 @@ on:
       - 'setup.py'
       - 'setup.cfg'
       - 'pyproject.toml'
-  workflow_dispatch:
-    inputs:
-      linux:
-        type: boolean
-        required: true
-        default: true
-      other-os:
-        type: boolean
-        required: true
-        default: true
 
 jobs:
   linux-build:
-    if: ${{ inputs.linux }} 
     runs-on: ubuntu-latest
     env:
       TWINE_USERNAME: __token__
@@ -50,7 +39,6 @@ jobs:
         continue-on-error: false
     
   other-os-build:
-    if: ${{ inputs.other-os }} 
     runs-on: ${{ matrix.os }}
     env:
       TWINE_USERNAME: __token__
@@ -98,5 +86,5 @@ jobs:
         run: |
           gh release create "v${{ steps.get_version.outputs.version }}" \
               --repo="$GITHUB_REPOSITORY" \
-              --title="${GITHUB_REPOSITORY#*/} v${{ steps.get_version.outputs.version }}" \
+              --title="${GITHUB_REPOSITORY#*/} ${{ steps.get_version.outputs.version }}" \
               --generate-notes
diff --git a/core/junction.hpp b/core/junction.hpp
index fb5d509..cab2ca1 100644
--- a/core/junction.hpp
+++ b/core/junction.hpp
@@ -597,11 +597,15 @@ template <typename T = double> class Layer {
     // dm1/dm1x x m2 = (0, -mz, my)
     // dm1/dm1y x m2 = (mz, 0, -mx)
     // dm1/dm1z x m2 = (-my, mx, 0)
-    const CVector<T> dm1crossm2(
-        c_dot(Dvector, CVector<T>(0, -coupledMag.z, coupledMag.y)),
-        c_dot(Dvector, CVector<T>(coupledMag.z, 0, -coupledMag.x)),
-        c_dot(Dvector, CVector<T>(-coupledMag.y, coupledMag.x, 0)));
+    // E = D z * (m1 x m2) == D m1 (m2 x z)
+    // dE/dm1 = D m2 x z
+    const CVector<T> dm1crossm2 = -1.0 * c_cross<T>(Dvector, coupledMag);
     return dm1crossm2 / (this->Ms * this->thickness);
+    // const CVector<T> dm1crossm2(
+    //     c_dot(Dvector, CVector<T>(0, -coupledMag.z, coupledMag.y)),
+    //     c_dot(Dvector, CVector<T>(coupledMag.z, 0, -coupledMag.x)),
+    //     c_dot(Dvector, CVector<T>(-coupledMag.y, coupledMag.x, 0)));
+    // return dm1crossm2 / (this->Ms * this->thickness);
   }
 
   CVector<T> calculateIDMI(T time, const CVector<T> &stepMag,
diff --git a/setup.py b/setup.py
index a65bb01..b665255 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 from setuptools import Extension, find_namespace_packages, setup
 from setuptools.command.build_ext import build_ext
 
-__version__ = "1.6.1"
+__version__ = "1.6.2"
 """
 As per
 https://github.com/pybind/python_example