Skip to content

Commit

Permalink
Core: Added correct check for Solver_VP_OSO in Calculate_Virtual_Force
Browse files Browse the repository at this point in the history
  • Loading branch information
Moritz Sallermann committed Nov 11, 2019
1 parent 37095ff commit ad38c8c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions core/include/engine/Solver_VP_OSO.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ void Method_Solver<Solver::VP_OSO>::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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/engine/Method_LLG.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit ad38c8c

Please sign in to comment.