Merge branch 'develop' into main

# Conflicts:
#	climada/_version.py

Author: emanuel-schmid

.gitignore

@@ -126,9 +126,6 @@ venv.bak/
 # mac finder files
 .DS_Store
 
-# directory with input data for hazard emulator tutorial
-data/emulator
-
 # climada system data files
 # they get downloaded separately from the repo
 data/system/global_coast*

climada.conf

@@ -6,12 +6,7 @@
         "test_data": "{test_directory}/entity/disc_rates/test/data"
     },
     "engine": {
-        "test_data": "{test_directory}/engine/test/data",
-        "supplychain": {
-            "local_data": {
-                "wiod": "{engine.test_data}"
-            }
-        }
+        "test_data": "{test_directory}/engine/test/data"
     },
     "exposures": {
         "test_data": "{test_directory}/entity/exposures/test/data"

climada/__init__.py

@@ -57,12 +57,9 @@
         ENT_DEMO_FUTURE,
         EXP_DEMO_H5,
         HAZ_DEMO_FL,
-        HAZ_DEMO_FLDDPH,
-        HAZ_DEMO_FLDFRC,
         HAZ_DEMO_MAT,
         HAZ_DEMO_H5,
         TC_ANDREW_FL,
-        DEMO_GDP2ASSET,
         DEMO_DIR.joinpath('demo_emdat_impact_data_2020.csv'),
         DEMO_DIR.joinpath('histsoc_landuse-15crops_annual_FR_DE_DEMO_2001_2005.nc'),
         DEMO_DIR.joinpath('hist_mean_mai-firr_1976-2005_DE_FR.hdf5'),
@@ -80,6 +77,7 @@
         DEMO_DIR.joinpath('WS_Europe.xls'),
         DEMO_DIR.joinpath('Portugal_firms_June_2017.csv'),
         DEMO_DIR.joinpath('Portugal_firms_2016_17_18_MODIS.csv'),
+        DEMO_DIR.joinpath('SRTM15+V2.0_sample.tiff'),
     ] + WS_DEMO_NC
 }
 

climada/_version.py

@@ -1 +1 @@
-__version__ = '2.2.0'
+__version__ = '3.0.0-cand'

climada/conf/climada.conf

@@ -9,14 +9,6 @@
         "forecast": {
             "plot_dir": "{local_data.save_dir}/forecast/plots",
             "local_data": "{local_data.save_dir}/forecast"
-        },
-        "supplychain": {
-            "resources": {
-                "wiod16": "http://www.wiod.org/protected3/data16/wiot_ROW/"
-            },
-            "local_data": {
-                "wiod": "{local_data.system}/WIOD"
-            }
         },
 		"uncertainty": {
     		"local_data": {
@@ -26,9 +18,6 @@
     },
     "exposures": {
         "def_ref_year": 2018,
-        "crop_production": {
-            "local_data": "{local_data.system}/ISIMIP_crop"
-        },
         "litpop": {
             "resources": {
                 "world_bank_inc_group": "http://databank.worldbank.org/data/download/site-content/OGHIST.xls"
@@ -50,23 +39,9 @@
                                 "https://www.nasa.gov/specials/blackmarble/*/tiles/georeferrenced/",
                                 "https://eoimages.gsfc.nasa.gov/images/imagerecords/144000/144898/"]
             }
-        },
-        "spam_agrar": {
-            "resources": {
-                "spam2005_api_access": "https://dataverse.harvard.edu/api/access/datafile/:persistentId?persistentId=doi:10.7910/DVN/DHXBJX/",
-                "spam2005_dataset": "https://dataverse.harvard.edu/dataset.xhtml?persistentId=doi:10.7910/DVN/DHXBJX"
-            }
         }
     },
     "hazard": {
-        "drought": {
-            "resources": {
-                "spei_file_url": "http://digital.csic.es/bitstream/10261/153475/8"
-            }
-        },
-        "landslide": {
-            "local_data": "."
-        },
         "relative_cropyield": {
             "local_data": "{exposures.crop_production.local_data}",
             "filename_wheat_mask": "mask_winter_and_spring_wheat_areas_phase3.nc4"

climada/engine/__init__.py

@@ -20,4 +20,3 @@
 """
 from .impact import *
 from .cost_benefit import *
-from .supplychain import *