Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Test

on:
# To debug the workflow, uncomment this entry AND comment pull_request_target
# pull_request:
# branches: [ main ]
pull_request_target:
branches: [ main, "migrate**" ]
types: [ labeled, opened, reopened, synchronize ]
pull_request:
branches: [ main ]
# pull_request_target:
# branches: [ main, "migrate**" ]
# types: [ labeled, opened, reopened, synchronize ]
schedule:
- cron: "0 5 * * *" # = 06:00 CET = 07:00 CEST

Expand All @@ -25,8 +25,20 @@ env:
python-version: "3.13"

jobs:
skip:
name: Skip workflow on PR branch
runs-on: ubuntu-latest
steps:
- name: Early exit
run: |
gh run cancel ${{ github.run_id }}
gh run watch ${{ github.run_id }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

check:
name: Check permissions, identify ref to test
needs: skip
runs-on: ubuntu-latest
steps:
- if: >
Expand Down
Binary file added doc/_static/global_r12_basin_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/_static/message_nexus_structure.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/_static/water_reference_system.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions doc/global/index.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
MESSAGEix-GLOBIOM global model
==============================

.. caution:: This section of the documentation is under revision
on this branch.
See :issue:`424` for details.

Text on these pages may mix old and revised material;
links may be broken;
and in general these pages **should not** be used as reference
until changes are reviewed and merged via :pull:`425`.

These pages document the IIASA Integrated Assessment Modeling (IAM) framework, also referred to as **MESSAGEix-GLOBIOM**, owing to the fact that the energy model |MESSAGEix| and the land use model GLOBIOM are its most important components.
|MESSAGEix|-GLOBIOM was developed for the quantification of the so-called Shared Socio-economic Pathways (SSPs) which are the first application of the IAM framework.

Expand Down
Loading
Loading