Skip to content
Snippets Groups Projects
Commit 43ed7a5c authored by Abhinav Singh's avatar Abhinav Singh
Browse files

Merge remote-tracking branch 'origin/develop' into FD_solver

parents 58a60102 28f507af
Branches FD_solver
No related tags found
No related merge requests found
Pipeline #5378 failed
...@@ -45,6 +45,8 @@ void write_test_report(report_sparse_grid_tests &report_sparsegrid_funcs, std::s ...@@ -45,6 +45,8 @@ void write_test_report(report_sparse_grid_tests &report_sparsegrid_funcs, std::s
plotGetSingle2D(report_sparsegrid_funcs, testSet, plotCounter); plotGetSingle2D(report_sparsegrid_funcs, testSet, plotCounter);
plotGetNeighbourhood2D(report_sparsegrid_funcs, testSet, plotCounter); plotGetNeighbourhood2D(report_sparsegrid_funcs, testSet, plotCounter);
std::string file_xml_results(test_dir); std::string file_xml_results(test_dir);
file_xml_results += std::string("/") + std::string(perfResultsXmlFile); file_xml_results += std::string("/") + std::string(perfResultsXmlFile);
...@@ -310,7 +312,7 @@ void plotDense3D(report_sparse_grid_tests &report_sparsegrid_funcs, std::set<std ...@@ -310,7 +312,7 @@ void plotDense3D(report_sparse_grid_tests &report_sparsegrid_funcs, std::set<std
base + ".gridScaling(#).GFlops.mean"); base + ".gridScaling(#).GFlops.mean");
report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").x.data(0).source", report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").x.data(0).source",
base + ".gridScaling(#).gridSize.x"); base + ".gridScaling(#).gridSize.x");
report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").options.log_x", true); report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").options.log_x", true);
int bes = static_cast<int>( report_sparsegrid_funcs.graphs.template get<double>( int bes = static_cast<int>( report_sparsegrid_funcs.graphs.template get<double>(
base + ".gridScaling(0).blockSize")); base + ".gridScaling(0).blockSize"));
report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").y.data(0).title", report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").y.data(0).title",
...@@ -330,7 +332,7 @@ void plotDense3D(report_sparse_grid_tests &report_sparsegrid_funcs, std::set<std ...@@ -330,7 +332,7 @@ void plotDense3D(report_sparse_grid_tests &report_sparsegrid_funcs, std::set<std
base + ".blockScaling(#).GFlops.mean"); base + ".blockScaling(#).GFlops.mean");
report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").x.data(0).source", report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").x.data(0).source",
base + ".blockScaling(#).blockSize"); base + ".blockScaling(#).blockSize");
report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").options.log_x",true); report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").options.log_x",true);
int ges = static_cast<int>( report_sparsegrid_funcs.graphs.template get<double>( int ges = static_cast<int>( report_sparsegrid_funcs.graphs.template get<double>(
base + ".blockScaling(0).gridSize.x")); base + ".blockScaling(0).gridSize.x"));
report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").y.data(0).title", report_sparsegrid_funcs.graphs.add("graphs.graph(" + std::to_string(plotCounter) + ").y.data(0).title",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment