Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Persefone.jl
- Activity
- Members
- Wiki
- Package Registry
- Model registry
- Terraform modules

Snippets Groups Projects

223050b9

Commit 223050b9 authored 1 month ago by jw82usig

Downloads
- Plain Diff

Merge branch 'marco/dev-aquacrop' into 'master'

Add AquaCrop.jl crop model, and support multiple crop models in a simulation

Closes #122

See merge request persefone/persefone-model!6

parents baab5b8c 43c806bc

No related branches found

No related tags found

No related merge requests found

Changes 22

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 16 additions, 0 deletions

CHANGELOG.md
Project.toml 4 additions, 0 deletions

Project.toml
data/crops/aquacrop/crop_data.csv 5 additions, 0 deletions

data/crops/aquacrop/crop_data.csv
src/Persefone.jl 20 additions, 0 deletions

src/Persefone.jl
src/core/input.jl 12 additions, 10 deletions

src/core/input.jl
src/core/simulation.jl 8 additions, 7 deletions

src/core/simulation.jl
src/crop/almass.jl 14 additions, 4 deletions

src/crop/almass.jl
src/crop/aquacrop.jl 253 additions, 0 deletions

src/crop/aquacrop.jl
src/crop/cropmodels.jl 48 additions, 41 deletions

src/crop/cropmodels.jl
src/crop/farmplot.jl 23 additions, 11 deletions

src/crop/farmplot.jl
src/crop/simplecrop.jl 9 additions, 3 deletions

src/crop/simplecrop.jl
src/parameters.toml 4 additions, 3 deletions

src/parameters.toml
src/world/landscape.jl 89 additions, 11 deletions

src/world/landscape.jl
test/crop_tests.jl 30 additions, 5 deletions

test/crop_tests.jl
test/landscape_tests.jl 1 addition, 1 deletion

test/landscape_tests.jl
test/nature_tests.jl 2 additions, 2 deletions

test/nature_tests.jl
test/paramscan.toml 1 addition, 1 deletion

test/paramscan.toml
test/runtests.jl 3 additions, 2 deletions

test/runtests.jl
test/test_parameters.toml 2 additions, 1 deletion

test/test_parameters.toml
test/test_parameters_almass.toml 2 additions, 1 deletion

test/test_parameters_almass.toml

with 546 additions and 103 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment