diff --git a/src/modules/butterflies/butterflies_stats.c b/src/modules/butterflies/butterflies_stats.c index 20925e9467b81c86abd65d121e3b86430ea1150f..bef5daf5d790d9cd2b68e479f2bba24a567c2fa5 100644 --- a/src/modules/butterflies/butterflies_stats.c +++ b/src/modules/butterflies/butterflies_stats.c @@ -12,6 +12,7 @@ #include "temporal/phase_names.h" #include "temporal/years.h" + const char *bf_get_stats_field_name(enum butterfly_stats which) { switch (which) { @@ -25,8 +26,6 @@ const char *bf_get_stats_field_name(enum butterfly_stats which) return "unpopulated_unfit"; case BF_STAT_EXCLUDED: return "excluded"; - case BF_STAT_GENERATION_ACTIVE: - return "generation_active"; case BF_POPULATED_AT_DISPERSAL: return "populated_at_dispersal"; @@ -51,6 +50,7 @@ const char *bf_get_stats_field_name(enum butterfly_stats which) exit_cats(EXIT_FAILURE); } + struct string_array *bf_assemble_stats(struct cats_configuration *conf, struct cats_grid *grid, bool header) { struct conf_data_butterflies *module_conf = CATS_MODULE_DATA; @@ -125,6 +125,7 @@ void bf_stats_write(struct cats_configuration *conf, struct cats_grid *grid) free_string_array(&data); } + void bf_area_stats_gather(struct cats_grid *grid, struct cats_thread_info *ts) { struct conf_data_butterflies *module_conf = CATS_MODULE_DATA; @@ -138,7 +139,6 @@ void bf_area_stats_gather(struct cats_grid *grid, struct cats_thread_info *ts) const int64_t id_unpop_unfit = module_conf->stat_ids[BF_STAT_UNPOPULATED_UNFIT]; const int32_t grid_id = grid->id; - //const cats_dt_rates zt = grid->param.ZT; const cats_dt_rates ot = grid->param.OT; struct statistics *stats = &ts->stats[grid_id]; diff --git a/src/modules/butterflies/butterflies_stats.h b/src/modules/butterflies/butterflies_stats.h index 09223497053184c8829e09838263aa2431d1a5f8..e213208d3b0647ac0c45e944247d593b1f7f3dc4 100644 --- a/src/modules/butterflies/butterflies_stats.h +++ b/src/modules/butterflies/butterflies_stats.h @@ -13,7 +13,6 @@ enum butterfly_stats { BF_STAT_UNPOPULATED_FIT, BF_STAT_UNPOPULATED_UNFIT, BF_STAT_EXCLUDED, - BF_STAT_GENERATION_ACTIVE, BF_OUTPUT_STAT_MAX, BF_POPULATED_AT_DISPERSAL, BF_RANDOM_WALK_COUNT,