Merge branch 'feature/add-missing-jrc-flood-impact-functions' into fe…

…ature/river_flooding_aqueduct

.github/workflows/testing.yml

@@ -25,6 +25,7 @@ jobs:
   build-and-test:
     name: Unit Test Pipeline
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       # For publishing results
       checks: write

.pylintrc

@@ -155,7 +155,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local,climada.util.config
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis. It
 # supports qualified module names, as well as Unix pattern matching.
-ignored-modules=numpy,cartopy,scipy,pathos,xarray.ufuncs,netCDF4,matplotlib.cm
+ignored-modules=numpy,cartopy,scipy,pathos,xarray.ufuncs,netCDF4,matplotlib.cm,clawpack
 
 # Show a hint with possible names when a member name was not found. The aspect
 # of finding the hint is based on edit distance.

AUTHORS.md

@@ -25,3 +25,4 @@
 * Jan Wüthrich
 * Zélie Standhanske
 * Lukas Riedel
+* Samuel Juhel

CHANGELOG.md

@@ -6,8 +6,16 @@ Release date: 2024-02-19
 
 ### Dependency Changes
 
+Added:
+
+- `boario` >=0.5.9
+
 ### Added
 
+- Included `boario` in the supplychain module [#81](https://github.com/CLIMADA-project/climada_petals/pull/81/)
+- Added a Copernicus download function `downloader.py` as part of the `climada.hazard.copernicus_interface` module under construction [#150](https://github.com/CLIMADA-project/climada_petals/pull/150/)
+- Update name of IBTrACS file to version 4.1 in tc_rainfield and tc_surge_bathub tests. [#152](https://github.com/CLIMADA-project/climada_petals/pull/152)
+
 ### Changed
 
 ### Fixed
@@ -43,6 +51,8 @@ Added:
 - Update the table of content for the tutorials [#125](https://github.com/CLIMADA-project/climada_petals/pull/125)
 - Store all-zero fraction matrices in `LowFlow` and `WildFire` hazards [#129](https://github.com/CLIMADA-project/climada_petals/pull/129) [#131](https://github.com/CLIMADA-project/climada_petals/pull/131)
 
+- `eeioa` approach from the supply chain module. See [associated discussion](https://github.com/CLIMADA-project/climada_petals/pull/81#discussion_r1596546221).
+
 ## 4.1.0
 
 Release date: 2024-02-19
@@ -144,4 +154,3 @@ Release aligned with climada (core) 3.3.
 ### Fixed
 
 - fix issue [#69](https://github.com/CLIMADA-project/climada_petals/issues/70) Warn.zeropadding for islands [](https://github.com/CLIMADA-project/climada_petals/pull/70)
-

Makefile

@@ -16,15 +16,15 @@ help:  ## Use one of the following instructions:
 
 .PHONY : lint
 lint : ## Static code analysis with Pylint
-	pylint -ry climada_petals > pylint.log || true
+	python -m pylint -ry climada_petals > pylint.log || true
 
 .PHONY : unit_test
 unit_test : ## Unit tests execution with coverage and xml reports
-	pytest $(PYTEST_ARGS) --ignore=climada_petals/test climada_petals/
+	python -m pytest $(PYTEST_ARGS) --ignore=climada_petals/test climada_petals/
 
 .PHONY : install_test
 install_test : ## Test installation was successful
-	pytest $(PYTEST_JUNIT_ARGS) --pyargs climada.engine.test.test_cost_benefit \
+	python -m pytest $(PYTEST_JUNIT_ARGS) --pyargs climada.engine.test.test_cost_benefit \
 	climada.engine.test.test_impact
 
 .PHONY : data_test
@@ -37,11 +37,11 @@ notebook_test : ## Test notebooks in doc/tutorial
 
 .PHONY : integ_test
 integ_test : ## Integration tests execution with xml reports
-	pytest $(PYTEST_ARGS) climada_petals/test/
+	python -m pytest $(PYTEST_ARGS) climada_petals/test/
 
 .PHONY : test
 test : ## Unit and integration tests execution with coverage and xml reports
-	pytest $(PYTEST_ARGS) climada_petals/
+	python -m pytest $(PYTEST_ARGS) climada_petals/
 
 .PHONY : ci-clean
 ci-clean :

climada_petals/conf/climada.conf

@@ -37,6 +37,15 @@
             "local_data": "{exposures.crop_production.local_data}",
             "filename_wheat_mask": "mask_winter_and_spring_wheat_areas_phase3.nc4"
         },
+        "tc_surge_geoclaw": {
+            "local_data": "{local_data.system}/geoclaw",
+            "clawpack_src_dir": "{hazard.tc_surge_geoclaw.local_data}/src",
+            "geoclaw_work_dir": "{hazard.tc_surge_geoclaw.local_data}/runs",
+            "resources": {
+                "clawpack_git": "https://github.com/clawpack/clawpack.git",
+                "clawpack_version": "v5.9.2"
+            }
+        },
         "tc_tracks_forecast": {
             "resources": {
                 "ecmwf": {
@@ -53,6 +62,10 @@
             "resources" : {
                 "aqueduct" : "http://wri-projects.s3.amazonaws.com/AqueductFloodTool/download/v2/"
             }
+        "copernicus": {
+            "local_data": "{local_data.system}/copernicus_data",
+            "seasonal_forecasts": "{local_data.system}/copernicus_data/seasonal_forecasts"
         }
     }
 }
+}