Commit 31880470 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Merging with master

parent 6e39b110
......@@ -507,7 +507,7 @@ public:
* \param p Point to apply the boundary condition
*
*/
bool applyPointBC(Point<dim,T> & pt) const
void applyPointBC(Point<dim,T> & pt) const
{
for (size_t i = 0 ; i < dim ; i++)
{
......
......@@ -698,11 +698,6 @@ public:
#endif
InitializeCellDecomposer(g_sz);
// get the grid spacing
Box<dim,St> sp = cd_sm.getCellBox();
InitializeCellDecomposer(g_sz);
ghost = convert_ghost(g,cd_sm);
InitializeDecomposition(g_sz);
......
......@@ -271,8 +271,8 @@ void Test2D(const Box<2,float> & domain, long int k)
grid_key_dx<2> start = dom2.getStart();
grid_key_dx<2> stop = dom2.getStop();
BOOST_REQUIRE_EQUAL(stop.get(0),g_dist.size(0)-1);
BOOST_REQUIRE_EQUAL(stop.get(1),g_dist.size(1)-1);
BOOST_REQUIRE_EQUAL((long int)stop.get(0),(long int)g_dist.size(0)-1);
BOOST_REQUIRE_EQUAL((long int)stop.get(1),(long int)g_dist.size(1)-1);
BOOST_REQUIRE_EQUAL(start.get(0),0);
BOOST_REQUIRE_EQUAL(start.get(1),0);
......
......@@ -18,8 +18,6 @@ BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
{
typedef Point2D_test<float> p;
Vcluster & v_cl = *global_v_cluster;
// Domain
Box<2,float> domain({0.0,0.0},{1.0,1.0});
......@@ -47,8 +45,6 @@ BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
{
auto key = it.get();
grid_key_dx<2> keyg = sg.getGKey(key);
sg.template get<p::s>(key) = 1;
sg.template get<p::v>(key)[0] = 0;
......@@ -62,7 +58,6 @@ BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
++it;
}
sg.write("stag_test.vtk");
/* }*/
}
......
......@@ -171,7 +171,7 @@ private:
// Particle to move
if (p_id != v_cl.getProcessUnitID())
{
if (p_id != -1)
if ((long int)p_id != -1)
{
prc_sz.get(p_id)++;
lbl_p.get(p_id).add(key);
......
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