Skip to content

Commit 0bc2fb6

Browse files
ChRen95ChRen95
committed
added tests and new package
1 parent 75cca9c commit 0bc2fb6

File tree

6 files changed

+31
-4
lines changed

6 files changed

+31
-4
lines changed

‎pyproject.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ dependencies = [
1919
"pyroll-freiberg-flow-stress ~= 2.0",
2020
"pyroll-lendl-equivalent-method ~= 2.0",
2121
"pyroll-linear-thermal-expansion ~= 2.1",
22-
"pyroll-gripping-analysis ~= 2.0"
2322
]
2423
readme = "README.md"
2524

‎pyroll/basic.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = "2.1.0"
1+
VERSION = "2.1.1"
22

33
import pyroll.core as core
44
from pyroll.core import (
@@ -13,8 +13,6 @@
1313

1414
import pyroll.freiberg_flow_stress as freiberg_flow_stress
1515
from pyroll.freiberg_flow_stress import FreibergFlowStressCoefficients
16-
17-
import pyroll.gripping_analysis as gripping_analysis
1816
import pyroll.integral_thermal as integral_thermal
1917
import pyroll.lippmann_mahrenholz_force_torque as lippmann_mahrenholz_force_torque
2018
import pyroll.wusatowski_spreading as wusatowski_spreading

‎tests/test_solve.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def test_solve(tmp_path: Path, caplog):
3232
rotational_frequency=1,
3333
),
3434
gap=2e-3,
35+
coulomb_friction_coefficient=0.4,
3536
),
3637
Transport(
3738
label="I => II",
@@ -49,6 +50,7 @@ def test_solve(tmp_path: Path, caplog):
4950
rotational_frequency=1,
5051
),
5152
gap=2e-3,
53+
coulomb_friction_coefficient=0.4,
5254
),
5355
])
5456

‎tests/test_solve_3rp_hex_75_2.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def test_solve_3rp_hexagon_75_2(tmp_path: Path, caplog):
3434

3535
),
3636
inscribed_circle_diameter=84.43e-3,
37+
coulomb_friction_coefficient=0.4,
3738
),
3839
Transport(
3940
label="I->II",
@@ -53,6 +54,7 @@ def test_solve_3rp_hexagon_75_2(tmp_path: Path, caplog):
5354

5455
),
5556
inscribed_circle_diameter=80.84e-3,
57+
coulomb_friction_coefficient=0.4,
5658
),
5759
Transport(
5860
label="II->III",
@@ -72,6 +74,7 @@ def test_solve_3rp_hexagon_75_2(tmp_path: Path, caplog):
7274

7375
),
7476
inscribed_circle_diameter=77.51e-3,
77+
coulomb_friction_coefficient=0.4,
7578
),
7679
Transport(
7780
label="III->IV",
@@ -92,6 +95,7 @@ def test_solve_3rp_hexagon_75_2(tmp_path: Path, caplog):
9295

9396
),
9497
inscribed_circle_diameter=75.8e-3,
98+
coulomb_friction_coefficient=0.4,
9599
),
96100
Transport(
97101
label="IV->V",
@@ -111,6 +115,7 @@ def test_solve_3rp_hexagon_75_2(tmp_path: Path, caplog):
111115

112116
),
113117
inscribed_circle_diameter=75.96e-3,
118+
coulomb_friction_coefficient=0.4,
114119
)
115120
])
116121

‎tests/test_solve_imf_semi_continuous_8_mm.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
4949
),
5050
velocity=1,
5151
gap=13.5e-3,
52+
coulomb_friction_coefficient=0.4,
5253
),
5354
Transport(
5455
label="I -> II",
@@ -66,6 +67,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
6667
),
6768
velocity=1,
6869
gap=1.5e-3,
70+
coulomb_friction_coefficient=0.4,
6971
),
7072
Transport(
7173
label="II -> III",
@@ -85,6 +87,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
8587
),
8688
velocity=2,
8789
gap=1.5e-3,
90+
coulomb_friction_coefficient=0.4,
8891
),
8992
Transport(
9093
label="III -> IV",
@@ -102,6 +105,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
102105
),
103106
velocity=2,
104107
gap=1e-3,
108+
coulomb_friction_coefficient=0.4,
105109
),
106110
Transport(
107111
label="IV -> V",
@@ -119,6 +123,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
119123
),
120124
velocity=2,
121125
gap=5.4e-3,
126+
coulomb_friction_coefficient=0.4,
122127
),
123128
Transport(
124129
label="V -> VI",
@@ -136,6 +141,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
136141
),
137142
velocity=2,
138143
gap=1.8e-3,
144+
coulomb_friction_coefficient=0.4,
139145
),
140146
Transport(
141147
label="VI -> VII",
@@ -153,6 +159,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
153159
),
154160
velocity=2,
155161
gap=0.8e-3,
162+
coulomb_friction_coefficient=0.4,
156163
),
157164
Transport(
158165
label="VII -> IIX",
@@ -170,6 +177,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
170177
),
171178
velocity=2,
172179
gap=3.8e-3,
180+
coulomb_friction_coefficient=0.4,
173181
),
174182
Transport(
175183
label="IIX -> IX",
@@ -187,6 +195,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
187195
),
188196
velocity=2,
189197
gap=3.5e-3,
198+
coulomb_friction_coefficient=0.4,
190199
),
191200
Transport(
192201
label="IX -> X",
@@ -203,6 +212,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
203212
),
204213
velocity=2,
205214
gap=4e-3,
215+
coulomb_friction_coefficient=0.4,
206216
),
207217
Transport(
208218
label="X -> XI",
@@ -221,6 +231,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
221231
),
222232
velocity=4.89,
223233
gap=1.2e-3,
234+
coulomb_friction_coefficient=0.4,
224235
),
225236
Transport(
226237
label="XI -> XII",
@@ -239,6 +250,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
239250
),
240251
velocity=6.1,
241252
gap=0.9e-3,
253+
coulomb_friction_coefficient=0.4,
242254
),
243255
Transport(
244256
label="XII -> XIII",
@@ -257,6 +269,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
257269
),
258270
velocity=7.91,
259271
gap=1.75e-3,
272+
coulomb_friction_coefficient=0.4,
260273
),
261274
Transport(
262275
label="XIII -> XIV",
@@ -275,6 +288,7 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
275288
),
276289
velocity=10,
277290
gap=1.5e-3,
291+
coulomb_friction_coefficient=0.4,
278292
),
279293
])
280294

‎tests/test_solve_sag_kalibreur.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
5252
),
5353
velocity=0.798,
5454
gap=53e-3,
55+
coulomb_friction_coefficient=0.4,
5556
),
5657
Transport(
5758
label="I -> II",
@@ -71,6 +72,7 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
7172
),
7273
velocity=9.993,
7374
gap=53e-3,
75+
coulomb_friction_coefficient=0.4,
7476
),
7577
Transport(
7678
label="II -> III",
@@ -91,6 +93,7 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
9193
),
9294
velocity=1.246,
9395
gap=43e-3,
96+
coulomb_friction_coefficient=0.4,
9497
),
9598
Transport(
9699
label="III -> IV",
@@ -111,6 +114,7 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
111114
),
112115
velocity=1.453,
113116
gap=44e-3,
117+
coulomb_friction_coefficient=0.4,
114118
),
115119
Transport(
116120
label="IV -> V",
@@ -130,6 +134,7 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
130134
),
131135
velocity=0.864,
132136
gap=39e-3,
137+
coulomb_friction_coefficient=0.4,
133138
),
134139
Transport(
135140
label="V -> VI",
@@ -148,6 +153,7 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
148153
),
149154
velocity=1.057,
150155
gap=19e-3,
156+
coulomb_friction_coefficient=0.4,
151157
),
152158
Transport(
153159
label="VI -> VII",
@@ -167,6 +173,7 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
167173
),
168174
velocity=1.186,
169175
gap=33.5e-3,
176+
coulomb_friction_coefficient=0.4,
170177
),
171178
Transport(
172179
label="VII -> IIX",
@@ -186,6 +193,7 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
186193
),
187194
velocity=1.437,
188195
gap=10e-3,
196+
coulomb_friction_coefficient=0.4,
189197
),
190198
Transport(
191199
label="IIX -> IX",
@@ -205,6 +213,7 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
205213
),
206214
velocity=1.5,
207215
gap=10e-3,
216+
coulomb_friction_coefficient=0.4,
208217
),
209218
])
210219

0 commit comments

Comments
 (0)