h2lib 13.1.304__py3-none-win_amd64.whl → 13.1.502__py3-none-win_amd64.whl

h2lib/_h2lib.py

@@ -209,6 +209,8 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
         """
         if time is None:
             time = self.get_time()
+        uvw = np.asarray(uvw, dtype=np.float32)
+        assert np.all(np.isfinite(uvw)), "uvw passed to h2lib.set_windfield contains nan or inf"
         return H2LibSignatures.set_windfield(self, np.asarray(uvw, dtype=np.float32),
                                              np.float64(box_offset_x), np.float64(time))
 
@@ -300,6 +302,191 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
         vx, vy, vz = self.get_rotor_avg_wsp(1, rotor)
         return [vy, vx, -vz]
 
+    def init_static_solver(self):
+        """
+        Initialize the static solver.
+
+        Raises
+        ------
+        RuntimeError
+            If the static solver has already been initialized.
+
+        Returns
+        -------
+        None.
+
+        """
+        error_code = H2LibSignatures.init_static_solver(self, restype=np.int64)[1]
+        if error_code > 0:
+            if error_code == 102:
+                raise RuntimeError("STATIC_SOLVER_ALREADY_INITIALIZED")
+            raise RuntimeError(error_code)  # pragma: no cover
+
+    def get_number_of_bodies_and_constraints(self):
+        """
+        Get number of bodies and constraints.
+
+        Raises
+        ------
+        RuntimeError
+            If the structure is confidential.
+
+        Returns
+        -------
+        nbdy : int
+            Number of bodies.
+        ncst : int
+            Number of constraints.
+
+        """
+        nbdy = -1
+        ncst = -1
+        error_code = -1
+        (
+            nbdy,
+            ncst,
+            error_code,
+        ) = H2LibSignatures.get_number_of_bodies_and_constraints(
+            self, nbdy, ncst, error_code
+        )[
+            0
+        ]
+        if error_code > 0:
+            if error_code == 4:
+                raise RuntimeError("STRUCTURE_IS_CONFIDENTIAL")
+            raise RuntimeError(error_code)  # pragma: no cover
+        return nbdy, ncst
+
+    def get_number_of_elements(self):
+        """
+        Get the number of elements for each body.
+
+        Raises
+        ------
+        RuntimeError
+            If the structure is confidential.
+
+        Returns
+        -------
+        nelem : (nbdy) ndarray, int
+            Number of elements for each body.
+
+        """
+        nbdy, _ = self.get_number_of_bodies_and_constraints()
+
+        nelem = np.zeros((nbdy, ), dtype=np.int64, order="F")
+        error_code = -1
+        _, nelem, error_code = H2LibSignatures.get_number_of_elements(
+            self, nbdy, nelem, error_code
+        )[0]
+
+        if error_code > 0:
+            if error_code == 4:  # pragma: no cover
+                # This cannot happen because if the structure is confidential we will
+                # get this error from get_number_of_bodies_and_constraints().
+                raise RuntimeError("STRUCTURE_IS_CONFIDENTIAL")  # pragma: no cover
+            elif error_code == 7:  # pragma: no cover
+                # This cannot happen because we call get_number_of_bodies_and_constraints().
+                raise ValueError("WRONG_NUMBER_OF_BODIES")  # pragma: no cover
+            raise RuntimeError(error_code)  # pragma: no cover
+        return nelem
+
+    def get_timoshenko_location(self, ibdy, ielem):
+        """
+        Get the location and orientation of an element.
+
+        Parameters
+        ----------
+        ibdy : int
+            Body index, starting from 0.
+        ielem : int
+            Element index, starting from 0.
+
+        Raises
+        ------
+        RuntimeError
+            If the structure is confidential.
+        IndexError
+            If the body or the element do not exist.
+
+        Returns
+        -------
+        l : float
+            Element length.
+        r1 : (3) ndarray
+            Location of node 1.
+        r12 : (3) ndarray
+            Vector from node 1 to node 2.
+        tes : (3, 3) ndarray
+            Transformation matrix describing orientation.
+
+        """
+
+        l = 0.0
+        r1 = np.zeros((3), order="F")
+        r12 = np.zeros((3), order="F")
+        tes = np.zeros((3, 3), order="F")
+        error_code = -1
+        (
+            _,
+            _,
+            l,
+            r1,
+            r12,
+            tes,
+            error_code,
+        ) = H2LibSignatures.get_timoshenko_location(
+            self, ibdy + 1, ielem + 1, l, r1, r12, tes, error_code
+        )[
+            0
+        ]
+        if error_code > 0:
+            if error_code == 4:
+                raise RuntimeError("STRUCTURE_IS_CONFIDENTIAL")
+            elif error_code == 5:
+                raise IndexError("BODY_DOES_NOT_EXIST")
+            elif error_code == 6:
+                raise IndexError("ELEMENT_DOES_NOT_EXIST")
+            raise RuntimeError(error_code)  # pragma: no cover
+
+        return l, r1, r12, tes
+
+    def get_body_rotation_tensor(self, ibdy):
+        """
+        Get the rotation tensor of the requested body, that transforms from local to global base.
+
+        Parameters
+        ----------
+        ibdy : int
+            Body index, starting from 0.
+
+        Raises
+        ------
+        RuntimeError
+            If the structure is confidential.
+        IndexError
+            If the body does not exist.
+
+        Returns
+        -------
+        amat : (3, 3) ndarray
+            Rotation tensor.
+
+        """
+        amat = np.zeros((3, 3), order="F")
+        error_code = -1
+        _, amat, error_code = H2LibSignatures.get_body_rotation_tensor(
+            self, ibdy + 1, amat, error_code
+        )[0]
+        if error_code > 0:
+            if error_code == 4:
+                raise RuntimeError("STRUCTURE_IS_CONFIDENTIAL")
+            elif error_code == 5:
+                raise IndexError("BODY_DOES_NOT_EXIST")
+            raise RuntimeError(error_code)  # pragma: no cover
+
+        return amat
+
 
 @contextmanager
 def set_LD_LIBRARY_PATH():

h2lib/_version.py

@@ -1,4 +1,4 @@
 # This file is autogenerated and should not be modified manually
-__version__ = '13.1.304'
-h2lib_version = '13.1.304'
-hawc2_version = '13.1.3'
+__version__ = '13.1.502'
+h2lib_version = '13.1.502'
+hawc2_version = '13.1.5+4-g20eca1a'

h2lib/dll_wrapper.py

@@ -8,6 +8,7 @@ import ctypes
 from _ctypes import POINTER
 from ctypes import c_int, c_double, c_char, c_char_p, c_long, c_longlong
 from contextlib import contextmanager
+import tempfile
 try:
     from ctypes import windll
 except ImportError:
@@ -26,23 +27,20 @@ in_use = []
 
 class SuppressStream(object):
 
-    def __init__(self, stream=sys.stderr):
+    def __init__(self, suppressed_output_file, stream=sys.stderr):
         self.orig_stream_fileno = stream.fileno()
         self.stream = stream
+        self.suppressed_output_file = suppressed_output_file
 
     def __enter__(self):
         # save stream file descriptor
         self.orig_stream_dup = os.dup(self.orig_stream_fileno)
-        self.devnull = open(os.devnull, 'w')
         self.stream.flush()
-        os.dup2(self.devnull.fileno(), self.orig_stream_fileno)
+        os.dup2(self.suppressed_output_file.fileno(), self.orig_stream_fileno)
 
     def __exit__(self, type, value, traceback):
-        os.close(self.orig_stream_fileno)
         os.dup2(self.orig_stream_dup, self.orig_stream_fileno)
         os.close(self.orig_stream_dup)
-        self.devnull.flush()
-        self.devnull.close()
 
 
 def suppress_output(f):
@@ -124,7 +122,7 @@ def wrap(self, f, *args, **kwargs):
         f.restype = restype
     with chdir(self.cwd):
         if self.suppress_output:
-            with SuppressStream(sys.stdout), SuppressStream(sys.stderr):
+            with SuppressStream(self.suppressed_output_file, sys.stdout), SuppressStream(self.suppressed_output_file, sys.stderr):
                 res = f(*c_args)
         else:
             res = f(*c_args)
@@ -152,6 +150,7 @@ class DLLWrapper(object):
         self.cdecl = cdecl
         self.fortran = fortran
         self.suppress_output = False
+        self.suppressed_output_file = tempfile.TemporaryFile('w')
         self.open()
         in_use.append(os.path.abspath(self.filename))
         atexit.register(self.close)
@@ -211,6 +210,7 @@ class DLLWrapper(object):
         else:
             _ctypes.dlclose(self.lib._handle)
         del self.lib
+        self.suppressed_output_file.close()
         atexit.unregister(self.close)
         in_use.remove(os.path.abspath(self.filename))
 

h2lib/h2lib_signatures.py

@@ -98,6 +98,14 @@ END SUBROUTINE'''
   end subroutine'''
         return self.get_lib_function('get_bem_grid_dim')(rotor, nazi, nrad)
 
+    def get_body_rotation_tensor(self, ibdy, amat, error_code):
+        '''subroutine get_body_rotation_tensor(ibdy, amat, error_code) &
+    integer(kind=8), intent(in) :: ibdy
+    real(kind=c_double), dimension(3, 3), intent(out) :: amat
+    integer(kind=8), intent(out) :: error_code
+end subroutine'''
+        return self.get_lib_function('get_body_rotation_tensor')(ibdy, amat, error_code)
+
     def get_diameter(self, rotor, restype):
         '''function get_diameter(rotor) bind(C, name="get_diameter")
     !DEC$ ATTRIBUTES DLLEXPORT :: get_diameter
@@ -152,6 +160,22 @@ END SUBROUTINE'''
   end function'''
         return self.get_lib_function('get_nrotors')(restype=restype)
 
+    def get_number_of_bodies_and_constraints(self, nbdy, ncst, error_code):
+        '''subroutine get_number_of_bodies_and_constraints(nbdy, ncst, error_code) &
+    integer(kind=8), intent(out) :: nbdy
+    integer(kind=8), intent(out) :: ncst
+    integer(kind=8), intent(out) :: error_code
+end subroutine'''
+        return self.get_lib_function('get_number_of_bodies_and_constraints')(nbdy, ncst, error_code)
+
+    def get_number_of_elements(self, nbdy, nelem, error_code):
+        '''subroutine get_number_of_elements(nbdy, nelem, error_code) &
+    integer(kind=8), intent(in) :: nbdy
+    integer(kind=8), dimension(nbdy), intent(out) :: nelem
+    integer(kind=8), intent(out) :: error_code
+end subroutine'''
+        return self.get_lib_function('get_number_of_elements')(nbdy, nelem, error_code)
+
     def get_rotor_avg_wsp(self, coo, rotor, wsp):
         '''subroutine get_rotor_avg_wsp(coo, rotor, wsp) bind(C, name="get_rotor_avg_wsp")
     integer*8, intent(in) :: rotor
@@ -199,6 +223,18 @@ END SUBROUTINE'''
 subroutine'''
         return self.get_lib_function('get_time')(time)
 
+    def get_timoshenko_location(self, ibdy, ielem, l, r1, r12, tes, error_code):
+        '''subroutine get_timoshenko_location(ibdy, ielem, l, r1, r12, tes, error_code) &
+    integer(kind=8), intent(in) :: ibdy
+    integer(kind=8), intent(in) :: ielem
+    real(kind=c_double), intent(out) :: l
+    real(kind=c_double), dimension(3), intent(out) :: r1
+    real(kind=c_double), dimension(3), intent(out) :: r12
+    real(kind=c_double), dimension(3,3), intent(out) :: tes
+    integer(kind=8), intent(out) :: error_code
+end subroutine'''
+        return self.get_lib_function('get_timoshenko_location')(ibdy, ielem, l, r1, r12, tes, error_code)
+
     def get_version(self, s):
         '''subroutine get_version(s) BIND(C, NAME='get_version')
                 character(kind=c_char, len=1), intent(inout)  :: s(255)
@@ -211,6 +247,12 @@ subroutine'''
     end subroutine'''
         return self.get_lib_function('init')()
 
+    def init_static_solver(self, restype):
+        '''function init_static_solver() result(error_code) &
+    !DEC$ ATTRIBUTES DLLEXPORT :: init_static_solver
+end function'''
+        return self.get_lib_function('init_static_solver')(restype=restype)
+
     def init_windfield(self, Nxyz, dxyz, box_offset_yz, transport_speed):
         '''subroutine init_windfield(Nxyz, dxyz, box_offset_yz, transport_speed) bind(C, name="init_windfield")
       integer*8, dimension(3), intent(in) :: Nxyz

{h2lib-13.1.304.dist-info → h2lib-13.1.502.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: h2lib
-Version: 13.1.304
-Summary: Python interface to HAWC2 (13.1.3)
+Version: 13.1.502
+Summary: Python interface to HAWC2 (13.1.5+4-g20eca1a)
 Download-URL: 
 Author: Mads M. Pedersen, S.G.Horcas and N.G.Ramos
 Author-email: mmpe@dtu.dk

h2lib-13.1.502.dist-info/RECORD

@@ -0,0 +1,10 @@
+h2lib/HAWC2Lib.dll,sha256=2JrIAyXlyeUiAyOOX9inxULx_bAgWop63-hg2dvcKMQ,30576128
+h2lib/__init__.py,sha256=f3fO4I6IEFRM9LaV2O3w9Pioj3GPI8qRl7P5Tg5ONtE,528
+h2lib/_h2lib.py,sha256=itCf0sXkdYekNLg9fFu_zi9n_pCV660SvbRoD8clPDk,20558
+h2lib/_version.py,sha256=9aTddFhC7_u7dLkV6GCDiIhcgLJ1Ut8MRjf6wzuQQjI,157
+h2lib/dll_wrapper.py,sha256=RC5_gJ1cwHXVfUaSvmsatyQrvks-aZJFAiXrG4B-FEI,12061
+h2lib/h2lib_signatures.py,sha256=j0TL8Zv6kX18F28X5cdzTlwQd1ZKiyg_zVBRqdOCPhY,16858
+h2lib-13.1.502.dist-info/METADATA,sha256=CTzQQAHq9U-4BIisfWmEbr_OY0kWT87Hn_O6yMTyaTM,738
+h2lib-13.1.502.dist-info/WHEEL,sha256=3vidnDuZ-QSnHIxLhNbI1gIM-KgyEcMHuZuv1mWPd_Q,101
+h2lib-13.1.502.dist-info/top_level.txt,sha256=y_a-tUqphEZQ_0nsWSMaSb21P8Lsd8hUxUdE9g2Dcbk,6
+h2lib-13.1.502.dist-info/RECORD,,

{h2lib-13.1.304.dist-info → h2lib-13.1.502.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-win_amd64
 

h2lib-13.1.304.dist-info/RECORD

@@ -1,10 +0,0 @@
-h2lib/HAWC2Lib.dll,sha256=KSsiNknsQ_PEfMkmpNKVUv7FAAiKo-nC_tVWEF9EOnc,29877248
-h2lib/__init__.py,sha256=f3fO4I6IEFRM9LaV2O3w9Pioj3GPI8qRl7P5Tg5ONtE,528
-h2lib/_h2lib.py,sha256=RBwI5FPkepo05pFSg50Go6i_ye9hthgmgSCm8k6DEyg,14990
-h2lib/_version.py,sha256=iizTBXTu347A-uMlr6INY1FMuezX-9BSyagu6qZtgmk,146
-h2lib/dll_wrapper.py,sha256=xQicDPnhK0Zgr3ifHX1peLJ6uwYZvXxLQAt9LIu45RY,11922
-h2lib/h2lib_signatures.py,sha256=KO7HJzoy6GUXnkRt_VBbwa5_RVKZlLV1cKonHTMm2TQ,14732
-h2lib-13.1.304.dist-info/METADATA,sha256=kNXLUUDqqpzPAM8g4isV3Th7UBwW7Fj17snXmZhz2C0,727
-h2lib-13.1.304.dist-info/WHEEL,sha256=KNRoynpGu-d6mheJI-zfvcGl1iN-y8BewbiCDXsF3cY,101
-h2lib-13.1.304.dist-info/top_level.txt,sha256=y_a-tUqphEZQ_0nsWSMaSb21P8Lsd8hUxUdE9g2Dcbk,6
-h2lib-13.1.304.dist-info/RECORD,,