Skip to content

Commit d5f9e25

Browse files
committed
Merge branch 'development' into feature/mct_optim
2 parents 3ebc502 + 6211adb commit d5f9e25

File tree

27 files changed

+6581
-12738
lines changed

27 files changed

+6581
-12738
lines changed

.github/workflows/ci_env.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: Lisflood OS Unit Tests
22

3-
on: [push]
3+
# Controls when the workflow will run
4+
on:
5+
push:
6+
branches: [ "master", "development" ]
7+
pull_request:
8+
branches: [ "master", "development" ]
49

510
jobs:
611
tests:

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ lisflood_model.egg-info
2525
.coverage
2626
*.tox.ini
2727
.vscode/
28+
*.ipynb
29+
.ipynb_checkpoints/

docs/3_step3_preparing-setting-file/index.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ For simplicity reasons, we suggest to follow the following steps:
1717
3) parameter options
1818
4) chose optional model routines (which ones are available; what they do; and how to “activate” them)
1919

20-
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.
20+
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.
2121
TIP: *$(ProjectDir)* or *$(ProjectPath)* cab used as built-in variable in the XML settings, to refer the project folder.
2222

2323
### Time-related constants
@@ -731,8 +731,9 @@ Within the 'lfoptions' element of the settings file, each option is defined usin
731731
+ **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).
732732
+ **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.
733733
+ **OutputMapsChunks**: this option is used to dump outputs to disk every X steps (default 1).
734+
+ **OutputMapsDataType**: this option sets the output data type and may take the following values: "float64" or "float32" (default float64)
734735

735736
### Reference settings file
736-
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.
737+
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.
737738

738739
[:top:](#top)

0 commit comments

Comments
 (0)