Feature/models/cngrxj #112
Merged
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
|
I cancelled the Travis jobs, because the last build of the master branch on which it is rebased was not successful. |
… by the site-package `strenum` (fixes commit f69c9d2 for Python 3.9 and 3.10).
… `netcdftools` reads all available data even if the time series of some sequences are missing.
…ssages created by the decorator `print_progress` of module `printtools`.
…nttools` to method `read` and `write` of class `NetCDFInterface` of module `netcdftools`.
…the relevant element as soon as possible (class `SubmodelAdder` of module `importtools`). This change should only be relevant when creating a model "by hand" for testing or other specific purposes.
…`evap_morsim` to the main model `lland_v3` to define (the same) input time series values for the equally named wind speed sequences.
…re clearly by splitting class `NetCDFInterface` into `NetCDFInterfaceReader`, `NetCDFInterfaceWriter`, and `NetCDFInterfaceJIT` and class `NetCDFVariableFlat` into `NetCDFVariableFlatReader` and `NetCDFVariableFlatWriter` (module `netcdftools`). This change is not only a refactoring but also allows the reading of time series data from input sequence objects (with the same standard name) that belong to different (sub)models of the same element (relevant when working with the new HydPy standard naming convention for input time series files).
…add the property `seriesmode` to the class `IOSequence` of module `sequencetools`.
…submodel" (class `SubmodelAdder` of module `importtools`). Otherwise, the flag would stay true when replacing a "main submodel" with a "real submodel".
…s (with the same standard name) that belong to different (sub)models of the same element (module `netcdftools`, completes commit f21c00b).
…er level to the required water depth (fixes commit 19dd0e1).
…and its application models to allow for an optional stabilisation of the flow between surface water and groundwater.
…odel `dam` from 0.01 to 0.0001 to increase the minimal numerical accuracy all dam application models achieve by default.
… not risk performance losses when working with Cython.
…utes of base model `wland`.
…l evaporation via option submodels that follow the `PrecipModel_V2` and `PETModel_V1` interface.
…Inz`, and `SInz` of base model `lland` (see issue hydpy-dev#79).
…ater` and `SoilMoistureLimit` instead of `FieldCapacity` and `WiltingPoint` and thereby change the way soil surface resistance is calculated for extremely shallow soils. This commit is more of a refactoring and conceptual fix. The resulting changes in the calculation results should be of minor relevance.
…" we decided against in hydpy-dev#111.
…t of wind speed and the leaf area index (if the information is available/required) when connecting main models and submodels.
…ng floats, ints, and bools to module `objecttools`.
…ition lines of parameters which a main model has prepared are not skipped if the related aspects of the main model or the submodel have been changed in the meantime.
…` and `evap_mlc` so that the adjustment of (grass) reference evapotranspiration to the more delayed evaporation from large water bodies becomes usable for different model combinations.
…sts by increasing the aerodynamic resistance (and remove the wind speed adjustment for forests of Oliver, 1979, for consistency).
…between channel segments.
…g directory (module `filetools`).
…e `projectname` property of the `pub` module.
…les` of class `NetworkManager` of module `filetools` a little.
…e the "complete" selection based on its new property `complete`.
…dule `hydpytools` and class `Elements` of `devicetools`.
… data variable names (especially with respect to node sequences) in the User Guides Project Structure section.
New GH token
…e` of module `submodelgraph_extension`.
…hon and Cython files (`pyupgrade`).
…_extensions` (`pyupgrade`).
…nment` context manager after updating all dependencies. Fixes hydpy-dev#149
…dding submodels (class `SubmodelAdder` of module `importtools`). This change is necessary due to the new `FrameLocalsProxy` approach of Python 3.13. However, it is also a general improvement because it should help to minimise conflicts between already available and newly introduced variables.
# Conflicts: # hydpy/docs/rst/modelcollection.rst
tyralla
merged commit 93d9816
into
hydpy-dev:feature/models/cngrxj
0 of 2 checks passed
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Here is my first draft of the Cema-Neige and the grxj-models based on the work of Bastian Klein. There are some open topics I would like to discuss, but maybe you can have a first look at it:
Open topics:
Lavenne:
airGR: