diff --git a/src/Grid/tests/grid_dist_id_unit_test_ext_dom.hpp b/src/Grid/tests/grid_dist_id_unit_test_ext_dom.hpp index add6c61dc43619ecdddf48d30393fa73c3807bb6..1fb50e130f58e2bf9fd6903e60ff37d2a6a479f0 100644 --- a/src/Grid/tests/grid_dist_id_unit_test_ext_dom.hpp +++ b/src/Grid/tests/grid_dist_id_unit_test_ext_dom.hpp @@ -28,7 +28,7 @@ void Test3D_extended_grid(const Box<3,float> & domain, long int k) float factor = pow(create_vcluster().getProcessingUnits()/2.0f,1.0f/3.0f); // This test in order to work must have at least one ghost - for ( ; (0.01 / factor) > (domain.getHigh(0) - domain.getLow(0) / k) ; k-= (k > 2*big_step)?big_step:small_step ) + for ( ; (0.01 / factor) > ((domain.getHigh(0) - domain.getLow(0)) / k) ; k-= (k > 2*big_step)?big_step:small_step ) { BOOST_TEST_CHECKPOINT( "Testing 3D extended grid k=" << k ); diff --git a/src/Grid/tests/sgrid_dist_id_unit_tests.cpp b/src/Grid/tests/sgrid_dist_id_unit_tests.cpp index 42b477a71761253aa5302655ce14d7238e8e416a..153862d5ca9bd426be1cd28143fc048ccec12cff 100644 --- a/src/Grid/tests/sgrid_dist_id_unit_tests.cpp +++ b/src/Grid/tests/sgrid_dist_id_unit_tests.cpp @@ -226,17 +226,6 @@ BOOST_AUTO_TEST_CASE( sgrid_dist_id_basic_test_2D) 4.0*sg.template get<0>(key); good &= (lap == 4.0); - - if (good == false) - { - int debug = 0; - - std::cout << sg.template get<0>(key.move(x,1)) << " " << sg.template get<0>(key.move(x,-1)) << " " << - sg.template get<0>(key.move(y,1))<< " " << sg.template get<0>(key.move(y,-1)) << " " << - 4.0*sg.template get<0>(key) << std::endl; - - debug++; - } } ++it4; @@ -501,17 +490,6 @@ BOOST_AUTO_TEST_CASE( sparse_grid_fast_stencil_vectorized_simplified_conv2) - deltaT * grid.get<U>(Cp) * grid.get<V>(Cp) * grid.get<V>(Cp) + - deltaT * F * (grid.get<U>(Cp) - 1.0) - grid.get<U_next>(Cp)) > 0.000000001 ) { - std::cout << "U: " << grid.get<U>(Cp) + uFactor * ( - grid.get<U>(mz) + - grid.get<U>(pz) + - grid.get<U>(my) + - grid.get<U>(py) + - grid.get<U>(mx) + - grid.get<U>(px) - - 6.0*grid.get<U>(Cp)) + - - deltaT * grid.get<U>(Cp) * grid.get<V>(Cp) * grid.get<V>(Cp) + - - deltaT * F * (grid.get<U>(Cp) - 1.0) << " != " << grid.get<U_next>(Cp) << " " << Cp.to_string() << std::endl; - match = false; break; } @@ -528,16 +506,6 @@ BOOST_AUTO_TEST_CASE( sparse_grid_fast_stencil_vectorized_simplified_conv2) deltaT * grid.get<U>(Cp) * grid.get<V>(Cp) * grid.get<V>(Cp) + - deltaT * (F+K) * grid.get<V>(Cp) - grid.get<V_next>(Cp)) > 0.000000001 ) { - std::cout << "V: " << grid.get<V>(Cp) + vFactor * ( - grid.get<V>(mz) + - grid.get<V>(pz) + - grid.get<V>(my) + - grid.get<V>(py) + - grid.get<V>(mx) + - grid.get<V>(px) - - 6*grid.get<V>(Cp)) + - deltaT * grid.get<U>(Cp) * grid.get<V>(Cp) * grid.get<V>(Cp) + - - deltaT * (F+K) * grid.get<V>(Cp) << "!= " << grid.get<V_next>(Cp) << " " << Cp.to_string() << std::endl; match = false; break; } @@ -698,16 +666,6 @@ BOOST_AUTO_TEST_CASE( sparse_grid_fast_stencil_vectorized_simplified_conv2_cross - deltaT * grid.get<U>(Cp) * grid.get<V>(Cp) * grid.get<V>(Cp) + - deltaT * F * (grid.get<U>(Cp) - 1.0) - grid.get<U_next>(Cp)) > 0.000000001 ) { - std::cout << "U: " << grid.get<U>(Cp) + uFactor * ( - grid.get<U>(mz) + - grid.get<U>(pz) + - grid.get<U>(my) + - grid.get<U>(py) + - grid.get<U>(mx) + - grid.get<U>(px) - - 6.0*grid.get<U>(Cp)) + - - deltaT * grid.get<U>(Cp) * grid.get<V>(Cp) * grid.get<V>(Cp) + - - deltaT * F * (grid.get<U>(Cp) - 1.0) << " != " << grid.get<U_next>(Cp) << " " << Cp.to_string() << std::endl; match = false; break; } @@ -724,17 +682,6 @@ BOOST_AUTO_TEST_CASE( sparse_grid_fast_stencil_vectorized_simplified_conv2_cross deltaT * grid.get<U>(Cp) * grid.get<V>(Cp) * grid.get<V>(Cp) + - deltaT * (F+K) * grid.get<V>(Cp) - grid.get<V_next>(Cp)) > 0.000000001 ) { - std::cout << "V: " << grid.get<V>(Cp) + vFactor * ( - grid.get<V>(mz) + - grid.get<V>(pz) + - grid.get<V>(my) + - grid.get<V>(py) + - grid.get<V>(mx) + - grid.get<V>(px) - - 6*grid.get<V>(Cp)) + - deltaT * grid.get<U>(Cp) * grid.get<V>(Cp) * grid.get<V>(Cp) + - - deltaT * (F+K) * grid.get<V>(Cp) << " != " << grid.get<V_next>(Cp) << " key: " << Cp.to_string() << std::endl; - match = false; break; }