Skip to content
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

Jump to bottom

Converter and Losses in GUI #684

Merged
merged 284 commits into from
Feb 27, 2024
Merged

Converter and Losses in GUI #684

merged 284 commits into from
Feb 27, 2024

Conversation

BonneelP
Copy link
Collaborator

Hello,

This Pull Request gather all the development of @clementd08 in particular:

  • Adding a Converter MotorCAD <=> pyleecan (including doc in notebook)
  • Extend simulation GUI to losses (dedicated losses data needs to be added in the lamination material)
  • SlotW30, SlotW62 and SlotW63

Thank you for your contribution !

clement and others added 30 commits November 21, 2023 09:24
[WP] correction
ce67bf9
[WP] add Jupyter Notebook
f43d684
{[WP] adding machine SCIM, and renaming rules
37b89a1
[NF] adding new slotW30
5f078c7
@AdrienLeduqueEomys
[DOC] Clean comments and docStrings
554406a
[WP] slotW30
93da932
[WP]
ea39f20
Merge branch 'Convertisseur' of https://github.com/EOMYS-Public/pyleecan
e298375 
 into Convertisseur
[WP] correction PR
b54b3f7
[WP] Correction rules
fed95a1
[WP] adding get_H1 to slotW14
c67b112
[WP] correction rules
a33283f
[WP] correction slotW30
c5191de
Merge branch 'Convertisseur' of https://github.com/EOMYS-Public/pyleecan
3878b8e 
 into Converter_WRSM

# Conflicts:
#	Tests/Methods/Converter/test_convert.py
#	pyleecan/Classes/Class_Dict.json
#	pyleecan/Classes/ConvertMC.py
#	pyleecan/GUI/Resources/pyleecan_rc.py
#	pyleecan/Generator/ClassesRef/Converter/ConvertMC.csv
#	pyleecan/Methods/Converter/Convert/Step/select_slot_rules.py
#	pyleecan/Methods/Converter/Convert/Step/selection_slot_rotor_rules.py
#	pyleecan/Methods/Converter/Convert/machine_type/selection_SCIM_rules.py
#	pyleecan/Methods/Converter/Convert/machine_type/selection_WRSM_rules.py
#	pyleecan/Methods/Converter/Convert/select_machine_rules.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Hole/add_rule_embedded_parallel_holeM62.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Rotor_Magnet/add_rule_inset_breadloaf_slotM12.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Rotor_Magnet/add_rule_surface_breadloaf_slotM13.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Rotor_Magnet/add_rule_surface_parallel_slotM15.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Slot/add_rule_form_wound_slotW29.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Slot/add_rule_parallel_tooth_SqB_slotW14.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Slot/add_rule_tapered_slot_slotW23.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Slot/rotor/add_rule_rotor_parallel_tooth_slotW11.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/add_rule_machine_dimension.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/add_rule_machine_dimension_surface_magnet.py
#	pyleecan/Methods/Converter/ConvertMC/convert_to_P/convert_other_to_dict.py
[BC] correction log, and error
c1c4423
[WP] correction to convert SCIM
b08821b
[WP] correction slotW11 if slot is into rotor and is_cstt_tooth
9d6dea8
[WP] correction rules
28fdba1
[WP]
8be52f4
[WP]
6417806
Merge branch 'Convertisseur' of https://github.com/EOMYS-Public/pyleecan
14e6af4 
 into Converter_WRSM

# Conflicts:
#	Tests/Methods/Converter/convert_start.py
#	Tests/Methods/Converter/test_convert.py
#	Tests/Methods/Converter/test_convert_machine.py
#	pyleecan/Methods/Converter/Convert/Step/select_slot_rotor_rules.py
#	pyleecan/Methods/Converter/Convert/machine_type/select_SCIM_rules.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Rotor_Magnet/add_rule_surface_breadloaf_slotM13.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Rotor_Magnet/add_rule_surface_radial_slotM14.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Slot/add_rule_form_wound_slotW29.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Slot/add_rule_parallel_tooth_SqB_slotW14.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Slot/add_rule_tapered_slot_slotW23.py
#	pyleecan/Methods/Converter/ConvertMC/Rules/Slot/rotor/add_rule_pears_slotW30.py
[WP] correction rules
6479b71
[NF] adding new slotW62
8d948c7
@clementd08
Merge branch 'Eomys:master' into Converter_WRSM
989613e
[NF] adding new slotW63
f24effa
Merge branch 'Converter_WRSM' of https://github.com/EOMYS-Public/pyle…
368e590 
…ecan into Converter_WRSM
[WP] correction geometry for internal slotW11
30dd8bb
[WP] add rule and selection for machine WRSM
66ca601
[WP] test correction
7669d52
[WP) add test, and correction notebook
5af7a1c
clementd08 and others added 29 commits January 30, 2024 16:19
@clementd08
Merge pull request #36 from EOMYS-Public/Converter_correction
8a46aee 
Converter / Correction FEMM
@clementd08
Merge branch 'master2' of https://github.com/EOMYS-Public/pyleecan in…
fb9a0b0 
…to Loss
@clementd08
[WP] correction review without mesh solution
f1869c7
@clementd08
[WP] add method to save mesh
8c75394
@clementd08
[WP] pull master
19a1e73
@clementd08
Merge branch 'master' of https://github.com/Eomys/pyleecan into Loss
52ac163 
# Conflicts:
#	pyleecan/Classes/Class_Dict.json
#	pyleecan/Classes/MeshSolution.py
#	pyleecan/GUI/Resources/pyleecan_rc.py
#	pyleecan/Generator/ClassesRef/Mesh/MeshSolution.csv
#	pyleecan/Methods/Output/OutLossModel/plot_mesh.py
@clementd08
[WP] add possibility to save mesh solution
4641956
@clementd08
[WP] add save in GUI for mesh solution
72af8fa
@BonneelP
Merge branch 'master' of https://github.com/Eomys/pyleecan into master2
cf11b0f 
# Conflicts:
#	pyleecan/GUI/Resources/pyleecan_rc.py
@BonneelP
Merge branch 'master2' of https://github.com/EOMYS-Public/pyleecan in…
20b3f58 
…to Loss
@clementd08
[WP] review correction
53476f5
@clementd08
Merge branch 'Loss' of https://github.com/EOMYS-Public/pyleecan into …
aa1fef7 
…Loss
@clementd08
[WP] add method to save mesh vtk
ff4fbe3
@clementd08
[WP] correction
afaad01
@clementd08
[WP]
f7ffd10
@clementd08
[WP] Add method save_vtk for obj MEshVTK
9cdabdd
@clementd08
[WP] correction test
385a3b9
@clementd08
[WP] correction docstring
e77881f
@clementd08
[WP] correction review, change error msg
b52cd2c
@clementd08
[WP] correction review, change error msg
f9d3f8e
@clementd08
Merge branch 'Loss' of https://github.com/EOMYS-Public/pyleecan into …
12fc282 
…Loss

# Conflicts:
#	pyleecan/GUI/Dialog/DMachineSetup/SSimu/SSimu.py
@BonneelP
[CO] Add type check to correct the tests
07c1cbe
@clementd08
[WP] Change localization of doc converter
9bd9d92
@clementd08
[WP] test correction simu
a09fa82
@clementd08
[WP] change name in GUI
f0e8a7f
@clementd08
[WP] black
304d612
@clementd08
[Wp] correction Notebook converter
45d02f0
@clementd08
[WP] apply black
85ce069
@clementd08
Merge pull request #37 from EOMYS-Public/Loss
a1cd22f
@BonneelP BonneelP merged commit f31be78 into Eomys:master Feb 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@BonneelP @AdrienLeduqueEomys @clementd08