h2lib 13.1.2301__py3-none-win_amd64.whl → 13.1.2601__py3-none-win_amd64.whl

h2lib/_h2lib.py

@@ -137,6 +137,28 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
         self.time = np.round(H2LibSignatures.run(self, np.float64(time), restype=np.float64)[1], 6)
         return self.time
 
+    def check_convergence(self):
+        """
+        Check the convergence of the simulation. Typically, after a time step or a call to the static solver.
+
+        Returns
+        -------
+        bconv : bool
+            `True` if the solution has converged.
+        resq : real
+            Residual on internal-external forces.
+        resg : real
+            Residual on constraint equations.
+        resd : real
+            Residual on increment.
+        """
+        bconv = False
+        resq = -1.0
+        resg = -1.0
+        resd = -1.0
+        bconv, resq, resg, resd = H2LibSignatures.check_convergence(self, bconv, resq, resg, resd)[0]
+        return bconv, resq, resg, resd
+
     def linearize(self):
         """
         Linearize the system, as done by the system eigen-analysis.
@@ -325,10 +347,23 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
         """
         H2LibSignatures.solver_static_delete(self)
 
-    def solver_static_run(self):
+    def solver_static_run(self, reset_structure=False):
         """
         Run the complete static solver algorithm.
 
+        When the calls to the static solver are independent, it may be convenient to
+        set `reset_structure = True`, so that the staic solver will run from the
+        undeflected configuration, as specified in the htc file. On the other hand,
+        if the static solver is obtained for increasing wind speeds, then it is convenient
+        to start from the last converged solution, thus setting `reset_structure = False`,
+        as done by HAWCStab2.
+
+        Parameters
+        ----------
+        reset_structure : bool, optional,
+            If `True` this function will reset the structure deflection and orientation
+            before running the static solver. The default is `False`.
+
         Raises
         ------
         RuntimeError
@@ -340,10 +375,14 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
 
         """
         error_code = -1
-        error_code = H2LibSignatures.solver_static_run(self, error_code)[0][0]
+        _, error_code = H2LibSignatures.solver_static_run(self, reset_structure, error_code)[0]
         if error_code > 0:
             raise _ERROR_CODES[error_code]
 
+    def structure_reset(self):
+        """Reset the structure deflection and orientation."""
+        H2LibSignatures.structure_reset(self)
+
     def add_sensor(self, sensor_line):
         """Add sensor to hawc2. The sensor will be accessible from h2lib but will not show up in the output file of HAWC2
         Note, that some sensors consist of multiple HAWC2 sensors, e.g. "wind free_wind" which has a Vx, Vy and Vz sensors
@@ -453,8 +492,8 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
             main_body,
             mbdy_eulerang_table.shape[0],
             np.asfortranarray(mbdy_eulerang_table.astype(np.float64)),
-            angles_in_deg,
-            reset_orientation,
+            bool(angles_in_deg),
+            bool(reset_orientation),
             np.asfortranarray(mbdy_ini_rotvec_d1.astype(np.float64)),
             error_code,
         )[0][-1]
@@ -510,7 +549,7 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
         reset_orientation : bool, optional,
             If `True` this function will reset the orientation to no rotation
             before applying `mbdy2_eulerang_table`. The default is `False`.
-        mbdy2_ini_rotvec_d1 : (4) ndarray, optional
+        mbdy2_ini_rotvec_d1 : (4) ndarray or list, optional
             Angular velocity. First 3 elements for the direction and last for the magnitude.
             Equivalent to HAWC2 command `mbdy2_ini_rotvec_d1`.
             The default is 0 speed.
@@ -548,7 +587,7 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
             np.asfortranarray(mbdy2_eulerang_table.astype(np.float64)),
             bool(angles_in_deg),
             reset_orientation,
-            np.asfortranarray(mbdy2_ini_rotvec_d1.astype(np.float64)),
+            np.asfortranarray(mbdy2_ini_rotvec_d1).astype(np.float64),
             error_code)[0][-1]
         if error_code > 0:
             raise _ERROR_CODES[error_code]

h2lib/_version.py

@@ -1,4 +1,4 @@
 # This file is autogenerated and should not be modified manually
-__version__ = '13.1.2301'
-h2lib_version = '13.1.2301'
-hawc2_version = '13.1.23+5-gcdb6f43'
+__version__ = '13.1.2601'
+h2lib_version = '13.1.2601'
+hawc2_version = '13.1.26'

h2lib/dll_wrapper.py

@@ -6,7 +6,7 @@ import platform
 import os
 import ctypes
 from _ctypes import POINTER
-from ctypes import c_int, c_double, c_char, c_char_p, c_long, c_longlong, Structure
+from ctypes import c_int, c_double, c_char, c_char_p, c_long, c_longlong, c_bool, Structure
 from contextlib import contextmanager
 import tempfile
 try:
@@ -16,11 +16,12 @@ except ImportError:
 import sys
 from pathlib import Path
 import atexit
+
 c_int_p = POINTER(ctypes.c_long)
 c_long_p = POINTER(ctypes.c_longlong)
-
 c_double_p = POINTER(ctypes.c_double)
 c_float_p = POINTER(ctypes.c_float)
+c_bool_p = POINTER(ctypes.c_bool)
 
 
 # Add support for complex numbers to ctypes.
@@ -110,7 +111,9 @@ def wrap(self, f, *args, **kwargs):
             args[i] = np.require(args[i], requirements=['C', 'F'][self.fortran])
 
     for arg in args:
-        if isinstance(arg, int):
+        if isinstance(arg, bool):
+            c_args.append(c_bool_p(c_bool(arg)))
+        elif isinstance(arg, int):
             c_args.append(c_long_p(c_longlong(arg)))
         elif isinstance(arg, float):
             c_args.append(c_double_p(c_double(arg)))
@@ -149,7 +152,7 @@ def wrap(self, f, *args, **kwargs):
     ret_args = []
     for arg in args:
         c_arg = c_args.pop(0)
-        if isinstance(arg, (int, float)):
+        if isinstance(arg, (int, float, bool)):
             ret_args.append(c_arg.contents.value)
         elif isinstance(arg, (str)):
             ret_args.append(c_arg.value.decode('cp1252'))

h2lib/h2lib_signatures.py

@@ -11,6 +11,15 @@ class H2LibSignatures():
     end subroutine'''
         return self.get_lib_function('add_sensor')(sensor_line, index_start, index_stop)
 
+    def check_convergence(self, bconv, resq, resg, resd):
+        '''subroutine check_convergence(bconv, resq, resg, resd) bind(C, name='check_convergence')
+      logical(kind=c_bool), intent(out) :: bconv
+      real(c_double), intent(out) :: resq
+      real(c_double), intent(out) :: resg
+      real(c_double), intent(out) :: resd
+    end subroutine'''
+        return self.get_lib_function('check_convergence')(bconv, resq, resg, resd)
+
     def do_system_eigenanalysis(self, include_damping, n_modes, natural_frequencies, damping_ratios, error_code):
         '''subroutine do_system_eigenanalysis(include_damping, n_modes, natural_frequencies, damping_ratios, error_code) &
 logical(kind=c_bool), intent(in) :: include_damping
@@ -361,8 +370,8 @@ end subroutine'''
         '''subroutine set_orientation_base(main_body_name,  &
 character(kind=c_char, len=1), dimension(256), intent(in) :: main_body_name
 real(kind=c_double), dimension(n_rows, 3),   intent(in) :: mbdy_eulerang_table
-logical, intent(in) :: angles_in_deg
-logical, intent(in) :: reset_orientation
+logical(c_bool), intent(in) :: angles_in_deg
+logical(c_bool), intent(in) :: reset_orientation
 real(kind=c_double), dimension(4),   intent(in) :: mbdy_ini_rotvec_d1
 end subroutine'''
         return self.get_lib_function('set_orientation_base')(main_body_name,
@@ -380,7 +389,7 @@ character(kind=c_char, len=1),   dimension(256),       intent(in   ) :: main_bod
 integer(kind=8),                                       intent(in   ) :: node_1
 integer(kind=8),                                       intent(in   ) :: node_2
 real(kind=c_double),             dimension(n_rows, 3), intent(in   ) :: mbdy2_eulerang_table
-logical,                                               intent(in   ) :: angles_in_deg
+logical(c_bool),                                       intent(in   ) :: angles_in_deg
 character(kind=c_char, len=256) :: mbdy_1_name  ! Same as main_body_1_name, but as string instead of an array of characters.
 character(kind=c_char, len=256) :: mbdy_2_name  ! Same as main_body_2_name, but as string instead of an array of characters.
 type(Tmain_body_input), pointer :: main_body_1  ! The main body pointer associated to main_body_1_name.
@@ -420,11 +429,12 @@ end subroutine'''
 end subroutine'''
         return self.get_lib_function('solver_static_init')()
 
-    def solver_static_run(self, error_code):
-        '''subroutine solver_static_run(error_code) bind(C, name="solver_static_run")
+    def solver_static_run(self, reset_structure, error_code):
+        '''subroutine solver_static_run(reset_structure, error_code) bind(C, name="solver_static_run")
+    logical(c_bool), intent(in) :: reset_structure
     integer(8), intent(out) :: error_code
 end subroutine'''
-        return self.get_lib_function('solver_static_run')(error_code)
+        return self.get_lib_function('solver_static_run')(reset_structure, error_code)
 
     def solver_static_solve(self, error_code):
         '''subroutine solver_static_solve(error_code) &
@@ -453,10 +463,17 @@ end subroutine'''
 
     def stop_on_error(self, flag):
         '''subroutine stop_on_error(flag) bind(C, name="stop_on_error")
-      logical, intent(in) :: flag
+      logical(c_bool), intent(in) :: flag
     end subroutine'''
         return self.get_lib_function('stop_on_error')(flag)
 
+    def structure_reset(self, ):
+        '''subroutine structure_reset() bind(C, name="structure_reset")
+    !DEC$ ATTRIBUTES DLLEXPORT :: structure_reset
+    integer*4 :: i, j
+end subroutine'''
+        return self.get_lib_function('structure_reset')()
+
     def test_hdf5(self, ):
         '''subroutine test_hdf5() BIND(C, NAME='test_hdf5')
   !DEC$ ATTRIBUTES DLLEXPORT :: test_hdf5
@@ -480,9 +497,8 @@ end subroutine'''
     def write_output(self, ):
         '''subroutine write_output() bind(C, name="write_output")
       !DEC$ ATTRIBUTES DLLEXPORT :: write_output
-      logical                       :: firstcall
       integer        :: nr, dummy=1
-      character*10 :: status = 'close';
+      character*10 :: status = 'close'
       Type (Toutvar) :: ov_dummy
     end subroutine'''
         return self.get_lib_function('write_output')()

{h2lib-13.1.2301.dist-info → h2lib-13.1.2601.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: h2lib
-Version: 13.1.2301
-Summary: Python interface to HAWC2 (13.1.23+5-gcdb6f43)
+Version: 13.1.2601
+Summary: Python interface to HAWC2 (13.1.26)
 Download-URL: 
 Author: Mads M. Pedersen, S.G.Horcas and N.G.Ramos
 Author-email: mmpe@dtu.dk

h2lib-13.1.2601.dist-info/RECORD

@@ -0,0 +1,10 @@
+h2lib/HAWC2Lib.dll,sha256=0hhBIkpISAacSb47XZWx--a8-p4VozfK98fSIgp8bnY,30908416
+h2lib/__init__.py,sha256=f3fO4I6IEFRM9LaV2O3w9Pioj3GPI8qRl7P5Tg5ONtE,528
+h2lib/_h2lib.py,sha256=5YLmLIrnpUEDYTMMDUfdiqkNB9uhApt45Iy0o8-hdTo,36698
+h2lib/_version.py,sha256=D7AppHvtXTcaO5MZsCOYp_eYDc2qNhzn1h0mS3zEU6Y,149
+h2lib/dll_wrapper.py,sha256=ZkcHog6jdVvzRNbVFza0atmMDTlbErf-42IqYITdVRE,12897
+h2lib/h2lib_signatures.py,sha256=hDefbIIUVPdyc-PqV6_tdzmoJVKUrsTJ8rm1JV24yH0,25073
+h2lib-13.1.2601.dist-info/METADATA,sha256=VT_imUf1hhAaxBXOqwQ8FzJApsFs9Mo066e6OiLHSNI,851
+h2lib-13.1.2601.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
+h2lib-13.1.2601.dist-info/top_level.txt,sha256=y_a-tUqphEZQ_0nsWSMaSb21P8Lsd8hUxUdE9g2Dcbk,6
+h2lib-13.1.2601.dist-info/RECORD,,

h2lib-13.1.2301.dist-info/RECORD

@@ -1,10 +0,0 @@
-h2lib/HAWC2Lib.dll,sha256=1DDWenk7w_1d-v7KFgWLcQ55KAOipPH2tj4pIqHCCHU,30859264
-h2lib/__init__.py,sha256=f3fO4I6IEFRM9LaV2O3w9Pioj3GPI8qRl7P5Tg5ONtE,528
-h2lib/_h2lib.py,sha256=L2DyUjbQzksXk6Uxw9ONu4eu_qcrYfSyEN8BWhqMoH8,35071
-h2lib/_version.py,sha256=5VdqQ05CAw21vzOGZvE7_ih5_mCKGbYrwlNtPD_C6pw,160
-h2lib/dll_wrapper.py,sha256=CfuRfDPEmmfYlEGKUmiXiuMhNiMcf24ripPHgqd8CiE,12761
-h2lib/h2lib_signatures.py,sha256=1CuaSNfaTgnbhqcSaehQGNVHhKpvLFwgs2UucKWVQJE,24289
-h2lib-13.1.2301.dist-info/METADATA,sha256=ctfxJlbL2MoblaX6BEnAml31TBjNBDhj0_N9rPOFxOI,862
-h2lib-13.1.2301.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
-h2lib-13.1.2301.dist-info/top_level.txt,sha256=y_a-tUqphEZQ_0nsWSMaSb21P8Lsd8hUxUdE9g2Dcbk,6
-h2lib-13.1.2301.dist-info/RECORD,,