Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Incorporate RuntimeError exception handling and logging in file reading operations #98

Merged
merged 8 commits into from
May 17, 2023
Merged

Incorporate RuntimeError exception handling and logging in file reading operations #98

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
00dad8f
Ignore Visual Studio project settings
soaressgabriel May 17, 2023
324475e
Add Visual Studio project files
soaressgabriel May 17, 2023
7f1907e
Add raster series files validador
soaressgabriel May 17, 2023
b8b86f9
Resolve #97
soaressgabriel May 17, 2023
30dcf4e
Remove unused __version__.py file
soaressgabriel May 17, 2023
0e6ad73
Update RUBEM.pyproj
soaressgabriel May 17, 2023
bc1092e
Update simulation cycle message
soaressgabriel May 17, 2023
9591687
Change log levels to production
soaressgabriel May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Visual Studio project settings
.vs

# Visual Studio Code project settings
.vscode

Expand Down
236 changes: 236 additions & 0 deletions RUBEM.pyproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{dee732fc-1583-4bc5-9a0e-da9293924f68}</ProjectGuid>
<ProjectHome />
<StartupFile />
<SearchPath />
<WorkingDirectory>.</WorkingDirectory>
<OutputPath>.</OutputPath>
<ProjectTypeGuids>{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
<LaunchProvider>Standard Python launcher</LaunchProvider>
<InterpreterId />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
<PropertyGroup Condition="'$(Configuration)' == 'Release'" />
<PropertyGroup>
<VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
</PropertyGroup>
<ItemGroup>
<Content Include="doc\requirements.txt" />
<Content Include="doc\source\**" />
<Content Include="resources\**" />
<Content Include="version.txt" />
<Content Include="versionfile.txt" />
<Compile Include="rubem\cli.py" />
<Compile Include="rubem\core.py" />
<Compile Include="rubem\date\_date_calc.py" />
<Compile Include="rubem\date\__init__.py" />
<Compile Include="rubem\date\__pycache__\_date_calc.cpython-37.pyc" />
<Compile Include="rubem\date\__pycache__\_date_calc.cpython-39.pyc" />
<Compile Include="rubem\date\__pycache__\__init__.cpython-37.pyc" />
<Compile Include="rubem\date\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="rubem\file\_file_convertions.py" />
<Compile Include="rubem\file\_file_generators.py" />
<Compile Include="rubem\file\__init__.py" />
<Compile Include="rubem\file\__pycache__\_file_convertions.cpython-37.pyc" />
<Compile Include="rubem\file\__pycache__\_file_convertions.cpython-39.pyc" />
<Compile Include="rubem\file\__pycache__\_file_generators.cpython-37.pyc" />
<Compile Include="rubem\file\__pycache__\_file_generators.cpython-39.pyc" />
<Compile Include="rubem\file\__pycache__\__init__.cpython-37.pyc" />
<Compile Include="rubem\file\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="rubem\modules\_evapotranspiration.py" />
<Compile Include="rubem\modules\_interception.py" />
<Compile Include="rubem\modules\_soil.py" />
<Compile Include="rubem\modules\_surface_runoff.py" />
<Compile Include="rubem\modules\__init__.py" />
<Compile Include="rubem\modules\__pycache__\_evapotranspiration.cpython-37.pyc" />
<Compile Include="rubem\modules\__pycache__\_evapotranspiration.cpython-39.pyc" />
<Compile Include="rubem\modules\__pycache__\_interception.cpython-37.pyc" />
<Compile Include="rubem\modules\__pycache__\_interception.cpython-39.pyc" />
<Compile Include="rubem\modules\__pycache__\_soil.cpython-37.pyc" />
<Compile Include="rubem\modules\__pycache__\_soil.cpython-39.pyc" />
<Compile Include="rubem\modules\__pycache__\_surface_runoff.cpython-37.pyc" />
<Compile Include="rubem\modules\__pycache__\_surface_runoff.cpython-39.pyc" />
<Compile Include="rubem\modules\__pycache__\__init__.cpython-37.pyc" />
<Compile Include="rubem\modules\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="rubem\preprocessing\kriging.py" />
<Compile Include="rubem\preprocessing\minmax.py" />
<Compile Include="rubem\preprocessing\pcrtss2tif.py" />
<Compile Include="rubem\preprocessing\preprocessing.yml" />
<Compile Include="rubem\preprocessing\tif2map.py" />
<Compile Include="rubem\preprocessing\tif2pcrtss.py" />
<Compile Include="rubem\preprocessing\__init__.py" />
<Compile Include="rubem\validation\_exception_validation.py" />
<Compile Include="rubem\validation\_schemas.py" />
<Compile Include="rubem\validation\_validators.py" />
<Compile Include="rubem\validation\__init__.py" />
<Compile Include="rubem\validation\__pycache__\_exception_validation.cpython-39.pyc" />
<Compile Include="rubem\validation\__pycache__\_schemas.cpython-39.pyc" />
<Compile Include="rubem\validation\__pycache__\_validators.cpython-39.pyc" />
<Compile Include="rubem\validation\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="rubem\_dynamic_model.py" />
<Compile Include="rubem\__init__.py" />
<Compile Include="rubem\__main__.py" />
<Compile Include="rubem\__pycache__\cli.cpython-39.pyc" />
<Compile Include="rubem\__pycache__\core.cpython-37.pyc" />
<Compile Include="rubem\__pycache__\core.cpython-39.pyc" />
<Compile Include="rubem\__pycache__\_dynamic_model.cpython-37.pyc" />
<Compile Include="rubem\__pycache__\_dynamic_model.cpython-39.pyc" />
<Compile Include="rubem\__pycache__\__init__.cpython-37.pyc" />
<Compile Include="rubem\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="rubem\__pycache__\__main__.cpython-39.pyc" />
<Compile Include="rubem\__pycache__\__version__.cpython-39.pyc" />
<Compile Include="tests\fixtures\base.template" />
<Compile Include="tests\fixtures\base.tss" />
<Compile Include="tests\fixtures\base2.template" />
<Compile Include="tests\fixtures\base3.template" />
<Compile Include="tests\fixtures\base4.template" />
<Compile Include="tests\fixtures\base5.template" />
<Compile Include="tests\fixtures\base6.template" />
<Compile Include="tests\fixtures\base7.template" />
<Compile Include="tests\fixtures\base8.template" />
<Compile Include="tests\fixtures\base\maps\clone\clone.map" />
<Compile Include="tests\fixtures\base\maps\dem\dem.map" />
<Compile Include="tests\fixtures\base\maps\dem\dem.tif" />
<Compile Include="tests\fixtures\base\maps\etp\etp00000.001" />
<Compile Include="tests\fixtures\base\maps\etp\etp00000.002" />
<Compile Include="tests\fixtures\base\maps\etp\etp00000.003" />
<Compile Include="tests\fixtures\base\maps\kp\kp000000.001" />
<Compile Include="tests\fixtures\base\maps\kp\kp000000.002" />
<Compile Include="tests\fixtures\base\maps\kp\kp000000.003" />
<Compile Include="tests\fixtures\base\maps\ldcover\cob00000.001" />
<Compile Include="tests\fixtures\base\maps\ldcover\cob00000.002" />
<Compile Include="tests\fixtures\base\maps\ldcover\cob00000.003" />
<Compile Include="tests\fixtures\base\maps\ndvi\ndvi0000.001" />
<Compile Include="tests\fixtures\base\maps\ndvi\ndvi0000.002" />
<Compile Include="tests\fixtures\base\maps\ndvi\ndvi0000.003" />
<Compile Include="tests\fixtures\base\maps\ndvi\ndvi_max.map" />
<Compile Include="tests\fixtures\base\maps\ndvi\ndvi_min.map" />
<Compile Include="tests\fixtures\base\maps\rain\prec0000.001" />
<Compile Include="tests\fixtures\base\maps\rain\prec0000.002" />
<Compile Include="tests\fixtures\base\maps\rain\prec0000.003" />
<Compile Include="tests\fixtures\base\maps\samples\samples.map" />
<Compile Include="tests\fixtures\base\maps\soil\soil.map" />
<Compile Include="tests\fixtures\base\out\bfw00000.001" />
<Compile Include="tests\fixtures\base\out\bfw00000.002" />
<Compile Include="tests\fixtures\base\out\bfw0000001.tif" />
<Compile Include="tests\fixtures\base\out\bfw0000002.tif" />
<Compile Include="tests\fixtures\base\out\eta00000.001" />
<Compile Include="tests\fixtures\base\out\eta00000.002" />
<Compile Include="tests\fixtures\base\out\eta0000001.tif" />
<Compile Include="tests\fixtures\base\out\eta0000002.tif" />
<Compile Include="tests\fixtures\base\out\itp00000.001" />
<Compile Include="tests\fixtures\base\out\itp00000.002" />
<Compile Include="tests\fixtures\base\out\itp0000001.tif" />
<Compile Include="tests\fixtures\base\out\itp0000002.tif" />
<Compile Include="tests\fixtures\base\out\lfw00000.001" />
<Compile Include="tests\fixtures\base\out\lfw00000.002" />
<Compile Include="tests\fixtures\base\out\lfw0000001.tif" />
<Compile Include="tests\fixtures\base\out\lfw0000002.tif" />
<Compile Include="tests\fixtures\base\out\rec00000.001" />
<Compile Include="tests\fixtures\base\out\rec00000.002" />
<Compile Include="tests\fixtures\base\out\rec0000001.tif" />
<Compile Include="tests\fixtures\base\out\rec0000002.tif" />
<Compile Include="tests\fixtures\base\out\rnf00000.001" />
<Compile Include="tests\fixtures\base\out\rnf00000.002" />
<Compile Include="tests\fixtures\base\out\rnf0000001.tif" />
<Compile Include="tests\fixtures\base\out\rnf0000002.tif" />
<Compile Include="tests\fixtures\base\out\smc00000.001" />
<Compile Include="tests\fixtures\base\out\smc00000.002" />
<Compile Include="tests\fixtures\base\out\smc0000001.tif" />
<Compile Include="tests\fixtures\base\out\smc0000002.tif" />
<Compile Include="tests\fixtures\base\out\srn00000.001" />
<Compile Include="tests\fixtures\base\out\srn00000.002" />
<Compile Include="tests\fixtures\base\out\srn0000001.tif" />
<Compile Include="tests\fixtures\base\out\srn0000002.tif" />
<Compile Include="tests\fixtures\base\out\tss_bfw.csv" />
<Compile Include="tests\fixtures\base\out\tss_eta.csv" />
<Compile Include="tests\fixtures\base\out\tss_itp.csv" />
<Compile Include="tests\fixtures\base\out\tss_lfw.csv" />
<Compile Include="tests\fixtures\base\out\tss_rec.csv" />
<Compile Include="tests\fixtures\base\out\tss_rnf.csv" />
<Compile Include="tests\fixtures\base\out\tss_smc.csv" />
<Compile Include="tests\fixtures\base\out\tss_srn.csv" />
<Compile Include="tests\fixtures\base\txt\ldcover\a_i.txt" />
<Compile Include="tests\fixtures\base\txt\ldcover\a_o.txt" />
<Compile Include="tests\fixtures\base\txt\ldcover\a_s.txt" />
<Compile Include="tests\fixtures\base\txt\ldcover\a_v.txt" />
<Compile Include="tests\fixtures\base\txt\ldcover\kcmax.txt" />
<Compile Include="tests\fixtures\base\txt\ldcover\kcmin.txt" />
<Compile Include="tests\fixtures\base\txt\ldcover\manning.txt" />
<Compile Include="tests\fixtures\base\txt\rainydays.txt" />
<Compile Include="tests\fixtures\base\txt\soil\dg.txt" />
<Compile Include="tests\fixtures\base\txt\soil\Kr.txt" />
<Compile Include="tests\fixtures\base\txt\soil\Tcc.txt" />
<Compile Include="tests\fixtures\base\txt\soil\Tpor.txt" />
<Compile Include="tests\fixtures\base\txt\soil\Tsat.txt" />
<Compile Include="tests\fixtures\base\txt\soil\Tw.txt" />
<Compile Include="tests\fixtures\base\txt\soil\Zr.txt" />
<Compile Include="tests\fixtures\base_cmp.csv" />
<Compile Include="tests\fixtures\clone1x1.map" />
<Compile Include="tests\fixtures\clone2x2.map" />
<Compile Include="tests\fixtures\dem.map" />
<Compile Include="tests\integration\__init__.py" />
<Compile Include="tests\unit\core\test_core_model_constructor.py" />
<Compile Include="tests\unit\core\test_core_model_run.py" />
<Compile Include="tests\unit\core\__init__.py" />
<Compile Include="tests\unit\core\__pycache__\test_core_model_constructor.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\core\__pycache__\test_core_model_run.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\core\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="tests\unit\date\test_utilities_date.py" />
<Compile Include="tests\unit\date\__init__.py" />
<Compile Include="tests\unit\date\__pycache__\test_utilities_date.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\date\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="tests\unit\file\test_utilities_file_convertions.py" />
<Compile Include="tests\unit\file\test_utilities_file_generators.py" />
<Compile Include="tests\unit\file\__init__.py" />
<Compile Include="tests\unit\file\__pycache__\test_utilities_file_convertions.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\file\__pycache__\test_utilities_file_generators.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\file\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="tests\unit\modules\test_module_evapotranspiration.py" />
<Compile Include="tests\unit\modules\test_module_interception.py" />
<Compile Include="tests\unit\modules\test_module_soil.py" />
<Compile Include="tests\unit\modules\test_module_surface_runoff.py" />
<Compile Include="tests\unit\modules\__init__.py" />
<Compile Include="tests\unit\modules\__pycache__\test_module_evapotranspiration.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\modules\__pycache__\test_module_interception.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\modules\__pycache__\test_module_soil.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\modules\__pycache__\test_module_surface_runoff.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\modules\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="tests\unit\preprocessing\test_preprocessing_kriging.py" />
<Compile Include="tests\unit\preprocessing\test_preprocessing_minmax.py" />
<Compile Include="tests\unit\preprocessing\test_preprocessing_pcrtss2tif.py" />
<Compile Include="tests\unit\preprocessing\test_preprocessing_tiff2map.py" />
<Compile Include="tests\unit\preprocessing\test_preprocessing_tiff2pcrtss.py" />
<Compile Include="tests\unit\preprocessing\__init__.py" />
<Compile Include="tests\unit\preprocessing\__pycache__\test_preprocessing_kriging.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\preprocessing\__pycache__\test_preprocessing_minmax.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\preprocessing\__pycache__\test_preprocessing_pcrtss2tif.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\preprocessing\__pycache__\test_preprocessing_tiff2map.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\preprocessing\__pycache__\test_preprocessing_tiff2pcrtss.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\preprocessing\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="tests\unit\test_version.py" />
<Compile Include="tests\unit\validation\test_validation_validators.py" />
<Compile Include="tests\unit\validation\__init__.py" />
<Compile Include="tests\unit\validation\__pycache__\test_validation_validators.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\validation\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="tests\unit\__init__.py" />
<Compile Include="tests\unit\__pycache__\test_version.cpython-39-pytest-7.0.0.pyc" />
<Compile Include="tests\unit\__pycache__\__init__.cpython-39.pyc" />
<Compile Include="tests\utils.py" />
<Compile Include="tests\__init__.py" />
<Compile Include="tests\__pycache__\utils.cpython-39.pyc" />
<Compile Include="tests\__pycache__\__init__.cpython-39.pyc" />
</ItemGroup>
<ItemGroup>
<Folder Include="doc\" />
<Folder Include="doc\source\**" />
<Folder Include="resources\**" />
<Folder Include="rubem\**" />
<Folder Include="tests\**" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
</Project>
23 changes: 23 additions & 0 deletions RUBEM.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33712.159
MinimumVisualStudioVersion = 10.0.40219.1
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "RUBEM", "RUBEM.pyproj", "{DEE732FC-1583-4BC5-9A0E-DA9293924F68}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DEE732FC-1583-4BC5-9A0E-DA9293924F68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DEE732FC-1583-4BC5-9A0E-DA9293924F68}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0BCA7672-3D62-4810-A858-5E4543B739F8}
EndGlobalSection
EndGlobal
5 changes: 1 addition & 4 deletions rubem/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
try:
from cli import main
except ImportError:
from .cli import main
from rubem.cli import main

if __name__ == "__main__":
main()
7 changes: 0 additions & 7 deletions rubem/__version__.py
View file
Open in desktop

This file was deleted.

Loading