Skip to content

Commit ce9346f

Browse files
BonneelPBonneelP
authored
Merge pull request #397 from EOMYS-Public/BH_curve
[CO] Matlib reorganization
2 parents 7d05ce2 + 7134450 commit ce9346f

File tree

343 files changed

+4434
-2036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+4434
-2036
lines changed

‎Tests/Classes/test_compare.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,29 @@ def test_compare():
9494
assert len(diff_list) == 11
9595

9696

97+
def test_compare_ignore():
98+
"""Test the compare method ignore_list parameter"""
99+
# Create reference object
100+
Mat1 = load(join(DATA_DIR, "Material", "M400-50A.json"))
101+
Mat2 = Mat1.copy()
102+
Mat2.name = "test"
103+
Mat2.path = "different/path"
104+
Mat2.mag.mur_lin = 2512
105+
Mat2.elec.rho = 1234
106+
107+
diff_list = Mat1.compare(Mat2)
108+
assert len(diff_list) == 4
109+
assert "self.name" in diff_list
110+
assert "self.path" in diff_list
111+
assert "self.mag.mur_lin" in diff_list
112+
assert "self.elec.rho" in diff_list
113+
114+
diff_list2 = Mat1.compare(Mat2, ignore_list=["self.name", "self.elec.rho"])
115+
assert len(diff_list2) == 2
116+
assert "self.path" in diff_list2
117+
assert "self.mag.mur_lin" in diff_list2
118+
119+
97120
if __name__ == "__main__":
98121
test_compare()
122+
test_compare_ignore()

‎Tests/Data/Material/Workflow/Copper1.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"HT": {
3+
"Cp": 381.0,
4+
"__class__": "MatHT",
5+
"alpha": 0.00393,
6+
"lambda_x": 385.0,
7+
"lambda_y": 385.0,
8+
"lambda_z": 385.0
9+
},
10+
"__class__": "Material",
11+
"__save_date__": "2021_05_03 14h38min33s ",
12+
"__version__": "pyleecan_1.2.1",
13+
"desc": "COPPER WINDING",
14+
"eco": {
15+
"__class__": "MatEconomical",
16+
"cost_unit": 60.0,
17+
"unit_name": "$"
18+
},
19+
"elec": {
20+
"__class__": "MatElectrical",
21+
"alpha": 1,
22+
"epsr": null,
23+
"rho": 1.73e-08
24+
},
25+
"is_isotropic": true,
26+
"mag": null,
27+
"name": "Copper1",
28+
"path": null,
29+
"struct": {
30+
"Ex": 115000000000.0,
31+
"Ey": 115000000000.0,
32+
"Ez": 115000000000.0,
33+
"Gxy": null,
34+
"Gxz": null,
35+
"Gyz": null,
36+
"__class__": "MatStructural",
37+
"nu_xy": null,
38+
"nu_xz": null,
39+
"nu_yz": null,
40+
"rho": 8900.0
41+
}
42+
}

‎Tests/Data/Material/Workflow/Insulator1.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"HT": {
3+
"Cp": 671.0,
4+
"__class__": "MatHT",
5+
"alpha": null,
6+
"lambda_x": 0.2,
7+
"lambda_y": 0.2,
8+
"lambda_z": 0.2
9+
},
10+
"__class__": "Material",
11+
"__save_date__": "2021_05_03 14h38min33s ",
12+
"__version__": "pyleecan_1.2.1",
13+
"desc": "INSULATOR1",
14+
"eco": {
15+
"__class__": "MatEconomical",
16+
"cost_unit": null,
17+
"unit_name": "$"
18+
},
19+
"elec": {
20+
"__class__": "MatElectrical",
21+
"alpha": 1,
22+
"epsr": null,
23+
"rho": null
24+
},
25+
"is_isotropic": true,
26+
"mag": null,
27+
"name": "Insulator1",
28+
"path": null,
29+
"struct": {
30+
"Ex": null,
31+
"Ey": null,
32+
"Ez": null,
33+
"Gxy": null,
34+
"Gxz": null,
35+
"Gyz": null,
36+
"__class__": "MatStructural",
37+
"nu_xy": null,
38+
"nu_xz": null,
39+
"nu_yz": null,
40+
"rho": 1200.0
41+
}
42+
}

‎Tests/Data/Material/Workflow/M400-50A.json‎

Lines changed: 242 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,242 @@
1+
{
2+
"HT": {
3+
"Cp": 1,
4+
"__class__": "MatHT",
5+
"alpha": 0.00393,
6+
"lambda_x": 1,
7+
"lambda_y": 1,
8+
"lambda_z": 1
9+
},
10+
"__class__": "Material",
11+
"__save_date__": "2021_05_03 14h38min33s ",
12+
"__version__": "pyleecan_1.2.1",
13+
"desc": "Lamination M400-50A",
14+
"eco": {
15+
"__class__": "MatEconomical",
16+
"cost_unit": 0.127,
17+
"unit_name": "$"
18+
},
19+
"elec": {
20+
"__class__": "MatElectrical",
21+
"alpha": 1,
22+
"epsr": 1,
23+
"rho": 1
24+
},
25+
"is_isotropic": false,
26+
"mag": {
27+
"BH_curve": {
28+
"__class__": "ImportMatrixVal",
29+
"is_transpose": false,
30+
"value": [
31+
[
32+
0.0,
33+
0.0
34+
],
35+
[
36+
100.0,
37+
0.5
38+
],
39+
[
40+
150.0,
41+
0.7
42+
],
43+
[
44+
180.0,
45+
0.8
46+
],
47+
[
48+
200.0,
49+
0.9
50+
],
51+
[
52+
250.0,
53+
1.0
54+
],
55+
[
56+
300.0,
57+
1.05
58+
],
59+
[
60+
350.0,
61+
1.1
62+
],
63+
[
64+
450.0,
65+
1.15
66+
],
67+
[
68+
550.0,
69+
1.2
70+
],
71+
[
72+
650.0,
73+
1.225
74+
],
75+
[
76+
750.0,
77+
1.25
78+
],
79+
[
80+
850.0,
81+
1.275
82+
],
83+
[
84+
950.0,
85+
1.3
86+
],
87+
[
88+
1100.0,
89+
1.325
90+
],
91+
[
92+
1250.0,
93+
1.35
94+
],
95+
[
96+
1400.0,
97+
1.375
98+
],
99+
[
100+
1550.0,
101+
1.4
102+
],
103+
[
104+
1700.0,
105+
1.425
106+
],
107+
[
108+
1900.0,
109+
1.45
110+
],
111+
[
112+
2150.0,
113+
1.475
114+
],
115+
[
116+
2450.0,
117+
1.5
118+
],
119+
[
120+
2750.0,
121+
1.525
122+
],
123+
[
124+
3150.0,
125+
1.55
126+
],
127+
[
128+
3600.0,
129+
1.575
130+
],
131+
[
132+
4100.0,
133+
1.6
134+
],
135+
[
136+
4700.0,
137+
1.625
138+
],
139+
[
140+
5250.0,
141+
1.65
142+
],
143+
[
144+
6000.0,
145+
1.675
146+
],
147+
[
148+
6700.0,
149+
1.7
150+
],
151+
[
152+
7500.0,
153+
1.725
154+
],
155+
[
156+
8650.0,
157+
1.75
158+
],
159+
[
160+
9500.0,
161+
1.775
162+
],
163+
[
164+
10750.0,
165+
1.8
166+
],
167+
[
168+
14500.0,
169+
1.85
170+
],
171+
[
172+
19500.0,
173+
1.9
174+
],
175+
[
176+
25000.0,
177+
1.95
178+
],
179+
[
180+
33000.0,
181+
2.0
182+
],
183+
[
184+
44000.0,
185+
2.05
186+
],
187+
[
188+
57000.0,
189+
2.1
190+
],
191+
[
192+
74000.0,
193+
2.15
194+
],
195+
[
196+
96000.0,
197+
2.2
198+
],
199+
[
200+
130000.0,
201+
2.25
202+
],
203+
[
204+
170000.0,
205+
2.3
206+
]
207+
]
208+
},
209+
"Brm20": 0,
210+
"Hc": 0,
211+
"LossData": {
212+
"__class__": "ImportMatrix",
213+
"is_transpose": false
214+
},
215+
"ModelBH": {
216+
"Bmax": 2.31,
217+
"Hmax": null,
218+
"__class__": "ModelBH",
219+
"delta": 100
220+
},
221+
"Wlam": 0.0005,
222+
"__class__": "MatMagnetics",
223+
"alpha_Br": 0,
224+
"is_BH_extrapolate": false,
225+
"mur_lin": 2500.0
226+
},
227+
"name": "M400-50A",
228+
"path": "",
229+
"struct": {
230+
"Ex": 215000000000.0,
231+
"Ey": 215000000000.0,
232+
"Ez": 80000000000.0,
233+
"Gxy": 0.0,
234+
"Gxz": 2000000000.0,
235+
"Gyz": 2000000000.0,
236+
"__class__": "MatStructural",
237+
"nu_xy": 0.3,
238+
"nu_xz": 0.03,
239+
"nu_yz": 0.03,
240+
"rho": 7650.0
241+
}
242+
}

0 commit comments

Comments
 (0)