From cb185faade1045ac3334a901a5b8397e4ec4d094 Mon Sep 17 00:00:00 2001
From: Daniel Vedder <daniel.vedder@idiv.de>
Date: Fri, 6 Sep 2024 13:56:07 +0200
Subject: [PATCH] Update to keep track with Persefone model
---
Manifest.toml | 2 +-
.../{almass_crop_growth_curves.csv => crop_growth_curves.csv} | 0
guiparams.toml | 3 +--
src/variables.jl | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
rename data/crops/almass/{almass_crop_growth_curves.csv => crop_growth_curves.csv} (100%)
diff --git a/Manifest.toml b/Manifest.toml
index 428f68b..bb8d29c 100644
--- a/Manifest.toml
+++ b/Manifest.toml
@@ -1315,7 +1315,7 @@ version = "2.8.1"
[[deps.Persefone]]
deps = ["ArgParse", "CSV", "CairoMakie", "DataFrames", "DataFramesMeta", "Dates", "Distributed", "Documenter", "FileIO", "GeoArrays", "Logging", "LoggingExtras", "Pkg", "Random", "Serialization", "StableRNGs", "StatsBase", "TOML", "Test", "TiffImages", "Unitful"]
-git-tree-sha1 = "426db9701e0362d499c6d29aa02f8ce5a5807dc7"
+git-tree-sha1 = "3ff76c13d401170fe49e6b8a3e2ff6d055250c72"
repo-rev = "master"
repo-url = "https://git.idiv.de/persefone/persefone-model.git"
uuid = "039acd1d-2a07-4b33-b082-83a1ff0fd136"
diff --git a/data/crops/almass/almass_crop_growth_curves.csv b/data/crops/almass/crop_growth_curves.csv
similarity index 100%
rename from data/crops/almass/almass_crop_growth_curves.csv
rename to data/crops/almass/crop_growth_curves.csv
diff --git a/guiparams.toml b/guiparams.toml
index 4eb653b..25af5f5 100644
--- a/guiparams.toml
+++ b/guiparams.toml
@@ -40,5 +40,4 @@ indoutfreq = "daily" # output frequency individual-level data, daily/monthly/yea
[crop]
cropmodel = "almass" # crop growth model to use, "almass" or "aquacrop"
-cropfile = "data/crops/almass/crop_data_general.csv" # file with general crop parameters
-growthfile = "data/crops/almass/almass_crop_growth_curves.csv" # file with crop growth param
+cropdirectory = "data/crops/almass" # the directory storing all data files for the selected crop model
diff --git a/src/variables.jl b/src/variables.jl
index 6c20057..45a2f1e 100644
--- a/src/variables.jl
+++ b/src/variables.jl
@@ -13,7 +13,7 @@ global timer = nothing
global mapimage = nothing
global plotimage = nothing
-const configfile = Observable("guiparams.toml")
+const configfile = Observable(joinpath(pkgdir(PersefoneDesktop), "guiparams.toml"))
const launching = Observable(false)
const running = Observable(false)
const ticks = Observable(0)
--
GitLab