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.

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

Dev/2.3.2 #84

Merged
merged 24 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
96073cd
changed poetry syntax to group instead of extras for github deploy wo…
kdberends Apr 24, 2024
170c208
updated changelog
kdberends Apr 29, 2024
bd93dfd
bumped version 2.3.1 -> 2.3.2
kdberends May 6, 2024
80bbf53
fixed type hint
kdberends May 6, 2024
5c68102
added documentation for Compare1D2D
kdberends May 6, 2024
2d9310d
#66 implemented new style
kdberends May 6, 2024
6e3f5a4
Delete .github/workflows/deploy.yml
kdberends May 6, 2024
8ac815a
Added option to create max13 and last25 graphs #65
kdberends May 6, 2024
8eda5d7
Merge branch 'dev/2.3.2' of https://github.com/Deltares/Fm2Prof into …
kdberends May 6, 2024
d232a2c
reduced code duplication
kdberends May 7, 2024
0116a8f
added test for utils.VisualiseOutput
kdberends May 7, 2024
d25fefd
fixed bug introduced by new test
kdberends May 7, 2024
6f95321
added test
kdberends May 7, 2024
c57341d
limit coverage to main package
kdberends May 7, 2024
9010279
small fix for utils test
kdberends May 7, 2024
e23b794
refactored according to python:S1542
kdberends May 7, 2024
1520c21
replaced unused local variable with _
kdberends May 7, 2024
2f63ac7
config errror
kdberends May 7, 2024
b755280
added coverage config to workflow
kdberends May 7, 2024
c991929
added test for visualiseoutput
kdberends May 7, 2024
8b4a404
added test for discharge figure
kdberends May 7, 2024
7542582
minor docstring and workflow fix
kdberends May 7, 2024
c1b99a7
removed coveragerc
kdberends May 7, 2024
58025a2
added notebook for visualisation
kdberends May 7, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ jobs:
args: >
-Dsonar.organization=deltares
-Dsonar.projectKey=Deltares_Fm2Prof
-Dsonar.python.coverage.reportPaths=.coverage-reports/coverage.xml
-Dsonar.python.coverage.reportPaths=.coverage-reports/coverage.xml
60 changes: 0 additions & 60 deletions .github/workflows/deploy.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@
/docs/build
/dist
/build
/documentation
/documentation

*.log
37 changes: 37 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
## v2.3.1 (24-04-2024)

**Bug fixes**
- Fixed a bug that threw an exception if user did not specify a stop time when using `utils.Compare1D2D` (#78)
- Fixed bug (#81) that prevented executable from being build because of missing favico

**Documentation**
- added python snippets to quickstart tutorial


## v2.3.0 (19-04-2024)

### New functionality

- Configuration file now has a new `debug` section with debug specific parameters. This section includes two parameters previously in the general `parameters` section (`ExportMapFiles` and `CssSelection`) and the new `ExportCSSData`.
- new debug option `ExportCSSData` that when enabled output data to analyse cross-section generation.
- new option `ConveyanceDetectionMethod` to toggle between the previous way to detect storage (0) and a the new one (1, default).

### Documentation

- documentation now includes a notebook specifying how output from `ExportCSSData` option can be used to analyse flow data
- docstrings of cross-section class updated to describe flow/storage separation methodology
- several chapters ported over from sphinx

### bug fixes & chores
- added dedicated tests for cross-section class
- test coverage is now reported in Sonarcloud
- fixed bug that caused error while writing log

### bug fixes & chores

- fixed bug in `utils` that threw an error when using matplotlib 3.7 or higher
- removed unused code blocks
- updated type hinting and code documentation of `CrossSection.py`



## v2.2.8 (2023-10-03)

This version update FM2PROF to Python 3.10 or higher. It removes unused dependencies and updates the package system `poetry` to version 1.8.2. Due to this switch, the commitizen workflow is currently not used, and the documentation system switch from sphinx to mkdocs.
Expand Down
9 changes: 9 additions & 0 deletions docs/markdown/utils.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Utilities API

FM2PROF includes a set of utilities to analyse its output.

## Compare1D2D

::: fm2prof.utils.Compare1D2D
options:
inherited_members: false
195 changes: 195 additions & 0 deletions docs/notebooks/VisualiseOutput.ipynb

Large diffs are not rendered by default.

620 changes: 620 additions & 0 deletions docs/notebooks/compare1d2d.ipynb

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions fm2prof/Fm2ProfRunner.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ class Fm2ProfRunner(FM2ProfBase):
iniFilePath (str): path to configuration file
"""

def __init__(self, iniFilePath: str = ""):
def __init__(self, iniFilePath: Path | str = ""):
"""
Initializes the project

iniFilePath (str): path to a configuration file. If not given,
default values will be used.
Parameters:
iniFilePath: path to a configuration file. If not given,
default values will be used.
"""
self.fm_model_data: FmModelData = None
self._output_files: OutputFiles = OutputFiles()
Expand Down Expand Up @@ -1107,7 +1108,7 @@ def set_output_directory(self, path) -> None:
"""
self.get_inifile().set_output_directory(path)

def get_output_directory(self) -> None:
def get_output_directory(self) -> str:
"""
Returns the current output directory
"""
Expand Down
2 changes: 1 addition & 1 deletion fm2prof/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = "2.3.1"
__version__ = "2.3.2"

from fm2prof.Fm2ProfRunner import Project
Loading
Loading