From 246e3e80c4659c2ae155844f16a5712e4611ac57 Mon Sep 17 00:00:00 2001
From: Andreas Gattringer <gattringera@a772-cvl-ws23.biodiv.univie.ac.at>
Date: Tue, 4 Jul 2023 14:36:31 +0200
Subject: [PATCH] minor cleanups
---
src/cats/grids/cats_grid.c | 3 +--
src/cats/grids/gdal_load.c | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/cats/grids/cats_grid.c b/src/cats/grids/cats_grid.c
index c99fcd3..a45585f 100644
--- a/src/cats/grids/cats_grid.c
+++ b/src/cats/grids/cats_grid.c
@@ -42,10 +42,9 @@
#include "plants/seeds.h"
#include "stats/grid_stats.h"
-#include "logging.h"
#include "gdal_load.h"
#include "grid_setup.h"
-#include "../../memory/cats_memory.h"
+#include "memory/cats_memory.h"
#include "misc/cats_random.h"
#ifdef USEMPI
diff --git a/src/cats/grids/gdal_load.c b/src/cats/grids/gdal_load.c
index d184c72..89efc01 100644
--- a/src/cats/grids/gdal_load.c
+++ b/src/cats/grids/gdal_load.c
@@ -26,7 +26,6 @@
#include <cpl_string.h>
#include "data/cats_grid.h"
#include "configuration/configuration.h"
-#include "logging.h"
#include "paths/paths.h"
#include "gdal_load.h"
#include "overlays/overlays.h"
@@ -141,7 +140,6 @@ void load_gdal_data(const struct raster_load_wrapper *data)
double nodata = GDALGetRasterNoDataValue(band, &have_nodata);
if (have_nodata) {
log_message(LOG_INFO, "\t'%s': found nodata value %f ", data->filename, nodata);
-
}
double orig = nodata;
@@ -189,7 +187,7 @@ void load_gdal_data(const struct raster_load_wrapper *data)
val = NAN;
}
- data->target_environment[r][c] = val;
+ data->target_environment[r][c] = (cats_dt_environment) val;
}
break;
--
GitLab