osis-python 0.3.8__tar.gz → 0.4.0__tar.gz

{osis_python-0.3.8/src/osis_python.egg-info → osis_python-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.3.8
+Version: 0.4.0
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT

{osis_python-0.3.8 → osis_python-0.4.0/src/osis_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.3.8
+Version: 0.4.0
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT

{osis_python-0.3.8 → osis_python-0.4.0}/src/osis_python.egg-info/SOURCES.txt

@@ -74,6 +74,7 @@ src/pyosis/result/manager.py
 src/pyosis/result/result.py
 src/pyosis/section/__init__.py
 src/pyosis/section/common.py
+src/pyosis/section/composite.py
 src/pyosis/section/manager.py
 src/pyosis/section/numeric.py
 src/pyosis/section/param.py

{osis_python-0.3.8 → osis_python-0.4.0}/src/pyosis/__init__.py

@@ -7,7 +7,7 @@ A library for extending OSIS functionality.
 A library that allows users to use CAE with great flexibility.
 """
 
-__version__ = "0.3.8"
+__version__ = "0.4.0"
 __author__ = "CCCC Highway Consultant Co. Ltd." # 中交公路规划设计院 - 工程技术研究中心 - lzh - wjh - myf
 
 from .core.engine import OSISEngine

{osis_python-0.3.8 → osis_python-0.4.0}/src/pyosis/boundary/manager.py

@@ -293,7 +293,7 @@ class ElstcSptBoundary(Boundary):
             is_occupied=d.get("isOccupied"),
             is_selected=d.get("isSelected"),
             is_ploted=d.get("isPloted"),
-            constraints=list(d.get("constraints")),
+            # constraints=list(d.get("constraints")),
             coor_no=d.get("coorNO"),
             k_values=list(d.get("k")),
             elastic_k=list(d.get("elasticK")),
@@ -333,8 +333,8 @@ class GeneralElstcSptBoundary(Boundary):
             flag_m=d.get("flagM"),
             flag_c=d.get("flagC"),
             stiffness_matrix=list(d.get("stiffnessMatrix")),
-            mass_matrix=list(d.get("massMatrix")),
-            damping_matrix=list(d.get("dampingMatrix")),
+            # mass_matrix=list(d.get("massMatrix")),
+            # damping_matrix=list(d.get("dampingMatrix")),
         )
 
     def __repr__(self) -> str:

{osis_python-0.3.8 → osis_python-0.4.0}/src/pyosis/dynamic/manager.py

@@ -7,7 +7,7 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Literal
 
 from .load_to_mass import (
@@ -28,18 +28,54 @@ from .seismic import (
 )
 from ..core.client import osis_client
 
-
+@dataclass(frozen=False)
+class LoadToMassLcPara:
+  """荷载转换质量中的单个荷载工况参数"""
+  load_case: str
+  mass_factor: float
+  g: float
+  mass_dir: list[int] = field(default_factory=lambda: [1, 1, 1])  # [X, Y, Z]
+  trans_node_force: bool = True   # transNForce
+  trans_beam_force: bool = True   # transBForce
+  trans_surface_force: bool = False  # transSForce
+  @classmethod
+  def _from_dict(cls, d: dict) -> LoadToMassLcPara:
+      return cls(
+          load_case=d.get("loadCase"),
+          mass_factor=d.get("massFactor"),
+          g=d.get("G"),
+          mass_dir=list(d.get("massDir") or [1, 1, 1]),
+          trans_node_force=bool(d.get("transNForce")),
+          trans_beam_force=bool(d.get("transBForce")),
+          trans_surface_force=bool(d.get("transSForce")),
+      )
 # ──────────────────────────────────────────────
 # 管理类
 # ──────────────────────────────────────────────
 @dataclass(frozen=False)
 class LoadToMass:
     name: str
+    no: int
+    analysis_type: int = 0
+    ok: bool = False
+    related_stages: list[int] = field(default_factory=list)
+    lc_paras_count: int = 0
+    lc_paras: list[LoadToMassLcPara] = field(default_factory=list)
 
     @classmethod
     def _from_dict(cls, d: dict) -> LoadToMass:
         return cls(
             name=d.get("name"),
+            no=d.get("no"),
+            analysis_type=d.get("analysisType", 0),
+            ok=bool(d.get("ok")),
+            related_stages=list(d.get("relatedStages") or []),
+            lc_paras_count=d.get("lcParasCount", 0),
+            lc_paras=[
+                LoadToMassLcPara._from_dict(p)
+                for p in (d.get("lcParas") or [])
+                if isinstance(p, dict)
+            ],
         )
 
 class LoadToMassManager:

{osis_python-0.3.8 → osis_python-0.4.0}/src/pyosis/element/manager.py

@@ -24,6 +24,9 @@ from .interface import (
     osis_element_del,
     osis_element_mod,
     osis_element_group,
+    osis_taperele,
+    osis_element_tapereledel,
+    osis_element_taperelemod,
 )
 
 
@@ -380,6 +383,48 @@ class TaperEleGroupManager:
         taper_ele_groups = [TaperEleGroup._from_dict(d) for d in resp.get("data", []) if "name" in d]
         return taper_ele_groups
 
+    def create(
+        self,
+        name: str,
+        z_type: Literal["0", "1"],
+        z_trans: float = 1.0,
+        z_pos: Literal["0", "1"] = "0",
+        z_dis: float = 0.0,
+        y_type: Literal["0", "1"] = "0",
+        y_trans: float = 1.0,
+        y_pos: Literal["0", "1"] = "0",
+        y_dis: float = 0.0,
+        *eles: str,
+
+    ) -> TaperEleGroup:
+        """创建变截面单元组"""
+        ok, err = osis_taperele(
+            name,
+            z_type,
+            z_trans,
+            z_pos,
+            z_dis,
+            y_type,
+            y_trans,
+            y_pos,
+            y_dis,
+            *eles,
+        )
+        if not ok:
+            raise RuntimeError(f"创建变截面单元组 {name} 失败: {err}")
+        return self.get(name)
+
+    def delete(self, name: str) -> None:
+        ok, err = osis_element_tapereledel(name)
+        if not ok:
+            raise RuntimeError(f"删除变截面单元组 {name} 失败: {err}")
+
+    def rename(self, old_name: str, new_name: str) -> TaperEleGroup:
+        ok, err = osis_element_taperelemod(old_name, new_name)
+        if not ok:
+            raise RuntimeError(f"重命名变截面单元组 {old_name} -> {new_name} 失败: {err}")
+        return self.get(new_name)
+
     def get(self, name: str | list[str]) -> TaperEleGroup | list[TaperEleGroup | None] | None:
         """根据名称获取变截面单元组
         Args:

{osis_python-0.3.8 → osis_python-0.4.0}/src/pyosis/live/manager.py

@@ -501,6 +501,8 @@ class LiveGradeManager:
         Raises:
             RuntimeError: 创建失败时抛出异常
         """
+        raise RuntimeError(f"暂不支持创建LiveGrade对象")
+        # TODO 需要修改DB文件grade字段值
         ok, err = osis_livegrade_crowd(name, "JTGD60_2015", "CROWD", eBridgeType, dPara)
         if not ok:
             raise RuntimeError(f"创建人群荷载等级 {name} 失败: {err}")

{osis_python-0.3.8 → osis_python-0.4.0}/src/pyosis/post/manager.py

@@ -10,6 +10,8 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..core import osis_run
+
 from .combine import (
     osis_combine_create,
     osis_combine_post,
@@ -495,6 +497,18 @@ class PostManager:
         if not ok:
             raise RuntimeError(f"删除验算作用 ({item}) 失败: {err}")
 
+    # ═══════════════════════════════════════════
+    # 快捷功能
+    # ═══════════════════════════════════════════
+
+    def combination_and_check():
+        '''
+        自动组合与验算
+        '''
+        ok, err = osis_run("CombinationAndCheck")
+        if not ok:
+            raise RuntimeError(f"自动组合与验算失败: {err}")
+        
     # ═══════════════════════════════════════════
     # 结果显示
     # ═══════════════════════════════════════════

{osis_python-0.3.8 → osis_python-0.4.0}/src/pyosis/section/common.py

@@ -371,7 +371,7 @@ def osis_section_conventionalbox(nSec: int, strName: str, eSectionType: Literal[
     pass
 
 @REGISTRY.register('Section')
-def osis_section_flat_box(nSec: int, strName: str, eSectionType: Literal["FLATBOX"]="FLATBOX",
+def osis_section_streamed_box(nSec: int, strName: str, eSectionType: Literal["STREAMEDBOX"]="STREAMEDBOX",
                           H: float=4.0, BtL: float=20.0, BtR: float=20.0, BbL: float=10.5, BbR: float=10.5, Bs: float=0.8,
                           Tt: float=0.28, Tb1: float=0.27, Tb2: float=0.27, Tw: float=0.25, Ttj: float=0.5, Tbj: float=0.27, Twj: float=0.4,
                           nCellNum: int=5, Bi1: float=4.7, Bi2: float=6.85, Bi3: float=6, Bi4: float=6.85,
@@ -384,12 +384,12 @@ def osis_section_flat_box(nSec: int, strName: str, eSectionType: Literal["FLATBO
                           eSlopeType: Literal["Integral", "CastInPlace"]="Integral",
                           i: float=0.0, i1: float=0.0, i2: float=0.0, i3: float=0.0, i4: float=0.0,
                           R1: float=0.5, R2: float=0.2):
-    """定义或修改扁平箱梁截面(FlatBox)。
+    """定义或修改扁平箱梁截面(STREAMEDBOX)。
 
     Args:
         nSec (int): 截面编号，从1开始编号。
         strName (str): 截面名称。
-        eSectionType (str): 截面类型，固定为 FLATBOX。
+        eSectionType (str): 截面类型，固定为 STREAMEDBOX。
         H (float): 截面高度。
         BtL (float): 设计线左顶板宽。
         BtR (float): 设计线右顶板宽。

osis_python-0.4.0/src/pyosis/section/composite.py

@@ -0,0 +1,229 @@
+from typing import Literal
+
+from ..core import REGISTRY
+
+
+@REGISTRY.register("Section")
+def osis_section_composite_steel_i(
+    Index: int,
+    Name: str,
+    Type: Literal["COMPOSITESTEELI"],
+    Bt: float,
+    Bc: float,
+    Tt1: float,
+    Tt2: float,
+    Tt3: float,
+    Tc1: float,
+    Tc2: float,
+    B1: float,
+    B2: float,
+    x1: float,
+    x2: float,
+    x3: float,
+    GirderNum: Literal["SINGLE", "DOUBLE", "TRIPLE"],
+    H1: float,
+    Bf1: float,
+    Bb1: float,
+    Tf1: float,
+    Tb1: float,
+    Tw1: float,
+    WebRibPos1: Literal["LEFT", "RIGHT", "BOTH"],
+    MiddleSameWithSide: Literal[0, 1],
+    H2: float,
+    Bf2: float,
+    Bb2: float,
+    Tf2: float,
+    Tb2: float,
+    Tw2: float,
+    WebRibPos2: Literal["LEFT", "RIGHT", "BOTH"],
+):
+    """定义或修改工字型钢组合截面（COMPOSITESTEELI）。
+
+    Args:
+        Index: 截面编号
+        Name: 截面名
+        Type: 固定为 COMPOSITESTEELI
+        Bt: 板宽
+        Bc: 悬臂长
+        Tt1: 标准段板厚
+        Tt2: 两侧加厚段板厚
+        Tt3: 中间加厚段板厚
+        Tc1: 悬臂端板厚
+        Tc2: 悬臂倒角处板厚
+        B1: 两侧加厚段板宽
+        B2: 中间加厚段板宽
+        x1, x2, x3: 倒角
+        GirderNum: SINGLE=单梁, DOUBLE=双梁, TRIPLE=三梁
+        H1, Bf1, Bb1, Tf1, Tb1, Tw1, WebRibPos1: 边梁
+        MiddleSameWithSide: 中梁构造同边梁，1=相同，0=不同
+        H2, Bf2, Bb2, Tf2, Tb2, Tw2, WebRibPos2: 中梁（MiddleSameWithSide=1 时 H2 等可填 0）
+    """
+    pass
+
+@REGISTRY.register("Section")
+def osis_section_composite_steel_trough(
+    Index: int,
+    Name: str,
+    Type: Literal["COMPOSITESTEELTROUGH"],
+    Bt: float,
+    Bc: float,
+    Tt1: float,
+    Tt2: float,
+    Tt3: float,
+    Tc1: float,
+    Tc2: float,
+    B1: float,
+    B2: float,
+    x1: float,
+    x2: float,
+    x3: float,
+    H1: float,
+    Bb: float,
+    Bf1: float,
+    Tf1: float,
+    Tb: float,
+    Tw1: float,
+    RightSameWithLeft: Literal[0, 1],
+    HasSteelI: Literal[0, 1],
+    H2: float,
+    Bf2: float,
+    Bf3: float,
+    Tf2: float,
+    Tf3: float,
+    Tw2: float,
+):
+    """定义或修改槽型钢组合截面（COMPOSITESTEELTROUGH）。
+
+    Args:
+        Index: 截面编号
+        Name: 截面名
+        Type: 固定为 COMPOSITESTEELTROUGH
+        Bt: 板宽
+        Bc: 悬臂长
+        Tt1: 标准段板厚
+        Tt2: 两侧加厚段板厚
+        Tt3: 中间加厚段板厚
+        Tc1: 悬臂端板厚
+        Tc2: 悬臂倒角处板厚
+        B1: 两侧加厚段板宽
+        B2: 中间加厚段板宽
+        x1, x2, x3: 倒角
+        H1: 主梁梁高
+        Bb: 主梁底板宽
+        Bf1: 主梁上翼缘宽
+        Tf1: 主梁上翼缘厚
+        Tb: 主梁底板厚
+        Tw1: 主梁腹板厚
+        RightSameWithLeft: 右腹板加劲肋布置是否与左侧相同，1=相同，0=不同
+        HasSteelI: 是否有小纵梁，1=有，0=无
+        H2, Bf2, Bf3, Tf2, Tf3, Tw2: 小纵梁（HasSteelI=0 时可填 0）
+    """
+    pass
+@REGISTRY.register("Section")
+def osis_section_composite_steel_box(
+    Index: int,
+    Name: str,
+    Type: Literal["COMPOSITESTEELBOX"],
+    Bt: float,
+    Bc: float,
+    Tt1: float,
+    Tt2: float,
+    Tt3: float,
+    Tc1: float,
+    Tc2: float,
+    B1: float,
+    B2: float,
+    x1: float,
+    x2: float,
+    x3: float,
+    GirderNum: Literal["SINGLE", "DOUBLE", "TRIPLE"],
+    H1: float,
+    Bf1: float,
+    Bct: float,
+    Bb: float,
+    Bcb: float,
+    Tf1: float,
+    Tb: float,
+    Tw1: float,
+    SameLayout: Literal[0, 1],
+    H2: float,
+    Bf2: float,
+    Bf3: float,
+    Tf2: float,
+    Tf3: float,
+    Tw2: float,
+):
+    """定义或修改箱型钢组合截面（COMPOSITESTEELBOX）。
+
+    Args:
+        Index: 截面编号
+        Name: 截面名
+        Type: 固定为 COMPOSITESTEELBOX
+        Bt: 板宽
+        Bc: 悬臂长
+        Tt1: 标准段板厚
+        Tt2: 两侧加厚段板厚
+        Tt3: 中间加厚段板厚
+        Tc1: 悬臂端板厚
+        Tc2: 悬臂倒角处板厚
+        B1: 两侧加厚段板宽
+        B2: 中间加厚段板宽
+        x1, x2, x3: 倒角
+        GirderNum: SINGLE=单梁, DOUBLE=双梁, TRIPLE=三梁
+        H1: 主梁梁高
+        Bf1: 主梁上翼缘宽
+        Bct: 主梁上翼缘悬出宽
+        Bb: 主梁下翼缘宽
+        Bcb: 主梁下翼缘悬出宽
+        Tf1: 主梁上翼缘厚
+        Tb: 主梁下翼缘厚
+        Tw1: 主梁腹板厚
+        SameLayout: 下翼缘加劲肋布置与上翼缘是否相同，1=相同，0=不同
+        H2, Bf2, Bf3, Tf2, Tf3, Tw2: 小纵梁/次梁（单梁时可填 0）
+    """
+    pass
+
+@REGISTRY.register("Section")
+def osis_section_composite_custom(
+    Index: int,
+    Name: str,
+    Type: Literal["COMPOSITECUSTOM"],
+    PartNum: int,
+    BaseE: float,
+    BaseMu: float,
+):
+    """定义或修改自定义组合截面（COMPOSITECUSTOM）。"""
+    pass
+
+
+@REGISTRY.register("SectionPart")
+def osis_section_part_polygon(
+    SecIndex: int,
+    PartIndex: int,
+    PartMatType: Literal["Concrete", "Steel"],
+    PartE: float,
+    PartMu: float,
+    PartDensity: float,
+    PartGeoType: Literal["Polygon"],
+    ContourMatrix: str,
+    ContourWidth: str,
+):
+    """自定义组合截面 - 面域 Part（Polygon）。"""
+    pass
+
+
+@REGISTRY.register("SectionPart")
+def osis_section_part_line(
+    SecIndex: int,
+    PartIndex: int,
+    PartMatType: Literal["Concrete", "Steel"],
+    PartE: float,
+    PartMu: float,
+    PartDensity: float,
+    PartGeoType: Literal["Line"],
+    PointMatrix: str,
+    LineMatrix: str,
+    WidthMatrix: str,
+):
+    """自定义组合截面 - 线域 Part（Line）。"""
+    pass