From 036a12a737144a00f788347a62e0c6f9e07831a6 Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Fri, 15 Jul 2022 15:59:05 +0200 Subject: [PATCH 1/2] Remove 'use_default_section_tolerances' property from Model --- src/ansys/acp/core/_tree_objects/model.py | 37 +++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/src/ansys/acp/core/_tree_objects/model.py b/src/ansys/acp/core/_tree_objects/model.py index db61057075..bb5b03b556 100644 --- a/src/ansys/acp/core/_tree_objects/model.py +++ b/src/ansys/acp/core/_tree_objects/model.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Any, Iterable, cast +from typing import Iterable, cast from grpc import Channel @@ -48,10 +48,19 @@ class Model(TreeObject): Parameters ---------- - resource_path : - The Resource Path identifying the Model. - server : - The ACP server on which the model resides. + name : + The name of the model. + use_nodal_thicknesses : + Defines whether to use nodal thicknesses or element thicknesses. + draping_offset_correction : + Defines whether to consider lay-up thickness in draping analysis. + angle_tolerance : + Section computation angle tolerance (in degree). + relative_thickness_tolerance : + Section computation relative thickness tolerance. + minimum_analysis_ply_thickness : + Section computation minimum analysis ply thickness (in length + unit of model). """ __slots__: Iterable[str] = tuple() @@ -59,11 +68,22 @@ class Model(TreeObject): COLLECTION_LABEL = "models" OBJECT_INFO_TYPE = model_pb2.ObjectInfo - def __init__(self, name: str = "ACP Model", **kwargs: Any) -> None: + def __init__( + self, + name: str = "ACP Model", + use_nodal_thicknesses: bool = False, + draping_offset_correction: bool = False, + angle_tolerance: float = 1.0, + relative_thickness_tolerance: float = 0.01, + minimum_analysis_ply_thickness: float = 1e-6, + ) -> None: super().__init__(name=name) - for key, value in kwargs.items(): - setattr(self, key, value) + self.use_nodal_thicknesses = use_nodal_thicknesses + self.draping_offset_correction = draping_offset_correction + self.angle_tolerance = angle_tolerance + self.relative_thickness_tolerance = relative_thickness_tolerance + self.minimum_analysis_ply_thickness = minimum_analysis_ply_thickness def _get_stub(self) -> model_pb2_grpc.ObjectServiceStub: return cast(model_pb2_grpc.ObjectServiceStub, super()._get_stub()) @@ -78,7 +98,6 @@ def _create_stub(self) -> model_pb2_grpc.ObjectServiceStub: angle_tolerance = grpc_data_property("properties.angle_tolerance") relative_thickness_tolerance = grpc_data_property("properties.relative_thickness_tolerance") minimum_analysis_ply_thickness = grpc_data_property("properties.minimum_analysis_ply_thickness") - use_default_section_tolerances = grpc_data_property("properties.use_default_section_tolerances") @classmethod def from_file(cls, *, path: _PATH, channel: Channel) -> Model: From e34cd126f1bfa499b58e9f2cc07fbfcd775b958b Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Fri, 12 Aug 2022 10:33:20 +0200 Subject: [PATCH 2/2] Remove use_default_section_tolerances from test --- tests/test_model.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index ce26e019eb..4e971c7e00 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -26,7 +26,6 @@ def test_unittest(grpc_server, model_data_dir_server, convert_temp_path): check_property(model, name="path", value=input_file_path), check_property(model, name="use_nodal_thicknesses", value=False, set_value=True), check_property(model, name="draping_offset_correction", value=False, set_value=True), - check_property(model, name="use_default_section_tolerances", value=True, set_value=False), check_property(model, name="angle_tolerance", value=1.0, set_value=2.0), check_property(model, name="relative_thickness_tolerance", value=0.01, set_value=0.03) @@ -68,7 +67,6 @@ def test_unittest(grpc_server, model_data_dir_server, convert_temp_path): check_property(model, name="path", value=input_file_path) check_property(model, name="use_nodal_thicknesses", value=True) check_property(model, name="draping_offset_correction", value=True) - check_property(model, name="use_default_section_tolerances", value=False) check_property(model, name="angle_tolerance", value=2.0) check_property(model, name="relative_thickness_tolerance", value=0.03) with suppress_for_pyacp():