Merge pull request #65 from fangohr/fix-anv-spintevolve-3d

Author: fangohr

oommf/app/oxs/local/anv-spintevolve-3d/provenance-anv-spintevolve-3d-HEAD.zip

@@ -1,18 +1,33 @@
 == git-repo-url: https://github.com/oommf-extensions/anv-spintevolve-3d.git
 == repo-name: anv-spintevolve-3d
 == snap-shot-of-repo: provenance-anv-spintevolve-3d-HEAD.zip
-== cloned-on-date: Thu Feb 29 14:10:24 2024
+== cloned-on-date: Wed Aug  7 17:20:03 2024
 == copied-files-from-path-in-repo: src/
 last commit:
-commit b51ac083778f3699e17042ca07e13238d4876ad2
-Author: Martin Lang <[email protected]>
-Date:   Fri Oct 13 10:00:54 2023 +0200
+commit 27ff14d7842469aa3cf95031813df967c86ce9b1
+Merge: b51ac08 691cd9b
+Author: Martin Lang <[email protected]>
+Date:   Wed Aug 7 17:15:43 2024 +0200
 
-    Compatibility with old and new OOMMF releases
+    Merge pull request #2 from oommf-extensions/fix-oommf21a0
+    
+    Fix extension to make it work with OOMMF 2.1a0
+
+commit 691cd9b937670058c5bafb126f6d92a950332472
+Author: Martin Lang <[email protected]>
+Date:   Wed Aug 7 17:13:20 2024 +0200
+
+    Update README
+
+commit d0e2c4e00c416e3e35ee0cf437cda7cf750ae5e8
+Author: Martin Lang <[email protected]>
+Date:   Wed Aug 7 17:08:18 2024 +0200
+
+    Fix extension to make it work with OOMMF 2.1a0
 
 == src file-list:
 total 92
--rw-r--r-- 1 pathaks cfel 80715 Feb 29 14:10 spintevolve_3d.cc
--rw-r--r-- 1 pathaks cfel 11495 Feb 29 14:10 spintevolve_3d.h
+-rw-r--r-- 1 mlang cfel 80719 Aug  7 17:20 spintevolve_3d.cc
+-rw-r--r-- 1 mlang cfel 11489 Aug  7 17:20 spintevolve_3d.h
 
 == see contents of provenance-anv-spintevolve-3d-HEAD.zip for additional info, examples, etc.

oommf/app/oxs/local/anv-spintevolve-3d/provenance-anv-spintevolve-3d.log

@@ -804,7 +804,7 @@ void Anv_SpinTEvolve_3d::NegotiateTimeStep
   if(stepsize<timestep_lower_bound) stepsize = timestep_lower_bound;
 
   // Negotiate with driver over size of next step
-  driver->FillState(cstate,nstate);
+  driver->FillStateMemberData(cstate,nstate);
   UpdateTimeFields(cstate,nstate,stepsize);
 
   // Update iteration count
@@ -1823,7 +1823,7 @@ void Anv_SpinTEvolve_3d::AdjustStepHeadroom(OC_INT4m step_reject)
 OC_BOOL
 Anv_SpinTEvolve_3d::Step(const Oxs_TimeDriver* driver,
                       Oxs_ConstKey<Oxs_SimState> current_state_key,
-                      const Oxs_DriverStepInfo& step_info,
+                      Oxs_DriverStepInfo& step_info,
                       Oxs_Key<Oxs_SimState>& next_state_key)
 {
   const OC_REAL8m bad_energy_cut_ratio = 0.75;

oommf/app/oxs/local/anv-spintevolve-3d/spintevolve_3d.cc

@@ -276,7 +276,7 @@ class Anv_SpinTEvolve_3d:public Oxs_TimeEvolver {
   virtual  OC_BOOL
   Step(const Oxs_TimeDriver* driver,
        Oxs_ConstKey<Oxs_SimState> current_state,
-       const Oxs_DriverStepInfo& step_info,
+       Oxs_DriverStepInfo& step_info,
        Oxs_Key<Oxs_SimState>& next_state);
   // Returns true if step was successful, false if
   // unable to step as requested.