From af5fa5202113bc29d5f62c2cdd1dabe28c1deb66 Mon Sep 17 00:00:00 2001 From: Andreas Gattringer <andreas.gattringer@univie.ac.at> Date: Wed, 19 Jul 2023 10:59:23 +0200 Subject: [PATCH] update file inclusions --- src/cats/configuration/check_configuration.c | 1 + src/cats/configuration/configuration.c | 1 + src/cats/configuration/preset.c | 3 +++ src/cats/configuration/print_configuration.c | 1 + src/cats/grids/grid_converters.c | 1 + src/cats/inline_carrying_capacity.h | 1 + src/cats/inline_vital_rates.h | 1 + src/cats/plants/plant_rates.c | 1 + src/cats/plants/plant_structures.c | 1 + src/cats/plants/seeds.c | 2 ++ src/cats/populations/plant_juveniles.c | 2 ++ 11 files changed, 15 insertions(+) diff --git a/src/cats/configuration/check_configuration.c b/src/cats/configuration/check_configuration.c index 4eaae98..fb54455 100644 --- a/src/cats/configuration/check_configuration.c +++ b/src/cats/configuration/check_configuration.c @@ -32,6 +32,7 @@ #include "inline_vital_rates.h" #include "dispersal/dispersal.h" #include "data/simulation_geometry.h" +#include "inline_vital_ages.h" int check_string(char *value, char *name) diff --git a/src/cats/configuration/configuration.c b/src/cats/configuration/configuration.c index 6d6fb2a..c6cc5a6 100644 --- a/src/cats/configuration/configuration.c +++ b/src/cats/configuration/configuration.c @@ -48,6 +48,7 @@ #include "inline_vital_rates.h" #include "dispersal/dispersal.h" #include "stats/grid_stats.h" +#include "inline_vital_ages.h" #ifdef CATS_ON_WINDOWS #include <windows.h> diff --git a/src/cats/configuration/preset.c b/src/cats/configuration/preset.c index 562e3cf..fef6c8a 100644 --- a/src/cats/configuration/preset.c +++ b/src/cats/configuration/preset.c @@ -21,11 +21,14 @@ * */ +#include <string.h> #include "cats_global.h" #include "preset.h" #include "vital_ages/default_vital_ages.h" #include "vital_rates/default_vital_rates.h" #include "inline_vital_rates.h" +#include "inline_vital_ages.h" +#include "misc/cats_maths_inline.h" enum cats_species_preset get_species_preset_from_from_string(const char *string) diff --git a/src/cats/configuration/print_configuration.c b/src/cats/configuration/print_configuration.c index 8265fe8..13bb981 100644 --- a/src/cats/configuration/print_configuration.c +++ b/src/cats/configuration/print_configuration.c @@ -33,6 +33,7 @@ #include "inline_vital_rates.h" #include "dispersal/dispersal.h" #include "modules/load_module.h" +#include "inline_vital_ages.h" const char *get_dispersal_name(enum dispersal_type type); diff --git a/src/cats/grids/grid_converters.c b/src/cats/grids/grid_converters.c index b09dd2c..b75b043 100644 --- a/src/cats/grids/grid_converters.c +++ b/src/cats/grids/grid_converters.c @@ -33,6 +33,7 @@ #include "populations/population.h" #include "inline_population.h" #include "dispersal/dispersal.h" +#include "misc/cats_maths_inline.h" cats_dt_environment **convert_double_to_environment(const struct cats_2d_array_double *in_grid) diff --git a/src/cats/inline_carrying_capacity.h b/src/cats/inline_carrying_capacity.h index 9b4c42c..c598758 100644 --- a/src/cats/inline_carrying_capacity.h +++ b/src/cats/inline_carrying_capacity.h @@ -36,6 +36,7 @@ #include "configuration/configuration.h" #include "plants/juveniles.h" #include "inline_vital_ages.h" +#include "inline_carrying_capacity.h" static inline cats_dt_rates juvenile_cc_multiplier(const struct cats_species_param *param, int32_t stage) diff --git a/src/cats/inline_vital_rates.h b/src/cats/inline_vital_rates.h index 65b7194..38de703 100644 --- a/src/cats/inline_vital_rates.h +++ b/src/cats/inline_vital_rates.h @@ -29,6 +29,7 @@ #include "data/cats_grid.h" #include "vital_rates/glm_functions.h" #include "vital_rates/direct_functions.h" +#include "inline.h" static inline cats_dt_rates get_vital_rate_maximum(const struct cats_vital_rate *vr) diff --git a/src/cats/plants/plant_rates.c b/src/cats/plants/plant_rates.c index 4c42753..16c881e 100644 --- a/src/cats/plants/plant_rates.c +++ b/src/cats/plants/plant_rates.c @@ -29,6 +29,7 @@ #include "data/cats_grid.h" #include "inline_population.h" #include "populations/population.h" +#include "misc/cats_maths_inline.h" cats_dt_rates get_pollination_probability(const struct cats_grid *grid, cats_dt_coord row, cats_dt_coord col, diff --git a/src/cats/plants/plant_structures.c b/src/cats/plants/plant_structures.c index d75d8f4..8d1378c 100644 --- a/src/cats/plants/plant_structures.c +++ b/src/cats/plants/plant_structures.c @@ -29,6 +29,7 @@ #include "seeds.h" #include "inline_population.h" #include "populations/population.h" +#include "inline_vital_ages.h" #include <memory/cats_memory.h> diff --git a/src/cats/plants/seeds.c b/src/cats/plants/seeds.c index 797e98f..c4cb44d 100644 --- a/src/cats/plants/seeds.c +++ b/src/cats/plants/seeds.c @@ -33,6 +33,8 @@ #include "inline_overlays.h" #include "inline_population.h" #include "populations/population.h" +#include "misc/cats_maths_inline.h" +#include "inline_vital_ages.h" #ifdef USEMPI #include "mpi/mpi_cats.h" diff --git a/src/cats/populations/plant_juveniles.c b/src/cats/populations/plant_juveniles.c index fd9e709..e80a9a7 100644 --- a/src/cats/populations/plant_juveniles.c +++ b/src/cats/populations/plant_juveniles.c @@ -29,6 +29,8 @@ #include "data/cats_grid.h" #include "inline_vital_rates.h" #include "memory/cats_memory.h" +#include "inline_vital_ages.h" +#include "inline_carrying_capacity.h" void setup_plant_juvenile_weights(struct cats_species_param *param) -- GitLab