adapted to tlibs changes

parent 7d411de7
......@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
in20tools
Copyright (C) 2018 Tobias WEBER
tlibs2
Copyright (C) 2017-2020 Tobias WEBER
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
in20tools Copyright (C) 2018 Tobias WEBER
tlibs2 Copyright (C) 2017-2020 Tobias WEBER
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......
......@@ -2,12 +2,8 @@
* tlibs2 -- magnon helper functions in preparation for the main tlibs2 repo: https://code.ill.fr/scientific-software/takin/tlibs2
* @author Tobias Weber <tweber@ill.fr>
* @date 30-may-2020
* @license GPLv2 or GPLv3, see 'LICENSE' file
* @desc based on the mathematical formalism of the skyrmion and helimagnon models by M. Garst and J. Waizner, 2016-2020, references:
* - https://doi.org/10.1088/1361-6463/aa7573
* - https://doi.org/10.1038/nmat4223 (supplement)
* - https://kups.ub.uni-koeln.de/7937/
* @desc forked on 7-Nov-2018 from my privately developed "tlibs" project (https://github.com/t-weber/tlibs).
* @license GPLv3, see 'LICENSE' file
* @desc tlibs forked on 7-Nov-2018 from the privately developed "tlibs" project (https://github.com/t-weber/tlibs).
*/
#ifndef __TLIBS2_PHYS_MAG__
......@@ -43,6 +39,10 @@ namespace tl2 {
/**
* Calculates energies and dynamical structure factors from Landau-Lifshitz (M x) and fluctuation matrices.
* Uses the mathematical formalism by M. Garst et al., references:
* - https://doi.org/10.1088/1361-6463/aa7573
* - https://doi.org/10.1038/nmat4223 (supplement)
* - https://kups.ub.uni-koeln.de/7937/
*/
template<class t_mat_cplx, class t_vec_cplx, class t_cplx, class t_real>
std::tuple<std::vector<t_cplx>, std::vector<t_vec_cplx>, std::vector<t_mat_cplx>>
......
......@@ -128,7 +128,7 @@ bool MagSystem<t_real, t_cplx, ORDER_FOURIER>::minimise(
return false;
}
bool ok = tl2::minimise<NUM_MINPARAMS>(func, names, vars, errs, &fixed, m_debug);
bool ok = tl2::minimise<tl2::t_real_min, NUM_MINPARAMS>(func, names, vars, errs, &fixed, m_debug);
sys.SetFourier(vars_to_fourier(vars));
return ok;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment