Commit d2ebc57b authored by incardon's avatar incardon

Fixing osx

parent 18cb8a75
...@@ -95,6 +95,7 @@ class petsc_AMG_report ...@@ -95,6 +95,7 @@ class petsc_AMG_report
Vcluster & v_cl = create_vcluster(); Vcluster & v_cl = create_vcluster();
v_cl.max(time1); v_cl.max(time1);
v_cl.max(time2); v_cl.max(time2);
v_cl.execute();
// Save the result // Save the result
AMG_time_err_coars tmp; AMG_time_err_coars tmp;
......
...@@ -23,6 +23,18 @@ ...@@ -23,6 +23,18 @@
template<typename copy_type, typename T, typename Ev, typename Eqs_sys, int sa> template<typename copy_type, typename T, typename Ev, typename Eqs_sys, int sa>
struct copy_ele_sca_array struct copy_ele_sca_array
{ {
/*! \brief Constructor
*
* It define the copy parameters.
*
* \param key destination position
* \param grid_dst grid destination
* \param x Source vector
* \param lin_id source element inside the vector
* \param gs_size grid size
* \param base_id processor id start
*
*/
template<typename Grid> inline static void copy(Grid & grid_dst, const grid_dist_key_dx<Eqs_sys::dims> & key, const Ev & x,size_t lin_id, size_t base_id, size_t gs_size) template<typename Grid> inline static void copy(Grid & grid_dst, const grid_dist_key_dx<Eqs_sys::dims> & key, const Ev & x,size_t lin_id, size_t base_id, size_t gs_size)
{ {
grid_dst.template get<T::value>(key) = x(lin_id * Eqs_sys::nvar + base_id); grid_dst.template get<T::value>(key) = x(lin_id * Eqs_sys::nvar + base_id);
...@@ -41,6 +53,18 @@ struct copy_ele_sca_array ...@@ -41,6 +53,18 @@ struct copy_ele_sca_array
template<typename copy_type, typename T, typename Ev, typename Eqs_sys> template<typename copy_type, typename T, typename Ev, typename Eqs_sys>
struct copy_ele_sca_array<copy_type,T,Ev,Eqs_sys,1> struct copy_ele_sca_array<copy_type,T,Ev,Eqs_sys,1>
{ {
/*! \brief Constructor
*
* It define the copy parameters.
*
* \param key destination position
* \param grid_dst grid destination
* \param x Source vector
* \param lin_id source element inside the vector
* \param gs_size grid size
* \param base_id processor id start
*
*/
template<typename Grid> inline static void copy(Grid & grid_dst, const grid_dist_key_dx<Eqs_sys::dims> & key, const Ev & x,size_t lin_id, size_t base_id, size_t gs_size) template<typename Grid> inline static void copy(Grid & grid_dst, const grid_dist_key_dx<Eqs_sys::dims> & key, const Ev & x,size_t lin_id, size_t base_id, size_t gs_size)
{ {
for (size_t i = 0 ; i < std::extent<copy_type>::value ; i++) for (size_t i = 0 ; i < std::extent<copy_type>::value ; i++)
...@@ -84,13 +108,15 @@ struct copy_ele ...@@ -84,13 +108,15 @@ struct copy_ele
//! source vector //! source vector
const Ev & x; const Ev & x;
/*! \brief constructor /*! \brief Constructor
* *
* It define the copy parameters. * It define the copy parameters.
* *
* \param key destination position * \param key destination position
* \param grid_dst grid destination * \param grid_dst grid destination
* \param v Source vector * \param x Source vector
* \param lin_id source element inside the vector
* \param gs_size grid size
* *
*/ */
inline copy_ele(const grid_dist_key_dx<Eqs_sys::dims> & key, S & grid_dst, const Ev & x, size_t lin_id, size_t gs_size) inline copy_ele(const grid_dist_key_dx<Eqs_sys::dims> & key, S & grid_dst, const Ev & x, size_t lin_id, size_t gs_size)
...@@ -109,7 +135,11 @@ struct copy_ele ...@@ -109,7 +135,11 @@ struct copy_ele
{std::cerr << "Error: " <<__FILE__ << ":" << __LINE__ << " Passing a temporal object";}; {std::cerr << "Error: " <<__FILE__ << ":" << __LINE__ << " Passing a temporal object";};
#endif #endif
//! It call the copy function for each property /*! \brief It call the copy function for each property
*
* \param t property id
*
*/
template<typename T> template<typename T>
inline void operator()(T& t) inline void operator()(T& t)
{ {
......
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