Skip to content

Commit 0c93da7

Browse files
authored
Merge branch 'master' into BMI
2 parents 8cb00df + 91a8572 commit 0c93da7

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

Project.toml

+13-6
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,30 @@ TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
2626
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
2727

2828
[compat]
29+
Aqua = "0.8"
2930
BasicModelInterface = "0.1"
3031
CFTime = "0.1"
31-
DelimitedFiles = "1.6"
32+
Dates = "<0.0.1,1"
33+
DelimitedFiles = "<0.0.1,1"
34+
Downloads = "<0.0.1,1"
3235
FieldMetadata = "0.3"
3336
Glob = "1.3"
3437
Graphs = "1.4"
3538
IfElse = "0.1"
36-
LoggingExtras = "0.4.6, 0.5, 1"
39+
LoggingExtras = "0.4.6,0.5,1"
3740
LoopVectorization = "0.12"
38-
NCDatasets = "0.12.11"
41+
NCDatasets = "0.13"
3942
Parameters = "0.12"
4043
Polyester = "0.7"
44+
Polynomials = "3,4"
4145
ProgressLogging = "0.1"
42-
StaticArrays = "0.12, 1.0"
43-
Statistics = "1"
44-
TOML = "1.0"
46+
QuadGK = "2"
47+
Random = "<0.0.1,1"
48+
StaticArrays = "0.12,1.0"
49+
Statistics = "<0.0.1,1"
50+
TOML = "<0.0.1,1"
4551
TerminalLoggers = "0.1.5"
52+
Test = "<0.0.1,1"
4653
UnPack = "1"
4754
julia = "1.6"
4855

docs/src/changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
(BasicModelInterface.jl), including function arguments, return types and the BMI
1616
specification that arrays are always flattened (this was not the case for variables stored
1717
as 2-dimensional arrays or as vector of SVectors).
18+
- Bump compat for NCDatasets to 0.13.
1819

1920
### Changed
2021
- For cyclic parameters different cyclic time inputs are supported (only one common cyclic

test/horizontal_process.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const ldd_mv = 255
44
# read the staticmaps into memory
55
nc = NCDataset(staticmaps_rhine_path)
66
# helper function to get the axis order and directionality right
7-
read_right(nc, var) = reverse(permutedims(nc[var][:]); dims = 2)
7+
read_right(nc, var) = reverse(permutedims(Array(nc[var])); dims = 2)
88
ldd_2d = read_right(nc, "ldd")
99

1010
inds, _ = Wflow.active_indices(ldd_2d, ldd_mv)

0 commit comments

Comments
 (0)