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

Development #165

Merged
merged 34 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
826385e
Update index.md
madiej6 Jan 23, 2024
87ee9e7
Merge pull request #147 from madiej6/patch-1
doc78 Jan 24, 2024
dbd9525
Small update to docs for preparation of setting files
doc78 Feb 27, 2024
06ce914
Small update in docs on how to use multiple nc input files for meteo …
doc78 Mar 6, 2024
e568a10
Removed duplicated settings reference file in documentation
doc78 Mar 27, 2024
fe94c33
Using full path for reference settings file in documentation
doc78 Mar 27, 2024
2d0e76b
Removed unused keys LAIOfDay and FirstDayOfMonth from settings files …
doc78 Jun 6, 2024
fb7a20b
Small fix to PCRaster output maps function
doc78 Jun 10, 2024
ff47d43
Fixed issue with transientlandusechange option when MapsCached is set…
doc78 Jun 13, 2024
cd48e36
Added warning on masking when NetCDF fill values are inside the mask map
doc78 Jun 18, 2024
d88a621
adding uz averaged per fraction
r3dmos Jun 24, 2024
3c74545
update ci to run only for master and develop + PR
corentincarton Jul 18, 2024
005daa0
Merge pull request #164 from ec-jrc/feature/162_update_ci
doc78 Jul 18, 2024
5b63027
Fix to the flip function in case of inverted meteo maps
doc78 Aug 9, 2024
280cfe8
Merge branch 'development' of https://github.com/ec-jrc/lisflood-code…
doc78 Aug 9, 2024
1ff0024
Fixed output generation for repwateruseGauges option
doc78 Aug 27, 2024
c6bdc9e
Revision of reservoir.py
casadoj Oct 6, 2024
4a911ab
Adapt Lisflood_initial.py to Hanazaki
casadoj Oct 8, 2024
da03a31
Create reservoir classes: Reservoir, Burek, Hanazaki
casadoj Oct 8, 2024
39fbfea
Update .gitignore
casadoj Oct 8, 2024
6c10a9c
Create class Reservoir with the Hanazaki reservoir routine
casadoj Oct 8, 2024
4731a10
Revision of the reference settings file
casadoj Oct 8, 2024
e21dd89
Update reference settings file
casadoj Oct 8, 2024
895f40e
Small fix to repRateUpsGauges restrictoption
doc78 Oct 31, 2024
d7ac6e3
Update reservoir.py
casadoj Nov 17, 2024
a6e594e
Update template settings file
casadoj Nov 17, 2024
86391f5
Update ReservoirInitialFill
casadoj Nov 18, 2024
9f9e955
update template settings file
casadoj Nov 27, 2024
b756257
update reservoir.py
casadoj Nov 27, 2024
073f311
update settings files tests
casadoj Nov 27, 2024
ea8bb7a
Small fix to unit test options
doc78 Nov 28, 2024
6c7b173
Merge pull request #178 from ec-jrc/feature/hanazaki
doc78 Nov 28, 2024
6428c17
Merge branch 'development' of https://github.com/ec-jrc/lisflood-code…
doc78 Nov 28, 2024
6211adb
Merge pull request #161 from ec-jrc/add_lz_ts
doc78 Nov 28, 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
7 changes: 6 additions & 1 deletion .github/workflows/ci_env.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: Lisflood OS Unit Tests

on: [push]
# Controls when the workflow will run
on:
push:
branches: [ "master", "development" ]
pull_request:
branches: [ "master", "development" ]

jobs:
tests:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ lisflood_model.egg-info
.coverage
*.tox.ini
.vscode/
*.ipynb
.ipynb_checkpoints/
5 changes: 3 additions & 2 deletions docs/3_step3_preparing-setting-file/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ For simplicity reasons, we suggest to follow the following steps:
3) parameter options
4) chose optional model routines (which ones are available; what they do; and how to “activate” them)

In order to facilitate the preparation of the settings file, a complete example is provided [here](https://ec-jrc.github.io/lisflood-code/3_step3_preparing-setting-file/lisfloodSettings_reference.xml). The user is encouraged to update the paths, the names of the maps and of the tables in the provided template. Please note that the template contains all the settings for a warm start run; the paths to the initial maps must be replaced with the initial bogus values in order to perform a pre-run or a cold start run.
In order to facilitate the preparation of the settings file, a complete example is provided [here](https://github.com/ec-jrc/lisflood-code/tree/master/src/lisfloodSettings_reference.xml). The user is encouraged to update the paths, the names of the maps and of the tables in the provided template. Please note that the template contains all the settings for a warm start run; the paths to the initial maps must be replaced with the initial bogus values in order to perform a pre-run or a cold start run.
TIP: *$(ProjectDir)* or *$(ProjectPath)* cab used as built-in variable in the XML settings, to refer the project folder.

### Time-related constants
Expand Down Expand Up @@ -680,8 +680,9 @@ Within the 'lfoptions' element of the settings file, each option is defined usin
+ **NetCDFTimeChunks**: chunking size in the time dimension. Recommended value is “auto" but chunking size can be specified manually or set to “-1" to load the whole time series into memory (very fast but expensive in terms of memory).
+ **MapsCaching** (True or False): option designed for the lisflood calibration. If set to True, all the static maps and forcings will be stored in a cache so that they don't have to be loaded by each lisflood instance. This option sets the value of NetCDFTimeChunks to "-1", meaning that the whole time series in the NetCDF inputs is loaded into memory.
+ **OutputMapsChunks**: this option is used to dump outputs to disk every X steps (default 1).
+ **OutputMapsDataType**: this option sets the output data type and may take the following values: "float64" or "float32" (default float64)

### Reference settings file
In order to facilitate the preparation of the settings file, a complete example is provided [here](../3_step3_preparing-setting-file/lisfloodSettings_reference.xml). The user is encouraged to update the paths, the names of the maps and of the tables in the provided template.
In order to facilitate the preparation of the settings file, a complete example is provided [here](https://github.com/ec-jrc/lisflood-code/tree/master/src/lisfloodSettings_reference.xml). The user is encouraged to update the paths, the names of the maps and of the tables in the provided template.

[:top:](#top)
Loading
Loading