add new infiltration methods #130
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…f from rainfall record assignment.
…iltration_tacr pull refactoring of output rasters which is still in progress
…nfiltration_tacr merge of parital ready output write refactoring
…iltration_tacr Conflicts: tests/test.ini It looks like you may be committing a merge. If this is not correct, please remove the file .git/MERGE_HEAD and try again.
|
There are other than infitlration-related changes. Several exceptions were added to the code which are not related to infiltration. |
jerabekjak
reviewed
Oct 4, 2022
Comment on lines
+30
to
+87
| def __str__(self): | ||
| return repr(self.msg) | ||
|
|
||
|
|
||
| class RainfallFileMissing(SmoderpError): | ||
|
|
||
| """Exception raised if file with rainfall record is missing | ||
|
|
||
| Attributes: | ||
| name of file which is missing | ||
| """ | ||
|
|
||
| def __init__(self, filen): | ||
| self.msg = 'Missing file: ' + str(filen) + '.' | ||
|
|
||
| def __str__(self): | ||
| return repr(self.msg) | ||
|
|
||
|
|
||
| class NegativeWaterLevel(SmoderpError): | ||
|
|
||
| """Exception raised if the water level goes to negative values. | ||
|
|
||
| """ | ||
|
|
||
| def __init__(self): | ||
| self.msg = 'Water level reached negative value' | ||
|
|
||
| def __str__(self): | ||
| return repr(self.msg) | ||
|
|
||
|
|
||
| class IncorrectInfiltrationType(SmoderpError): | ||
|
|
||
| """Exception raised if the water level goes to negative values. | ||
|
|
||
| """ | ||
|
|
||
| def __init__(self, infiltration_type): | ||
| self.msg = 'Incorrect infiltration type: the infiltraion id should be in the range 1 - 4. {} was assign in the config'.format(infiltration_type) | ||
|
|
||
| def __str__(self): | ||
| return repr(self.msg) | ||
|
|
||
|
|
||
| class InflowsError(SmoderpError): | ||
|
|
||
| """Exception raised if the inflow to cell cannot be calculated. | ||
|
|
||
| """ | ||
|
|
||
| def __init__(self): | ||
| self.msg = 'Error in inflows definition' | ||
|
|
||
| def __str__(self): | ||
| return repr(self.msg) | ||
|
|
||
|
|
There was a problem hiding this comment.
Errors related to infiltration and to water balance calculations.
|
smoderp2d/io_functions/post_proc.py this is now in the base provider. this model is not called anywhere and may be therefore delated. |
jerabekjak
reviewed
Oct 4, 2022
Comment on lines
+42
to
+44
| self.infiltration = ( | ||
| 0.5 * self._s / math.sqrt(totalT + deltaT) + self._ks) * deltaT | ||
|
|
There was a problem hiding this comment.
Careful. This was changed in newer pull request #125.
|
Will be solved by @jerabekjak in June 2024 (or not). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to issues:
#27
#13