[CDN-READER] Update group-related classes

docs/cdb/api.rst

@@ -38,8 +38,8 @@ associated public API.
     CableLoad
     CableResult
     CrossSectionalData
-    _GroupData
-    _GroupLCData
+    Groups
+    GroupsLC
     _LoadCases
     _Node
     _NodeData
@@ -48,7 +48,7 @@ associated public API.
     _NodeResidual
     Quads
     QuadData
-    _SecondaryGroupLCData
+    SecondaryGroupsLC
     _Spring
     _SpringData
     _SpringResult

docs/cdb/test_setup.rst

@@ -94,11 +94,14 @@ the temporary environment variable approach, open an MSYS2 MINGW64 shell, naviga
     tests/cable_load
     tests/cable_result
     tests/cross_section
+    tests/groups
+    tests/groups_lc
     tests/node_data
     tests/node_load
     tests/node_residual
     tests/node_result
     tests/quad_data
+    tests/sec_groups_lc
     tests/spring_data
     tests/spring_result
     tests/truss_data

docs/cdb/tests/groups.rst

@@ -0,0 +1,37 @@
+Groups
+------
+
+Related test suite: ``test_groups.py``
+
+Expected CDB file name: ``GROUP_DATA.cdb``
+
+Runs with: SOFiSTiK 2025
+
+Version: 1
+
+.. code-block:: text
+
+    +PROG AQUA
+    HEAD MATERIAL AND SECTIONS
+        NORM EN 199X-200X
+        STEE NO 1 TYPE YC ES 210000.0 GAM 78.5 TITL 'S355'
+        PROF 1 TYPE CHS 60.0 10.0 MNO 1
+    END
+
+    +PROG SOFIMSHA
+    HEAD GEOMETRY REV-1-SOF-2025
+    SYST 3D GDIR NEGZ GDIV 10
+        NODE NO 1 X 00.0 Y 0.0 Z +0.0 FIX F
+        NODE NO 2 X 05.0 Y 0.0 Z -0.5
+        NODE NO 3 X 10.0 Y 0.0 Z -1.0 FIX F
+
+        GRP 3 TITL 'GRP 3'
+            SPRI NO 2 NA 2 NE 3
+            CABL NO 6 NA 1 NE 2 NCS 1
+        GRP 10 TITL 'GRP 10'
+            BEAM NO 1 NA 1 NE 2 NCS 1
+            TRUS NO 1 NA 2 NE 3 NCS 1
+        GRP 20 TITL 'GRP 20'
+            BEAM NO 2 NA 2 NE 3 NCS 1
+            CABL NO 6 NA 1 NE 2 NCS 1
+    END

docs/cdb/tests/groups_lc.rst

@@ -0,0 +1,53 @@
+GroupsLC
+--------
+
+Related test suite: ``test_groups_lc.py``
+
+Expected CDB file name: ``GROUP_LC_DATA.cdb``
+
+Runs with: SOFiSTiK 2025
+
+Version: 1
+
+.. code-block:: text
+
+    +PROG AQUA
+    HEAD MATERIAL AND SECTIONS
+        NORM EN 199X-200X
+        STEE NO 1 TYPE YC ES 210000.0 GAM 78.5 TITL 'S355'
+        PROF 1 TYPE CHS 60.0 10.0 MNO 1
+    END
+
+    +PROG SOFIMSHA
+    HEAD GEOMETRY REV-1-SOF-2025
+    SYST 3D GDIR NEGZ GDIV 10
+        NODE NO 1 X 00.0 Y 0.0 Z +0.0 FIX F
+        NODE NO 2 X 05.0 Y 0.0 Z -0.5
+        NODE NO 3 X 10.0 Y 0.0 Z -1.0 FIX F
+
+        GRP 3 TITL 'GRP 3'
+            SPRI NO 2 NA 2 NE 3
+            CABL NO 6 NA 1 NE 2 NCS 1
+        GRP 10 TITL 'GRP 10'
+            BEAM NO 1 NA 1 NE 2 NCS 1
+            TRUS NO 1 NA 2 NE 3 NCS 1
+        GRP 20 TITL 'GRP 20'
+            BEAM NO 2 NA 2 NE 3 NCS 1
+            CABL NO 6 NA 1 NE 2 NCS 1
+    END
+
+    +PROG ASE
+    HEAD DUMMY ANALYSES
+        LOOP#I 2
+            SYST PROB LINE
+            GRP - VAL YES
+            IF (#I==0)
+                GRP 10 VAL OFF
+            ELSE
+                GRP 3 VAL OFF
+            ENDIF
+            LET#LC #I+1000
+            LC #LC DLZ 1.0 TITL 'DUMMY'
+            END
+        ENDLOOP
+    END

docs/cdb/tests/sec_groups_lc.rst

@@ -0,0 +1,63 @@
+GroupsLC
+--------
+
+Related test suite: ``test_secondary_groups_lc.py``
+
+Expected CDB file name: ``SEC_GROUPS_LC.cdb``
+
+Runs with: SOFiSTiK 2025
+
+Version: 1
+
+.. code-block:: text
+
+    +PROG AQUA
+    HEAD MATERIAL AND SECTIONS
+        NORM EN 199X-200X
+        STEE NO 1 TYPE YC ES 210000.0 GAM 78.5 TITL 'S355'
+        PROF 1 TYPE CHS 60.0 10.0 MNO 1
+    END
+
+    +PROG SOFIMSHA
+    HEAD GEOMETRY REV-1-SOF-2025
+    SYST 3D GDIR NEGZ GDIV 10
+        NODE NO 1 X 00.0 Y 0.0 Z +0.0 FIX F
+        NODE NO 2 X 05.0 Y 0.0 Z -0.5
+        NODE NO 3 X 10.0 Y 0.0 Z -1.0 FIX F
+
+        GRP 3 TITL 'GRP 3'
+            SPRI NO 2 NA 2 NE 3
+            CABL NO 6 NA 1 NE 2 NCS 1
+        GRP 10 TITL 'GRP 10'
+            BEAM NO 1 NA 1 NE 2 NCS 1
+            TRUS NO 1 NA 2 NE 3 NCS 1
+        GRP 20 TITL 'GRP 20'
+            BEAM NO 2 NA 2 NE 3 NCS 1
+            BEAM NO 4 NA 1 NE 2 NCS 1
+            CABL NO 6 NA 1 NE 2 NCS 1
+    END
+
+    +PROG SOFIMSHA
+    HEAD SECONDARY GROUPS
+    SYST REST
+        GRP 'TEST' TITL 'SECONDARY TEST GROUP'
+            BEAM (202,-204)
+    END
+
+    +PROG ASE
+    HEAD DUMMY ANALYSES
+        LOOP#I 2
+            SYST PROB LINE
+            GRP - VAL YES
+            IF (#I==0)
+                GRP 10 VAL OFF
+                GRP 'TEST' VAL OFF
+            ELSE
+                GRP 3 VAL OFF
+                GRP 'TEST' VAL YES
+            ENDIF
+            LET#LC #I+1000
+            LC #LC DLZ 1.0 TITL 'DUMMY'
+            END
+        ENDLOOP
+    END

src/py_sofistik_utils/cdb_reader/__init__.py

@@ -7,8 +7,8 @@
 from . _internals.cable_load import CableLoad
 from . _internals.cable_result import CableResult
 from . _internals.cross_section_data import CrossSectionalData
-from . _internals.group_data import _GroupData
-from . _internals.group_lc_data import _GroupLCData
+from . _internals.group_data import Groups
+from . _internals.group_lc_data import GroupsLC
 from . _internals.load_cases import _LoadCases
 from . _internals.node import _Node
 from . _internals.node_data import _NodeData
@@ -17,7 +17,7 @@
 from . _internals.node_result import _NodeResult
 from . _internals.quad import Quads
 from . _internals.quad_data import QuadData
-from . _internals.sec_group_lc_data import _SecondaryGroupLCData
+from . _internals.sec_group_lc_data import SecondaryGroupsLC
 from . _internals.spring import _Spring
 from . _internals.spring_data import _SpringData
 from . _internals.spring_result import _SpringResult
@@ -39,8 +39,8 @@
     "CableLoad",
     "CableResult",
     "CrossSectionalData",
-    "_GroupData",
-    "_GroupLCData",
+    "Groups",
+    "GroupsLC",
     "_LoadCases",
     "_Node",
     "_NodeData",
@@ -49,7 +49,7 @@
     "_NodeResult",
     "Quads",
     "QuadData",
-    "_SecondaryGroupLCData",
+    "SecondaryGroupsLC",
     "_Spring",
     "_SpringData",
     "_SpringResult",

src/py_sofistik_utils/cdb_reader/_internals/beam_data.py

@@ -5,7 +5,7 @@
 from pandas import DataFrame
 
 # local library specific imports
-from . group_data import _GroupData
+from . group_data import Groups
 from . sofistik_dll import SofDll
 from . sofistik_classes import CBEAM, CBEAM_SCT
 from . sofistik_utilities import decode_beam_end_release
@@ -261,13 +261,13 @@ def load(self) -> None:
                 )
 
             # assigning groups
-            group_data = _GroupData(self._dll)
+            group_data = Groups(self._dll)
             group_data.load()
 
             df = DataFrame(conv_data).sort_values("ELEM_ID", kind="mergesort")
             elem_ids = df["ELEM_ID"]
 
-            for grp, grp_range in group_data.iterator_beam():
+            for grp, grp_range in group_data.iterator("BEAM"):
                 if grp_range.stop == 0:
                     continue
                 left = elem_ids.searchsorted(grp_range.start, side="left")

src/py_sofistik_utils/cdb_reader/_internals/beam_results.py

@@ -6,7 +6,7 @@
 
 # local library specific imports
 from . beam_data import _BeamData
-from . group_data import _GroupData
+from . group_data import Groups
 from . sofistik_dll import SofDll
 from . sofistik_classes import CBEAM_FOR
 
@@ -193,13 +193,13 @@ def load(self, load_cases: int | list[int]) -> None:
                 data.extend(self._load(load_case))
 
         # assigning groups
-        group_data = _GroupData(self._dll)
+        group_data = Groups(self._dll)
         group_data.load()
 
         df = DataFrame(data).sort_values("ELEM_ID", kind="mergesort")
         elem_ids = df["ELEM_ID"]
 
-        for grp, grp_range in group_data.iterator_beam():
+        for grp, grp_range in group_data.iterator("BEAM"):
             if grp_range.stop == 0:
                 continue
             left = elem_ids.searchsorted(grp_range.start, side="left")

src/py_sofistik_utils/cdb_reader/_internals/beam_stresses.py

@@ -6,7 +6,7 @@
 
 # local library specific imports
 from . beam_data import _BeamData
-from . group_data import _GroupData
+from . group_data import Groups
 from . sofistik_dll import SofDll
 from . sofistik_classes import CBEAM_STR
 from . sofistik_utilities import long_to_str
@@ -190,13 +190,13 @@ def load(self, load_cases: int | list[int]) -> None:
                 data.extend(self._load(load_case))
 
         # assigning groups
-        group_data = _GroupData(self._dll)
+        group_data = Groups(self._dll)
         group_data.load()
 
         df = DataFrame(data).sort_values("ELEM_ID", kind="mergesort")
         elem_ids = df["ELEM_ID"]
 
-        for grp, grp_range in group_data.iterator_beam():
+        for grp, grp_range in group_data.iterator("BEAM"):
             if grp_range.stop == 0:
                 continue
             left = elem_ids.searchsorted(grp_range.start, side="left")

src/py_sofistik_utils/cdb_reader/_internals/cable_data.py

@@ -5,7 +5,7 @@
 from pandas import concat, DataFrame
 
 # local library specific imports
-from . group_data import _GroupData
+from . group_data import Groups
 from . sofistik_dll import SofDll
 from . sofistik_classes import CCABL
 
@@ -163,13 +163,13 @@ def load(self) -> None:
                 )
 
             # assigning groups
-            group_data = _GroupData(self._dll)
+            group_data = Groups(self._dll)
             group_data.load()
 
             df = DataFrame(data).sort_values("ELEM_ID", kind="mergesort")
             elem_ids = df["ELEM_ID"]
 
-            for grp, grp_range in group_data.iterator_cable():
+            for grp, grp_range in group_data.iterator("CABLE"):
                 if grp_range.stop == 0:
                     continue
 

src/py_sofistik_utils/cdb_reader/_internals/cable_load.py

@@ -5,7 +5,7 @@
 from pandas import concat, DataFrame
 
 # local library specific imports
-from . group_data import _GroupData
+from . group_data import Groups
 from . sofistik_classes import CCABL_LOA
 from . sofistik_dll import SofDll
 
@@ -208,13 +208,13 @@ def load(self, load_cases: int | list[int]) -> None:
                 data.extend(self._load(load_case))
 
         # assigning groups
-        group_data = _GroupData(self._dll)
+        group_data = Groups(self._dll)
         group_data.load()
 
         df = DataFrame(data).sort_values("ELEM_ID", kind="mergesort")
         elem_ids = df["ELEM_ID"]
 
-        for grp, grp_range in group_data.iterator_cable():
+        for grp, grp_range in group_data.iterator("CABLE"):
             if grp_range.stop == 0:
                 continue
 

src/py_sofistik_utils/cdb_reader/_internals/cable_result.py

@@ -5,7 +5,7 @@
 from pandas import concat, DataFrame
 
 # local library specific imports
-from . group_data import _GroupData
+from . group_data import Groups
 from . sofistik_dll import SofDll
 from . sofistik_classes import CCABL_RES
 
@@ -170,13 +170,13 @@ def load(self, load_cases: int | list[int]) -> None:
                 data.extend(self._load(load_case))
 
         # assigning groups
-        group_data = _GroupData(self._dll)
+        group_data = Groups(self._dll)
         group_data.load()
 
         df = DataFrame(data).sort_values("ELEM_ID", kind="mergesort")
         elem_ids = df["ELEM_ID"]
 
-        for grp, grp_range in group_data.iterator_cable():
+        for grp, grp_range in group_data.iterator("CABLE"):
             if grp_range.stop == 0:
                 continue