pyroll-core 2.1.7__tar.gz → 2.1.8__tar.gz

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyroll-core
-Version: 2.1.7
+Version: 2.1.8
 Summary: PyRoll rolling simulation framework - core library.
 Project-URL: Homepage, https://pyroll-project.github.io
 Project-URL: Repository, https://github.com/pyroll-project/pyroll-core

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/__init__.py

@@ -12,7 +12,7 @@ from .hooks import Hook, HookHost, HookFunction, root_hooks
 from .disk_elements import DiskElementUnit
 from .config import Config, config
 
-VERSION = "2.1.7"
+VERSION = "2.1.8"
 
 root_hooks.extend(
     [

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/roll/hookimpls.py

@@ -24,6 +24,11 @@ def roll_power(self: Roll):
     return self.roll_torque * self.rotational_frequency * 2 * np.pi
 
 
+@Roll.working_velocity
+def working_velocity(self: Roll):
+    return self.rotational_frequency * self.working_radius * 2 * np.pi
+
+
 @Roll.surface_velocity
 def surface_velocity(self: Roll):
     return self.rotational_frequency * self.nominal_radius * 2 * np.pi
@@ -31,7 +36,7 @@ def surface_velocity(self: Roll):
 
 @Roll.rotational_frequency
 def rotational_frequency(self: Roll):
-    return self.surface_velocity / self.nominal_radius
+    return self.surface_velocity / (2 * np.pi * self.nominal_radius)
 
 
 @Roll.width

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/roll/roll.py

@@ -32,6 +32,9 @@ class Roll(HookHost):
     surface_velocity = Hook[float]()
     """Tangential velocity of the outer roll surface (at nominal radius)."""
 
+    working_velocity = Hook[float]()
+    """Tangential velocity of the roll surface (at working radius)."""
+
     contour_points = Hook[LineString]()
     """Points of the contour line in the z-y-plane."""
 

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/roll_pass/hookimpls/deformation_unit.py

@@ -116,4 +116,4 @@ def contact_contour_angles(self: DeformationUnit.Profile):
 
         return angles
 
-    return [calculate_angles(line) for line in self.contact_contour_lines]
+    return [calculate_angles(line) for line in self.contact_lines]

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/roll_pass/hookimpls/helpers.py

@@ -18,7 +18,7 @@ def out_cross_section3(rp: ThreeRollPass, width: float) -> Polygon:
     poly = Polygon(np.concatenate([cl.coords for cl in rp.contour_lines]))
 
     for _ in range(3):
-        poly = clip_by_rect(poly, -math.inf, -width / 2, math.inf, math.inf)
+        poly = clip_by_rect(poly, -math.inf, -math.inf, math.inf, width / 2)
         poly = rotate(poly, angle=120, origin=(0, 0))
 
     return refine_cross_section(poly)

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/roll_pass/hookimpls/profile.py

@@ -19,14 +19,14 @@ def exit_point(self: RollPass.OutProfile):
     return 0
 
 
-@RollPass.InProfile.x
-def entry_point(self: RollPass.InProfile):
-    return -self.roll_pass.roll.contact_length
+@RollPass.InProfile.longitudinal_angle
+def longitudinal_angle(self: RollPass.InProfile):
+    return self.roll_pass.entry_angle
 
 
-@RollPass.OutProfile.x
-def exit_point(self: RollPass.OutProfile):
-    return 0
+@RollPass.OutProfile.longitudinal_angle
+def longitudinal_angle(self: RollPass.OutProfile):
+    return self.roll_pass.exit_angle
 
 
 @RollPass.OutProfile.strain
@@ -78,7 +78,7 @@ def cross_section(self: RollPass.OutProfile) -> Polygon:
 @ThreeRollPass.OutProfile.cross_section
 def cross_section3(self: ThreeRollPass.OutProfile) -> Polygon:
     cs = helpers.out_cross_section3(self.roll_pass, self.width)
-    if (-cs.bounds[1] + cs.centroid.y) * 2.02 < self.width:
+    if (cs.bounds[3] + cs.centroid.y) * 2.02 < self.width:
         raise ValueError(
             "Profile's width can not be larger than its contour lines."
             "May be caused by critical overfilling."

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/roll_pass/hookimpls/roll.py

@@ -51,4 +51,4 @@ def surface_velocity(self: RollPass.Roll):
         if self.has_value("neutral_angle"):
             return self.roll_pass.velocity / np.cos(self.neutral_angle)
         else:
-            return self.roll_pass.velocity / np.cos(self.roll_pass.exit_point)
+            return self.roll_pass.velocity / np.cos(self.roll_pass.exit_angle)

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/roll_pass/hookimpls/roll_pass.py

@@ -139,7 +139,7 @@ def height3(self):
         self.roll.groove.usable_width / 2,
         math.inf
     )
-    return 2 * usable_contour.bounds[3]
+    return abs(2 * usable_contour.bounds[1])
 
 
 @RollPass.volume
@@ -167,9 +167,9 @@ def contact_area3(self: ThreeRollPass):
 @RollPass.velocity
 def velocity(self: RollPass):
     if self.roll.has_value("neutral_angle"):
-        return self.roll.surface_velocity * np.cos(self.roll.neutral_angle)
+        return self.roll.working_velocity * np.cos(self.roll.neutral_angle)
     else:
-        return self.roll.surface_velocity * np.cos(0)
+        return self.roll.rotational_frequency * self.roll.working_radius * 2 * np.pi
 
 
 @RollPass.duration
@@ -275,11 +275,4 @@ def exit_angle(self: RollPass):
     return np.arcsin(self.exit_point / self.roll.working_radius)
 
 
-@RollPass.InProfile.longitudinal_angle
-def longitudinal_angle(self: RollPass.InProfile):
-    return self.roll_pass.entry_angle
 
-
-@RollPass.OutProfile.longitudinal_angle
-def longitudinal_angle(self: RollPass.OutProfile):
-    return self.roll_pass.exit_angle

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/roll_pass/three_roll_pass.py

@@ -21,12 +21,13 @@ class ThreeRollPass(RollPass):
             return self._contour_lines
 
         shift = self.roll.groove.usable_width / 2 / np.sqrt(3) + self.gap / np.sqrt(3)
-        upper = translate(self.roll.contour_line, yoff=shift)
-        upper = LineString(upper.coords[::-1])  # get back coordinate order
-        right = rotate(upper, angle=-120, origin=(0, 0))
-        left = rotate(upper, angle=120, origin=(0, 0))
+        lower = translate(self.roll.contour_line, yoff=shift)
+        lower = LineString(lower.coords[::-1])  # get back coordinate order
+        right = rotate(lower, angle=-60, origin=(0, 0))
+        left = rotate(lower, angle=60, origin=(0, 0))
+        lower = rotate(lower, angle=180, origin=(0, 0))
 
-        self._contour_lines = [right, upper, left]
+        self._contour_lines = [left, lower, right]
         return self._contour_lines
 
     @property

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/rotator/hookimpls.py

@@ -52,6 +52,12 @@ def box_diamond_45(self: Rotator):
         return 45
 
 
+@Rotator.rotation
+def box_flat_0(self: Rotator):
+    if "box" in self.in_profile.classifiers and "flat" in self.next_roll_pass.classifiers:
+        return 0
+
+
 @Rotator.rotation
 def square_flat_45(self: Rotator):
     if "square" in self.in_profile.classifiers and "flat" in self.next_roll_pass.classifiers:

{pyroll_core-2.1.7 → pyroll_core-2.1.8}/pyroll/core/profile/hookimpls.py

@@ -19,13 +19,13 @@ def width(self: Profile):
 @Profile.height
 def height_3fold(self: Profile):
     if "3fold" in self.classifiers:
-        return (self.cross_section.bounds[3] - self.cross_section.centroid.y) * 2
+        return (self.cross_section.centroid.y - self.cross_section.bounds[1]) * 2
 
 
 @Profile.width
 def width_3fold(self: Profile):
     if "3fold" in self.classifiers:
-        return (self.cross_section.centroid.y - self.cross_section.bounds[1]) * 2
+        return (self.cross_section.bounds[3] - self.cross_section.centroid.y) * 2
 
 
 @Profile.equivalent_height