Pypsa de merge

.devcontainer/Dockerfile

@@ -0,0 +1,24 @@
+FROM debian:bookworm
+
+ARG PIXI_VERSION=v0.50.2
+
+RUN mkdir -p /mnt/storage
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+    ca-certificates wget curl rsync git delta procps zsh build-essential python3-dev\
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Instal oh-my-zsh with git plugin and default theme
+RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/v1.2.1/zsh-in-docker.sh)" -- \
+    -t robbyrussell \
+    -p git
+
+# Install starship
+RUN curl -sS https://starship.rs/install.sh | sh -s -- -y
+
+# Install pixi
+RUN curl -L -o /usr/local/bin/pixi -fsSL --compressed "https://github.com/prefix-dev/pixi/releases/download/${PIXI_VERSION}/pixi-$(uname -m)-unknown-linux-musl" \
+    && chmod +x /usr/local/bin/pixi \
+    && pixi info

.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+{
+    "name": "pypsa-at",
+    "build": {
+      "context": "..",
+      "dockerfile": "Dockerfile"
+    },
+    "mounts": [
+      "source=/mnt/storage,target=/mnt/storage,type=bind",
+      "source=cutouts,target=/IdeaProjects/pypsa-at/cutouts,type=volume"
+    ],
+    "forwardPorts": [
+      8000,
+      2718
+    ],
+    "portsAttributes": {
+      "8000": {"label": "mkdocs"},
+      "2718": {"label": "marimo"}
+    },
+    "postCreateCommand": "git fetch --unshallow",
+    "postAttachCommand": "",
+    "customizations": {
+      "jetbrains": {
+        "backend": "PyCharm"
+      }
+    },
+    "containerEnv": {
+      "SHELL": "/bin/zsh"
+    },
+    "remoteUser": "root"
+  }

.gitattributes

@@ -4,3 +4,5 @@
 
 *.h5 filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report if something doesn't work quite right.
+title: ''
+labels: bug
+assignees: ''
+---
+
+<!-- Please do not post usage questions here. Ask them on the PyPSA mailing list: https://groups.google.com/forum/#!forum/pypsa -->
+
+## Checklist
+
+- [ ] I am using the current [`main`](https://github.com/AGGM-AG/pypsa-at/tree/main) branch, else please indicate.
+- [ ] I am running on an up-to-date [`pypsa-at` environment](https://github.com/AGGM-AG/pypsa-at/blob/main/envs/environment.yaml). Update via `conda env update -f envs/environment.yaml`.
+
+## Describe the Bug
+
+*Please provide a description of what the bug is and add a minimal example/command for reproducing the bug.*
+
+## Error Message
+
+*If applicable, paste any terminal output to help illustrating your problem.*
+*In some cases it may also be useful to share your list of installed packages: `conda list`.*
+
+```
+<paste here>
+```

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -17,10 +17,10 @@ body:
     options:
     - label: >
         I have confirmed this bug exists on the lastest
-        [release](https://github.com/pypsa/PyPSA-DE/releases) of PyPSA-DE.
+        [release](https://github.com/AGGM-AG/pypsa-at/releases) of PyPSA-AT.
     - label: >
         I have confirmed this bug exists on the current
-        [`master`](https://github.com/pypsa/PyPSA-DE/tree/master) branch of PyPSA-DE.
+        [`main`](https://github.com/AGGM-AG/pypsa-at/tree/main) branch of PyPSA-AT.
 
 - type: textarea
   id: problem

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+- name: PyPSA Mailing List
+  url: https://groups.google.com/forum/#!forum/pypsa
+  about: Please ask and answer general usage questions here.
+- name: Stackoverflow
+  url: https://stackoverflow.com/questions/tagged/pypsa
+  about: Please ask and answer code-related questions here.

.github/pull_request_template.md

@@ -1,8 +1,8 @@
 Before asking for a review for this PR make sure to complete the following checklist:
 
-- [ ] Workflow with target rule `ariadne_all` completes without errors
-- [ ] The logic of `export_ariadne_variables` has been adapted to the changes
+- [ ] Workflow with target rule `all` completes without errors
+- [ ] The logic of `export_iamc_variables` has been adapted to the changes
 - [ ] One or several figures that validate the changes in the PR have been posted as a comment
-- [ ] A brief description of the changes has been added to `Changelog.md`
+- [ ] A brief description of the changes has been added to `changelog.md`
 - [ ] The latest `main` has been merged into the PR
-- [ ] The config has a new prefix of the format `YYYYMMDDdescriptive_title`
+- [ ] The config has a new prefix of the format `YYYYMMDD_descriptive_title`

.github/workflows/push-images.yaml

@@ -4,11 +4,11 @@ on:
   push:
 
     branches:
-    - master
+    - main
   workflow_dispatch:
 
 env:
-  IMAGE_NAME: pypsa/eur-dev-env
+  IMAGE_NAME: aggm-ag/at-dev-env
   BASE_ENV: envs/linux-64.lock.yaml
 
 jobs:
@@ -39,7 +39,7 @@ jobs:
         docker push ghcr.io/${{ env.IMAGE_NAME }}:${{ github.sha }}
 
         # Add latest tag if on main branch
-        if [ "${{ github.ref }}" == "refs/heads/master" ]; then
+        if [ "${{ github.ref }}" == "refs/heads/main" ]; then
           docker tag ghcr.io/${{ env.IMAGE_NAME }}:${{ github.sha }} ghcr.io/${{ env.IMAGE_NAME }}:latest
           docker push ghcr.io/${{ env.IMAGE_NAME }}:latest
         fi

.github/workflows/test.yaml

@@ -76,7 +76,7 @@ jobs:
     - uses: conda-incubator/setup-miniconda@v3
       with:
         miniforge-version: latest
-        activate-environment: pypsa-de
+        activate-environment: pypsa-at
         channel-priority: strict
 
     - name: Cache Conda env
@@ -89,7 +89,7 @@ jobs:
     - name: Update environment
       if: steps.cache-env.outputs.cache-hit != 'true'
       run: |
-        conda env update -n pypsa-de -f ${{ env.env_file }}
+        conda env update -n pypsa-at -f ${{ env.env_file }}
         echo "Run conda list" && conda list
 
     - name: Run snakemake test workflows

.github/workflows/update-pinned-env.yaml

@@ -49,11 +49,11 @@ jobs:
         for file in envs/*.lock.yaml; do
           if [ -f "$file" ]; then
             echo "Processing $file"
-            if ! grep -q "name: pypsa-de" "$file"; then
-              # Insert name: pypsa-de before channels section
-              sed -i '7a name: pypsa-de' "$file"
+            if ! grep -q "name: pypsa-at" "$file"; then
+              # Insert name: pypsa-at before channels section
+              sed -i '7a name: pypsa-at' "$file"
             else
-              echo "name: pypsa-de already exists in $file"
+              echo "name: pypsa-at already exists in $file"
             fi
           fi
         done

.github/workflows/validate.yaml

@@ -3,7 +3,7 @@ name: Validator Bot
 on:
   pull_request:
     branches:
-    - master
+    - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,9 +23,9 @@ jobs:
       with:
         step: run-self-hosted-validation
         env_file: envs/environment.yaml
-        snakemake_config: config/config.de.yaml
+        snakemake_config: config/config.at.yaml
         pre_command: "build_scenarios -f"
-        main_command: "ariadne_all"
+        main_command: "all"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Check validation status
@@ -41,24 +41,19 @@ jobs:
     name: Create report
     needs: run-validation
     if: |
-      github.event.pull_request.head.repo.full_name == github.repository && 
+      github.event.pull_request.head.repo.full_name == github.repository &&
       needs.run-validation.outputs.validation_failed != 'true'
     runs-on: ubuntu-latest
     steps:
     - uses: PyPSA/pypsa-validator@v0.2.5
       with:
         step: create-comment
-        snakemake_config: config/config.de.yaml
+        snakemake_config: config/config.at.yaml
         # The path starting from prefix in config
         # For plot results/<prefix>/<scenario>/<plot_name>.png pass
         # <scenario>/<plot_name>.png
         plots: >
           "
-          KN2045_Mix/ariadne/primary_energy.png
-          KN2045_Mix/ariadne/secondary_energy.png
-          KN2045_Mix/ariadne/final_energy.png
-          ariadne_comparison/Trade-Secondary-Energy-Hydrogen-Volume.png
-          ariadne_comparison/Trade-Secondary-Energy-Liquids-Hydrogen-Volume.png
-          ariadne_comparison/Capacity-Electricity-Solar.png
+          AT10_KN2040/evaluation/HTML/sankey_diagram_EU_2050.html
           "
         validator_key: ${{ secrets.VALIDATOR_KEY }}

.gitignore

@@ -24,6 +24,7 @@ gurobi.log
 /data
 /cutouts
 /tmp
+/public  # mkdocs build
 doc/_build
 
 /scripts/old
@@ -49,6 +50,8 @@ dconf
 /data/bundle/nuts*
 data/gas_network/scigrid-gas/
 data/costs_*.csv
+# PyPSA-AT specific data files
+#/data/austrian_transmission_capacities.csv
 
 dask-worker-space/
 publications.jrc.ec.europa.eu/
@@ -91,4 +94,12 @@ dev/*
 # ai coding tools
 CLAUDE.md
 .claude/
-.github/copilot-instructions.md
+.github/copilot-instructions.md
+#folder quick marimo evals
+.marimo/JM_marimo_bs
+
+# pixi environments
+.pixi
+*.egg-info
+pixi.bak.*
+__marimo__/

.marimo/build_cluster_focus_weights.py

@@ -0,0 +1,110 @@
+import marimo
+
+__generated_with = "0.11.22"
+app = marimo.App(width="medium")
+
+
+@app.cell
+def _():
+    import marimo as mo
+    import pandas as pd
+
+    return mo, pd
+
+
+@app.cell
+def _():
+    countries = [
+        "AL",
+        "AT",
+        "BA",
+        "BE",
+        "BG",
+        "CH",
+        "CZ",
+        "DE",
+        "DK",
+        "EE",
+        "ES",
+        "FI",
+        "FR",
+        "GB",
+        "GR",
+        "HR",
+        "HU",
+        "IE",
+        "IT",
+        "LT",
+        "LU",
+        "LV",
+        "ME",
+        "MK",
+        "NL",
+        "NO",
+        "PL",
+        "PT",
+        "RO",
+        "RS",
+        "SE",
+        "SI",
+        "SK",
+        "XK",
+    ]
+    return (countries,)
+
+
+@app.cell
+def _(countries):
+    nodes_per_country = {
+        "DE": 16,
+        "AT": 10,
+        "IT": 3,
+        "DK": 2,
+        # "UK": 2,
+        # "ES": 2,
+        # "GR": 2
+    }
+    country_nodes = {c: nodes_per_country.get(c, 1) for c in countries}
+    country_nodes
+    return country_nodes, nodes_per_country
+
+
+@app.cell
+def _(country_nodes):
+    n_cluster = sum(country_nodes.values())
+    n_cluster
+    return (n_cluster,)
+
+
+@app.cell
+def _(country_nodes, n_cluster):
+    focus_weights = {
+        c: round(w / n_cluster - 5e-5, 4) for c, w in country_nodes.items()
+    }
+    focus_weights
+    return (focus_weights,)
+
+
+@app.cell
+def _(focus_weights):
+    focus_weights["AT"] += 1 - sum(focus_weights.values())
+    focus_weights["AT"] = round(focus_weights["AT"], 4)
+    focus_weights
+    return
+
+
+@app.cell
+def _(focus_weights):
+    assert sum(focus_weights.values()) == 1.0, (
+        f"Sum of focus weights is not 1.0 but {sum(focus_weights.values())}"
+    )
+    return
+
+
+@app.cell
+def _():
+    return
+
+
+if __name__ == "__main__":
+    app.run()