Merge branch 'develop' into main

# Conflicts:
#	climada/_version.py
#	requirements/env_climada.yml
#	requirements/env_docs.yml

Author: schmide

.coveragerc

@@ -51,16 +51,20 @@ coverage.xml
 .hypothesis/
 
 # Temporary data generated by unit tests
+climada/engine/test/data/supplychain/*
 climada/engine/test/data/test.csv
-climada/engine/test/data/test.xlsx
 climada/engine/test/data/test_imp_mat.npz
-climada/entity/impact_funcs/test/test_write.xlsx
-climada/hazard/test/data/test_haz.h5
+climada/engine/test/data/test.xlsx
+climada/entity/impact_funcs/test/data/test_write.xlsx
 climada/hazard/test/data/tc_tracks_nc/*
+climada/hazard/test/data/test_centr.h5
+climada/hazard/test/data/test_haz.h5
 climada/test/data/1988234N13299.nc
+climada/test/data/exposure_buildings_default_47_7.h5
 climada/test/data/exposure_high_47_8.h5
 climada/test/data/test_write_hazard.tif
 climada/util/test/data/save_test.pkl
+climada/util/test/data/test_write_raster.tif
 
 # Translations
 *.mo
@@ -122,7 +126,7 @@ venv.bak/
 # mac finder files
 .DS_Store
 
-# directory with input data for hazard emulator tutorial 
+# directory with input data for hazard emulator tutorial
 data/emulator
 
 # climada system data files
@@ -166,11 +170,10 @@ data/system/GMT_intermediate_coast*
 # climada system data files: folders for hazard and exposure data
 data/system/hazard/
 data/system/litpop/
-data/system/litpop_2014/ 
+data/system/litpop_2014/
 
 # climada data: ISIMIP crop data folder:
 data/ISIMIP_crop/
 
 # climada data results folder:
-data/results/
-
+results/

.gitignore

@@ -147,7 +147,9 @@ ignore-on-opaque-inference=yes
 # List of class names for which member attributes should not be checked (useful
 # for classes with dynamically set attributes). This supports the use of
 # qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local
+# Config is excluded from pylint, because its members are dynamically created
+# from the climada.conf file
+ignored-classes=optparse.Values,thread._local,_thread._local,climada.util.config.Config
 
 # List of module names for which member attributes should not be checked
 # (useful for modules/projects where namespaces are manipulated during runtime
@@ -288,10 +290,10 @@ const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
 docstring-min-length=-1
 
 # Naming hint for function names
-function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+function-name-hint=(([a-z][a-z0-9_]{2,40})|(_[a-z0-9_]*))$
 
 # Regular expression matching correct function names
-function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+function-rgx=(([a-z][a-z0-9_]{2,40})|(_[a-z0-9_]*))$
 
 # Good variable names which should always be accepted, separated by a comma
 good-names=i,j,k,ex,Run,_

.pylintrc

@@ -12,7 +12,9 @@ Evelyn Mühlhofer
 Rachel Bungerer
 Inga Sauer
 Samuel Lüthi
-Mannie Kam
+Pui Man (Mannie) Kam
 Simona Meiler
 Alessio Ciullo
 Thomas Vogt
+Benoit P. Guillod
+Chahan Kropf

AUTHORS

@@ -12,15 +12,7 @@ pipeline {
             source activate climada_env
             pylint -ry climada | tee pylint.log'''
 
-            step([
-                $class: 'WarningsPublisher',
-                parserConfigurations: [[
-                    parserName: 'PyLint',
-                    pattern   : 'pylint.log'
-                ]],
-                unstableTotalHigh: '25',
-                usePreviousBuildAsReference: true
-            ])
+            recordIssues tools: [pyLint(pattern: 'pylint.log')]
           }
         }
 

Jenkinsfile

@@ -12,7 +12,7 @@ lint : ## Static code analysis with Pylint
 
 .PHONY : unit_test
 unit_test : ## Unit tests execution with coverage and xml reports
-	python -m coverage run  tests_runner.py unit
+	python -m coverage run tests_runner.py unit
 	python -m coverage xml -o coverage.xml
 	python -m coverage html -d coverage
 

Makefile

@@ -0,0 +1,27 @@
+{
+    "_comment": "this is a climada configuration file meant to supersede the default configuration in climada/conf during test",
+    "test_directory": "./climada",
+    "test_data": "{test_directory}/test/data",
+    "disc_rates": {
+        "test_data": "{test_directory}/entity/disc_rates/test/data"
+    },
+    "engine": {
+        "test_data": "{test_directory}/engine/test/data"
+    },
+    "exposures": {
+        "test_data": "{test_directory}/entity/exposures/test/data"
+    },
+    "impact_funcs": {
+        "test_data": "{test_directory}/entity/impact_funcs/test/data"
+    },
+    "hazard": {
+        "test_data": "{test_directory}/hazard/test/data"
+    },
+    "measures": {
+        "test_data": "{test_directory}/entity/measures/test/data"
+    },
+    "util": {
+        "test_data": "{test_directory}/util/test/data"
+    },
+    "log_level": "INFO"
+}

climada.conf

@@ -18,7 +18,91 @@
 
 climada init
 """
+from shutil import copyfile
+from pathlib import Path
 
-from .util.config import CONFIG, setup_conf_user, setup_logging
-setup_conf_user()
-setup_logging(CONFIG['global']['log_level'])
+from .util.config import CONFIG, setup_logging
+from .util.constants import *
+
+
+__all__ = ['init']
+
+
+NGI_UNEP_DIR = SYSTEM_DIR.joinpath('ls_pr_NGI_UNEP')
+GSDP_DIR = SYSTEM_DIR.joinpath('GSDP')
+
+REPO_DATA = {
+    'data/system': [
+        ISIMIP_GPWV3_NATID_150AS,
+        GLB_CENTROIDS_MAT,
+        ENT_TEMPLATE_XLS,
+        HAZ_TEMPLATE_XLS,
+        RIVER_FLOOD_REGIONS_CSV,
+        NATEARTH_CENTROIDS[150],
+        NATEARTH_CENTROIDS[360],
+        SYSTEM_DIR.joinpath('GDP2Asset_converter_2.5arcmin.nc'),
+        SYSTEM_DIR.joinpath('WEALTH2GDP_factors_CRI_2016.csv'),
+        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'),
+    ],
+    'data/system/ls_pr_NGI_UNEP': [
+        NGI_UNEP_DIR.joinpath('ls_pr_md.xml'),
+        NGI_UNEP_DIR.joinpath('ls_pr.tfw'),
+        NGI_UNEP_DIR.joinpath('ls_pr.tif'),
+        NGI_UNEP_DIR.joinpath('ls_pr.xml'),
+    ],
+    'data/system/GSDP': [
+        GSDP_DIR.joinpath(f'{cc}_GSDP.xls')
+        for cc in ['AUS', 'BRA', 'CAN', 'CHE', 'CHN', 'DEU', 'FRA', 'IDN', 'IND', 'JPN', 'MEX',
+                   'TUR', 'USA', 'ZAF']
+    ],
+    'data/demo': [
+        ENT_DEMO_TODAY,
+        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'),
+        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'),
+        DEMO_DIR.joinpath('h08_gfdl-esm2m_ewembi_historical_histsoc_co2_dis_global_daily_DEMO_FR_2001_2003.nc'),
+        DEMO_DIR.joinpath('h08_gfdl-esm2m_ewembi_historical_histsoc_co2_dis_global_daily_DEMO_FR_2004_2005.nc'),
+        DEMO_DIR.joinpath('gepic_gfdl-esm2m_ewembi_historical_2005soc_co2_yield-whe-noirr_global_DEMO_TJANJIN_annual_1861_2005.nc'),
+        DEMO_DIR.joinpath('pepic_miroc5_ewembi_historical_2005soc_co2_yield-whe-firr_global_annual_DEMO_TJANJIN_1861_2005.nc'),
+        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'),
+    ] + WS_DEMO_NC
+}
+
+
+def setup_climada_data():
+
+    for dirpath in [DEMO_DIR, SYSTEM_DIR, NGI_UNEP_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():
+                src = Path(__file__).parent.parent.joinpath(src_dir, path.name)
+                copyfile(src, path)
+
+
+def init():
+    setup_climada_data()
+    setup_logging(CONFIG.log_level.str())
+
+
+init()

climada/__init__.py

@@ -1 +1 @@
-__version__ = '1.5.1'
+__version__ = '2.0.0-dev'

climada/_version.py

@@ -0,0 +1,46 @@
+{
+    "_comment": "this is the climada default configuration, it will be (partially) superseded by the first climada.conf files that are present in the user's home directory and the working directory or its parent directories",
+    "local_data": {
+        "system": "~/climada/data",
+        "demo": "~/climada/demo/data",
+        "save_dir": "./results"
+    },
+    "exposures": {
+        "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"
+            }
+        },
+        "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": {
+            "resources": {
+                "opensearch": "https://pmmpublisher.pps.eosdis.nasa.gov/opensearch",
+                "climatology_monthly": "https://svs.gsfc.nasa.gov/vis/a000000/a004600/a004631/frames/9600x5400_16x9_30p/MonthlyClimatology/[01-12]_ClimatologyMonthly_032818_9600x5400.tif"
+            },
+            "local_data": "."
+        },
+        "relative_cropyield": {
+            "local_data": "{exposures.crop_production.local_data}"
+        },
+        "trop_cyclone": {
+            "random_seed": 54
+        }
+    },
+    "log_level": "WARNING",
+    "max_matrix_size": 1000000000
+}