Merge pull request #173 from LabSid-USP/fix/170-check-if-the-selected…

…-gdal-driver-is-available-before-using-it Add check if selected GDAL driver is available before using it
LabSid-USP · Mar 19, 2024 · e8f9aa4 · e8f9aa4
2 parents 1c9b01c + 695b995
commit e8f9aa4
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 26 deletions.
diff --git a/rubem/_dynamic_model.py b/rubem/_dynamic_model.py
@@ -530,7 +530,13 @@ def __current_step_report(self):
             if not var.get("is_raster_series_enabled"):
                 continue
 
-            if self.config.output_variables.file_format is OutputFileFormat.GEOTIFF:
+            if OutputFileFormat.PCRASTER in self.config.output_variables.file_formats:
+                self.report(
+                    variable=output_vars_dict.get(var.get("id")),
+                    name=var.get("raster_filename_prefix"),
+                )
+
+            if OutputFileFormat.GEOTIFF in self.config.output_variables.file_formats:
                 report(
                     variable=output_vars_dict.get(var.get("id")),
                     name=var.get("raster_filename_prefix"),
@@ -541,12 +547,6 @@ def __current_step_report(self):
                     no_data_value=MISSING_VALUE_DEFAULT,
                 )
 
-            if self.config.output_variables.file_format is OutputFileFormat.PCRASTER:
-                self.report(
-                    variable=output_vars_dict.get(var.get("id")),
-                    name=var.get("raster_filename_prefix"),
-                )
-
             if self.config.raster_files.sample_locations and self.config.output_variables.tss:
                 # The same as self.tss_file_xxx.sample(self.xxx)
                 sample_func = self.sample_time_series_dict.get(var.get("id"))

diff --git a/rubem/configuration/model_configuration.py b/rubem/configuration/model_configuration.py
@@ -6,7 +6,6 @@
 import textwrap
 from typing import Union
 
-
 from ..configuration.calibration_parameters import CalibrationParameters
 from ..configuration.initial_soil_conditions import InitialSoilConditions
 from ..configuration.input_raster_files import InputRasterFiles
@@ -105,6 +104,14 @@ def __init__(
                 impervious_area_interception=float(self.__get_setting("CONSTANTS", "i_imp")),
             )
             self.output_directory = OutputDataDirectory(self.__get_setting("DIRECTORIES", "output"))
+
+            output_formats = OutputFileFormat.PCRASTER
+
+            if str_to_bool(
+                self.__get_setting("RASTER_FILE_FORMAT", "tiff_raster_series", optional=True)
+            ):
+                output_formats = output_formats | OutputFileFormat.GEOTIFF
+
             self.output_variables = OutputVariables(
                 itp=str_to_bool(self.__get_setting("GENERATE_FILE", "itp")),
                 bfw=str_to_bool(self.__get_setting("GENERATE_FILE", "bfw")),
@@ -116,12 +123,9 @@ def __init__(
                 rnf=str_to_bool(self.__get_setting("GENERATE_FILE", "rnf")),
                 arn=str_to_bool(self.__get_setting("GENERATE_FILE", "arn")),
                 tss=str_to_bool(self.__get_setting("GENERATE_FILE", "tss")),
-                output_format=(
-                    OutputFileFormat.PCRASTER
-                    if str_to_bool(self.__get_setting("RASTER_FILE_FORMAT", "map_raster_series"))
-                    else OutputFileFormat.GEOTIFF
-                ),
+                output_formats=output_formats,
             )
+
             self.raster_series = InputRasterSeries(
                 etp=self.__get_setting("DIRECTORIES", "etp"),
                 etp_filename_prefix=self.__get_setting("FILENAME_PREFIXES", "etp_prefix"),

diff --git a/rubem/configuration/output_format.py b/rubem/configuration/output_format.py
@@ -1,7 +1,7 @@
-from enum import Enum, auto
+from enum import Flag, auto
 
 
-class OutputFileFormat(Enum):
+class OutputFileFormat(Flag):
     """
     Enum class representing the output file format options.
     """

diff --git a/rubem/configuration/output_variables.py b/rubem/configuration/output_variables.py
@@ -37,8 +37,8 @@ class OutputVariables:
     :param tss: Enable or disable Create time output time series (TSS). Defaults to `False`.
     :type tss: bool, optional
 
-    :param output_format: The output file format. Defaults to ``OutputFileFormat.PCRASTER``.
-    :type output_format: OutputFileFormat, optional
+    :param output_formats: The output file formats. Defaults to ``OutputFileFormat.PCRASTER``.
+    :type output_formats: OutputFileFormat, optional
     """
 
     def __init__(
@@ -53,7 +53,7 @@ def __init__(
         rnf: bool = False,
         arn: bool = False,
         tss: bool = False,
-        output_format: OutputFileFormat = OutputFileFormat.PCRASTER,
+        output_formats: OutputFileFormat = OutputFileFormat.PCRASTER,
     ) -> None:
         self.logger = logging.getLogger(__name__)
         self.itp = {
@@ -120,7 +120,7 @@ def __init__(
             "table_filename_prefix": "tss_arn",
         }
         self.tss = tss
-        self.file_format = output_format
+        self.file_formats = output_formats
 
     def get_enabled_raster_series(self) -> list:
         """
@@ -202,5 +202,5 @@ def __str__(self) -> str:
             f"Total Runoff (RNF): {'Enabled' if self.rnf else 'Disabled'}\n"
             f"Accumulated Total Runoff (ARN): {'Enabled' if self.rnf else 'Disabled'}\n"
             f"Create time output time series (TSS): {'Enabled' if self.tss else 'Disabled'}\n"
-            f"Output format: {self.file_format}"
+            f"Output format: {self.file_formats}"
         )
diff --git a/rubem/configuration/raster_map.py b/rubem/configuration/raster_map.py
@@ -67,6 +67,9 @@ def __init__(
     ) -> None:
         self.logger = logging.getLogger(__name__)
 
+        gdal.UseExceptions()
+        gdal.AllRegister()
+
         self.logger.debug("Opening raster file: %s", file_path)
 
         self.__validate_file(file_path)

diff --git a/rubem/file/_file_generators.py b/rubem/file/_file_generators.py
@@ -3,7 +3,6 @@
 from typing import Optional, Union
 
 from osgeo import gdal
-import pcraster as pcr
 from pcraster._pcraster import Field
 from pcraster.framework import pcr2numpy
 
@@ -13,10 +12,6 @@
 logger = logging.getLogger(__name__)
 
 
-gdal.UseExceptions()
-gdal.AllRegister()
-
-
 def report(
     variable: Field,
     name: str,
@@ -80,6 +75,9 @@ def __report(
     else:
         out_tif = os.path.join(str(outpath), f"{name}.{extension}")
 
+    gdal.UseExceptions()
+    gdal.AllRegister()
+
     with gdal.GetDriverByName(driver_short_name).Create(
         out_tif,
         base_raster_info.cols,

diff --git a/tests/unit/configuration/test_output_variables.py b/tests/unit/configuration/test_output_variables.py
@@ -52,5 +52,5 @@ def test_output_variables_constructor(
             smc=smc,
             rnf=rnf,
             tss=tss,
-            output_format=output_format,
+            output_formats=output_format,
         )