h2lib 13.2.702__py3-none-win_amd64.whl → 13.2.801__py3-none-win_amd64.whl

h2lib/distributed_sections.py

@@ -1,6 +1,7 @@
 from h2lib.h2lib_signatures import H2LibSignatures
 import numpy as np
 from enum import Enum
+import sys
 
 
 class DistributedSections():
@@ -41,11 +42,12 @@ class H2Lib_DistributedSections(H2LibSignatures):
         add_distributed_sections and before first call to get_distributed_sections,
         get_distributed_section_position_orientation and set_distributed_section_force_and_moment
         """
+        assert getattr(self, 'distributed_sections_initialized', False) is False
         mbdy_name_dict = self.get_mainbody_name_dict()
         assert mainbody_name in mbdy_name_dict, f"'{mainbody_name}' does not exist. Valid names are {list(mbdy_name_dict.keys())}."
         mbdy_nr = mbdy_name_dict[mainbody_name]
         nsec = len(section_relative_position)
-        link_id = H2LibSignatures.add_distributed_sections(
+        link_id = H2LibSignatures._add_distributed_sections(
             self,
             mainbody_nr=int(mbdy_nr),
             nsec=nsec,
@@ -60,7 +62,8 @@ class H2Lib_DistributedSections(H2LibSignatures):
         add_distributed_sections and before first call to get_distributed_sections,
         get_distributed_section_position_orientation and set_distributed_section_force_and_moment
         """
-        return H2LibSignatures.initialize_distributed_sections(self)
+        self.distributed_sections_initialized = True
+        return H2LibSignatures._initialize_distributed_sections(self)
 
     def get_distributed_sections(self, link_type: LinkType, link_id):
         """Return a DistributedSections link object (needed for get_distributed_section_position_orientation
@@ -79,17 +82,26 @@ class H2Lib_DistributedSections(H2LibSignatures):
         -------
         DistributedSections object
         """
-        mbdy_nr, nsec = H2LibSignatures.get_distributed_sections(
+        mbdy_nr, nsec = H2LibSignatures._get_distributed_sections(
             self, link_type.value, link_id, mainbody_nr=0, nsec=0)[0][2:]
         mbdy_name_dict = self.get_mainbody_name_dict()
         mbdy_name = {nr: name for name, nr in mbdy_name_dict.items()}[mbdy_nr]
         return DistributedSections(mbdy_name, link_type, link_id, nsec)
 
     def get_distributed_section_position_orientation(self, ds: DistributedSections, mainbody_coo_nr=0):
-        """
+        """Computes the position and orientation of a set of distributed sections.
+        Note, the distributed sections are located on the c2def (aeroload/blade sections have a chord/4 offset
+        relative to c2def
+
         Parameters
         ----------
         ds : DistributedSections
+            reference to distributed sections as returned from add_distributed_sections or get_distributed_sections
+        mainbody_coo_nr : int, optional
+            Specifies the coodinate system of the returned position and orientation.
+            If 0 (default), the output is in global coordinates
+            Otherwise the output is transformed to the coordinate system of the mainbody with the specified index.
+            The index can be obtained from get_mainbody_name_dict
 
         Returns
         -------
@@ -100,11 +112,11 @@ class H2Lib_DistributedSections(H2LibSignatures):
         """
         sec_pos = np.zeros((ds.nsec, 3), dtype=np.float64, order="F")
         sec_ori = np.zeros((ds.nsec, 3, 3), dtype=np.float64, order="F")
-        return H2LibSignatures.get_distributed_section_position_orientation(
+        return H2LibSignatures._get_distributed_section_position_orientation(
             self, int(ds.link_type.value), int(ds.link_id), int(ds.nsec), sec_pos, sec_ori,
             int(mainbody_coo_nr))[0][3:-1]
 
-    def set_distributed_section_force_and_moment(self, ds: DistributedSections, sec_frc, sec_mom):
+    def set_distributed_section_force_and_moment(self, ds: DistributedSections, sec_frc, sec_mom, mainbody_coo_nr=0):
         """Set forces and moments at distributed sections
 
         Parameters
@@ -115,15 +127,21 @@ class H2Lib_DistributedSections(H2LibSignatures):
             Section forces pr. length [N/m] in global coordinates, shape=(nsec,3)
         sec_momc : array_like
             Section moments pr. length [Nm/m] in global coordinates, shape=(nsec,3)
+        mainbody_coo_nr : int, optional
+            Specifies the coodinate system of the provided forces and moments.
+            If 0 (default), the forces and moments are in global coordinates
+            Otherwise the index of the mainbody in which coordinate system, the forces and moments are provided
+            The index can be obtained from get_mainbody_name_dict
         """
+        assert getattr(self, 'distributed_sections_initialized',
+                       False) is True, "Call initialize_distributed_sections before set_distributed_section_force_and_moment"
         sec_frc = np.asfortranarray(sec_frc, dtype=np.float64)
         sec_mom = np.asfortranarray(sec_mom, dtype=np.float64)
         assert sec_frc.shape == (ds.nsec, 3)
         assert sec_mom.shape == (ds.nsec, 3)
-
-        return H2LibSignatures.set_distributed_section_force_and_moment(
+        return H2LibSignatures._set_distributed_section_force_and_moment(
             self, link_type=int(ds.link_type.value), link_id=int(ds.link_id), nsec=int(ds.nsec),
-            frc_g=sec_frc, mom_g=sec_mom)
+            frc_g=sec_frc, mom_g=sec_mom, mainbody_coo_nr=int(mainbody_coo_nr))
 
     def set_fsi_loads_h2lib(self, fx, fy, fz, mx, my, mz):  # pragma: no cover
         """Temporary function needed to replicate results of the cpl coupling framework"""