From 6321217682cf7c864867255522fa854a16443763 Mon Sep 17 00:00:00 2001
From: Andreas Gattringer <andreas.gattringer@univie.ac.at>
Date: Tue, 25 Jul 2023 15:11:02 +0200
Subject: [PATCH] butterflies: remove unused stat
---
src/modules/butterflies/butterflies_stats.c | 6 +++---
src/modules/butterflies/butterflies_stats.h | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/modules/butterflies/butterflies_stats.c b/src/modules/butterflies/butterflies_stats.c
index 20925e9..bef5daf 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 0922349..e213208 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,
--
GitLab