osis-python 0.4.6__tar.gz → 0.5.0__tar.gz

{osis_python-0.4.6/src/osis_python.egg-info → osis_python-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.4.6
+Version: 0.5.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.4.6 → osis_python-0.5.0/src/osis_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.4.6
+Version: 0.5.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.4.6 → osis_python-0.5.0}/src/osis_python.egg-info/SOURCES.txt

@@ -17,10 +17,13 @@ src/pyosis/control/manager.py
 src/pyosis/control/nonlinear.py
 src/pyosis/core/__init__.py
 src/pyosis/core/all_func.py
+src/pyosis/core/apdl_sync.py
 src/pyosis/core/basic_manager.py
+src/pyosis/core/build.py
 src/pyosis/core/client.py
 src/pyosis/core/command.py
 src/pyosis/core/engine.py
+src/pyosis/core/sync_apdl_cli.py
 src/pyosis/dynamic/__init__.py
 src/pyosis/dynamic/load_to_mass.py
 src/pyosis/dynamic/manager.py
@@ -96,6 +99,9 @@ src/pyosis/thickness/__init__.py
 src/pyosis/thickness/interface.py
 src/pyosis/thickness/manager.py
 src/pyosis/transfer/__init__.py
-src/pyosis/transfer/command_map.py
 src/pyosis/transfer/generator.py
-src/pyosis/transfer/parser.py
+src/pyosis/transfer/matrix.py
+src/pyosis/transfer/parser.py
+src/pyosis/transfer/routes.py
+src/pyosis/transfer/split.py
+src/pyosis/transfer/sync_exec.py

{osis_python-0.4.6 → osis_python-0.5.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.4.6"
+__version__ = "0.5.0"
 __author__ = "CCCC Highway Consultant Co. Ltd." # 中交公路规划设计院 - 工程技术研究中心 - lzh - wjh - myf
 
 from .core.engine import OSISEngine

{osis_python-0.4.6 → osis_python-0.5.0}/src/pyosis/boundary/manager.py

@@ -20,7 +20,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from typing import Any, Literal
-from enum import Enum, IntEnum
+from enum import IntEnum
 
 from ..core.client import osis_client
 from .interface import (
@@ -138,13 +138,17 @@ class Boundary:
     
     def assign(
         self,
-        eOP: Literal["a", "s", "r", "aa", "ra"] = "a",
-        param: list | None = None,
+        op: Literal["a", "s", "r", "aa", "ra"] = "a",
+        *param: int | str,
     ) -> None:
         """分配边界给节点"""
-        ok, err = osis_assign_boundary(self.no, eOP, param if param is not None else [])
+        if len(param) == 1 and isinstance(param[0], list):
+            nodes = param[0]
+        else:
+            nodes = list(param)
+        ok, err = osis_assign_boundary(self.no, op, nodes)
         if not ok:
-            raise RuntimeError(f"分配边界 {self.no} 到节点 {param} 失败: {err}")
+            raise RuntimeError(f"分配边界 {self.no} 到节点 {nodes} 失败: {err}")
 
 
 @dataclass(frozen=True)
@@ -389,13 +393,13 @@ class BoundaryGroup:
             self._sync_from_dict(data[0])
         return self
 
-    def _execute(self, operation: str, param: list | None = None) -> None:
+    def _execute(self, operation: Literal["c", "a", "s", "r", "aa", "ra", "m", "d"], *param: str | int) -> None:
         """执行边界组底层操作（内部使用）"""
-        ok, err = osis_boundary_group(self.name, operation, param)
+        ok, err = osis_boundary_group(self.name, operation, list(param))
         if not ok:
             raise RuntimeError(f"边界组操作 {self.name} ({operation}) 失败: {err}")
 
-    def add(self, boundaries: list[int]) -> BoundaryGroup:
+    def add(self, *boundaries: int) -> BoundaryGroup:
         """向边界组添加边界
 
         Args:
@@ -404,10 +408,10 @@ class BoundaryGroup:
         Returns:
             更新后的 BoundaryGroup 对象
         """
-        self._execute("a", boundaries)
+        self._execute("a", *boundaries)
         return self.refresh()
 
-    def remove(self, boundaries: list[int]) -> BoundaryGroup:
+    def remove(self, *boundaries: int) -> BoundaryGroup:
         """从边界组移除边界
 
         Args:
@@ -416,10 +420,10 @@ class BoundaryGroup:
         Returns:
             更新后的 BoundaryGroup 对象
         """
-        self._execute("r", boundaries)
+        self._execute("r", *boundaries)
         return self.refresh()
 
-    def replace(self, boundaries: list[int]) -> BoundaryGroup:
+    def replace(self, *boundaries: int) -> BoundaryGroup:
         """替换边界组内边界
 
         Args:
@@ -428,7 +432,7 @@ class BoundaryGroup:
         Returns:
             更新后的 BoundaryGroup 对象
         """
-        self._execute("s", boundaries)
+        self._execute("s", *boundaries)
         return self.refresh()
 
     def add_all(self) -> BoundaryGroup:
@@ -458,7 +462,7 @@ class BoundaryGroup:
         Returns:
             更新后的 BoundaryGroup 对象
         """
-        self._execute("m", [new_name])
+        self._execute("m", new_name)
         self.name = new_name
         return self.refresh()
 
@@ -483,9 +487,9 @@ class BoundaryGroupManager:
         >>> bg = boundary_manager.group.create("桥台1")
         >>> bg = boundary_manager.group.get("桥台1")
         >>> # 组成员操作（在对象上调用）
-        >>> bg.add([1, 2])
-        >>> bg.remove([1])
-        >>> bg.replace([3, 4])
+        >>> bg.add(1, 2)
+        >>> bg.remove(1)
+        >>> bg.replace("3by4")   # 组内把边界 3 替换为 4
     """
 
     def __init__(self) -> None:
@@ -506,16 +510,16 @@ class BoundaryGroupManager:
 
     # ── 增删改 ────────────────────────────────
 
-    def create(self, name: str) -> BoundaryGroup:
+    def create(self, name: str, op:Literal["c", "a", "s", "r", "aa", "ra", "m", "d"], *param) -> BoundaryGroup:
         """创建边界组
 
         Args:
             name: 边界组名称
-
+            op: 操作
         Returns:
             创建的 BoundaryGroup 对象
         """
-        ok, err = osis_boundary_group(name, "c")
+        ok, err = osis_boundary_group(name, op, *param)
         if not ok:
             raise RuntimeError(f"创建边界组 {name} 失败: {err}")
         return self.get(name)
@@ -605,7 +609,7 @@ class BoundaryManager:
         >>> all_bds = boundary_manager.all()
         >>> # 边界组操作
         >>> bg = boundary_manager.group.create("桥台1")
-        >>> bg.add([1, 2])
+        >>> bg.add(1, 2)
         >>> bg = boundary_manager.group.get("桥台1")
     """
 
@@ -635,88 +639,101 @@ class BoundaryManager:
         return max(bd.no for bd in boundaries) + 1
 
     # ── 增删改 ────────────────────────────────
+    def create(self, no: int | None, type: str, *args: Any, **kwargs: Any) -> Boundary:
+        """创建边界（便捷入口，内部转发到对应 create_* 方法）
+
+        Args:
+            no: 边界编号，None 则自动分配
+            type: 边界类型，"GENERAL" / "MSTSLV" / "RELEASE" /
+                  "ELSTCSPT" / "GES" / "RIGID"
+            *args: 按位置传给对应 create_* 的参数
+            **kwargs: 按关键字传给对应 create_* 的参数
+
+        Raises:
+            ValueError: 未知的 type
+            RuntimeError: 创建失败
+
+        Examples:
+            >>> boundary_manager.create(None, "GENERAL", bX=1, bY=1, bZ=1)
+            >>> boundary_manager.create(1, "MSTSLV", nNode=10)
+            >>> boundary_manager.create(2, "RIGID", nNodeI=5)
+        """
+        _creator = {
+            "GENERAL": self.create_general,
+            "MSTSLV": self.create_master_slave,
+            "RELEASE": self.create_release,
+            "ELSTCSPT": self.create_elstcspt,
+            "GES": self.create_general_elstcspt,
+            "RIGID": self.create_rigid,
+        }
+        type_key = type.upper()
+        if type_key not in _creator:
+            raise ValueError(
+                f"未知边界类型: {type!r}，支持: {', '.join(_creator)}"
+            )
+        return _creator[type_key](no, *args, **kwargs)
 
     def create_general(
         self,
-        nCoor: int | str = "",
-        bX: Literal[0, 1] = 1,
-        bY: Literal[0, 1] = 1,
-        bZ: Literal[0, 1] = 1,
-        bRX: Literal[0, 1] = 1,
-        bRY: Literal[0, 1] = 1,
-        bRZ: Literal[0, 1] = 1,
-        bRW: Literal[0, 1] = 1,
-        no: int | None = None,
+        no: int | None,
+        coor: int | str = "",
+        x: bool = 1,
+        y: bool = 1,
+        z: bool = 1,
+        rx: bool = 1,
+        ry: bool = 1,
+        rz: bool = 1,
+        rw: bool = 1,
     ) -> GeneralBoundary:
         """创建一般边界"""
         if no is None:
             no = self._next_no()
-        ok, err = osis_boundary_general(no, "GENERAL", nCoor or "", bX, bY, bZ, bRX, bRY, bRZ, bRW)
+        ok, err = osis_boundary_general(no, "GENERAL", coor or "", x, y, z, rx, ry, rz, rw)
         if not ok:
             raise RuntimeError(f"创建一般边界 {no} 失败: {err}")
         return self.get(no)  # type: ignore[return-value]
 
     def create_master_slave(
         self,
-        nNode: int,
-        bX: Literal[0, 1] = 1,
-        bY: Literal[0, 1] = 1,
-        bZ: Literal[0, 1] = 1,
-        bRX: Literal[0, 1] = 1,
-        bRY: Literal[0, 1] = 1,
-        bRZ: Literal[0, 1] = 1,
-        no: int | None = None,
-        bCoincident: int | None = 1,
+        no: int | None,
+        node: int,
+        dx: bool = 1,
+        dy: bool = 1,
+        dz: bool = 1,
+        rx: bool = 1,
+        ry: bool = 1,
+        rz: bool = 1,
+        coincident: int | None = 1,
     ) -> MstSlvBoundary:
         """创建主从约束"""
         if no is None:
             no = self._next_no()
-        ok, err = osis_boundary_master_slave(no, "MSTSLV", nNode, bX, bY, bZ, bRX, bRY, bRZ,bCoincident)
+        ok, err = osis_boundary_master_slave(no, "MSTSLV", node, dx, dy, dz, rx, ry, rz,coincident)
         if not ok:
             raise RuntimeError(f"创建主从约束 {no} 失败: {err}")
         return self.get(no)  # type: ignore[return-value]
 
     def create_release(
         self,
-        Fxi_state: bool,
-        Fyi_state: bool,
-        Fzi_state: bool,
-        Mxi_state: bool,
-        Myi_state: bool,
-        Mzi_state: bool,
-        Mbi_state: bool,
-        Fxi: float,
-        Fyi: float,
-        Fzi: float,
-        Mxi: float,
-        Myi: float,
-        Mzi: float,
-        Mbi: float,
-        Fxj_state: bool,
-        Fyj_state: bool,
-        Fzj_state: bool,
-        Mxj_state: bool,
-        Myj_state: bool,
-        Mzj_state: bool,
-        Mbj_state: bool,
-        Fxj: float,
-        Fyj: float,
-        Fzj: float,
-        Mxj: float,
-        Myj: float,
-        Mzj: float,
-        Mbj: float,
-        no: int | None = None,
+        no: int | None,
+        fxi_state: bool,fyi_state: bool,fzi_state: bool,
+        mxi_state: bool,myi_state: bool,mzi_state: bool,mbi_state: bool,
+        fxi: float,fyi: float,fzi: float,
+        mxi: float,myi: float,mzi: float,mbi: float,
+        fxj_state: bool,fyj_state: bool,fzj_state: bool,
+        mxj_state: bool,myj_state: bool,mzj_state: bool,mbj_state: bool,
+        fxj: float,fyj: float,fzj: float,
+        mxj: float,myj: float,mzj: float,mbj: float,
     ) -> ReleaseBoundary:
         """创建释放梁端约束"""
         if no is None:
             no = self._next_no()
         ok, err = osis_boundary_release(
             no, "RELEASE",
-            Fxi_state, Fyi_state, Fzi_state, Mxi_state, Myi_state, Mzi_state, Mbi_state,
-            Fxi, Fyi, Fzi, Mxi, Myi, Mzi, Mbi,
-            Fxj_state, Fyj_state, Fzj_state, Mxj_state, Myj_state, Mzj_state, Mbj_state,
-            Fxj, Fyj, Fzj, Mxj, Myj, Mzj, Mbj,
+            fxi_state, fyi_state, fzi_state, mxi_state, myi_state, mzi_state, mbi_state,
+            fxi, fyi, fzi, mxi, myi, mzi, mbi,
+            fxj_state, fyj_state, fzj_state, mxj_state, myj_state, mzj_state, mbj_state,
+            fxj, fyj, fzj, mxj, myj, mzj, mbj,
         )
         if not ok:
             raise RuntimeError(f"创建释放梁端约束 {no} 失败: {err}")
@@ -724,76 +741,81 @@ class BoundaryManager:
 
     def create_elstcspt(
         self,
-        nCoor: int | str = "",
-        bX: Literal[0, 1] = 1,
-        DX: float = 1e13,
-        bY: Literal[0, 1] = 1,
-        DY: float = 1e13,
-        bZ: Literal[0, 1] = 1,
-        DZ: float = 1e13,
-        bRX: Literal[0, 1] = 1,
-        RX: float = 1e16,
-        bRY: Literal[0, 1] = 1,
-        RY: float = 1e16,
-        bRZ: Literal[0, 1] = 1,
-        RZ: float = 1e16,
-        no: int | None = None,
+        no: int | None,
+        coor: int | str = "",
+        x: bool = 1,
+        dx: float | int = 1e13,
+        y: bool = 1,
+        dy: float | int = 1e13,
+        z: bool = 1,
+        dz: float | int = 1e13,
+        rx: bool = 1,
+        drx: float | int = 1e16,
+        ry: bool = 1,
+        dry: float | int = 1e16,
+        rz: bool = 1,
+        drz: float | int = 1e16,
     ) -> ElstcSptBoundary:
         """创建弹性支承"""
         if no is None:
             no = self._next_no()
         ok, err = osis_boundary_elstcspt(
-            no, "ELSTCSPT", nCoor or "", bX, DX, bY, DY, bZ, DZ, bRX, RX, bRY, RY, bRZ, RZ
+            no, "ELSTCSPT", coor or "", x, dx, y, dy, z, dz, rx, drx, ry, dry, rz, drz
         )
         if not ok:
             raise RuntimeError(f"创建弹性支承 {no} 失败: {err}")
         return self.get(no)  # type: ignore[return-value]
 
     def create_general_elstcspt(
-        self,
-        nCoor: int | str = "",
-        stiffness_matrix: list[float] | None = None,
-        mass_matrix: list[float] | None = None,
-        damping_matrix: list[float] | None = None,
-        no: int | None = None,
+            self,
+            no: int | None ,
+            coor: int | str = "",
+            *params: float | int,
+            stiffness_matrix: list[float] | None = None,
+            mass_matrix: list[float] | None = None,
+            damping_matrix: list[float] | None = None,
     ) -> GeneralElstcSptBoundary:
         """创建一般弹性支承
 
+        支持两种调用方式:
+            1) OSIS 平铺（与命令流一致）::
+                create(6, "GES", "", K11, K12, ..., K66, bM, bC, ...)
+                → create_general_elstcspt("", K11, K12, ..., bM, bC, no=6)
+
+            2) 列表写法（手写脚本）::
+                create(6, "GES", coor="", stiffness_matrix=[...])
+
         Args:
-            nCoor: 局部坐标系编号，"" 代表缺省
-            stiffness_matrix: 6x6 刚度矩阵上三角元素（21个值），必须全部给出
-                顺序：K11,K12,K13,K14,K15,K16,K22,K23,K24,K25,K26,K33,K34,K35,K36,K44,K45,K46,K55,K56,K66
-            mass_matrix: 6x6 质量矩阵上三角元素（21个值），可选
-            damping_matrix: 6x6 阻尼矩阵上三角元素（21个值），可选
             no: 边界编号，None 时自动分配
+            coor: 局部坐标系编号，"" 代表缺省
+            *params: OSIS 平铺参数（K11..K66, bM, [M..], bC, [C..]）
+            stiffness_matrix: 6x6 刚度矩阵上三角元素（21 个值）
+            mass_matrix: 6x6 质量矩阵上三角元素（21 个值），可选
+            damping_matrix: 6x6 阻尼矩阵上三角元素（21 个值），可选
 
         Returns:
             GeneralElstcSptBoundary 对象
         """
         if no is None:
             no = self._next_no()
-        if stiffness_matrix is None:
-            stiffness_matrix = []
-        
-        # 构建参数序列
-        params = list(stiffness_matrix)
-        
-        # 质量矩阵
-        if mass_matrix:
-            params.append(1)  # bM = 1
-            params.extend(mass_matrix)
-        else:
-            params.append(0)  # bM = 0
-        
-        # 阻尼矩阵
-        if damping_matrix:
-            params.append(1)  # bC = 1
-            params.extend(damping_matrix)
+
+        if params:
+            flat = params
         else:
-            params.append(0)  # bC = 0
-        
+            flat = list(stiffness_matrix or [])
+            if mass_matrix:
+                flat.append(1)
+                flat.extend(mass_matrix)
+            else:
+                flat.append(0)
+            if damping_matrix:
+                flat.append(1)
+                flat.extend(damping_matrix)
+            else:
+                flat.append(0)
+
         ok, err = osis_boundary_general_elstcspt(
-            no, "GES", nCoor or "", *params
+            no, "GES", coor or "", *flat
         )
         if not ok:
             raise RuntimeError(f"创建一般弹性支承 {no} 失败: {err}")
@@ -801,14 +823,14 @@ class BoundaryManager:
 
     def create_rigid(
         self,
+        no: int | None,
         nNodeI: int,
-        no: int | None = None,
     ) -> Boundary:
         """创建刚性连接
 
         Args:
-            nNodeI: 节点1编号（刚性区域的主节点）
             no: 边界编号，None 时自动分配
+            nNodeI: 节点1编号（刚性区域的主节点）
 
         Returns:
             Boundary 对象
@@ -877,9 +899,9 @@ class BoundaryManager:
         提供边界组的增删改查功能。
 
         用法:
-            >>> boundary_manager.group.create("桥台1")
-            >>> boundary_manager.group.add("桥台1", [1, 2])
-            >>> boundary_manager.group.get("桥台1")
+            >>> bg = boundary_manager.group.create("桥台1")
+            >>> bg.add(1, 2)
+            >>> bg = boundary_manager.group.get("桥台1")
         """
         return self._group_manager
 

{osis_python-0.4.6 → osis_python-0.5.0}/src/pyosis/control/manager.py

@@ -94,49 +94,49 @@ class ControlManager:
 
     # ── 材料效应开关 ────────────────────────────
 
-    def set_calc_tendon(self, enabled: bool = True) -> None:
+    def set_calc_tendon(self, enabled: Literal[0,1] = 1) -> None:
         """是否计算预应力"""
         ok, err = osis_calc_tendon(enabled)
         if not ok:
             raise RuntimeError(f"设置预应力计算失败: {err}")
 
-    def set_calc_concurrent_force(self, enabled: bool = True) -> None:
+    def set_calc_concurrent_force(self, enabled: Literal[0,1] = 1) -> None:
         """是否计算并发反力"""
         ok, err = osis_calc_con_force(enabled)
         if not ok:
             raise RuntimeError(f"设置并发反力计算失败: {err}")
 
-    def set_calc_shrink(self, enabled: bool = True) -> None:
+    def set_calc_shrink(self, enabled: Literal[0,1] = 1) -> None:
         """是否计算收缩"""
         ok, err = osis_calc_shrink(enabled)
         if not ok:
             raise RuntimeError(f"设置收缩计算失败: {err}")
 
-    def set_calc_creep(self, enabled: bool = True) -> None:
+    def set_calc_creep(self, enabled: Literal[0,1] = 1) -> None:
         """是否计算徐变"""
         ok, err = osis_calc_creep(enabled)
         if not ok:
             raise RuntimeError(f"设置徐变计算失败: {err}")
 
-    def set_calc_shear(self, enabled: bool = True) -> None:
+    def set_calc_shear(self, enabled: Literal[0,1] = 1) -> None:
         """是否计算剪切"""
         ok, err = osis_calc_shear(enabled)
         if not ok:
             raise RuntimeError(f"设置剪切计算失败: {err}")
 
-    def set_calc_relaxation(self, enabled: bool = True) -> None:
+    def set_calc_relaxation(self, enabled: Literal[0,1] = 1) -> None:
         """是否计算钢束松弛"""
         ok, err = osis_calc_rlx(enabled)
         if not ok:
             raise RuntimeError(f"设置钢束松弛计算失败: {err}")
 
-    def set_mod_loc_coor(self, enabled: bool = True) -> None:
+    def set_mod_loc_coor(self, enabled: Literal[0,1] = 1) -> None:
         """是否修改变截面单元局部坐标轴来计算内力/应力"""
         ok, err = osis_mod_loc_coor(enabled)
         if not ok:
             raise RuntimeError(f"设置局部坐标轴修正失败: {err}")
 
-    def set_inc_tendon(self, enabled: bool = True) -> None:
+    def set_inc_tendon(self, enabled: Literal[0,1] = 1) -> None:
         """是否考虑钢束自重及钢束对截面几何特性的影响"""
         ok, err = osis_inc_tendon(enabled)
         if not ok:
@@ -146,8 +146,8 @@ class ControlManager:
 
     def set_nonlinear(
         self,
-        geom: bool = False,
-        link: bool = False,
+        geom: Literal[0,1] = 0,
+        link: Literal[0,1] = 0,
     ) -> None:
         """设置非线性控制开关
 
@@ -159,29 +159,29 @@ class ControlManager:
         if not ok:
             raise RuntimeError(f"设置非线性控制失败: {err}")
 
-    def set_line_search(self, enabled: bool = True) -> None:
+    def set_line_search(self, enabled: Literal[0,1] = 1) -> None:
         """设置线性搜索开关"""
         ok, err = osis_ln_srch(enabled)
         if not ok:
             raise RuntimeError(f"设置线性搜索失败: {err}")
 
-    def set_auto_time_step(self, enabled: bool = True) -> None:
+    def set_auto_time_step(self, enabled: Literal[0,1] = 1) -> None:
         """设置是否自动计算时间荷载步"""
         ok, err = osis_auto_ts(enabled)
         if not ok:
             raise RuntimeError(f"设置自动时间步长失败: {err}")
 
-    def set_substitution_steps(self, nls: int, nsbmx: int) -> None:
+    def set_substitution_steps(self, ls: int, sbmx: int) -> None:
         """指定荷载步数和最大荷载子步数"""
-        ok, err = osis_NSUBST(nls, nsbmx)
+        ok, err = osis_NSUBST(ls, sbmx)
         if not ok:
             raise RuntimeError(f"设置荷载步数失败: {err}")
 
     # ── 模态分析 ────────────────────────────────
 
-    def set_modal_opt(self, n_mod: int = 1) -> None:
+    def set_modal_opt(self, num: int = 1) -> None:
         """定义模态分析所需的特征值最大数目"""
-        ok, err = osis_mod_opt(n_mod)
+        ok, err = osis_mod_opt(num)
         if not ok:
             raise RuntimeError(f"设置模态分析参数失败: {err}")