Skip to content

Resolving merge conflicts between main and develop branches #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GuillaumeMaistre merged 3 commits into from
Mar 25, 2026
Merged

Resolving merge conflicts between main and develop branches #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da8d20d
Develop --> Main (#58)
nikolaredstork Jan 30, 2026
99ea9dc
fix headers (#61)
nikolaredstork Jan 30, 2026
1be5df9
Merge branch 'main' into develop
GuillaumeMaistre Mar 25, 2026
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
3 changes: 1 addition & 2 deletions doc/3_User_Guide/5_Outputs/3_business_view.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@

Output representation describes how simulation results are exposed and formatted for end users. It operates downstream of **Business Views** and does not affect simulation or metric calculations. This layer is responsible only for structuring and presenting already computed Business Outputs.

**The output representation layer and its supported formats are still under active development.**

**The output representation layer and its supported formats are still under active development.**
3 changes: 1 addition & 2 deletions doc/4_Interoperability/1_PyPSA_to_GEMS_converter/1_overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@
<li><a href="../4_current_limitations/">Current Limitations of the Converter</a></li>
<li><a href="../5_step_by_step_guide/">Step-by-Step Guide: Manually Executing a Simulation in GEMS Modeler</a></li>
<li><a href="../6_comparing_results/">Comparing Results Between GEMS Modeler and PyPSA</a></li>
</ul>

</ul>
1 change: 0 additions & 1 deletion doc/4_Interoperability/1_PyPSA_to_GEMS_converter/2_how_the_converter_works.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ Connections between components (such as generators and loads connected to buses)
<h2 id="6-study-structure-generation">6. <strong>Study Structure Generation</strong></h2>
<p>Finally, the converter generates the complete GEMS study structure.</p>
</div>

1 change: 0 additions & 1 deletion doc/4_Interoperability/1_PyPSA_to_GEMS_converter/3_input_and_output.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ study_directory/
└── ...
```
</div>

1 change: 0 additions & 1 deletion doc/4_Interoperability/1_PyPSA_to_GEMS_converter/5_step_by_step_guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,3 @@ subprocess.run([
</li>
</ol>
</div>

3 changes: 1 addition & 2 deletions doc/4_Interoperability/1_PyPSA_to_GEMS_converter/6_comparing_results.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
<h1>Comparing Results Between GEMS Modeler and PyPSA</h1>
<p>If you want to see detailed statistics and a comparison between <strong>Antares Modeler</strong> and <strong>PyPSA study optimization</strong>, you can check the full analysis here:</p>
<p>👉 <a href="https://github.com/AntaresSimulatorTeam/PyPSA-to-GEMS-Converter/blob/converter-docs/src/tests/local_benchmark/benchmark_analysis.ipynb">View benchmark analysis</a></p>
</div>

</div>
Loading