diff --git a/src/FiniteDifference/FDScheme.hpp b/src/FiniteDifference/FDScheme.hpp
index cf94aefea29bd5d205b8a45d079363cea3975b2e..ff669b8b7be61074c95d5884af6201d7003052dd 100644
--- a/src/FiniteDifference/FDScheme.hpp
+++ b/src/FiniteDifference/FDScheme.hpp
@@ -616,6 +616,32 @@ private:
g_map.template ghost_get<0>();
}
+ /*! \initialize the object FDScheme
+ *
+ * \param domain simulation domain
+ *
+ */
+ void Initialize(const Box<Sys_eqs::dims,typename Sys_eqs::stype> & domain)
+ {
+ construct_gmap();
+
+ // Create a CellDecomposer and calculate the spacing
+
+ size_t sz_g[Sys_eqs::dims];
+ for (size_t i = 0 ; i < Sys_eqs::dims ; i++)
+ {
+ if (Sys_eqs::boundary[i] == NON_PERIODIC)
+ sz_g[i] = gs.getSize()[i] - 1;
+ else
+ sz_g[i] = gs.getSize()[i];
+ }
+
+ CellDecomposer_sm<Sys_eqs::dims,typename Sys_eqs::stype> cd(domain,sz_g,0);
+
+ for (size_t i = 0 ; i < Sys_eqs::dims ; i++)
+ spacing[i] = cd.getCellBox().getHigh(i);
+ }
+
public:
/*! \brief set the staggered position for each property
@@ -676,34 +702,34 @@ public:
* \param pd Padding, how many points out of boundary are present
* \param stencil maximum extension of the stencil on each directions
* \param domain the domain
- * \param gs grid infos where Finite differences work
- * \param b_g Finite difference grid (it is not important what it contain only its decomposition is used)
+ * \param b_g object grid that will store the solution
+ *
+ */
+ FDScheme(const Ghost<Sys_eqs::dims,long int> & stencil,
+ const Box<Sys_eqs::dims,typename Sys_eqs::stype> & domain,
+ const typename Sys_eqs::b_grid & b_g)
+ :pd({0,0,0},{0,0,0}),gs(b_g.getGridInfoVoid()),g_map(b_g,stencil,pd),row(0),row_b(0)
+ {
+ Initialize(domain);
+ }
+
+ /*! \brief Constructor
+ *
+ * The periodicity is given by the grid b_g
+ *
+ * \param pd Padding, how many points out of boundary are present
+ * \param stencil maximum extension of the stencil on each directions
+ * \param domain the domain
+ * \param b_g object grid that will store the solution
*
*/
FDScheme(Padding<Sys_eqs::dims> & pd,
const Ghost<Sys_eqs::dims,long int> & stencil,
const Box<Sys_eqs::dims,typename Sys_eqs::stype> & domain,
- const grid_sm<Sys_eqs::dims,void> & gs,
const typename Sys_eqs::b_grid & b_g)
- :pd(pd),gs(gs),g_map(b_g,stencil,pd),row(0),row_b(0)
+ :pd(pd),gs(b_g.getGridInfoVoid()),g_map(b_g,stencil,pd),row(0),row_b(0)
{
- construct_gmap();
-
- // Create a CellDecomposer and calculate the spacing
-
- size_t sz_g[Sys_eqs::dims];
- for (size_t i = 0 ; i < Sys_eqs::dims ; i++)
- {
- if (Sys_eqs::boundary[i] == NON_PERIODIC)
- sz_g[i] = gs.getSize()[i] - 1;
- else
- sz_g[i] = gs.getSize()[i];
- }
-
- CellDecomposer_sm<Sys_eqs::dims,typename Sys_eqs::stype> cd(domain,sz_g,0);
-
- for (size_t i = 0 ; i < Sys_eqs::dims ; i++)
- spacing[i] = cd.getCellBox().getHigh(i);
+ Initialize(domain);
}
/*! \brief Impose an operator
@@ -802,8 +828,8 @@ public:
*/
template<unsigned int prp, typename T, typename b_term, typename iterator> void impose_dit(const T & op ,
b_term & b_t,
- long int id ,
- const iterator & it_d)
+ const iterator & it_d,
+ long int id = 0)
{
grid_b<b_term,prp> b(b_t);
@@ -894,6 +920,33 @@ public:
copy_normal<Vct,Grid_dst,pos...>(v,g_dst);
}
}
+
+ /*! \brief Copy the vector into the grid
+ *
+ * ## Copy the solution into the grid
+ * \snippet eq_unit_test.hpp Copy the solution to grid
+ *
+ * \tparam scheme Discretization scheme
+ * \tparam Grid_dst type of the target grid
+ * \tparam pos target properties
+ *
+ * \param v Vector that contain the solution of the system
+ * \param g_dst Destination grid
+ *
+ */
+ template<unsigned int ... pos, typename Vct, typename Grid_dst> void copy(Vct & v, Grid_dst & g_dst)
+ {
+ long int start[Sys_eqs_typ::dims];
+ long int stop[Sys_eqs_typ::dims];
+
+ for (size_t i = 0 ; i < Sys_eqs_typ::dims ; i++)
+ {
+ start[i] = 0;
+ stop[i] = g_dst.size(i);
+ }
+
+ this->copy<pos...>(v,start,stop,g_dst);
+ }
};
#define EQS_FIELDS 0
diff --git a/src/FiniteDifference/eq_unit_test.hpp b/src/FiniteDifference/eq_unit_test.hpp
index e97ac66f26e502388262b1cb0dfee8533a2ed111..d7b98e77da13f27c82d74544f8d3fa2d73645ca7 100644
--- a/src/FiniteDifference/eq_unit_test.hpp
+++ b/src/FiniteDifference/eq_unit_test.hpp
@@ -174,7 +174,7 @@ template<typename solver_type,typename lid_nn> void lid_driven_cavity_2d()
Ghost<2,long int> stencil_max(1);
// Finite difference scheme
- FDScheme<lid_nn> fd(pd, stencil_max, domain, g_dist.getGridInfo(), g_dist);
+ FDScheme<lid_nn> fd(pd, stencil_max, domain,g_dist);
// Here we impose the equation, we start from the incompressibility Eq imposed in the bulk with the
// exception of the first point {0,0} and than we set P = 0 in {0,0}, why we are doing this is again
diff --git a/src/FiniteDifference/eq_unit_test_3d.hpp b/src/FiniteDifference/eq_unit_test_3d.hpp
index b515558df366c7a89f08200b7d531fd4eb61495b..71626e592ae0891da23cfc7c6b700850934deab2 100644
--- a/src/FiniteDifference/eq_unit_test_3d.hpp
+++ b/src/FiniteDifference/eq_unit_test_3d.hpp
@@ -124,7 +124,7 @@ template<typename solver_type,typename lid_nn_3d> void lid_driven_cavity_3d()
Ghost<3,long int> stencil_max(1);
// Distributed grid
- FDScheme<lid_nn_3d> fd(pd,stencil_max,domain,g_dist.getGridInfo(),g_dist);
+ FDScheme<lid_nn_3d> fd(pd,stencil_max,domain,g_dist);
// start and end of the bulk
diff --git a/src/interpolation/interpolation_unit_tests.hpp b/src/interpolation/interpolation_unit_tests.hpp
index bd0437cc7aed3a48f1a60f2eba732410db99849a..c2d8a39503defdfcb6a0f4a3a5268557f278540a 100644
--- a/src/interpolation/interpolation_unit_tests.hpp
+++ b/src/interpolation/interpolation_unit_tests.hpp
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE( interpolation_full_test )
Box<2,float> domain({0.0,0.0},{1.0,1.0});
size_t sz[2] = {64,64};
- Ghost<2,long int> gg(3);
+ Ghost<2,long int> gg(2);
Ghost<2,float> gv(0.01);
size_t bc_v[2] = {PERIODIC,PERIODIC};