h2lib 13.1.3109__py3-none-win_amd64.whl → 13.2.201__py3-none-win_amd64.whl

h2lib/_h2lib.py

@@ -130,19 +130,21 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
         self._initialized = True
         return r
 
-    def init_AD(self, htc_path=None, model_path='.', tiploss_method=2, tiploss_shen_c2=21, rotor=0):
+    def init_AD(self, htc_path=None, model_path='.', tiploss_method=2, tiploss2_shen_c2=21, tiploss2_shen_h=0, rotor=0):
         """Initialize HAWC2 for Actuator Disc workflow, where wind speeds including induction at the aerodynamic sections
         are passed from e.g. CFD to HAWC2 via set_aerosections_windspeed.
         This function will:
         - Disable wind speed update at blade sections (wind speeds must be set via set_aerosections_windspeed)
         - Disable HAWC2 induction (induction_method=0).
         - set GetWindSpeedData%u_mean=nan to avoid unintended use of the free wind module in HAWC2
-        - set the tiploss_method. The default method is 2, which works with the AD workflow, but the tiploss_shen_c2
-          parameter must be tuned to give sensible results, see tiploss_method in the HAWC2 manual
+        - set the tiploss_method. The default method is 2, which works with the AD workflow,
+          but the tiploss2_shen_c2 and tiploss2_shen_h parameters must be tuned to give sensible results,
+          see tiploss_method in the HAWC2 manual
         """
         assert not self._initialized, "h2lib already initialized via init, init_AD or init_AL"
         self.read_input(htc_path, model_path)
-        r = H2LibSignatures.init_AD(self, rotor + 1, int(tiploss_method), float(tiploss_shen_c2))
+        r = H2LibSignatures.init_AD(self, rotor + 1, int(tiploss_method),
+                                    float(tiploss2_shen_c2), float(tiploss2_shen_h))
         self._initialized = True
         return r
 

h2lib/_version.py

@@ -1,4 +1,4 @@
 # This file is autogenerated and should not be modified manually
-__version__ = '13.1.3109'
-h2lib_version = '13.1.3109'
-hawc2_version = '13.1.31+5-g08eea40'
+__version__ = '13.2.201'
+h2lib_version = '13.2.201'
+hawc2_version = '13.2.2+2-g5cd9228'

h2lib/dll_wrapper.py

@@ -163,10 +163,8 @@ def wrap(self, f, *args, check_stop=True, **kwargs):
         elif isinstance(arg, (str)):
             ret_args.append(c_arg.value.decode('cp1252'))
             # c_args.pop(0)
-        elif isinstance(arg, np.ndarray):
-            ret_args.append(arg)
         else:
-            raise NotImplementedError(arg.__class__.__name__)
+            ret_args.append(arg)
     return ret_args, res
 
 

h2lib/h2lib_signatures.py

@@ -320,28 +320,29 @@ end subroutine'''
     end subroutine'''
         return self.get_lib_function('init')(check_stop=check_stop)
 
-    def init_AD(self, rotor, tiploss_method, tiploss_shen_c2):
-        '''subroutine init_AD(rotor, tiploss_method, tiploss_shen_c2) bind(C, name="init_AD")
+    def init_AD(self, rotor, tiploss_method, tiploss2_shen_c2, tiploss2_shen_h, check_stop=True):
+        '''subroutine init_AD(rotor, tiploss_method, tiploss2_shen_c2, tiploss2_shen_h) bind(C, name="init_AD")
     integer*8, intent(in) :: rotor
     integer*8, intent(in) :: tiploss_method
-    REAL(c_double), intent(in) :: tiploss_shen_c2
+    REAL(c_double), intent(in) :: tiploss2_shen_c2, tiploss2_shen_h
   end subroutine'''
-        return self.get_lib_function('init_AD')(rotor, tiploss_method, tiploss_shen_c2)
+        return self.get_lib_function('init_AD')(rotor, tiploss_method, tiploss2_shen_c2,
+                                                tiploss2_shen_h, check_stop=check_stop)
 
-    def init_AL(self, rotor, epsilon_smearing):
+    def init_AL(self, rotor, epsilon_smearing, check_stop=True):
         '''subroutine init_AL(rotor, epsilon_smearing) bind(C, name="init_AL")
     real(c_double), intent(in) :: epsilon_smearing
     integer*8, intent(in) :: rotor
   end subroutine'''
-        return self.get_lib_function('init_AL')(rotor, epsilon_smearing)
+        return self.get_lib_function('init_AL')(rotor, epsilon_smearing, check_stop=check_stop)
 
-    def init_windfield(self, Nxyz, dxyz, box_offset_yz, transport_speed):
+    def init_windfield(self, Nxyz, dxyz, box_offset_yz, transport_speed, check_stop=True):
         '''subroutine init_windfield(Nxyz, dxyz, box_offset_yz, transport_speed) bind(C, name="init_windfield")
       integer*8, dimension(3), intent(in) :: Nxyz
       real*8              :: transport_speed
     end subroutine'''
         return self.get_lib_function('init_windfield')(
-            Nxyz, dxyz, box_offset_yz, transport_speed)
+            Nxyz, dxyz, box_offset_yz, transport_speed, check_stop=check_stop)
 
     def linearize(self, n_tdofs, n_rdofs, check_stop=True):
         '''subroutine linearize(n_tdofs, n_rdofs) bind(C, name="linearize")
@@ -381,6 +382,12 @@ end subroutine'''
     end subroutine'''
         return self.get_lib_function('read_input')(htc_path, check_stop=check_stop)
 
+    def reset_stop_code_and_message(self, check_stop=True):
+        '''subroutine reset_stop_code_and_message() bind(C, name="reset_stop_code_and_message")
+  !DEC$ ATTRIBUTES DLLEXPORT :: reset_stop_code_and_message
+end subroutine'''
+        return self.get_lib_function('reset_stop_code_and_message')(check_stop=check_stop)
+
     def run(self, time, restype, check_stop=True):
         '''function run(time) bind(C, name='run')
       !DEC$ ATTRIBUTES DLLEXPORT :: run
@@ -389,12 +396,6 @@ end subroutine'''
     end function'''
         return self.get_lib_function('run')(time, restype=restype, check_stop=check_stop)
 
-    def reset_stop_code_and_message(self, check_stop=True):
-        '''subroutine reset_stop_code_and_message() bind(C, name="reset_stop_code_and_message")
-  !DEC$ ATTRIBUTES DLLEXPORT :: reset_stop_code_and_message
-end subroutine'''
-        return self.get_lib_function('reset_stop_code_and_message')(check_stop=check_stop)
-
     def setState(self, val, check_stop=True):
         '''subroutine setState(val) BIND(C, NAME='setState')
   integer, intent(in) :: val

{h2lib-13.1.3109.dist-info → h2lib-13.2.201.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: h2lib
-Version: 13.1.3109
-Summary: Python interface to HAWC2 (13.1.31+5-g08eea40)
+Version: 13.2.201
+Summary: Python interface to HAWC2 (13.2.2+2-g5cd9228)
 Download-URL: 
 Author: Mads M. Pedersen, S.G.Horcas and N.G.Ramos
 Author-email: mmpe@dtu.dk

h2lib-13.2.201.dist-info/RECORD

@@ -0,0 +1,10 @@
+h2lib/HAWC2Lib.dll,sha256=M6SWeBpQ32Phv7Bcj0LQhmiJdnXwWNwoNSPKtk_mpLc,30980096
+h2lib/__init__.py,sha256=f3fO4I6IEFRM9LaV2O3w9Pioj3GPI8qRl7P5Tg5ONtE,528
+h2lib/_h2lib.py,sha256=Nxtz01N-AcMX-OZYS2-QRjuGDBVVKWopBHcxAHfjR7s,39553
+h2lib/_version.py,sha256=wfBRDfXJqowsNUL3qywY9qWaPyrqBIh3pXkfxk1s-vw,157
+h2lib/dll_wrapper.py,sha256=O_lGZ_w3FirjEn4FIE5OeZz30nwpufJB5sflVzf4Cc4,13446
+h2lib/h2lib_signatures.py,sha256=gHHPZ9vjwQwRA8Vb8V2gOuYBL6mZz9r_pcu7_EtzVoE,29637
+h2lib-13.2.201.dist-info/METADATA,sha256=YYuUvTlE3pDY7aS7STdo14Y4c-wMj1fI0Wv85hV0AzY,860
+h2lib-13.2.201.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+h2lib-13.2.201.dist-info/top_level.txt,sha256=y_a-tUqphEZQ_0nsWSMaSb21P8Lsd8hUxUdE9g2Dcbk,6
+h2lib-13.2.201.dist-info/RECORD,,

h2lib-13.1.3109.dist-info/RECORD

@@ -1,10 +0,0 @@
-h2lib/HAWC2Lib.dll,sha256=-RWWR4jTbcA6IREWSn_kf9Jvy4lHNseaX6rwiMGISrI,30970368
-h2lib/__init__.py,sha256=f3fO4I6IEFRM9LaV2O3w9Pioj3GPI8qRl7P5Tg5ONtE,528
-h2lib/_h2lib.py,sha256=X0G8PYTrArB1Wk9IbhHvUMlximW3oCP54hIWy0SnNuM,39438
-h2lib/_version.py,sha256=BsyaHU7sQvoNU74qCuDZ9ajCgPbQ-Lg-ayQmc_xJBAM,160
-h2lib/dll_wrapper.py,sha256=NtH3wVJ4okYLBXjdRxpllnImRDE7p692OgHuwHkt-WQ,13552
-h2lib/h2lib_signatures.py,sha256=sPCh92WdCc6brPgARZ_QBgSz49Yjq0M5SpWb0or5KvM,29396
-h2lib-13.1.3109.dist-info/METADATA,sha256=TvFSne3cdju76W83EBX0gQGkWYQvpvp-thxH2wyQDzA,862
-h2lib-13.1.3109.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
-h2lib-13.1.3109.dist-info/top_level.txt,sha256=y_a-tUqphEZQ_0nsWSMaSb21P8Lsd8hUxUdE9g2Dcbk,6
-h2lib-13.1.3109.dist-info/RECORD,,