Commit bdb4db8b authored by Tobias WEBER's avatar Tobias WEBER
Browse files

adapted to tlibs2 changes

parent 75626e5f
......@@ -14,7 +14,7 @@
using t_real = double;
using t_vec = std::vector<t_real>;
using t_vec = tl2::vec<t_real, std::vector>;
using t_mat = tl2::mat<t_real, std::vector>;
constexpr t_real g_eps = 1e-6;
......
......@@ -15,7 +15,7 @@
using t_real = double;
using t_vec = std::vector<t_real>;
using t_vec = tl2::vec<t_real, std::vector>;
using t_mat = tl2::mat<t_real, std::vector>;
constexpr t_real g_eps = 1e-6;
......
......@@ -33,8 +33,8 @@
using t_real = double;
using t_cplx = std::complex<t_real>;
using t_vec = std::vector<t_real>;
using t_vec_cplx = std::vector<t_cplx>;
using t_vec = tl2::vec<t_real, std::vector>;
using t_vec_cplx = tl2::vec<t_cplx, std::vector>;
using t_mat = tl2::mat<t_real, std::vector>;
using t_mat_cplx = tl2::mat<t_cplx, std::vector>;
......
......@@ -317,7 +317,7 @@ class MolDyn
if(frameskip || iNumConfigs % 100)
{
std::cout << "\rReading " << strConfig << ". "
<< unsigned{percentage} << " %. ";
<< static_cast<unsigned>(percentage) << " %. ";
std::cout.flush();
}
......@@ -374,7 +374,7 @@ class MolDyn
std::size_t filepos = tl2::get_file_pos(ifstr);
percentage = t_real{filepos*100} / t_real{filesize};
percentage = static_cast<t_real>(filepos*100) / static_cast<t_real>(filesize);
if(m_sigLoadProgress.num_slots() && !*m_sigLoadProgress(percentage))
{
std::cerr << "\nLoading cancelled." << std::endl;
......@@ -438,7 +438,7 @@ class MolDyn
}
}
percentage = t_real{(frame+1)*100}/t_real{m_frames.size()};
percentage = static_cast<t_real>((frame+1)*100)/static_cast<t_real>(m_frames.size());
if(m_sigSaveProgress.num_slots() && !*m_sigSaveProgress(percentage))
{
std::cerr << "\nSaving cancelled." << std::endl;
......@@ -448,7 +448,7 @@ class MolDyn
if(frame % 100)
{
std::cout << "\rSaving configuration " << (frame+1) << " of " << m_frames.size() << ". "
<< unsigned{percentage} << " %. ";
<< static_cast<unsigned>(percentage) << " %. ";
std::cout.flush();
}
}
......
......@@ -27,7 +27,7 @@
using t_real = double;
using t_vec = std::vector<t_real>;
using t_vec = tl2::vec<t_real, std::vector>;
using t_mat = tl2::mat<t_real, std::vector>;
......
......@@ -33,7 +33,7 @@ using namespace tl2_ops;
using t_real = double;
using t_cplx = std::complex<t_real>;
using t_vec = std::vector<t_cplx>;
using t_vec = tl2::vec<t_cplx, std::vector>;
using t_mat = tl2::mat<t_cplx, std::vector>;
using t_matvec = std::vector<t_mat>;
......
......@@ -33,7 +33,7 @@
using t_real = double;
using t_cplx = std::complex<t_real>;
using t_vec = std::vector<t_real>;
using t_vec = tl2::vec<t_real, std::vector>;
using t_vec_cplx = std::vector<t_cplx>;
using t_mat = tl2::mat<t_real, std::vector>;
using t_mat_cplx = tl2::mat<t_cplx, std::vector>;
......
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