diff --git a/README.md b/README.md index ce1932c663ee1bdee4a20b7f420a0e8376c891c1..1435d10f3e5c0fc2d100b813a14ca06a2417682a 100644 --- a/README.md +++ b/README.md @@ -36,18 +36,20 @@ for the risk of Septoria, Easy to map and calculate based on weather data alone. The model has been implemented by [Tor-Einar Skog](https://nibio.no/en/employees/tor-einar-skog), [NIBIO](https://nibio.no/en). It is designed to fit into the gridded pest prediction models of [VIPS](https://nibio.no/en/services/vips). ### Software requirements -The model can only be run on Linux, as some of the tools mentioned below are only available on Linux. The development and testing of the model has been done using [Ubuntu Linux 22.04LTS](https://ubuntu.com/). +The model can only be run on Linux, as some of the tools mentioned below are only available on Linux. The development and testing of the model has been done using [Ubuntu Linux](https://ubuntu.com/), versions 22/24. + #### CDO and GDAL -The heavy lifting in this model is done by the tools [CDO](https://code.mpimet.mpg.de/projects/cdo) and [GDAL](https://gdal.org/). These tools need to be installed and available. CDO is only available on Linux. +The heavy lifting in this model is done by the tools [CDO](https://code.mpimet.mpg.de/projects/cdo) and [GDAL](https://gdal.org/). These tools need to be installed and available. GDAL can be installed by your package manager. CDO is only available on Linux. CDO (and Python, see below) is managed by [MiniConda](https://docs.anaconda.com/free/miniconda/index.html). All requirements must be specified in the `conda_environment.yml` file. #### Python requirements -The Python requirements are specified in `requirements.txt` file, and are included in the virtualenv created by the `run_SEPTREFHUM.sh` (see below). +The Python requirements are specified in `conda_environment.yml` file, and are included in the conda environment created by the `run_SEPTREFHUM.sh` (see below). ### Input data requirements The model (as per 2023-10-25) assumes that weather data files named `met_1_0km_nordic-[YYYY-MM-DD].nc` are available in the `in/` folder. The files must contain hourly timesteps with the following weather parameters: * RR (Rainfall in mm) * UM (Relative humidity in %) +* TM (Temperature in °C) ### Running the model It is required that you have set the following environment variables: @@ -93,9 +95,10 @@ MAPSERVER_EXTENT="-1.5831861262936526 52.4465003983706595 39.2608060398730458 71 ```bash $ ./run_SEPTREFHUM.sh ``` -This creates a Python virtualenv, installs all the Python dependencies, runs the model and stores output in a log file. +This creates a Conda environment, installs all the CDO/Python dependencies, runs the model and stores output in a log file. Alternatively, primarily for development purposes, you can run the Python script SEPTREFHUM directly: + ```bash $ ./SEPTREFHUM.py ``` @@ -117,13 +120,13 @@ A [Jinja2](https://pypi.org/project/Jinja2/) template mapfile (for [Mapserver](h Examples of the two layers are shown below - + -*WARNING_STATUS example. Showing Norway* +*WARNING_STATUS example. Showing Europe and surrounding areas* - + -*WHS (Wet Hour Sum) example. Showing Norway* +*WHS (Wet Hour Sum) example. Showing Europe and surrounding areas* ## Notes to self diff --git a/WARNING_STATUS_layer_example.png b/WARNING_STATUS_layer_example.png index ca87fc7d6920b28e2f78542dd3e7dafcf7a052b6..4f153b9953d0b00f86f943290d3d1e34fad402c8 100644 Binary files a/WARNING_STATUS_layer_example.png and b/WARNING_STATUS_layer_example.png differ diff --git a/WHS_layer_example.png b/WHS_layer_example.png index 36c6ef49c4c9653b4a33822cdd6996ff0738df9e..9228e9f2ffcb450ed64d92382a77027753f985e5 100644 Binary files a/WHS_layer_example.png and b/WHS_layer_example.png differ diff --git a/requirements.txt b/requirements.txt index 222acb6b40f5f293dba1fe4592ae578604cefa3f..8c05a79212b9c5ab894729bec285e7230620344e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +# Not in use anymore. Please specify your Python requirements in /conda_environment.yml Jinja2 netCDF4 pytz