Merge branch 'pik-piam:main' into main

Author: irr-github

config/default_config.yaml

@@ -70,10 +70,10 @@ logging:
 enable:
   build_cutout: false
   retrieve_cutout: false
-  retrieve_raster: false
+  retrieve_raster: true
 
 atlite:
-  cutout_name: "China-2020c_bare"
+  cutout_name: "China-2020c"
   freq: "h"
   nprocesses: 1
   show_progress: true
@@ -104,9 +104,14 @@ renewable:
       n: 3  
     capacity_per_sqkm: 3 # ScholzPhd Tab 4.3.1: 10MW/km^2
     potential: simple # or conservative
-    natura: false
+    natural_reserves: false
+    max_altitude: 3000 # m
+    max_slope: 20 # %
     clip_p_max_pu: 1.e-2
     min_p_nom_max: 1.e-2
+    # Copernicus LC100 land cover codes for allowed areas
+    # 20=Shrubland, 30=Herbaceous, 40=Agriculture, 60=Bare, 100=Moss
+    land_cover_codes: [20, 30, 40, 60, 100]
   offwind:
     cutout: China-2020c
     resource:
@@ -118,10 +123,12 @@ renewable:
     capacity_per_sqkm: 2 # ScholzPhd Tab 4.3.1: 20MW/km^2
     correction_factor: 0.8855
     potential: simple # or conservative
-    natura: true
+    natural_reserves: true
     max_depth: 50
     clip_p_max_pu: 1.e-2
     min_p_nom_max: 1.e-2
+    # Offshore wind uses water depth from GEBCO, not land cover codes
+    land_cover_codes: null
   solar:
     cutout: China-2020c
     resource:
@@ -136,9 +143,13 @@ renewable:
     capacity_per_sqkm: 5.1 # ScholzPhd Tab 4.3.1: 170 MW/km^2 3%
     potential: simple # or conservative
     correction_factor: 0.85
-    natura: false
+    natural_reserves: false
     clip_p_max_pu: 1.e-2
     min_p_nom_max: 1.e-2
+    # Copernicus LC100 land cover codes for allowed areas
+    # 20=Shrubland, 30=Herbaceous, 40=Agriculture, 50=Urban, 60=Bare, 100=Moss
+    land_cover_codes: [20, 30, 50, 60, 100]
+    max_slope: 12 # %
 renewable_potential_cutoff: 200 # MW, skip low potentials
 
 heat_demand:

config/pik_hpc_profile/config.yaml

@@ -78,6 +78,10 @@ set-resources:
     time: 300
     threads: 4
     mem_mb: 30000
+  build_solar_thermal_profiles:
+    time: 30
+    threads: 4
+    mem_mb: 16000
   plot_network:
     mem_mb: 8000
     threads: 2
@@ -91,21 +95,11 @@ set-resources:
     threads: 1
     partition: io # login
     qos: io
-  retrieve_Build_up_raster:
+  retrieve_copernicus_land_cover:
     time: 300
     threads: 1
     partition: io # login
     qos: io
-  retrieve_Grass_raster:
-    time: 300
-    threads: 1
-    partition: io
-    qos: io
-  retrieve_Bare_raster:
-    time: 300
-    threads: 1
-    partition: io
-    qos: io
   retrieve_powerplants:
     time: 300
     threads: 2

docs/data.md

@@ -0,0 +1,52 @@
+# Data
+
+The user is responsible for checking the license of the original data, their validity and applicability.
+Below is a list of data sources
+
+### Land classification (copernicus global land cover)
+Marcel Buchhorn, Bruno Smets, Luc Bertels, Bert De Roo, Myroslava Lesiv, Nandin-Erdene Tsendbazar, Martin Herold, & Steffen Fritz. (2020). Copernicus Global Land Service: Land Cover 100m: collection 3: epoch 2019: Globe (V3.0.1) [Data set]. Zenodo. https://doi.org/10.5281/zenodo.3939050
+
+- Source: Copernicus Global Land Service:
+- Link: https://land.copernicus.eu/en/products/global-dynamic-land-cover/copernicus-global-land-service-land-cover-100m-collection-3-epoch-2019-globe
+- License: Creative Commons Attribution 4.0 International 
+- Description: 100m resolution land classification
+
+### Administrative regions
+GADM Global adminstrative map
+- Source: GADM
+- Link: https://gadm.org/
+- License: [GADM license](https://gadm.org/license.html)
+- Description: poylgons of administrative areas
+
+### Protected areas
+China Nature Reserve Specimen Resource Sharing Platform. (2024). List and Vector Boundaries of Nature Reserves in China [Data set].
+
+- Source: China Nature Reserve Specimen Resource Sharing Platform
+- Link: https://doi.org/10.5281/zenodo.14875797
+- License: MIT
+- Description: polygons of protected area
+
+### Bathymetry
+Elevation and depth data
+
+- Source: GEBCO
+- Link: https://www.gebco.net/data-products-gridded-bathymetry-data/gebco2025-grid
+- License: CC0 (reference)
+- Description: Bathymetric dataset (2025 version).
+
+### Power infrastruture
+Historical brownfield capacities
+
+- Source: Glboal Energy Monitor
+- Link: https://globalenergymonitor.org/projects/global-integrated-power-tracker/
+- License: Creative Commons Attribution 4.0 International Public License
+- Description: powerplant, renewable and transmission data
+
+### Population
+Gridded population data
+
+- Source: WorldPop (www.worldpop.org - School of Geography and Environmental Science, University of Southampton; Department of Geography and Geosciences, University of Louisville; Departement de Geographie, Universite de Namur) and Center for International Earth Science Information Network (CIESIN), Columbia University (2018). Global High Resolution Population Denominators Project - Funded by The Bill and Melinda Gates Foundation (OPP1134076). https://dx.doi.org/10.5258/SOTON/WP00647
+- Link: https://hub.worldpop.org/doi/10.5258/SOTON/WP00647
+- License: CC-BY 4.0 (reference)
+- Description: Gridded population data.
+

tests/integration/test_workflow.py

@@ -48,11 +48,14 @@ def launch_subprocess(cmd: str, env=None) -> subprocess.CompletedProcess:
         logging.info("\n\t".join(res.stdout.split("\n")))
         logging.info(f"return code: {res.returncode}")
         logging.info(f"====== stderr ====== :\n {'\n\t'.join(res.stderr.split('\n'))}")
+        return res
     except subprocess.CalledProcessError as e:
         logging.error(e.stderr)
         logging.error(e)
-        assert False, "Workflow integration test failed"
-    return res
+        # Return the failed process info instead of raising assertion
+        return subprocess.CompletedProcess(
+            args=e.cmd, returncode=e.returncode, stdout=e.stdout, stderr=e.stderr
+        )
 
 
 # TODO: add existing baseyear, add remind_coupled, add_plotting
@@ -116,7 +119,7 @@ def test_dry_run(make_test_config_file):
     """Simple workflow test to check the snakemake inputs and outputs are valid"""
     cfg = make_test_config_file
     cmd = f"snakemake --configfile {cfg} -n -f"
-    cmd += " --rerun-incomplete"
+    cmd += " --rerun-incomplete --rerun-triggers input"
     res = launch_subprocess(cmd)
     if res.returncode != 0:
         hash_id = copy_failed_config(cfg)