Skip to content

Commit

Permalink
Merge branch 'main' into release/0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
maxcapodi78 authored and maxcapodi78 committed Mar 24, 2022
2 parents 2bd49a9 + 5418ae4 commit 59460e4
Show file tree
Hide file tree
Showing 40 changed files with 631 additions and 123 deletions.
2 changes: 2 additions & 0 deletions _unittest/example_models/choke_json_file/choke_1winding_1Layer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
},
"Core": {
"Name": "Core",
"Material": "ferrite",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
"Chamfer": 0.8
},
"Outer Winding": {
"Name": "Winding",
"Material": "copper",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
Expand Down
2 changes: 1 addition & 1 deletion _unittest/example_models/choke_json_file/choke_1winding_1Layer_Corrected.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Mid Winding": {"Turns": 111, "Coil Pit(deg)": 1.621, "Occupation(%)": 99.961666666666659}, "Layer": {"Double": false, "Simple": true, "Triple": false}, "Number of Windings": {"4": false, "1": true, "3": false, "2": false}, "Similar Layer": {"Different": false, "Similar": true}, "Inner Winding": {"Turns": 111, "Coil Pit(deg)": 1.621, "Occupation(%)": 99.961666666666659}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": false, "Circle": true, "Octagon": false, "Hexagon": false}, "Outer Winding": {"Turns": 111, "Wire Diameter": 1, "Name": "Winding", "Outer Radius": 50.55, "Inner Radius": 19.45, "Coil Pit(deg)": 1.621, "Occupation(%)": 99.961666666666659, "Height": 21.1}, "Layer Type": {"Separate": true, "Linked": false}, "Core": {"Name": "Core", "Outer Radius": 50, "Inner Radius": 20, "Chamfer": 0.80000000000000004, "Height": 20}}
{"Number of Windings": {"1": true, "2": false, "3": false, "4": false}, "Layer": {"Simple": true, "Double": false, "Triple": false}, "Layer Type": {"Separate": true, "Linked": false}, "Similar Layer": {"Similar": true, "Different": false}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": false, "Hexagon": false, "Octagon": false, "Circle": true}, "Core": {"Name": "Core", "Material": "ferrite", "Inner Radius": 20, "Outer Radius": 50, "Height": 20, "Chamfer": 0.8}, "Outer Winding": {"Name": "Winding", "Material": "copper", "Inner Radius": 19.45, "Outer Radius": 50.55, "Height": 21.1, "Wire Diameter": 1, "Turns": 111, "Coil Pit(deg)": 1.621, "Occupation(%)": 99.96166666666666}, "Mid Winding": {"Turns": 111, "Coil Pit(deg)": 1.621, "Occupation(%)": 99.96166666666666}, "Inner Winding": {"Turns": 111, "Coil Pit(deg)": 1.621, "Occupation(%)": 99.96166666666666}}
2 changes: 2 additions & 0 deletions _unittest/example_models/choke_json_file/choke_1winding_3Layer_Linked.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
},
"Core": {
"Name": "Core",
"Material": "ferrite",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
"Chamfer": 0.8
},
"Outer Winding": {
"Name": "Winding",
"Material": "copper",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
Expand Down
2 changes: 1 addition & 1 deletion _unittest/example_models/choke_json_file/choke_1winding_3Layer_Linked_Corrected.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Mid Winding": {"Turns": 104, "Coil Pit(deg)": 1.731, "Occupation(%)": 100.01333333333334}, "Layer": {"Double": false, "Simple": false, "Triple": true}, "Number of Windings": {"4": false, "1": true, "3": false, "2": false}, "Similar Layer": {"Different": true, "Similar": false}, "Inner Winding": {"Turns": 111, "Coil Pit(deg)": 1.622, "Occupation(%)": 100.02333333333334}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": false, "Circle": true, "Octagon": false, "Hexagon": false}, "Outer Winding": {"Turns": 98, "Wire Diameter": 1, "Name": "Winding", "Outer Radius": 52.75, "Inner Radius": 17.25, "Coil Pit(deg)": 1.836, "Occupation(%)": 99.96, "Height": 25.5}, "Layer Type": {"Separate": false, "Linked": true}, "Core": {"Name": "Core", "Outer Radius": 50, "Inner Radius": 20, "Chamfer": 0.80000000000000004, "Height": 20}}
{"Number of Windings": {"1": true, "2": false, "3": false, "4": false}, "Layer": {"Simple": false, "Double": false, "Triple": true}, "Layer Type": {"Separate": false, "Linked": true}, "Similar Layer": {"Similar": false, "Different": true}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": false, "Hexagon": false, "Octagon": false, "Circle": true}, "Core": {"Name": "Core", "Material": "ferrite", "Inner Radius": 20, "Outer Radius": 50, "Height": 20, "Chamfer": 0.8}, "Outer Winding": {"Name": "Winding", "Material": "copper", "Inner Radius": 17.25, "Outer Radius": 52.75, "Height": 25.5, "Wire Diameter": 1, "Turns": 98, "Coil Pit(deg)": 1.836, "Occupation(%)": 99.96}, "Mid Winding": {"Turns": 104, "Coil Pit(deg)": 1.731, "Occupation(%)": 100.01333333333334}, "Inner Winding": {"Turns": 111, "Coil Pit(deg)": 1.622, "Occupation(%)": 100.02333333333334}}
2 changes: 2 additions & 0 deletions _unittest/example_models/choke_json_file/choke_2winding_1Layer_Common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
},
"Core": {
"Name": "Core",
"Material": "ferrite",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
"Chamfer": 0.8
},
"Outer Winding": {
"Name": "Winding",
"Material": "copper",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
Expand Down
2 changes: 1 addition & 1 deletion _unittest/example_models/choke_json_file/choke_2winding_1Layer_Common_Corrected.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Mid Winding": {"Turns": 10, "Coil Pit(deg)": 1.621, "Occupation(%)": 18.011111111111113}, "Layer": {"Double": false, "Simple": true, "Triple": false}, "Number of Windings": {"4": false, "1": false, "3": false, "2": true}, "Similar Layer": {"Different": false, "Similar": true}, "Inner Winding": {"Turns": 10, "Coil Pit(deg)": 1.621, "Occupation(%)": 18.011111111111113}, "Mode": {"Differential": false, "Common": true}, "Wire Section": {"None": false, "Circle": false, "Octagon": true, "Hexagon": false}, "Outer Winding": {"Turns": 10, "Wire Diameter": 1, "Name": "Winding", "Outer Radius": 50.55, "Inner Radius": 19.45, "Coil Pit(deg)": 1.621, "Occupation(%)": 18.011111111111113, "Height": 21.1}, "Layer Type": {"Separate": true, "Linked": false}, "Core": {"Name": "Core", "Outer Radius": 50, "Inner Radius": 20, "Chamfer": 0.80000000000000004, "Height": 20}}
{"Number of Windings": {"1": false, "2": true, "3": false, "4": false}, "Layer": {"Simple": true, "Double": false, "Triple": false}, "Layer Type": {"Separate": true, "Linked": false}, "Similar Layer": {"Similar": true, "Different": false}, "Mode": {"Differential": false, "Common": true}, "Wire Section": {"None": false, "Hexagon": false, "Octagon": true, "Circle": false}, "Core": {"Name": "Core", "Material": "ferrite", "Inner Radius": 20, "Outer Radius": 50, "Height": 20, "Chamfer": 0.8}, "Outer Winding": {"Name": "Winding", "Material": "copper", "Inner Radius": 19.45, "Outer Radius": 50.55, "Height": 21.1, "Wire Diameter": 1, "Turns": 10, "Coil Pit(deg)": 1.621, "Occupation(%)": 18.011111111111113}, "Mid Winding": {"Turns": 10, "Coil Pit(deg)": 1.621, "Occupation(%)": 18.011111111111113}, "Inner Winding": {"Turns": 10, "Coil Pit(deg)": 1.621, "Occupation(%)": 18.011111111111113}}
2 changes: 2 additions & 0 deletions _unittest/example_models/choke_json_file/choke_2winding_2Layer_Common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
},
"Core": {
"Name": "Core",
"Material": "ferrite",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
"Chamfer": 0.8
},
"Outer Winding": {
"Name": "Winding",
"Material": "copper",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
Expand Down
2 changes: 1 addition & 1 deletion _unittest/example_models/choke_json_file/choke_2winding_2Layer_Common_Corrected.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Mid Winding": {"Turns": 25, "Coil Pit(deg)": 1.7998, "Occupation(%)": 99.9888888888889}, "Layer": {"Double": true, "Simple": false, "Triple": false}, "Number of Windings": {"4": true, "1": false, "3": false, "2": false}, "Similar Layer": {"Different": true, "Similar": false}, "Inner Winding": {"Turns": 20, "Coil Pit(deg)": 3.8227, "Occupation(%)": 84.948888888888888}, "Mode": {"Differential": false, "Common": true}, "Wire Section": {"None": false, "Circle": true, "Octagon": false, "Hexagon": false}, "Outer Winding": {"Turns": 25, "Wire Diameter": 1, "Name": "Winding", "Outer Radius": 51.65, "Inner Radius": 18.35, "Coil Pit(deg)": 1.718, "Occupation(%)": 95.444444444444443, "Height": 23.3}, "Layer Type": {"Separate": true, "Linked": false}, "Core": {"Name": "Core", "Outer Radius": 50, "Inner Radius": 20, "Chamfer": 0.80000000000000004, "Height": 20}}
{"Number of Windings": {"1": false, "2": true, "3": false, "4": false}, "Layer": {"Simple": false, "Double": true, "Triple": false}, "Layer Type": {"Separate": true, "Linked": false}, "Similar Layer": {"Similar": true, "Different": false}, "Mode": {"Differential": false, "Common": true}, "Wire Section": {"None": false, "Hexagon": true, "Octagon": false, "Circle": false}, "Core": {"Name": "Core", "Material": "ferrite", "Inner Radius": 20, "Outer Radius": 50, "Height": 20, "Chamfer": 0.8}, "Outer Winding": {"Name": "Winding", "Material": "copper", "Inner Radius": 18.35, "Outer Radius": 51.65, "Height": 23.3, "Wire Diameter": 1, "Turns": 25, "Coil Pit(deg)": 1.718, "Occupation(%)": 47.72222222222222}, "Mid Winding": {"Turns": 25, "Coil Pit(deg)": 1.718, "Occupation(%)": 47.72222222222222}, "Inner Winding": {"Turns": 25, "Coil Pit(deg)": 1.718, "Occupation(%)": 47.72222222222222}}
2 changes: 2 additions & 0 deletions _unittest/example_models/choke_json_file/choke_2winding_2Layer_Linked_Differential.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
},
"Core": {
"Name": "Core",
"Material": "ferrite",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
"Chamfer": 0.8
},
"Outer Winding": {
"Name": "Winding",
"Material": "copper",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
Expand Down
2 changes: 1 addition & 1 deletion ...t/example_models/choke_json_file/choke_2winding_2Layer_Linked_Differential_Corrected.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Mid Winding": {"Turns": 14, "Coil Pit(deg)": 1.621, "Occupation(%)": 25.215555555555557}, "Layer": {"Double": true, "Simple": false, "Triple": false}, "Number of Windings": {"4": false, "1": false, "3": false, "2": true}, "Similar Layer": {"Different": true, "Similar": false}, "Inner Winding": {"Turns": 20, "Coil Pit(deg)": 0.10000000000000001, "Occupation(%)": 84.948888888888888}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": false, "Circle": false, "Octagon": false, "Hexagon": true}, "Outer Winding": {"Turns": 12, "Wire Diameter": 1, "Name": "Winding", "Outer Radius": 51.65, "Inner Radius": 18.35, "Coil Pit(deg)": 1.718, "Occupation(%)": 22.906666666666666, "Height": 23.3}, "Layer Type": {"Separate": false, "Linked": true}, "Core": {"Name": "Core", "Outer Radius": 50, "Inner Radius": 20, "Chamfer": 0.80000000000000004, "Height": 20}}
{"Number of Windings": {"1": false, "2": true, "3": false, "4": false}, "Layer": {"Simple": false, "Double": true, "Triple": false}, "Layer Type": {"Separate": false, "Linked": true}, "Similar Layer": {"Similar": false, "Different": true}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": false, "Hexagon": true, "Octagon": false, "Circle": false}, "Core": {"Name": "Core", "Material": "ferrite", "Inner Radius": 20, "Outer Radius": 50, "Height": 20, "Chamfer": 0.8}, "Outer Winding": {"Name": "Winding", "Material": "copper", "Inner Radius": 18.35, "Outer Radius": 51.65, "Height": 23.3, "Wire Diameter": 1, "Turns": 12, "Coil Pit(deg)": 1.718, "Occupation(%)": 22.906666666666666}, "Mid Winding": {"Turns": 14, "Coil Pit(deg)": 1.621, "Occupation(%)": 25.215555555555557}, "Inner Winding": {"Turns": 20, "Coil Pit(deg)": 0.1, "Occupation(%)": 84.94888888888889}}
2 changes: 2 additions & 0 deletions _unittest/example_models/choke_json_file/choke_3winding_3Layer_Separate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
},
"Core": {
"Name": "Core",
"Material": "ferrite",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
"Chamfer": 0.8
},
"Outer Winding": {
"Name": "Winding",
"Material": "copper",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
Expand Down
2 changes: 1 addition & 1 deletion _unittest/example_models/choke_json_file/choke_3winding_3Layer_Separate_Corrected.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Number of Windings": {"1": false, "2": false, "3": true, "4": false}, "Layer": {"Simple": false, "Double": false, "Triple": true}, "Layer Type": {"Separate": true, "Linked": false}, "Similar Layer": {"Similar": true, "Different": false}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": true, "Hexagon": false, "Octagon": false, "Circle": false}, "Core": {"Name": "Core", "Inner Radius": 20, "Outer Radius": 50, "Height": 20, "Chamfer": 0.8}, "Outer Winding": {"Name": "Winding", "Inner Radius": 17.25, "Outer Radius": 52.75, "Height": 25.5, "Wire Diameter": 1, "Turns": 15, "Coil Pit(deg)": 1.828, "Occupation(%)": 45.7}, "Mid Winding": {"Turns": 15, "Coil Pit(deg)": 1.828, "Occupation(%)": 45.7}, "Inner Winding": {"Turns": 15, "Coil Pit(deg)": 1.828, "Occupation(%)": 45.7}}
{"Number of Windings": {"1": false, "2": false, "3": true, "4": false}, "Layer": {"Simple": false, "Double": false, "Triple": true}, "Layer Type": {"Separate": true, "Linked": false}, "Similar Layer": {"Similar": true, "Different": false}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": true, "Hexagon": false, "Octagon": false, "Circle": false}, "Core": {"Name": "Core", "Material": "ferrite", "Inner Radius": 20, "Outer Radius": 50, "Height": 20, "Chamfer": 0.8}, "Outer Winding": {"Name": "Winding", "Material": "copper", "Inner Radius": 17.25, "Outer Radius": 52.75, "Height": 25.5, "Wire Diameter": 1, "Turns": 15, "Coil Pit(deg)": 1.828, "Occupation(%)": 45.7}, "Mid Winding": {"Turns": 15, "Coil Pit(deg)": 1.828, "Occupation(%)": 45.7}, "Inner Winding": {"Turns": 15, "Coil Pit(deg)": 1.828, "Occupation(%)": 45.7}}
2 changes: 2 additions & 0 deletions _unittest/example_models/choke_json_file/choke_4winding_3Layer_Linked.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
},
"Core": {
"Name": "Core",
"Material": "ferrite",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
"Chamfer": 0.8
},
"Outer Winding": {
"Name": "Winding",
"Material": "copper",
"Inner Radius": 20,
"Outer Radius": 50,
"Height": 20,
Expand Down
2 changes: 1 addition & 1 deletion _unittest/example_models/choke_json_file/choke_4winding_3Layer_Linked_Corrected.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Number of Windings": {"1": false, "2": false, "3": false, "4": true}, "Layer": {"Simple": false, "Double": false, "Triple": true}, "Layer Type": {"Separate": false, "Linked": true}, "Similar Layer": {"Similar": false, "Different": true}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": false, "Hexagon": false, "Octagon": true, "Circle": false}, "Core": {"Name": "Core", "Inner Radius": 20, "Outer Radius": 50, "Height": 20, "Chamfer": 0.8}, "Outer Winding": {"Name": "Winding", "Inner Radius": 16.7, "Outer Radius": 53.3, "Height": 26.6, "Wire Diameter": 1.2, "Turns": 1, "Coil Pit(deg)": 2.265, "Occupation(%)": 5.033333333333333}, "Mid Winding": {"Turns": 3, "Coil Pit(deg)": 2.099, "Occupation(%)": 13.993333333333334}, "Inner Winding": {"Turns": 4, "Coil Pit(deg)": 1.956, "Occupation(%)": 17.386666666666667}}
{"Number of Windings": {"1": false, "2": false, "3": false, "4": true}, "Layer": {"Simple": false, "Double": false, "Triple": true}, "Layer Type": {"Separate": false, "Linked": true}, "Similar Layer": {"Similar": false, "Different": true}, "Mode": {"Differential": true, "Common": false}, "Wire Section": {"None": false, "Hexagon": false, "Octagon": true, "Circle": false}, "Core": {"Name": "Core", "Material": "ferrite", "Inner Radius": 20, "Outer Radius": 50, "Height": 20, "Chamfer": 0.8}, "Outer Winding": {"Name": "Winding", "Material": "copper", "Inner Radius": 16.7, "Outer Radius": 53.3, "Height": 26.6, "Wire Diameter": 1.2, "Turns": 1, "Coil Pit(deg)": 2.265, "Occupation(%)": 5.033333333333333}, "Mid Winding": {"Turns": 3, "Coil Pit(deg)": 2.099, "Occupation(%)": 13.993333333333334}, "Inner Winding": {"Turns": 4, "Coil Pit(deg)": 1.956, "Occupation(%)": 17.386666666666667}}
11 changes: 10 additions & 1 deletion _unittest/test_05_Mesh.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,16 @@ def test_assign_surface_mesh_manual(self):
surface = self.aedtapp.mesh.assign_surface_mesh_manual(o.id, 1e-6, aspect_ratio=3, meshop_name="Surface_Manual")
assert "Surface_Manual" in [i.name for i in self.aedtapp.mesh.meshoperations]
assert surface.props["SurfDev"] == 1e-6
assert surface.props["AspectRatioChoice"]
assert surface.props["AspectRatioChoice"] == 2

cylinder_zx = self.aedtapp.modeler.create_cylinder(
self.aedtapp.PLANE.ZX, udp, 3, coax_dimension, 0, "surface_manual"
)
surface_default_value = self.aedtapp.mesh.assign_surface_mesh_manual(cylinder_zx.id)
assert "Surface_Manual" in [i.name for i in self.aedtapp.mesh.meshoperations]
assert surface_default_value.props["SurfDev"] == "0.0001mm"
assert surface_default_value.props["NormalDev"] == "1"
assert surface_default_value.props["AspectRatioChoice"] == 1

def test_assign_surface_priority(self):
surface = self.aedtapp.mesh.assign_surf_priority_for_tau(["surface", "surface_manual"], 1)
Expand Down
8 changes: 3 additions & 5 deletions _unittest/test_08_Primitives3D.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ def test_72_check_choke_values(self):
@pyaedt_unittest_check_desktop_error
def test_73_make_winding(self):
chamfer = self.aedtapp.modeler._make_winding_follow_chamfer(0.8, 1.1, 2, 1)
winding_list = self.aedtapp.modeler._make_winding("Winding", "", "", 29.9, 52.1, 22.2, 2, 5, 15, chamfer, True)
winding_list = self.aedtapp.modeler._make_winding("Winding", "copper", 29.9, 52.1, 22.2, 5, 15, chamfer, True)
assert isinstance(winding_list, list)
assert isinstance(winding_list[0], Object3d)
assert isinstance(winding_list[1], list)
Expand All @@ -1102,8 +1102,7 @@ def test_74_make_double_linked_winding(self):
chamfer = self.aedtapp.modeler._make_winding_follow_chamfer(0.8, 1.1, 2, 1)
winding_list = self.aedtapp.modeler._make_double_linked_winding(
"Double_Winding",
"",
"",
"copper",
27.7,
54.3,
26.6,
Expand All @@ -1125,8 +1124,7 @@ def test_75_make_triple_linked_winding(self):
chamfer = self.aedtapp.modeler._make_winding_follow_chamfer(0.8, 1.1, 2, 1)
winding_list = self.aedtapp.modeler._make_triple_linked_winding(
"Triple_Winding",
"",
"",
"copper",
25.5,
56.5,
31.0,
Expand Down
5 changes: 5 additions & 0 deletions codecov.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ coverage:
if_not_found: success
if_ci_failed: error
if_no_uploads: error
ignore:
- "examples" # ignore folders and all its contents
- "_unittest_ironpython" # ignore folders and all its contents
- "pyaedt/third_party/**/*.py" # ignore folders and all its contents

Loading

0 comments on commit 59460e4

Please sign in to comment.