From 8115c3c8d76c1aee3aef6079e0f162cea9a5ec9b Mon Sep 17 00:00:00 2001 From: Andreas Gattringer <andreas.gattringer@univie.ac.at> Date: Tue, 18 Jul 2023 14:42:44 +0200 Subject: [PATCH] butterflies: whitespace changes --- src/modules/butterflies/butterflies_actions.c | 3 ++- src/modules/butterflies/butterflies_generations.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/butterflies/butterflies_actions.c b/src/modules/butterflies/butterflies_actions.c index 4706600..4ce07be 100644 --- a/src/modules/butterflies/butterflies_actions.c +++ b/src/modules/butterflies/butterflies_actions.c @@ -133,6 +133,7 @@ void grid_butterflies_maturation(struct cats_grid *grid, struct cats_thread_info continue; } + bf_cell_maturation(grid, ts, row, col, false); } } @@ -180,7 +181,6 @@ void butterflies_area_dispersal(struct cats_grid *grid, struct cats_thread_info for (cats_dt_coord row = start_row; row < end_row; row++) { for (cats_dt_coord col = start_col; col < end_col; col++) { - if (cell_excluded_by_overlay(conf, row, col) || bf_cell_excluded_by_generation(grid, row, col)) { continue; @@ -189,6 +189,7 @@ void butterflies_area_dispersal(struct cats_grid *grid, struct cats_thread_info butterflies_cell_dispersal(grid, ts, row, col, false, false); } } + /* if (ts->rw_debug_cells_with_adults) { log_message(LOG_INFO, "thread %d: %ld cells with adults, %ld random walks, %ld deposits", diff --git a/src/modules/butterflies/butterflies_generations.c b/src/modules/butterflies/butterflies_generations.c index 70f21d1..3e0ab66 100644 --- a/src/modules/butterflies/butterflies_generations.c +++ b/src/modules/butterflies/butterflies_generations.c @@ -59,6 +59,7 @@ void bf_area_generation_update(struct cats_grid *grid, struct cats_thread_info * } cats_dt_rates gen = calculate_rate(rate, 0, conf->param, grid, row, col, NULL); + data->generations[row][col] = (float) gen; if (data->eggs[row][col] > 0) cells_with_eggs += 1; -- GitLab