minor cleanups

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

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;