Commit 989faad7 authored by COULAUD Olivier's avatar COULAUD Olivier
Browse files

Remove old data files and update test_l2p

parent 876a5d56
# Data sets
## cuboide distribution
## cuboid distribution
- unitCube_100_PF.fma 100 particles in [0, 1]^3 ; 1/r kernels outputs = value + gradient
- unitCube_100K_PF.bfma 100000 particles in [0, 1]^3; 1/r kernels outputs = value + gradient
- datal2p_10.fma 10 particles in [0, 1]^3 but located in box [0,0,5]^3 with
......@@ -12,3 +12,9 @@
## elipsoid distribution
8 8 3 1
20 8 0 0 0
-0.809016942977905 -0.587785363197327 0 1 19.8690448901211 -8.03720144984615 -5.83936272467833 0
-0.587785065174103 -0.80901712179184 0 1 19.8690495043939 -5.83939212936456 -8.03717974258334 0
-0.95105654001236 -0.309016972780228 0 1 19.8690462463629 -9.44828754171591 -3.0699546578931 0
-1 -8.74227765734759e-08 0 1 19.8690467557751 -9.9345234899819 1.51865955164976e-05 0
-0.309017091989517 -0.951056480407715 0 1 19.8690496611776 -3.06990660445839 -9.44830426975436 0
-0.951056480407715 0.309017032384872 0 1 19.8690472701359 -9.44829727552098 3.06991840282098 0
-0.809017062187195 0.587785184383392 0 1 19.8690468781146 -8.03718936858399 5.83938360192354 0
-0.587785184383392 0.80901700258255 0 1 19.8690471587839 -5.8393800625387 8.03718600152016 0
-4.37113882867379e-08 1 0 1 19.8690470527446 1.89416060747405e-06 9.93452384256731 0
-0.309017032384872 0.951056480407715 0 1 19.8690482868212 -3.0699299139211 9.44829552552104 0
1.19248806385031e-08 -1 0 1 19.8690461366028 3.33666059781912e-07 -9.93452305677763 0
0.30901712179184 -0.951056480407715 0 1 19.8690497486129 3.0699052375826 -9.44830561101195 0
0.587785065174103 -0.80901712179184 0 1 19.869049280649 5.83939700890764 -8.03717711587371 0
0.809016942977905 -0.587785303592682 0 1 19.8690448336021 8.03719717365274 -5.83936472513313 0
0.95105654001236 -0.309016942977905 0 1 19.8690460191081 9.44828920454901 -3.06995008068061 0
1 0 0 1 19.8690473849277 9.93452269860343 2.82761930803233e-06 0
0.309016972780228 0.95105654001236 0 1 19.8690465673824 3.06993714988633 9.44829410804673 0
0.95105654001236 0.30901700258255 0 1 19.8690469648262 9.4482950126871 3.06993670773744 0
0.587785243988037 0.80901700258255 0 1 19.8690465777223 5.83936608429895 8.0371976790359 0
0.80901700258255 0.587785243988037 0 1 19.8690468670862 8.03719603793721 5.83936810099824 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -58,7 +58,7 @@ auto derz_exp= [](const value_type& x, const value_type& y, const value_type& z)
auto poly = [](const value_type& x, const value_type& y, const value_type& z) -> value_type
{ return x*x + x*y + (y+1)*(1+y) + std::pow(z+1,4); };
auto derx_poly = [](const value_type& x, const value_type& y, const value_type& z) -> value_type
{ return 2*x + y; };
{ return value_type(2.0)*x + y; };
auto dery_poly = [](const value_type& x, const value_type& y, const value_type& z) -> value_type
{ return x+ 2*(y+1);};
auto derz_poly = [](const value_type& x, const value_type& y, const value_type& z) -> value_type
......@@ -170,7 +170,7 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int
time.tac();
std::cout << scalfmm::colors::green << "... Done.\n" << scalfmm::colors::reset;
std::cout << scalfmm::colors::yellow << "Container 3.0 loaded in " << time.elapsed() << "s\n"
std::cout << scalfmm::colors::yellow << "Container loaded in " << time.elapsed() << "s\n"
<< scalfmm::colors::reset;
time.tic();
......@@ -217,10 +217,10 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int
[&pos, &order, &roots_x, &roots_y, &roots_z, &global_idx, &far_uniform](auto& cell, auto& leaf) {
// func(x) = 0.5*(x*x + y*y + z*z)
// func(x) = 0.5*(x*x + y*y + z*z)
auto func = functions::exp;
auto derx_func = functions::derx_exp;
auto dery_func = functions::dery_exp;
auto derz_func = functions::derz_exp;
auto func = functions::poly;
auto derx_func = functions::derx_poly;
auto dery_func = functions::dery_poly;
auto derz_func = functions::derz_poly;
auto source_particle_iterator = leaf.particles().begin();
auto cont = leaf.particles();
......@@ -231,7 +231,7 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int
// Move roots inside cells x = center + width/2 roots
auto center = cell.center();
auto half_width = cell.width() * 0.5;
// auto pos_x(roots_x) ;
//
auto pos_x = half_width * roots_x + center[0];
auto pos_y = half_width * roots_y + center[1];
auto pos_z = half_width * roots_z + center[2];
......@@ -248,7 +248,6 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int
flatten_view.at(i) = func(pos_x[i], pos_y[i], pos_z[i]);
}
//
// std::cout << "loc: " << flatten_view << std::endl;
// Apply the l2p operator
/// farfield operator
///
......@@ -296,8 +295,7 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int
//
++pos;
});
// std::cout << scalfmm::colors::red << std::setprecision(10) <<"Energy: "<< energy<<" TotalPhysicalValue:
// " << total_physical_value<< std::endl<< scalfmm::colors::reset;
}
return 0;
}
Supports Markdown
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