Merge branch 'marco/rm-duplicate-params' into 'master'

Remove duplicated data files from test folder

Closes #118

See merge request persefone/persefone-model!5

test/test_parameters.toml

@@ -21,11 +21,11 @@ startdate = 2022-02-01
 enddate = 2022-03-31
 
 [world]
-mapdirectory = "." # the directory in which all geographic data are stored
+mapdirectory = "data/regions/jena/" # the directory in which all geographic data are stored
 mapresolution = 10 # map resolution in meters
-landcovermap = "landcover_jena.tif" # location of the landcover map
-farmfieldsmap = "fields_jena.tif" # location of the field geometry map
-weatherfile = "weather_jena.csv" # location of the weather data file
+landcovermap = "landcover.tif" # location of the landcover map
+farmfieldsmap = "fields.tif" # location of the field geometry map
+weatherfile = "weather.csv" # location of the weather data file
 
 [farm]
 farmmodel = "BasicFarmer" # which version of the farm model to use

test/test_parameters_almass.toml

@@ -21,11 +21,11 @@ startdate = 2022-02-01
 enddate = 2022-03-31
 
 [world]
-mapdirectory = "." # the directory in which all geographic data are stored
+mapdirectory = "data/regions/jena/" # the directory in which all geographic data are stored
 mapresolution = 10 # map resolution in meters
-landcovermap = "landcover_jena.tif" # location of the landcover map
-farmfieldsmap = "fields_jena.tif" # location of the field geometry map
-weatherfile = "weather_jena.csv" # location of the weather data file
+landcovermap = "landcover.tif" # location of the landcover map
+farmfieldsmap = "fields.tif" # location of the field geometry map
+weatherfile = "weather.csv" # location of the weather data file
 
 [farm]
 farmmodel = "BasicFarmer" # which version of the farm model to use

test/test_parameters_simplecrop.toml

@@ -21,11 +21,11 @@ startdate = 2022-02-01
 enddate = 2022-03-31
 
 [world]
-mapdirectory = "." # the directory in which all geographic data are stored
+mapdirectory = "data/regions/jena/" # the directory in which all geographic data are stored
 mapresolution = 10 # map resolution in meters
-landcovermap = "landcover_jena.tif" # location of the landcover map
-farmfieldsmap = "fields_jena.tif" # location of the field geometry map
-weatherfile = "weather_jena.csv" # location of the weather data file
+landcovermap = "landcover.tif" # location of the landcover map
+farmfieldsmap = "fields.tif" # location of the field geometry map
+weatherfile = "weather.csv" # location of the weather data file
 
 [farm]
 farmmodel = "BasicFarmer" # which version of the farm model to use