Merge branch 'main' into fix_merge

pypsa-meets-earth · Oct 3, 2024 · b0f331e · b0f331e
2 parents e38855d + 356fb71
commit b0f331e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,8 +58,8 @@ jobs:
         key: data-cutouts-${{ env.WEEK }}-${{ env.CACHE_NUMBER }}
 
 
-    - name: Conda list
-      run: conda list
+    - name: Micromamba list
+      run: micromamba list
 
     - name: Run Test
       run: make test

diff --git a/README.md b/README.md
@@ -326,6 +326,13 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
             <sub><b>GridGrapher</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/finozzifa">
+            <img src="https://avatars.githubusercontent.com/u/167071962?v=4" width="100;" alt="finozzifa"/>
+            <br />
+            <sub><b>Finozzifa</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/Emre-Yorat89">
             <img src="https://avatars.githubusercontent.com/u/62134151?v=4" width="100;" alt="Emre-Yorat89"/>
@@ -353,13 +360,6 @@ The documentation is available here: [documentation](https://pypsa-earth.readthe
             <br />
             <sub><b>Ekaterina-Vo</b></sub>
         </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/finozzifa">
-            <img src="https://avatars.githubusercontent.com/u/167071962?v=4" width="100;" alt="finozzifa"/>
-            <br />
-            <sub><b>Finozzifa</b></sub>
-        </a>
     </td></tr>
 <tr>
     <td align="center">

diff --git a/configs/bundle_config.yaml b/configs/bundle_config.yaml
@@ -269,17 +269,30 @@ databundles:
       build_cutout: [all]
 
   # cutouts bundle of the cutouts folder for the European continent
-  # Note: this includes nearly the entire north emisphere [long +-180, lat 1-85]. Size about 81GB (zipped)
+  # Coordinate bounds: [long -32 to 60, lat 1.5-74]
+  # Size about 17 GB (zipped)
   bundle_cutouts_europe:
     countries: [Europe]
     category: cutouts
     destination: "cutouts"
     urls:
-      gdrive: https://drive.google.com/file/d/1Ew7rQT0VNBqJW1AUrOrOP2IJKSJS7Uoy/view?usp=sharing
+      gdrive: https://drive.google.com/file/d/17QS7qkuCiyj95Pr-ZQRl3qgp5CQE6HTy/view?usp=drive_link
     output: [cutouts/cutout-2013-era5.nc]
     disable_by_opt:
       build_cutout: [all]
 
+  # cutouts bundle of the cutouts folder for the northern hemisphere
+  # Note: this includes nearly the entire northern emisphere [long +-180, lat 1-85]. Size about 81GB (zipped)
+  #bundle_cutouts_northern_hemisphere:
+  #  countries: [NorthAmerica, Europe]
+  #  category: cutouts
+  #  destination: "cutouts"
+  #  urls:
+  #    gdrive: https://drive.google.com/file/d/1Ew7rQT0VNBqJW1AUrOrOP2IJKSJS7Uoy/view?usp=sharing
+  #  output: [cutouts/cutout-2013-era5.nc]
+  #  disable_by_opt:
+  #    build_cutout: [all]
+
   # cutouts bundle of the cutouts folder for the Asian continent, except Russia
   # Size about 30GB (zipped)
   bundle_cutouts_asia:

diff --git a/doc/release_notes.rst b/doc/release_notes.rst
@@ -24,6 +24,7 @@ E.g. if a new rule becomes available describe how to use it `make test` and in o
 
 * Include a dedicated cutout for North America in bundle_config.yaml `PR #1121 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1121>`_
 
+* Include a dedicated cutout for Europe in bundle_config.yaml `PR #1125 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1125>`_
 
 PyPSA-Earth 0.4.1
 =================