Skip to content

Commit

Permalink
tracing
Browse files Browse the repository at this point in the history
  • Loading branch information
RudolfWeeber committed Jul 19, 2024
1 parent 719fa7b commit a4729bc
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/core/cell_system/CellStructure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,10 @@ struct CellStructure : public System::Leaf<CellStructure> {
for (auto &p : Cells::particles(decomposition->local_cells())) {
add_particle(std::move(p));
}
for (auto &p : local_particles()) {
std::cout << p.id()<< " ";
}
std::cout << std::endl;
}

public:
Expand Down
7 changes: 6 additions & 1 deletion src/core/cell_system/RegularDecomposition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ void RegularDecomposition::init_cell_interactions() {
if (fully_connected_boundary()) {
if ((*fully_connected_boundary()).first ==
(*fully_connected_boundary()).second) {
throw std::runtime_error("fully_connectd_boudnary normal and connection "
throw std::runtime_error("fully_connectd_boundary normal and connection "
"coordinates need to differ.");
}
if (node_grid[(*fully_connected_boundary()).second] != 1) {
Expand Down Expand Up @@ -674,6 +674,11 @@ RegularDecomposition::RegularDecomposition(
boost::optional<std::pair<int, int>> fully_connected)
: m_comm(std::move(comm)), m_box(box_geo), m_local_box(local_geo),
m_fully_connected_boundary(fully_connected) {

std::cout << "Regular: Range: "<<range<<std::endl;
if (m_fully_connected_boundary) {
std::cout << "fcb "<<(*m_fully_connected_boundary).first<<" "<<(*m_fully_connected_boundary).second<<std::endl;
}
/* set up new regular decomposition cell structure */
create_cell_grid(range);

Expand Down
1 change: 1 addition & 0 deletions src/core/forces.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ void System::System::calculate_forces() {
lb_couple_particles();
}

particles = cell_structure->local_particles();
#ifdef CUDA
#ifdef CALIPER
CALI_MARK_BEGIN("copy_forces_from_GPU");
Expand Down
2 changes: 1 addition & 1 deletion src/script_interface/cell_system/CellSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ void CellSystem::initialize(CellStructureType const &cs_type,
m_cell_structure->set_hybrid_decomposition(cutoff_regular, n_square_types);
} else if (cs_type == CellStructureType::REGULAR) {
boost::optional<std::pair<int, int>> fcb_pair = {};
if (params.count("fully_conected_boundary") && is_type<None>(params.at("fully_connected_boudnary"))) {
if (params.count("fully_connected_boundary") && is_type<None>(params.at("fully_connected_boundary"))) {
// pass
} else {
auto const fully_connected_boundary = get_value_or<std::vector<int>>(params, "fully_connected_boundary", {});
Expand Down

0 comments on commit a4729bc

Please sign in to comment.