pyroll-core 3.0.3__tar.gz → 3.0.4__tar.gz

{pyroll_core-3.0.3 → pyroll_core-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyroll-core
-Version: 3.0.3
+Version: 3.0.4
 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-3.0.3 → pyroll_core-3.0.4}/pyroll/core/__init__.py

@@ -44,7 +44,7 @@ from .hooks import Hook, HookHost, HookFunction, root_hooks
 from .disk_elements import DiskElementUnit
 from .config import Config, config, PlottingBackend, ConfigValue, ConfigMeta
 
-VERSION = "3.0.3"
+VERSION = "3.0.4"
 
 __all__ = [
     # grooves
@@ -131,8 +131,6 @@ root_hooks.extend(
         BaseRollPass.InProfile.velocity,
         PassSequence.log_elongation,
         BaseRollPass.OutProfile.technologically_orientated_cross_section,
-        BaseRollPass.technologically_orientated_contour_lines,
-        # BaseRollPass.back_tension,
-        # BaseRollPass.front_tension
+        BaseRollPass.technologically_orientated_contour_lines
     ]
 )

{pyroll_core-3.0.3 → pyroll_core-3.0.4}/pyroll/core/roll_pass/hookimpls/profile.py

@@ -1,4 +1,7 @@
-from shapely.geometry import Polygon
+import numpy as np
+from shapely import Polygon, clip_by_rect, union
+from shapely.affinity import translate, scale
+from shapely.errors import GEOSException
 
 from ..base import BaseRollPass
 from ..three_roll_pass import ThreeRollPass
@@ -63,7 +66,21 @@ def cross_section_error(self: BaseRollPass.OutProfile):
 
 @BaseRollPass.OutProfile.cross_section
 def cross_section(self: BaseRollPass.OutProfile) -> Polygon:
-    cs = helpers.out_cross_section(self.roll_pass, self.width)
+    half_abs_spread = (self.width - self.roll_pass.in_profile.width) / 2
+    half_in_profile = clip_by_rect(self.roll_pass.in_profile.cross_section, 0, -np.inf, np.inf, np.inf)
+    out_profile_side_contour_translated = translate(half_in_profile, xoff=half_abs_spread)
+    roll_pass_cross_section = Polygon(np.concatenate([cl.coords for cl in self.roll_pass.contour_lines.geoms]))
+
+    try:
+        filling_rectangle = clip_by_rect(roll_pass_cross_section, 0, -np.inf, half_abs_spread, np.inf)
+        intermediate_section = roll_pass_cross_section.intersection(out_profile_side_contour_translated)
+        half_cross_section_1 = union(intermediate_section, filling_rectangle)
+        half_cross_section_2 = scale(half_cross_section_1, xfact=-1, yfact=-1, origin=(0, 0))
+        cs = union(half_cross_section_1, half_cross_section_2)
+    except GEOSException as e:
+        self.logger.warning("Infinitesimal small spreading. Continuing without bulging.")
+        cs = helpers.out_cross_section(self.roll_pass, self.width)
+
     if cs.width * 1.01 < self.width:
         raise ValueError(
             "Profile's width can not be larger than its contour lines." "May be caused by critical overfilling."