Skip to content

Dccrg test #1333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pedr-nz wants to merge 3 commits into
base: dev
Choose a base branch
from
Draft

Dccrg test #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e804e4c
Ensure C++17 compatible
May 21, 2026
43e31aa
Update dccrg
Aug 10, 2026
e54849d
Update dccrg to new version
Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

[submodule "submodules/dccrg"]
path = submodules/dccrg
url = https://github.com/fmihpc/dccrg.git
branch = vlasiator-version
url = https://github.com/pedr-nz/dccrg.git
branch = attempt2-rmBoost

[submodule "submodules/eigen"]
path = submodules/eigen
Expand Down
2 changes: 1 addition & 1 deletion submodules/dccrg
Open in desktop
Submodule dccrg updated 61 files
+6 −0 .gitignore
+5 −2 Makefile
+115 −3 dccrg.hpp
+74 −255 dccrg_get_cell_datatype.hpp
+1 −0 dccrg_mpi_support.hpp
+3 −1 examples/basic_cell_data.cpp
+1 −1 examples/game_of_life.cpp
+1 −1 examples/game_of_life_with_output.cpp
+1 −1 examples/simple_game_of_life.cpp
+26 −0 makefiles/carrington_gcc_openmpi
+26 −0 makefiles/hile
+46 −0 testpackage/full_test_carrington.sh
+4 −0 testpackage/list_passed_tests.sh
+3 −3 tests/additional_cell_data/neighbor_data1.cpp
+3 −3 tests/additional_cell_data/neighbor_data2.cpp
+6 −6 tests/additional_cell_data/project_makefile
+3 −3 tests/additional_cell_data/test1.cpp
+3 −3 tests/additional_cell_data/test2.cpp
+3 −3 tests/advection/project_makefile
+6 −5 tests/constructors/copy.cpp
+2 −2 tests/constructors/project_makefile
+1 −1 tests/constructors/simple.cpp
+2 −0 tests/game_of_life/cell.hpp
+2 −2 tests/game_of_life/game_of_life_test.cpp
+1 −1 tests/game_of_life/game_of_life_test_array.cpp
+1 −1 tests/game_of_life/hierarchical_test.cpp
+1 −1 tests/game_of_life/pinned_cells.cpp
+21 −20 tests/game_of_life/project_makefile
+1 −1 tests/game_of_life/refined.cpp
+1 −1 tests/game_of_life/refined2d.cpp
+1 −1 tests/game_of_life/refined_scalability3d.cpp
+1 −1 tests/game_of_life/scalability.cpp
+1 −1 tests/game_of_life/scalability1d.cpp
+1 −1 tests/game_of_life/scalability3d.cpp
+2 −2 tests/game_of_life/unrefined2d.cpp
+2 −2 tests/geometry/project_makefile
+10 −54 tests/get_cell_datatype/enable_if.cpp
+0 −125 tests/get_cell_datatype/get_cell_mpi_datatype.cpp
+3 −14 tests/get_cell_datatype/project_makefile
+2 −32 tests/get_cell_datatype/run_time.cpp
+1 −1 tests/get_cells/project_makefile
+1 −1 tests/get_cells/test1.cpp
+1 −1 tests/init/init.cpp
+9 −9 tests/iterators/project_makefile
+1 −1 tests/iterators/test1.cpp
+1 −1 tests/iterators/test2.cpp
+1 −1 tests/iterators/test3.cpp
+1 −1 tests/iterators/test4.cpp
+1 −1 tests/load_balancing/load_balancing_test.cpp
+1 −1 tests/load_balancing/multi_stage_load_balancing.cpp
+4 −4 tests/load_balancing/project_makefile
+2 −2 tests/mpi_support/all_gather.cpp
+4 −4 tests/mpi_support/project_makefile
+9 −7 tests/refine/dont_refine.cpp
+6 −6 tests/refine/project_makefile
+1 −1 tests/refine/refine_simple.cpp
+1 −1 tests/refine/scalability.cpp
+4 −4 tests/refine/unrefine_simple.cpp
+1 −1 tests/restart/cell.hpp
+2 −0 tests/restart/project_makefile
+3 −3 tests/restart/variable_cell_data.cpp
2 changes: 1 addition & 1 deletion vlasovsolver/cpu_trans_pencils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ void printPencilsFunc(const setOfPencils& pencils, const uint dimension, const i
for (auto id : cells) {
ss << id << " ";
for (auto [bin2, cells2] : pencils.targetCellsInBin) {
if (bin != bin2 && cells2.contains(id)) {
if (bin != bin2 && cells2.count(id)>0) {
collisions.insert(bin2);
}
}
Expand Down
8 changes: 4 additions & 4 deletions vlasovsolver/cpu_trans_pencils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ struct setOfPencils {
for (auto id = ids.begin() + idsStart[i]; id < ids.begin() + idsStart[i] + lengthOfPencils[i]; ++id) {
// We don't need to consider source and target cells of the pencil separately
// as all pencils with source/target cell C must be in the same bin as all pencils with target C
if (*id && allTargetCells.contains(*id)) {
if (*id && allTargetCells.count(*id)>0) {
targetCellsInBin[i].insert(*id);
}
}
Expand All @@ -148,18 +148,18 @@ struct setOfPencils {
do {
binsToDelete.clear();
for (auto& [binIndex1, cellsInBin1] : targetCellsInBin) {
if (binsToDelete.contains(binIndex1)) {
if (binsToDelete.count(binIndex1)>0) {
continue;
}

for (auto& [binIndex2, cellsInBin2] : targetCellsInBin) {
if (binIndex1 == binIndex2 || binsToDelete.contains(binIndex2)) {
if (binIndex1 == binIndex2 || binsToDelete.count(binIndex2)>0) {
continue;
}

// Check for overlapping cells
for (auto cell : cellsInBin2) {
if (cellsInBin1.contains(cell)) {
if (cellsInBin1.count(cell)>0) {
binsToDelete.insert(binIndex2);

// Insert all cells from bin2 to bin1
Expand Down
Loading