osis-python 0.7.4__py3-none-any.whl → 0.7.5__py3-none-any.whl

{osis_python-0.7.4.dist-info → osis_python-0.7.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.7.4
+Version: 0.7.5
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT
@@ -255,9 +255,10 @@ engine.prop.coord.create_three_point(
     p3x=0, p3y=1, p3z=0,
 )
 
-# Creep and shrinkage(no, name, avg_humidity, birth_time, type_coeff, shrink_birth)
+# Creep and shrinkage(no, name, code, fcuk, avg_humidity,
+#                     component_approximate_size, type_coeff, birth_by_shrinking, fly_ash_ratio)
 engine.prop.creep_shrink.create(no=1, name="Creep1", avg_humidity=70.0,
-                                birth_time=7, type_coeff=5.0, shrink_birth=3)
+                                type_coeff=5.0, birth_by_shrinking=3)
 
 # Damping (Rayleigh 自定义系数)
 engine.prop.damping.create_rayleigh_custom(name="Damping1", alpha=0.05, beta=0.005)

{osis_python-0.7.4.dist-info → osis_python-0.7.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
-osis_python-0.7.4.dist-info/licenses/LICENSE,sha256=T4mkSYliXdU9mYe-NfHkqg6GPhzoYaIQO_a630UzpS4,1088
-pyosis/__init__.py,sha256=8qi838xbdeE0GHBZUqQMs--vhiCMs-rn1J6GqA_xMuA,440
+osis_python-0.7.5.dist-info/licenses/LICENSE,sha256=T4mkSYliXdU9mYe-NfHkqg6GPhzoYaIQO_a630UzpS4,1088
+pyosis/__init__.py,sha256=fO35LAwXFLKagoQ9zSbK1hfIydGGkAcGsEkAMj__GeA,440
 pyosis/boundary/__init__.py,sha256=W5LfF-jugWa-YI8pnfELZaz0pXLa-D8TiGnBn12HGGQ,102
 pyosis/boundary/interface.py,sha256=obqQUVFuQK9I7S8IaBZ2VBYfyXgNVBS0PQa9LzRlaAc,8990
 pyosis/boundary/manager.py,sha256=AAGdkp0sLV85enT9TQT9iqvWzjJyLzjiw0rC-tajSrI,39576
@@ -63,9 +63,9 @@ pyosis/project/manager.py,sha256=II6NxEig5KJYzuPu3_70KadQ0HYu2TfbW338hZ23dEk,409
 pyosis/property/__init__.py,sha256=xGdJItBRic3rd-6i5vyjGfA3KY-e9-WuOquIEnjPP_4,191
 pyosis/property/component_thickness.py,sha256=fH9jpt2V6w2lSL2jDb1cuk5wylfhvnznxZXObafxe44,794
 pyosis/property/coordinate.py,sha256=xFfuzXCzBWqYsDxHifpYCYgC_to9kC4LKD2yTX2CtvM,2668
-pyosis/property/creep_shrink.py,sha256=VsBYrMb8LjCWAx8AG7XeiYlww1HaK43gmayG7fcSL10,1469
+pyosis/property/creep_shrink.py,sha256=5k85N_jSfGrqOwryzIy8Yg0oR4qmgyg8VlT-7uf0nzs,2291
 pyosis/property/damping.py,sha256=pasnvd1zua1skO-3lcLydFYT3phIZKqC-28DZn5jsGA,3225
-pyosis/property/manager.py,sha256=BQRI0dTzPiaMjsUnzgjolponJpas7FLMhM9qDE1ULvw,31135
+pyosis/property/manager.py,sha256=7wHj0PC38hC42i0S36JDAeU8TUrjIQF0cubRgNUNpAI,33234
 pyosis/property/pu_curve.py,sha256=E3oUfe7ERYKX6q9v1U-HnNP1LRbWobNYB8dUC26s8aQ,1534
 pyosis/quick_building/__init__.py,sha256=QiWapgiZk6pkAdiznKI0bVIc16UcFOIALQuLhupLkqw,48
 pyosis/quick_building/interface.py,sha256=xdQrORabxmnlhi537pspFokQBaXSmnZMIxA_kxSo_cE,13951
@@ -98,13 +98,13 @@ pyosis/thickness/__init__.py,sha256=YGYmUPc9TvAlw4eFuEjxaG7HjvwLQJelU_Mx2M6RhW0,
 pyosis/thickness/interface.py,sha256=o9fwAnPtincBvNB7KZ-Cw67V4mSvoMYgcuLqD_FMLs0,1311
 pyosis/thickness/manager.py,sha256=JfKNKQnAaqEVnFyr3UwCj9cl4qhHYT_9Pp7HVBYNx6M,5048
 pyosis/transfer/__init__.py,sha256=OZVxVnjhDGe4fHC6pjtOaKPzAKuoDp3-XkNFzDWepsE,623
-pyosis/transfer/generator.py,sha256=hDM2je_3t18_S9mimYi1yB7XD2YKVm98cERLLnx_RFQ,3750
+pyosis/transfer/generator.py,sha256=sVcmOfXp9_Xx0_Rk_BrSgIdK5CL47m6sBeIWCC-22XU,3869
 pyosis/transfer/matrix.py,sha256=sHw9X34-PUeY1EdoNklgK0LUHwbBPnhkhk0R9ME0XG0,3378
-pyosis/transfer/out_to_python.py,sha256=oaD5xX2lvMTriQe4LIW43xKYw1kh__W45vQzsLDZ1S0,15223
+pyosis/transfer/out_to_python.py,sha256=wiU58lQvdfugxebizO91wPwFWVk8x1Q7LgKyScFNqZA,15706
 pyosis/transfer/parser.py,sha256=R_aBlYJTe53hD1sX5PBv86bhj88NQwANFRN4pGYudQ8,6774
-pyosis/transfer/routes.py,sha256=EvJ88cgtulYShvgoDfaDkkxVn3fhYgL0CffmJEtk2sY,9649
+pyosis/transfer/routes.py,sha256=l1EdTAWeyvhkQSbK3jMKwn2SeXJHF9Lf2AdEDV6X0l4,10798
 pyosis/transfer/split.py,sha256=hpBe9D9WbjbKsovx4hM3X5RjTrruWNkuFmZt2ed0fME,1284
-osis_python-0.7.4.dist-info/METADATA,sha256=E7utN9rzJfEKH-lgpIGuz1r6puAeLaF_Mjd2aNYtoIY,20117
-osis_python-0.7.4.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-osis_python-0.7.4.dist-info/top_level.txt,sha256=6VDNySkQKwipRXcN8ayKVci4vAXi4oPyWLqFhNVcIfM,7
-osis_python-0.7.4.dist-info/RECORD,,
+osis_python-0.7.5.dist-info/METADATA,sha256=u0ZbbySda6s0zZ2X4IKvJhK2mo6FfASB5QYfJ5HER-o,20180
+osis_python-0.7.5.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+osis_python-0.7.5.dist-info/top_level.txt,sha256=6VDNySkQKwipRXcN8ayKVci4vAXi4oPyWLqFhNVcIfM,7
+osis_python-0.7.5.dist-info/RECORD,,

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.7.4"
+__version__ = "0.7.5"
 
 from .core.engine import OSISEngine
 from .core.batch import batch, flush, batch_state, BatchError

pyosis/property/creep_shrink.py

@@ -6,17 +6,35 @@ pyosis.property.creep_shrink 的 Docstring
 from ..core import REGISTRY
 
 @REGISTRY.register("CrpShrk")
-def osis_creep_shrink(nNO: int=1, strName: str="收缩徐变1", dAvgHumidity: float=70.0, nBirthTime: int=7, dTypeCoeff: float=5.0, nBirthByShrinking: int=3):
+def osis_creep_shrink(
+    nNO: int = 1,
+    strName: str = "收缩徐变1",
+    strCode: str = "JTG3362_2018",
+    dFcuk: float = 5.0e7,
+    dAvgHumidity: float = 70.0,
+    dComponentApproximateSize: float = 1.0,
+    dTypeCoeff: float = 5.0,
+    nBirthByShrinking: int = 3,
+    dFlyAshRatio: float = 0.0,
+):
     """
     创建或修改收缩徐变特性
 
+    命令流：CrpShrk, Index, Name, Code, Fcuk, AVG.Humidity,
+            ComponentApproximateSize, Type.Coeff, BirthByShrinking, FlyAshRatio
+    参数按此顺序组装，共 9 个，缺一不可（软件侧会校验参数个数）。
+
     Args:
-        nNO (int): 收缩徐变特性编号
-        strName (str): 特性名称
-        dAvgHumidity (float): 年平均湿度（百分比）
-        nBirthTime (int): 混凝土龄期（天）
-        dTypeCoeff (float): 水泥种类系数
-        nBirthByShrinking (int): 收缩开始时的混凝土龄期（天数）
+        nNO (int): 收缩徐变特性编号（Index）
+        strName (str): 名称（Name）
+        strCode (str): 规范（Code），目前只支持 JTG3362_2018
+        dFcuk (float): 28天龄期的混凝土强度（Fcuk），按工程当前压力单位填写，
+            默认单位 Pa 下 5.0e7 即 50MPa，合法区间 1MPa~200MPa
+        dAvgHumidity (float): 周围环境的相对湿度，百分比，取值 40~99
+        dComponentApproximateSize (float): 构件大致尺寸（m），必须大于 0
+        dTypeCoeff (float): 水泥种类系数（Type.Coeff）
+        nBirthByShrinking (int): 收缩开始时的混凝土龄期，天数（BirthByShrinking）
+        dFlyAshRatio (float): 粉煤灰添加量，百分比，取值 0~50
 
     Returns:
         tuple (bool, str): 是否成功，失败原因

pyosis/property/manager.py

@@ -3,7 +3,7 @@
 用法:
     >>> from pyosis.property import property_manager
     >>> property_manager.coord.create_three_point(1, 0, 0, 0, 10, 0, 0, 0, 10, 0)
-    >>> property_manager.creep_shrink.create(1, "CS1", 70.0, 7, 5.0, 3)
+    >>> property_manager.creep_shrink.create(1, "CS1", "JTG3362_2018", 5.0e7, 70.0, 1.0, 5.0, 3)
     >>> property_manager.damping.create_modal("Damp1", 0.05)
     >>> property_manager.pu_curve.create(1, "PU1", 0, 3, 0.0, 0.01, 0.02, 0.0, 100.0, 150.0)
 """
@@ -295,24 +295,39 @@ class CoordinateManager(BasicManager):
 class CreepShrink:
     """收缩徐变对象"""
     avg_humidity: float
-    birth_by_shrinking: int
-    birth_time: int
+    birth_by_shrinking: int   # 收缩起始龄期(天)，接口字段 birthByShrinking
+    birth_time: int           # 只读遗留字段，当前命令流已不再写入
+    code: str                 # 规范，仅 JTG3362_2018
+    component_approximate_size: float  # 构件大致尺寸(m)
+    fcuk: float               # 28天龄期混凝土强度，工程当前压力单位
+    fly_ash_ratio: float      # 粉煤灰添加量(%)
     name: str
     no: int
-    shrink_birth: int
     related_material: list[int]
+    shrink_birth: int         # 同 birth_by_shrinking 的旧名，读到的是同一个值
     type_coeff: float
     @classmethod
     def _from_dict(cls, d: dict) -> CreepShrink:
-        """从接口 dict 构造 CreepShrink 对象（内部使用）"""
+        """从接口 dict 构造 CreepShrink 对象（内部使用）
+
+        收缩起始龄期的接口字段名是 birthByShrinking；旧的 shrinkBirth 读出来
+        恒为 None，因此 birth_by_shrinking 与 shrink_birth 两个属性都取该字段。
+        """
+        birth = d.get("birthByShrinking")
+        if birth is None:
+            birth = d.get("shrinkBirth")
         return cls(
             avg_humidity=d.get("avgHumidity"),
-            birth_by_shrinking=d.get("birthByShrinking"),
+            birth_by_shrinking=birth,
             birth_time=d.get("birthTime"),
+            code=d.get("code"),
+            component_approximate_size=d.get("componentApproximateSize"),
+            fcuk=d.get("fcuk"),
+            fly_ash_ratio=d.get("flyAshRatio"),
             name=d.get("name"),
             no=d.get("no"),
-            shrink_birth=d.get("shrinkBirth"),
             related_material=list(d.get("relatedMaterial") or []),
+            shrink_birth=birth,
             type_coeff = d.get("typeCoeff"),
         )
 
@@ -373,20 +388,33 @@ class CreepShrinkManager(BasicManager):
         self,
         no: int = 1,
         name: str = "收缩徐变1",
+        code: str = "JTG3362_2018",
+        fcuk: float = 5.0e7,
         avg_humidity: float = 70.0,
-        birth_time: int = 7,
+        component_approximate_size: float = 1.0,
         type_coeff: float = 5.0,
-        shrink_birth: int = 3,
+        birth_by_shrinking: int = 3,
+        fly_ash_ratio: float = 0.0,
+        shrink_birth: int | None = None,
     ) -> CreepShrink:
         '''创建或修改收缩徐变特性
 
+        形参顺序与命令流字段顺序一致：
+        CrpShrk, Index, Name, Code, Fcuk, AVG.Humidity,
+        ComponentApproximateSize, Type.Coeff, BirthByShrinking, FlyAshRatio
+
         Args:
             no (int): 收缩徐变特性编号
             name (str): 特性名称
-            avg_humidity (float): 年平均湿度（百分比）
-            birth_time (int): 混凝土龄期（天）
+            code (str): 规范，目前只支持 JTG3362_2018
+            fcuk (float): 28天龄期的混凝土强度，按工程当前压力单位填写，
+                默认单位 Pa 下 5.0e7 即 50MPa，合法区间 1MPa~200MPa
+            avg_humidity (float): 周围环境的相对湿度（百分比），40~99
+            component_approximate_size (float): 构件大致尺寸（m），大于 0
             type_coeff (float): 水泥种类系数
-            shrink_birth (int): 收缩开始时的混凝土龄期（天数）
+            birth_by_shrinking (int): 收缩开始时的混凝土龄期（天数）
+            fly_ash_ratio (float): 粉煤灰添加量（百分比），0~50
+            shrink_birth (int|None): birth_by_shrinking 的旧写法，传了就覆盖上面的值
 
         Returns:
             创建的 CreepShrink 对象
@@ -394,8 +422,18 @@ class CreepShrinkManager(BasicManager):
         Raises:
             RuntimeError: 创建失败时抛出
         '''
+        if shrink_birth is not None:
+            birth_by_shrinking = shrink_birth
         ok, err = osis_creep_shrink(
-            no, name, avg_humidity, birth_time, type_coeff, shrink_birth,
+            nNO=no,
+            strName=name,
+            strCode=code,
+            dFcuk=fcuk,
+            dAvgHumidity=avg_humidity,
+            dComponentApproximateSize=component_approximate_size,
+            dTypeCoeff=type_coeff,
+            nBirthByShrinking=birth_by_shrinking,
+            dFlyAshRatio=fly_ash_ratio,
         )
         if not ok:
             raise RuntimeError(f"创建收缩徐变特性 {no} 失败: {err}")

pyosis/transfer/generator.py

@@ -61,6 +61,9 @@ def _render_route(cmd: ParsedCommand) -> str:
     fields = cmd.fields[1:]
 
     if isinstance(route, str):
+        fixer = REST_FIXERS.get(_route_key(cmd.name))
+        if fixer is not None:
+            fields = fixer(fields)
         formatted = [_format_value(v) for v in fields]
         if not formatted:
             return f"{route}()"

pyosis/transfer/out_to_python.py

@@ -20,6 +20,16 @@ from collections import defaultdict
 from pathlib import Path
 from typing import Iterable
 
+# 以脚本方式直接运行(python src/pyosis/transfer/out_to_python.py)时,
+# sys.path[0] 是本文件所在目录,`pyosis` 会被 site-packages 里 pip 装的那份
+# 旧副本先解析掉,本仓库的改动一律不生效。这里把本仓库的 src 顶到最前。
+_SRC_ROOT = Path(__file__).resolve().parents[2]
+if (_SRC_ROOT / "pyosis" / "__init__.py").is_file():
+    _src = str(_SRC_ROOT)
+    if _src in sys.path:
+        sys.path.remove(_src)
+    sys.path.insert(0, _src)
+
 from pyosis.transfer.generator import generate_lines
 from pyosis.transfer.parser import (
     BLANK_RE,

pyosis/transfer/routes.py

@@ -46,9 +46,36 @@ def _fix_section_part(rest: list[str]) -> list[str]:
     return rest
 
 
+def _fix_creep_shrk(rest: list[str]) -> list[str]:
+    """CrpShrk 旧命令流 → 新 9 字段序（同软件侧 UpdatePreviousCommand 的升级逻辑）
+
+    新:        Index, Name, Code, Fcuk, AVG.Humidity, ComponentApproximateSize,
+               Type.Coeff, BirthByShrinking, FlyAshRatio
+    早期5.01:  Index, Name, Humidity, Birth, Type.Coeff, BirthByShrinking,
+               FlyAshRatio, ComponentApproximateSize          (8 字段)
+    4.9.6:     Index, Name, Humidity, Birth, Type.Coeff, BirthByShrinking (6 字段)
+
+    旧格式的 Birth（加载龄期）在新命令流里已取消，直接丢弃；
+    Code/Fcuk/尺寸/粉煤灰补齐为软件升级时写入的默认值。
+    """
+    n = len(rest)
+    if n == 9:
+        return rest
+    if n == 6:
+        index, name, humidity, _birth, type_coeff, shrink_age = rest
+        fly_ash, size = "0", "1"
+    elif n == 8:
+        index, name, humidity, _birth, type_coeff, shrink_age, fly_ash, size = rest
+    else:
+        return rest
+    return [index, name, "JTG3362_2018", "50000000", humidity, size,
+            type_coeff, shrink_age, fly_ash]
+
+
 REST_FIXERS = {
     "SectionMesh": _fix_section_mesh,
     "SectionPart": _fix_section_part,
+    "CrpShrk": _fix_creep_shrk,
 }
 
 ROUTES = {