diff --git a/src/core/input.jl b/src/core/input.jl index 7a89f6ccd4cedfd3c7dec6e4b8aa9f128910b43f..0efa711ff616797102850f1fc6de33b73d930597 100644 --- a/src/core/input.jl +++ b/src/core/input.jl @@ -97,13 +97,13 @@ 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 "$(@param(world.mapdirectory)) not found in current working directory." + @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: $(@param(world.mapdirectory))." + @warn "Using package directory to load maps: $(settings["world.mapdirectory"])." #@debug "Using package directory to load map data: $(settings["world.mapdirectory"])". else - @warn "Couldn't find maps at $(@param(world.mapdirectory))." + @warn "Couldn't find maps at $(settings["world.mapdirectory"])." #Base.error("Couldn't find map directory $(settings["world.mapdirectory"]).") #FIXME end end @@ -112,7 +112,8 @@ function preprocessparameters(settings::Dict{String,Any}, defaultoutdir::String) settings["crop.cropdirectory"] = abspath(pkgdir(@__MODULE__), 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"]).") + #Base.error("Couldn't find crop directory $(settings["crop.cropdirectory"]).") + @warn "Couldn't find crop directory $(settings["crop.cropdirectory"])." end end # sanity checks