Merge pull request #58 from Margherita-Capitani/Multi_Microgrid

First_fix_for_multimicrogrid

.github/workflows/ci-linux.yaml

@@ -38,13 +38,15 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Setup Mambaforge
-      uses: conda-incubator/setup-miniconda@v2
+    - name: Setup micromamba
+      uses: mamba-org/setup-micromamba@v2
       with:
-        miniforge-variant: Mambaforge
-        miniforge-version: latest
-        activate-environment: pypsa-earth
-        use-mamba: true
+        micromamba-version: '1.5.9-1'
+        environment-file: "envs/environment.yaml"
+        log-level: debug
+        init-shell: bash
+        cache-environment: true
+        cache-downloads: true
 
     - name: Fill submodule
       run: |
@@ -62,8 +64,6 @@ jobs:
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
         mamba env update -n pypsa-earth -f envs/environment.yaml
-        conda activate pypsa-earth
-        pip install rampdemand
 
     - name: Conda list
       run: |

Snakefile

@@ -164,7 +164,7 @@ if config["enable"].get("download_osm_buildings", True):
 
     rule download_osm_data:
         output:
-            building_resources="resources/" + RDIR + "osm/raw/all_raw_building.geojson",
+            building_resources="resources/" + RDIR + "osm/raw/all_raw_buildings.geojson",
         log:
             "logs/" + RDIR + "download_osm_data.log",
         benchmark:
@@ -178,7 +178,7 @@ if config["enable"].get("download_osm_buildings", True):
 
 rule clean_earth_osm_data:
     input:
-        all_buildings="resources/" + RDIR + "osm/raw/all_raw_building.geojson",
+        all_buildings="resources/" + RDIR + "osm/raw/all_raw_buildings.geojson",
         microgrid_shapes="resources/shapes/microgrid_shapes.geojson",
     output:
         microgrid_building="resources/buildings/microgrid_building.geojson",

config.distribution.yaml

@@ -58,6 +58,7 @@ house_area_limit:
 
 build_demand_type:
   type: 0
+  std: "on"
 # type allows to select the mode by which the microgrid demand profile is generated.
 # 0 = a predetermined hourly profile is used
 # 1 = an average hourly profile is calculated by exploiting the ramp tool

doc/requirements.txt

@@ -9,7 +9,6 @@ sphinx_rtd_theme
 setuptools<58.3.0
 
 pypsa
-vresutils>=0.3.1
 powerplantmatching>=0.4.8
 atlite>=0.2.2
 dask<=2021.3.1

envs/environment.yaml

@@ -15,8 +15,8 @@ dependencies:
 - pypsa>=0.24, <0.25
 # - atlite>=0.2.4  # until https://github.com/PyPSA/atlite/issues/244 is not merged
 - dask
-- powerplantmatching
-- earth-osm>=2.1
+- powerplantmatching>=0.5.19
+- earth-osm>=2.3.post1
 - atlite
 
   # Dependencies of the workflow itself
@@ -28,7 +28,7 @@ dependencies:
 - ruamel.yaml<=0.17.26
 - pytables
 - lxml
-- numpy
+- numpy<2
 - pandas
 - geopandas>=0.11.0, <=0.14.3
 - fiona<1.10.0
@@ -81,11 +81,9 @@ dependencies:
 - gurobi
 
 - pip:
-  - earth-osm>=2.2 # until conda release it out
-  - powerplantmatching>=0.5.19 # until conda release it out
   - rampdemand
   - git+https://github.com/davide-f/google-drive-downloader@master  # google drive with fix for virus scan
-  - git+https://github.com/FRESNA/vresutils@master  # until new pip release > 0.3.1 (strictly)
   - tsam>=1.1.0
   - chaospy  # lastest version only available on pip
   - fake_useragent
+  - numpy<=1.26.4