Skip to content

Conversation

@CarlosEpia
Copy link
Contributor

@CarlosEpia CarlosEpia commented Oct 19, 2025

Fixes #1274 .

Necessary changes to replace mastr data from 2024-01-08 for 2025-02-09. It was already tested for SH and DE. The results look consistent. Additional fixes related to power plants were also included here.


🧑‍💻 Contributor Checklist

Before requesting a review, make sure you've completed all of the following:

  • All tests pass locally or via CI
    (for more information on local test, check tox in the Contributing section)
    (CI tests are automatically executed when creating a PR, you can see the results of the checks below)
  • Workflow has run at least once in Test mode
    (optional if no dataset changes are involved)
  • Relevant documentation is updated (API, new features, etc.)
  • Dataset-versions are updated when existing datasets are adjusted.
  • Added a note to CHANGELOG.rst about the changes
  • Added yourself to AUTHORS.rst

Optional:

  • Changes have been tested in Everything mode
  • Extend the checklist for reviewers: Which aspects should be reviewed in particular?
<!-- Example:
Please focus on validating the data handling in file XYZ.
-->

🔍 Reviewer Checklist

During your review, please check the following:

  • Is the code clean, readable, and efficient? Are there any oddities or obvious inefficiencies?
  • Does the code work as expected? (should already be verified by contributor)
  • Do all tests pass? (see CI results)
  • Is the documentation complete and up to date?
  • Is CHANGELOG.rst updated accordingly?
  • Is all necessary metadata complete and correct?
    • If metadata is pending: Is there an appropriate issue filed?

📝 Additional Notes (optional)


@CarlosEpia
Copy link
Contributor Author

CarlosEpia commented Oct 19, 2025

For eGon100RE no changes are seen in the etrago generators tables. But for eGon2035 there are differences vs the last run regarding biomass and CHPs, as can be seen in the table below that summarizes the total install capacities in DE:
image
I will go deeper in the code to find the reason of the differences and probably I will ask @ClaraBuettner about some methods in case of necessary.

@CarlosEpia CarlosEpia marked this pull request as draft October 21, 2025 07:05
@CarlosEpia CarlosEpia self-assigned this Nov 10, 2025
@CarlosEpia CarlosEpia marked this pull request as ready for review November 11, 2025 10:18
len_old = len(units)
ts = pd.Timestamp(
config.datasets()["mastr_new"]["status2023_date_max"]
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure that we don't need that filter at all anymore?
I am just wondering if it would be needed if we want to create a status2024 scenario for example.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see two different cases here:

  • Future scenarios: wind onshore and solar ground mounted generators benefit from the most updated available data, since those are the most possible locations for future generators.
  • Status scenario: We should, as you mentioned, filter the generators by commissioning date.

I think it makes sense to import all generators for futures scenarios, and filter the generators installed after the last day of our status scenario year using this function

Does it make sense for you?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think we can do it like that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in bf2593a 33b419e and ad3b399

"Cloppenburg": "50643382",
}
elif ("220101" in osm_year) | ("240101" in osm_year):
elif "250101" in osm_year:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means that the branch has to be combined with the osm update, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, so that means that this branch should be merged after the osm, update, right? Is that already merged?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So far I have ran always the two branches together. To make it more clear, I merged the two of them 87dd6fa and will close both issues #1363 and #1274 by merging only this PR.

"Garrel/Ost": "23837631",
"Rastede": "23837631",
"Emden/Borßum": "34835258",
"Cloppenburg": "50643382",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you move this? Is it the idea that it works for osm data from 2020 and 2025?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some clarifications:

  • id_bus: Contains the osm_id that are common when using OSM data from 2020 and 2025
  • id_bus2: Contains all osm_id that changes between the 2 mentions OSM years

The in comparison with 2024, 5 substations change the osm_id and they had to be moved to id_bus2. I decided to do this to keep the compatibility with our last osm year, but I could adapt everything so we set that only data from osm2025 is suitable. Do you prefer to keep it like it is or change to work only with 2025?

@ClaraBuettner
Copy link
Contributor

For eGon100RE no changes are seen in the etrago generators tables. But for eGon2035 there are differences vs the last run regarding biomass and CHPs, as can be seen in the table below that summarizes the total install capacities in DE: ... I will go deeper in the code to find the reason of the differences and probably I will ask @ClaraBuettner about some methods in case of necessary.

@CarlosEpia Could you please leave a comment if this is still up to date or not? I would just like to make sure that we are not confused later on when we have a look at merged PRs.

Copy link
Contributor

@ClaraBuettner ClaraBuettner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please take a look at the comments :)

@ClaraBuettner
Copy link
Contributor

How is this PR related to #1368?

@CarlosEpia
Copy link
Contributor Author

For eGon100RE no changes are seen in the etrago generators tables. But for eGon2035 there are differences vs the last run regarding biomass and CHPs, as can be seen in the table below that summarizes the total install capacities in DE: ... I will go deeper in the code to find the reason of the differences and probably I will ask @ClaraBuettner about some methods in case of necessary.

@CarlosEpia Could you please leave a comment if this is still up to date or not? I would just like to make sure that we are not confused later on when we have a look at merged PRs.

The cause of the differences was basically that the function scale_prox2now was working wrongly, which produces different results for different MASTR versions. Fixed here: 389a367

@CarlosEpia
Copy link
Contributor Author

How is this PR related to #1368?

At least in my case, I've only seen the problem described in #1368 happening when using the MASTR data from February 2025.

@ClaraBuettner
Copy link
Contributor

How is this PR related to #1368?

At least in my case, I've only seen the problem described in #1368 happening when using the MASTR data from February 2025.

Okay, so is it related to this PR, or was there already some progress with the problem described there?
I am just wondering if we need to adjust sth. here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] Multiple MaStR dataset versions used in parallel — unify and update to latest official open_mastr release

3 participants