diff --git a/run.jl b/run.jl index 51bc2329d986d53cd040d702bb359658055ebed0..4dbf6d2b196ac136f49ed47895d74a1433dc2cc5 100755 --- a/run.jl +++ b/run.jl @@ -7,4 +7,4 @@ using Pkg Pkg.activate(".") using Persephone -simulate() +@time simulate() diff --git a/src/analysis/analyse_nature.R b/src/analysis/analyse_nature.R index d3b9be805a4d121e1c707ba0d18fddf84e6b0416..4629aa944b45a543406618bed70e74c5a4485f82 100755 --- a/src/analysis/analyse_nature.R +++ b/src/analysis/analyse_nature.R @@ -12,7 +12,7 @@ library(terra) autorun = TRUE ## automatically run all analyses? -datadir = "results" ## "results" by default +datadir = "test_results" ## "results" by default popfile = "populations.csv" indfile = "individuals.csv" mapfile = "landcover_jena.tif" @@ -26,7 +26,7 @@ populationTrends = function() { mutate(Date = as.POSIXct(strptime(Date,format="%Y-%m-%d"))) ggplot(data=popdata, aes(x=Date, y=Abundance, color=Species)) + geom_point() + - geom_smooth() + + ##geom_smooth() + scale_color_viridis_d() + theme_bw() ggsave(paste0(datadir, "/", population_output_file, ".pdf"), width=8, height=4) diff --git a/src/nature/wolpertinger.jl b/src/nature/wolpertinger.jl index f426ba85f630e3ff7d8cd86951cbfa11f1f394b4..f22abc6a8b14089224de464bf64c5079304702f5 100644 --- a/src/nature/wolpertinger.jl +++ b/src/nature/wolpertinger.jl @@ -47,5 +47,5 @@ newspecies("Wolpertinger", updatewolpertinger!, Dict("popdensity"=>1/10000, "birthenergy"=>400, - "fecundity"=>0.02, + "fecundity"=>0.01, "maxspeed"=>5)) diff --git a/src/parameters.toml b/src/parameters.toml index d0032e310beaf2f3fd5182561e7f2a73f2140796..1f8a75b132f65cccd3e91d8c5f351f805caa606f 100644 --- a/src/parameters.toml +++ b/src/parameters.toml @@ -15,7 +15,7 @@ loglevel = "debug" # verbosity level: "debug", "info", "quiet" seed = 0 # seed value for the RNG (0 -> random value) # dates to start and end the simulation startdate = 2020-01-01 -enddate = 2020-01-31 +enddate = 2020-12-31 [farm] diff --git a/test.sh b/test.sh new file mode 100755 index 0000000000000000000000000000000000000000..15fb6c9c136143ad1c8340a769504892c4b42498 --- /dev/null +++ b/test.sh @@ -0,0 +1,11 @@ +#!/bin/bash +## A short shell script to test the current development version of Persephone. + +if [[ -d "test_results" ]] +then + rm -r test_results +fi + +./run.jl -o test_results -s 1 + +src/analysis/analyse_nature.R