-
Notifications
You must be signed in to change notification settings - Fork 605
Jao converter #2755
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.
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
Open
lezneew
wants to merge
30
commits into
e2nIEE:develop
Choose a base branch
from
lezneew:JAO-converter
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,579
−852
Open
Jao converter #2755
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
3103e9a
similarity search
lezneew b26a7d4
similarity search v2
lezneew dbe59ee
similarity search working
lezneew 863f4df
extended similarity search for table columns
lezneew 614b0e5
refactored code. added documentation
lezneew c07d5e7
Merge remote-tracking branch 'origin/JAO-converter' into JAO-converter
lezneew 4f05829
refactored code
lezneew bc9ca00
refactored code
lezneew 0bda73d
[CHANGED] refactored typing
lezneew 4342fd1
[FIXED] potential regex backtracking
lezneew 847e5b7
[FIX] Regex backtracking
lezneew 9438296
Refactored Code
lezneew 31f6c55
Refactored Code
lezneew 5e38dc6
Merge branch 'develop' into JAO-converter
lezneew 7baadbe
[Fix] regex
lezneew 5675cce
Merge remote-tracking branch 'origin/JAO-converter' into JAO-converter
lezneew 7214e70
Merge branch 'develop' into JAO-converter
lezneew 99798a8
refactored code
lezneew 78b5eae
moved helper functions for norm. of strings and fuzzy matching to new…
lezneew e9e9008
Copyright added to utils.py
lezneew 3509842
Merge branch 'develop' into JAO-converter
lezneew 04670d7
[ADDED] mapping between JAO and pp documentation
lezneew 7d41c1e
Merge branch 'develop' into JAO-converter
lezneew 293be8d
[FIXED] test
lezneew d33f195
Merge remote-tracking branch 'origin/JAO-converter' into JAO-converter
lezneew 7d6636d
[FIXED] newest JAO release had non-connecting lines and typing issues…
lezneew e8d1632
Merge branch 'develop' into JAO-converter
lezneew 04c517e
-sphinx documentation refactored from numpy notation,
lezneew 32987c1
Merge remote-tracking branch 'origin/JAO-converter' into JAO-converter
lezneew c5b8dd4
Rework of jao converter, to be more readable and maintainable.
vogt31337 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| pandapower table,pandapower column,JAO sheet,JAO column (typical, variants),Transformation/notes | ||
| net.line,from_bus,"Lines, Tielines",Substation_1 / Full Name + Voltage_level(kV),Matched to an existing bus by name and VN, fuzzy name normalization applied. | ||
| net.line,to_bus,"Lines, Tielines",Substation_2 / Full Name + Voltage_level(kV),Matched to an existing bus by name and VN, fuzzy name normalization applied. | ||
| net.line,length_km,"Lines, Tielines",Electrical Parameters / Length_(km),"If 0 or NaN, set to 1 km (with log warning)." | ||
| net.line,r_ohm_per_km,"Lines, Tielines","Electrical Parameters / Resistance_R(Ω) or (""resistance r ohm"")",Total R divided by Length (km). | ||
| net.line,x_ohm_per_km,"Lines, Tielines","Electrical Parameters / Reactance_X(Ω) or (""reactance x ohm"")",Total X divided by Length (km). | ||
| net.line,c_nf_per_km,"Lines, Tielines","Susceptance_B(μS) (or ""Susceptance_B (µS)"")",B_total/Length (km) is passed into c_nf_per_km (units μS/km) | ||
| net.line,g_us_per_km,-,-,Not set (no JAO line conductance column used), defaults to 0 in pandapower. | ||
| net.line,max_i_ka,"Lines, Tielines",Maximum Current Imax (A) / Fixed,"Converted A to kA, if missing, filled with max_i_ka_fillna." | ||
| net.line,parallel,-,-,Not provided by JAO - defaults to 1. | ||
| net.line,df,-,-,Not provided by JAO - defaults to 1. | ||
| net.line,in_service,-,-,Not provided by JAO - defaults to True. | ||
| net.bus,vn_kv,"Lines, Tielines","Voltage_level(kV) (Voltage_level (kV), Voltage_level [kV])",Numeric conversion | ||
| net.bus,in_service,-,-,"Not provided by JAO, defaults to True." | ||
| net.transformer,hv_bus,Transformers + Buses,Location / Full Name + Primary/Secondary Voltage,"High-voltage side bus index. Location matched to existing bus at required VN, if no exact VN, nearest VN at location is used or a new bus is created (per converter rules)." | ||
| net.transformer,lv_bus,Transformers + Buses,Location / Full Name + Primary/Secondary Voltage,"Low-voltage side bus index, analogous to hv_bus. Ensured hv_bus != lv_bus (LV duplicated if necessary)." | ||
| net.transformer,sn_mva,Transformers,Maximum Current Imax (A) primary (Fixed/Max) + VN,Rated apparent power [MVA]. Computed: sn_mva = √3 · Imax_primary(A) · vn_hv_kv(kV) / 1e3. Falls back to “Max” or global fill if Fixed is missing. | ||
| net.transformer,vn_hv_kv,Transformers,Voltage level Primary/Secondary,"Rated HV voltage [kV], vn_hv_kv = max(Primary, Secondary)." | ||
| net.transformer,vn_lv_kv,Transformers,Voltage level Primary/Secondary,"Rated LV voltage [kV], vn_lv_kv = min(Primary, Secondary)." | ||
| net.transformer,vk_percent,Transformers,resistance r ohm, reactance x ohm,"Short-circuit voltage [%], compute per-unit r_k = R_ohm/z_base, x_k = X_ohm/z_base with z_base = vn_lv_kv²/s_n, vk% = sign(x_k)·√(r_k² + x_k²)·100." | ||
| net.transformer,vkr_percent,Transformers,resistance r ohm,Real component of short-circuit voltage [%], vkr% = r_k·100 (same base as vk%). | ||
| net.transformer,pfe_kw,Transformers,conductance g (μS),"Iron losses [kW], pfe_kw = g0 · sn_mva · 1e3, where g0 is per-unit conductance from G (μS)." | ||
| net.transformer,i0_percent,Transformers,"susceptance b (μS), conductance g (μS)","No-load current [%], i0% = 100 · √(b0² + g0²) · (system sn_mva) / sn_mva, b0,g0 from B,G (μS) on transformer base." | ||
| net.transformer,shift_degree,Transformers,theta degree,"Phase shift angle [deg], default 0 if missing." | ||
| net.transformer,in_service,-,-,"Not provided by JAO, defaults to True." | ||
| net.transformer,oltc,-,-,Optional in create_transformer_from_parameters. Defaults to False | ||
| net.transformer,power_station_unit,-,-,"Not provided by JAO, defaults to False." | ||
| net.transformer,leakage_resistance_ratio_hv,-,-,Ratio of transformer short-circuit resistance allocated on HV side (default 0.5). | ||
| net.transformer,leakage_reactance_ratio_hv,-,-,Ratio of transformer short-circuit reactance allocated on HV side (default 0.5). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,7 @@ | ||
| from .from_jao import from_jao | ||
| # -*- coding: utf-8 -*- | ||
|
|
||
| # Copyright (c) 2016-2026 by University of Kassel and Fraunhofer Institute for Energy Economics | ||
| # and Energy System Technology (IEE), Kassel. All rights reserved. | ||
|
|
||
| from pandapower.converter.jao.from_jao import ( | ||
| from_jao, get_grid_groups, drop_islanded_grid_groups) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this line, as it is only required for non utf-8 or python < 3. In python 3 file encoding is utf-8 by default.
(same for other files in this pr)