Skip to content

Commit

Permalink
Feature reduction.
Browse files Browse the repository at this point in the history
  • Loading branch information
GPMueller committed Jun 3, 2019
1 parent 3b782f8 commit 5a61c3e
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 610 deletions.
14 changes: 0 additions & 14 deletions core/docs/c-api/Quantities.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,3 @@ void Quantity_Get_Grad_Force_MinimumMode(State * state, float * gradient, float
Minimum mode following information
### Quantity_Get_HTST_Prefactor
```C
float Quantity_Get_HTST_Prefactor(State * state, int idx_image_minimum, int idx_image_sp, int idx_chain=-1)
```

HTST Prefactor for transition from minimum to saddle point.

Note that the method assumes you gave it correct images, where the
gradient is zero and which correspond to a minimum and a saddle point
respectively.

9 changes: 0 additions & 9 deletions core/include/Spirit/Quantities.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,4 @@ PREFIX float Quantity_Get_Topological_Charge(State * state, int idx_image=-1, in
// Minimum mode following information
PREFIX void Quantity_Get_Grad_Force_MinimumMode(State * state, float * gradient, float * eval, float * mode, float * forces, int idx_image=-1, int idx_chain=-1);

/*
HTST Prefactor for transition from minimum to saddle point.
Note that the method assumes you gave it correct images, where the
gradient is zero and which correspond to a minimum and a saddle point
respectively.
*/
PREFIX float Quantity_Get_HTST_Prefactor(State * state, int idx_image_minimum, int idx_image_sp, int idx_chain=-1);

#endif
1 change: 0 additions & 1 deletion core/include/engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set(HEADER_SPIRIT_ENGINE
${CMAKE_CURRENT_SOURCE_DIR}/Hamiltonian_Heisenberg.hpp
${CMAKE_CURRENT_SOURCE_DIR}/Hamiltonian_Gaussian.hpp
${CMAKE_CURRENT_SOURCE_DIR}/Eigenmodes.hpp
${CMAKE_CURRENT_SOURCE_DIR}/HTST.hpp
${CMAKE_CURRENT_SOURCE_DIR}/Solver_SIB.hpp
${CMAKE_CURRENT_SOURCE_DIR}/Solver_Heun.hpp
${CMAKE_CURRENT_SOURCE_DIR}/Solver_Depondt.hpp
Expand Down
34 changes: 0 additions & 34 deletions core/include/engine/HTST.hpp

This file was deleted.

8 changes: 0 additions & 8 deletions core/python/spirit/quantities.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ def get_magnetization(p_state, idx_image=-1, idx_chain=-1):
return [float(i) for i in magnetization]


_Get_HTST_Prefactor = _spirit.Quantity_Get_HTST_Prefactor
_Get_HTST_Prefactor.argtypes = [ctypes.c_void_p, ctypes.c_int, ctypes.c_int, ctypes.c_int]
_Get_HTST_Prefactor.restype = ctypes.c_float
def get_htst_prefactor(p_state, idx_image_minimum, idx_image_sp, idx_chain=-1):
"""Calculates and returns the HTST rate prefactor."""
return _Get_HTST_Prefactor(p_state, idx_image_minimum, idx_image_sp, idx_chain)


### Temporary info function for MMF
_Get_MinimumMode = _spirit.Quantity_Get_Grad_Force_MinimumMode
_Get_MinimumMode.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_float),
Expand Down
24 changes: 0 additions & 24 deletions core/src/Spirit/Quantities.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include <Spirit/Quantities.h>
#include <Spirit/Geometry.h>
#include <data/State.hpp>
#include <engine/HTST.hpp>
#include <engine/Vectormath.hpp>
#include <engine/Manifoldmath.hpp>
#include <engine/Eigenmodes.hpp>
Expand Down Expand Up @@ -70,29 +69,6 @@ float Quantity_Get_Topological_Charge(State * state, int idx_image, int idx_chai
}


float Quantity_Get_HTST_Prefactor(State * state, int idx_image_minimum, int idx_image_sp, int idx_chain)
try
{
std::shared_ptr<Data::Spin_System> image_minimum, image_sp;
std::shared_ptr<Data::Spin_System_Chain> chain;
from_indices(state, idx_image_minimum, idx_chain, image_minimum, chain);
from_indices(state, idx_image_sp, idx_chain, image_sp, chain);

auto& info = chain->htst_info;
info.minimum = image_minimum;
info.saddle_point = image_sp;

Engine::HTST::Calculate_Prefactor(chain->htst_info);

return (float)info.prefactor;
}
catch( ... )
{
spirit_handle_exception_api(-1, idx_chain);
return 0;
}


void check_modes(const vectorfield & image, const vectorfield & grad, const MatrixX & tangent_basis, const VectorX & eigenvalues, const MatrixX & eigenvectors_2N, const vectorfield & minimum_mode)
{
using namespace Engine;
Expand Down
1 change: 0 additions & 1 deletion core/src/engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ set(SOURCE_SPIRIT_ENGINE
${CMAKE_CURRENT_SOURCE_DIR}/Hamiltonian_Heisenberg.cu
${CMAKE_CURRENT_SOURCE_DIR}/Hamiltonian_Gaussian.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Eigenmodes.cpp
${CMAKE_CURRENT_SOURCE_DIR}/HTST.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Method.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Method_LLG.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Method_GNEB.cpp
Expand Down
Loading

0 comments on commit 5a61c3e

Please sign in to comment.