From 622a5e790874fddc48aa273af7c7b642356a31da Mon Sep 17 00:00:00 2001
From: Daniel Vedder <daniel.vedder@idiv.de>
Date: Tue, 10 Sep 2024 16:06:43 +0200
Subject: [PATCH] Fixed bug in preprocessparameters()
---
src/core/input.jl | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/core/input.jl b/src/core/input.jl
index 0efa711..b0a2b99 100644
--- a/src/core/input.jl
+++ b/src/core/input.jl
@@ -97,23 +97,19 @@ function preprocessparameters(settings::Dict{String,Any}, defaultoutdir::String)
end
# check if input data are present in the working directory or the package directory
if !isdir(settings["world.mapdirectory"])
- @warn "$(settings["world.mapdirectory"]) not found in current working directory."
if isdir(abspath(pkgdir(@__MODULE__), settings["world.mapdirectory"]))
settings["world.mapdirectory"] = abspath(pkgdir(@__MODULE__), settings["world.mapdirectory"])
- @warn "Using package directory to load maps: $(settings["world.mapdirectory"])."
- #@debug "Using package directory to load map data: $(settings["world.mapdirectory"])".
+ @debug "Using package directory to load map data: $(settings["world.mapdirectory"])."
else
- @warn "Couldn't find maps at $(settings["world.mapdirectory"])."
- #Base.error("Couldn't find map directory $(settings["world.mapdirectory"]).") #FIXME
+ Base.error("Couldn't find map directory $(settings["world.mapdirectory"]).")
end
end
if !isdir(settings["crop.cropdirectory"])
if isdir(abspath(pkgdir(@__MODULE__), settings["crop.cropdirectory"]))
settings["crop.cropdirectory"] = abspath(pkgdir(@__MODULE__), settings["crop.cropdirectory"])
- @debug "Using package directory to load crop data: $(settings["crop.cropdirectory"])".
+ @debug "Using package directory to load crop data: $(settings["crop.cropdirectory"])."
else
- #Base.error("Couldn't find crop directory $(settings["crop.cropdirectory"]).")
- @warn "Couldn't find crop directory $(settings["crop.cropdirectory"])."
+ Base.error("Couldn't find crop directory $(settings["crop.cropdirectory"]).")
end
end
# sanity checks
--
GitLab