Skip to content

Commit

Permalink
Merge pull request #123 from LabSid-USP/fix/122-unsuccessful-executio…
Browse files Browse the repository at this point in the history
…n-without-station-locations-map

Fix unsuccessful execution without station locations map
  • Loading branch information
soaressgabriel committed Feb 16, 2024
2 parents 5aca5d4 + 8780bc0 commit 271e074
Showing 1 changed file with 11 additions and 14 deletions.
25 changes: 11 additions & 14 deletions rubem/core.py
Expand Up @@ -51,8 +51,10 @@ def __init__(self, modelConfig: ConfigParser) -> None:
"""

if not isinstance(modelConfig, ConfigParser):
logger.error("The model constructor expected an argument type like"
"ConfigParser but got %s", type(modelConfig))
logger.error(
"The model constructor expected an argument type like" "ConfigParser but got %s",
type(modelConfig),
)
raise TypeError(
"The model constructor expected an argument type like"
f" ConfigParser, but got {type(modelConfig)}"
Expand All @@ -76,23 +78,23 @@ def __validateModelConfig(self, modelConfig) -> None:
:param modelConfig: Configuration parser object
:type modelConfig: ConfigParser
"""

logger.info("Validating model configuration...")
_validators.schemaValidator(modelConfig)
_validators.dateValidator(modelConfig)
_validators.directoryPathValidator(modelConfig)
_validators.fileNamePrefixValidator(modelConfig)
_validators.filePathValidator(modelConfig)
_validators.rasterSeriesFileValidador(modelConfig)
_validators.rasterSeriesFileValidador(modelConfig)
_validators.floatTypeValidator(modelConfig)
_validators.booleanTypeValidator(modelConfig)
_validators.value_range_validator(modelConfig)
_validators.domain_validator(modelConfig)

def __setup(self) -> None:
"""Perform model initialization procedures"""
logger.info("Determining which files to generate...")

logger.info("Determining which files to generate...")
# Store which variables have or have not been selected for export
genFilesList = ["itp", "bfw", "srn", "eta", "lfw", "rec", "smc", "rnf"]
genFilesDic = {}
Expand Down Expand Up @@ -146,8 +148,7 @@ def load(cls, data):
return cls.__loadFromDict(data)
else:
logger.error("Unsupported model configuration format: %s", type(data))
raise Exception(
"Unsupported model configuration format", type(data))
raise Exception("Unsupported model configuration format", type(data))

@classmethod
def __loadFromConfigFile(cls, filePath):
Expand All @@ -172,10 +173,7 @@ def __loadFromDict(cls, dataDict):
raise ValueError("Empty model configuration dictionay")

def __exportTablesAsCSV(self) -> None:
"""Converts PCRaster TSS files to Comma-Separated Values (CSV) files
:raises RuntimeError: Export of time series files not enabled
"""
"""Converts PCRaster TSS files to Comma-Separated Values (CSV) files"""
# Check whether the generation of time series has been activated
if self.config.getboolean("GENERATE_FILE", "tss"):
logger.info("Exporting tables as CSV...")
Expand All @@ -184,5 +182,4 @@ def __exportTablesAsCSV(self) -> None:
# removes .tss files
tss2csv(self.config.get("DIRECTORIES", "output"), cols)
else:
logger.error("Export of time series files not enabled")
raise RuntimeError("Generation of time series must be activated")
logger.warning("Generation of time series was not enabled to export time series files.")

0 comments on commit 271e074

Please sign in to comment.