diff --git a/.gitignore b/.gitignore index 942730046b9ffad14a6c87c9dd1f0cdc4a139885..368f40ddb4cac3b0e1731277b1c1c38a96f41883 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ TODO.md docs/planning -*results*/ \ No newline at end of file +*results*/ +profile*txt \ No newline at end of file diff --git a/Makefile b/Makefile index 0683312ee65cd5105253ad5e207c5c4a8d8614ca..3de32b7f73c6b4f66332a300444a3575bfce779b 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL = /bin/bash .PHONY: run test docs release install run: - # running example simulation + # run an example simulation if [ -d "example_results" ]; then rm -r example_results; fi ./run.jl -o example_results src/analysis/analyse_nature.R example_results @@ -19,6 +19,11 @@ docs: sed -i -e "s/\*Last updated:.*/\*Last updated: ${commit}\*/" docs/src/index.md cd docs; julia builddocs.jl +profile: + # run and profile an example simulation + if [ -d "example_results" ]; then rm -r example_results; fi + ./runprofile.jl -o example_results + container: echo "Not yet implemented (#43)" diff --git a/README.md b/README.md index 59351c5a79b67d4be76b00abed75d26bcb88bbaa..7d5f457ae2fa3f38679db385b2e01b53e94ea441 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ If you are on Linux or MacOS, you can also use `make`: ``` > make run # run a simulation with default values > make test # run the test suite +> make profile # run and profile a default simulation > make docs # build the documentation > make release # create a release ``` diff --git a/docs/src/index.md b/docs/src/index.md index 3a783f5543666e575ff656c82b12365d5f21a7d9..f1c9c33f46fa62d04a52f8e5fe83667ce215ad45 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -51,8 +51,6 @@ of parameters): [core] configfile = "src/parameters.toml" # location of the configuration file -landcovermap = "data/landcover_jena.tif" # location of the landcover map -farmfieldsmap = "data/fields_jena.tif" # location of the field geometry map outdir = "results" # location and name of the output folder overwrite = "ask" # overwrite the output directory? (true/false/"ask") loglevel = "debug" # verbosity level: "debug", "info", "warn" @@ -62,6 +60,10 @@ seed = 2 # seed value for the RNG (0 -> random value) startdate = 2022-01-01 enddate = 2022-12-31 +[world] +landcovermap = "data/landcover_jena.tif" # location of the landcover map +farmfieldsmap = "data/fields_jena.tif" # location of the field geometry map + [farm] farmmodel = "FieldManager" # which version of the farm model to use (not yet implemented)