h2lib 13.0.407__cp38-cp38-win_amd64.whl → 13.0.410__cp38-cp38-win_amd64.whl

h2lib/_h2lib.py

@@ -4,7 +4,6 @@ import shutil
 from h2lib.dll_wrapper import DLLWrapper
 from h2lib.h2lib_signatures import H2LibSignatures
 from h2lib.utils import MultiProcessInterface
-from _collections import defaultdict
 
 
 class H2Lib(H2LibSignatures, DLLWrapper):
@@ -142,8 +141,8 @@ class H2Lib(H2LibSignatures, DLLWrapper):
     def get_nSections(self, rotor=0, blade=0):
         return H2LibSignatures.get_nSections(self, rotor + 1, blade + 1, restype=np.int64)[1]
 
-    def diameter(self, rotor=0):
-        return H2LibSignatures.diameter(self, rotor + 1, restype=np.float64)[1]
+    def get_diameter(self, rotor=0):
+        return H2LibSignatures.get_diameter(self, rotor + 1, restype=np.float64)[1]
 
     def aero_sections_data_shape(self, rotor):
         if not rotor in self._aero_sections_data_shape:

h2lib/h2lib_signatures.py

@@ -8,18 +8,12 @@ class H2LibSignatures():
     end function'''
         return self.get_lib_function('add_sensor')(sensor_line, restype=restype)
 
-    def diameter(self, rotor, restype):
-        '''function diameter(rotor) bind(C, name="diameter")
-    !DEC$ ATTRIBUTES DLLEXPORT :: diameter
-    integer*8, intent(in) :: rotor
-    Type (Taerorotor),pointer :: rotor_p
-    real(c_double)  :: diameter
- end function'''
-        return self.get_lib_function('diameter')(rotor, restype=restype)
-
     def echo_version(self, ):
         '''subroutine echo_version() BIND(C, NAME='echo_version')
-!        end subroutine'''
+    !DEC$ ATTRIBUTES DLLEXPORT :: echo_version
+    !GCC$ ATTRIBUTES DLLEXPORT :: echo_version
+    type (tbuildinfo)   :: b
+end subroutine'''
         return self.get_lib_function('echo_version')()
 
     def extern_write_log(self, c_msg, n, dll_name, error, warning):
@@ -148,6 +142,15 @@ END SUBROUTINE'''
         return self.get_lib_function('get_def_ini_hawc2_4miras')(xini_,yini_,zini_,txini_,tyini_,tzini_, 
         xi_hub_,yi_hub_,zi_hub_,xi_root_,yi_root_,zi_root_)
 
+    def get_diameter(self, rotor, restype):
+        '''function get_diameter(rotor) bind(C, name="get_diameter")
+    !DEC$ ATTRIBUTES DLLEXPORT :: get_diameter
+    integer*8, intent(in) :: rotor
+    Type (Taerorotor),pointer :: rotor_p
+    real(c_double)  :: get_diameter
+ end function'''
+        return self.get_lib_function('get_diameter')(rotor, restype=restype)
+
     def get_fsi_loads_hawc2(self, fxbld_,fybld_,fzbld_,mxbld_,mybld_,mzbld_):
         '''subroutine get_fsi_loads_hawc2(fxbld_,fybld_,fzbld_,mxbld_,mybld_,mzbld_) &
        real(c_double),intent(out)::fxbld_(nrotors,nblades_max,nsec_max), &

h2lib/utils.py

@@ -1,7 +1,6 @@
 import multiprocessing
-import time
-from multiprocessing import Queue
 import atexit
+import numpy as np
 
 
 def run(cls, inputQueue, outputQueue, cls_args, **kwargs):
@@ -88,6 +87,7 @@ class ProcessClass():
 
 class MultiProcessInterface():
     def __init__(self, cls, args_lst):
+        self.cls = cls
         self.obj_lst = [ProcessClass(cls)(*args) for args in args_lst]
 
     def __getattribute__(self, name):
@@ -99,7 +99,7 @@ class MultiProcessInterface():
             def wrap(*args, **kwargs):
                 for i, o in enumerate(self.obj_lst):
                     def get_arg(arg):
-                        if hasattr(arg, '__len__') and len(arg) == len(a_lst):
+                        if isinstance(arg, list) and len(arg) == len(a_lst):
                             return arg[i]
                         else:
                             return arg
@@ -116,9 +116,7 @@ class MultiProcessInterface():
             return [getattr(o, name) for o in self.obj_lst]
 
     def __getitem__(self, slice):
-        lst = self.obj_lst[slice]
-        if not hasattr(lst, '__len__'):
-            lst = [lst]
+        lst = np.atleast_1d(np.array(self.obj_lst)[slice]).tolist()
         return SubsetProcessWrapper(lst)
 
     def __enter__(self):

{h2lib-13.0.407.dist-info → h2lib-13.0.410.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: h2lib
-Version: 13.0.407
+Version: 13.0.410
 Summary: Python interface to HAWC2 (13.0.4+17-g58229ac)
 Download-URL: 
 Author: S.G.Horcas and N.G.Ramos
@@ -11,8 +11,5 @@ Requires-Dist: numpy
 Requires-Dist: intel-fortran-rt ==2021.3.0
 Requires-Dist: mkl ==2021.3.0
 Provides-Extra: test
-Requires-Dist: pytest ; extra == 'test'
-Requires-Dist: pytest-cov ; extra == 'test'
-Requires-Dist: hipersim ; extra == 'test'
-Requires-Dist: wetb ; extra == 'test'
+Requires-Dist: h2lib-tests ; extra == 'test'
 

h2lib-13.0.410.dist-info/RECORD

@@ -0,0 +1,10 @@
+h2lib/HAWC2Lib.dll,sha256=xMykcPC5qGVqdZiU-e80f0s53wkoXs6Q0FlyHpTOXYw,29155840
+h2lib/__init__.py,sha256=v4RtCtR7Cfv-LSx-9tnLK0WSefKVjIKrGjfBVBhONzI,27
+h2lib/_h2lib.py,sha256=u6V-J_B-SBfBCgTkRu0AphywTikQSfQGAfBwvJYISxI,9060
+h2lib/dll_wrapper.py,sha256=jFCcT1gnjIl6k_I5nvzeLgG75I0D5VTiWwwWKV7M77w,11962
+h2lib/h2lib_signatures.py,sha256=zhANdNacmPZ_9mMvSEiLK_09PSkwZ0lXHLWKDxmEAEQ,25371
+h2lib/utils.py,sha256=Et7LTR1jlKDcMfkwlUpdIaZcy9qRr46p0WP-U0JNK7k,4722
+h2lib-13.0.410.dist-info/METADATA,sha256=Zjjj9YTOZFr73rgAoexQwIW5SYjlr-x4KCtUCKNvVko,379
+h2lib-13.0.410.dist-info/WHEEL,sha256=KplWMgwSZbeAOumvxNxIrVbNPnn_LVzfBH7l38jDCVM,100
+h2lib-13.0.410.dist-info/top_level.txt,sha256=y_a-tUqphEZQ_0nsWSMaSb21P8Lsd8hUxUdE9g2Dcbk,6
+h2lib-13.0.410.dist-info/RECORD,,

h2lib-13.0.407.dist-info/RECORD

@@ -1,10 +0,0 @@
-h2lib/HAWC2Lib.dll,sha256=D-B557qyIepvdTNX6HtOqQp29OK6HWOqHg7vzri9q5s,29155840
-h2lib/__init__.py,sha256=v4RtCtR7Cfv-LSx-9tnLK0WSefKVjIKrGjfBVBhONzI,27
-h2lib/_h2lib.py,sha256=9pUp7Gll3YxtfKg_CoNrUnl4pRy55V8Q7g4lykmRjBo,9090
-h2lib/dll_wrapper.py,sha256=jFCcT1gnjIl6k_I5nvzeLgG75I0D5VTiWwwWKV7M77w,11962
-h2lib/h2lib_signatures.py,sha256=V1AjS4z5pzuJQwUv_6cbJSOW2eNT1aCVBH1uF7PlJfo,25230
-h2lib/utils.py,sha256=sd1__Cr6HIILB101KiqI4tYN_j6yb2UwRSdnArpW9lU,4760
-h2lib-13.0.407.dist-info/METADATA,sha256=OXhFVilpZzsL8P3cO2PGc1XiP_MHnTTgY24VkmgiFTM,501
-h2lib-13.0.407.dist-info/WHEEL,sha256=KplWMgwSZbeAOumvxNxIrVbNPnn_LVzfBH7l38jDCVM,100
-h2lib-13.0.407.dist-info/top_level.txt,sha256=y_a-tUqphEZQ_0nsWSMaSb21P8Lsd8hUxUdE9g2Dcbk,6
-h2lib-13.0.407.dist-info/RECORD,,