From ad38c8c475c9a2c1db215efcc9a63df1ab6b557e Mon Sep 17 00:00:00 2001 From: Moritz Sallermann Date: Mon, 11 Nov 2019 16:50:58 +0100 Subject: [PATCH] Core: Added correct check for Solver_VP_OSO in Calculate_Virtual_Force --- core/include/engine/Solver_VP_OSO.hpp | 8 ++++---- core/src/engine/Method_LLG.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/include/engine/Solver_VP_OSO.hpp b/core/include/engine/Solver_VP_OSO.hpp index 437dea402..de8034b2c 100644 --- a/core/include/engine/Solver_VP_OSO.hpp +++ b/core/include/engine/Solver_VP_OSO.hpp @@ -87,10 +87,10 @@ void Method_Solver::Iteration () } for (int img = 0; img < noi; ++img) { - auto sd = this->searchdir[img].data(); - auto v = this->velocities[img].data(); - auto g = this->grad[img].data(); - auto m_temp = this->m; + auto sd = this->searchdir[img].data(); + auto v = this->velocities[img].data(); + auto g = this->grad[img].data(); + auto m_temp = this->m; scalar dt = this->systems[img]->llg_parameters->dt; scalar ratio = projection_full/force_norm2_full; diff --git a/core/src/engine/Method_LLG.cpp b/core/src/engine/Method_LLG.cpp index aec0f964e..d51e3e5d8 100644 --- a/core/src/engine/Method_LLG.cpp +++ b/core/src/engine/Method_LLG.cpp @@ -162,7 +162,7 @@ namespace Engine ////////// // Direct minimisation - if (parameters.direct_minimization || solver == Solver::VP) + if (parameters.direct_minimization || solver == Solver::VP || solver == Solver::VP_OSO) { dtg = parameters.dt * Constants::gamma / Constants::mu_B; Vectormath::set_c_cross( dtg, image, force, force_virtual);