Merge branch 'develop' into main

# Conflicts:
#	requirements/env_developer.yml

Author: emanuel-schmid

AUTHORS

@@ -3,7 +3,7 @@ David N. Bresch
 Samuel Eberenz
 Jan Hartman
 Marine Perus
-Thomas Roosli
+Thomas Röösli
 Dario Stocker
 Veronica Bozzini
 Tobias Geiger
@@ -12,7 +12,7 @@ Evelyn Mühlhofer
 Rachel Bungerer
 Inga Sauer
 Samuel Lüthi
-Pui Man (Mannie) Kam
+Pui Man Kam
 Simona Meiler
 Alessio Ciullo
 Thomas Vogt

climada/__init__.py

@@ -43,9 +43,9 @@
         SYSTEM_DIR.joinpath('GDP_TWN_IMF_WEO_data.csv'),
         SYSTEM_DIR.joinpath('FAOSTAT_data_country_codes.csv'),
         SYSTEM_DIR.joinpath('rcp_db.xls'),
-        SYSTEM_DIR.joinpath('tc_if_cal_v01_TDR1.0.csv'),
-        SYSTEM_DIR.joinpath('tc_if_cal_v01_EDR.csv'),
-        SYSTEM_DIR.joinpath('tc_if_cal_v01_RMSF.csv'),
+        SYSTEM_DIR.joinpath('tc_impf_cal_v01_TDR1.0.csv'),
+        SYSTEM_DIR.joinpath('tc_impf_cal_v01_EDR.csv'),
+        SYSTEM_DIR.joinpath('tc_impf_cal_v01_RMSF.csv'),
     ],
     'data/system/GSDP': [
         GSDP_DIR.joinpath(f'{cc}_GSDP.xls')
@@ -66,6 +66,8 @@
         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'),
+        DEMO_DIR.joinpath('crop_production_demo_data_yields_CHE.nc4'),
+        DEMO_DIR.joinpath('crop_production_demo_data_cultivated_area_CHE.nc4'),
         DEMO_DIR.joinpath('FAOSTAT_data_producer_prices.csv'),
         DEMO_DIR.joinpath('FAOSTAT_data_production_quantity.csv'),
         DEMO_DIR.joinpath('lpjml_ipsl-cm5a-lr_ewembi_historical_2005soc_co2_yield-whe-noirr_annual_FR_DE_DEMO_1861_2005.nc'),
@@ -76,18 +78,20 @@
         DEMO_DIR.joinpath('pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-noirr_global_annual_DEMO_TJANJIN_1861_2005.nc'),
         DEMO_DIR.joinpath('WS_ERA40_sample.mat'),
         DEMO_DIR.joinpath('WS_Europe.xls'),
+        DEMO_DIR.joinpath('Portugal_firms_June_2017.csv'),
+        DEMO_DIR.joinpath('Portugal_firms_2016_17_18_MODIS.csv'),
     ] + WS_DEMO_NC
 }
 
 
-def setup_climada_data():
+def setup_climada_data(reload=False):
 
     for dirpath in [DEMO_DIR, SYSTEM_DIR, GSDP_DIR]:
         dirpath.mkdir(parents=True, exist_ok=True)
 
     for src_dir, path_list in REPO_DATA.items():
         for path in path_list:
-            if not path.exists():
+            if not path.exists() or reload:
                 src = Path(__file__).parent.parent.joinpath(src_dir, path.name)
                 copyfile(src, path)
 

climada/_version.py

@@ -1 +1 @@
-__version__ = '2.1.1'
+__version__ = '2.1.1-dev'

climada/conf/climada.conf

@@ -25,12 +25,30 @@
     	}
     },
     "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"
+            },
+            "gpw_population": {
+                "filename_gpw": "gpw_v4_population_count_rev%02i_%04i_30_sec.tif",
+                "dirname_gpw": "gpw-v4-population-count-rev%02i_%04i_30_sec_tif",
+                "gpw_version": 11,
+                "years_available": [2020, 2015, 2010, 2005, 2000]
+            },
+            "nightlights": {
+                "blackmarble_years": [2012, 2016],
+                "noaa_url": "https://ngdc.noaa.gov/eog/data/web_data/v4composites/",
+                "nasa_url_start": "https://eoimages.gsfc.nasa.gov/images/imagerecords/144000/",
+                "nasa_url_ends" : ["144896/", "144897/", "144898/"],
+                "nasa_site_old" : "https://www.nasa.gov/specials/blackmarble/*/tiles/georeferrenced/",
+                "nasa_sites" : ["https://eoimages.gsfc.nasa.gov/images/imagerecords/144000/144897/",
+                                "https://eoimages.gsfc.nasa.gov/images/imagerecords/144000/144896/",
+                                "https://www.nasa.gov/specials/blackmarble/*/tiles/georeferrenced/",
+                                "https://eoimages.gsfc.nasa.gov/images/imagerecords/144000/144898/"]
             }
         },
         "spam_agrar": {
@@ -50,7 +68,8 @@
             "local_data": "."
         },
         "relative_cropyield": {
-            "local_data": "{exposures.crop_production.local_data}"
+            "local_data": "{exposures.crop_production.local_data}",
+            "filename_wheat_mask": "mask_winter_and_spring_wheat_areas_phase3.nc4"
         },
         "trop_cyclone": {
             "random_seed": 54
@@ -60,5 +79,10 @@
         }
     },
     "log_level": "WARNING",
-    "max_matrix_size": 1000000000
+    "max_matrix_size": 1000000000,
+    "data_api": {
+        "host": "https://climada.ethz.ch",
+        "chunk_size": 8192,
+        "cache_db": "{local_data.system}/.downloads.db"
+    }
 }