From 0a06343855fbae2d09c2b05b16af12e187cb6b50 Mon Sep 17 00:00:00 2001 From: Andreas Gattringer <andreas.gattringer@univie.ac.at> Date: Tue, 6 Jun 2023 12:56:30 +0200 Subject: [PATCH] apply filename pattern substition to overlays --- src/cats/overlays/overlay_resources.c | 4 ---- src/cats/overlays/overlays.c | 8 +++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/cats/overlays/overlay_resources.c b/src/cats/overlays/overlay_resources.c index 744523a..64a171f 100644 --- a/src/cats/overlays/overlay_resources.c +++ b/src/cats/overlays/overlay_resources.c @@ -1,7 +1,3 @@ -// -// Created by andreas on 08/02/23. -// - #include <assert.h> #include <math.h> #include "overlay_resources.h" diff --git a/src/cats/overlays/overlays.c b/src/cats/overlays/overlays.c index b423774..3d7c17b 100644 --- a/src/cats/overlays/overlays.c +++ b/src/cats/overlays/overlays.c @@ -34,7 +34,7 @@ #include "overlay_habitat_type_cc.h" #include "overlay_exclusion.h" #include "overlay_resources.h" - +#include "paths/path_patterns.h" const char *get_overlay_name(enum overlay_type type) { @@ -139,7 +139,9 @@ void load_overlay_from_file(struct cats_configuration *conf, enum overlay_type t log_message(LOG_ERROR, "overlay type %d out of range", type); } log_message(LOG_INFO, "gdal: loading grid mask %s", filename); - struct cats_2d_array_double *raw_values = get_double_values_from_gdal(&conf->geometry, filename, false, false); + char *filename_substituted = filename_pattern_substitution(filename, conf, conf->time.year_current); + + struct cats_2d_array_double *raw_values = get_double_values_from_gdal(&conf->geometry, filename_substituted, false, false); check_raster_dimensions(raw_values->dimension, conf->geometry.dimension); @@ -168,6 +170,6 @@ void load_overlay_from_file(struct cats_configuration *conf, enum overlay_type t break; } - + free(filename_substituted); free_cats_grid(&raw_values); } -- GitLab