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

h2lib/_h2lib.py

@@ -116,19 +116,53 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
     def get_time(self):
         return np.round(H2LibSignatures.get_time(self, time=0.)[0][0], 6)
 
-    def read_input(self, htc_path='htc/input_hawc.htc', model_path='.'):
-        self._model_path = model_path
-        self.cwd = self.model_path
-        return H2LibSignatures.read_input(self, htc_path)
+    def read_input(self, htc_path, model_path='.'):
+        if htc_path is not None:
+            self._model_path = model_path
+            self.cwd = self.model_path
+            return H2LibSignatures.read_input(self, htc_path)
 
     def init(self, htc_path=None, model_path='.'):
-        assert not hasattr(self, '_init_result'), "init called twice"
-        if htc_path is not None:
-            self.read_input(htc_path, model_path)
+        assert not self._initialized, "h2lib already initialized via init, init_AD or init_AL"
+        self.read_input(htc_path, model_path)
         r = H2LibSignatures.init(self)
         self._initialized = True
         return r
 
+    def init_AD(self, htc_path=None, model_path='.', tiploss_method=2, tiploss_shen_c2=21, 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
+        """
+        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))
+        self._initialized = True
+        return r
+
+    def init_AL(self, epsilon_smearing, htc_path=None, model_path='.', rotor=0):
+        """Initialize HAWC2 for Actuator Line 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)
+        - Enable viscous core correction which compensates for the missing induction due to smearing of the forces.
+          The method calculates the missing induction as a smearing factor times the normal near wake induction
+          (induction_method=2) while disregarding the BEM farwake contribution.
+          The smearing factor is based on the smearing size given by epsilon_smearing [m].
+        - set GetWindSpeedData%u_mean=nan to avoid unintended use of the free wind module in HAWC2
+        - set the tiploss_method to 0, to avoid unintended additional tiploss correction
+        """
+        assert not self._initialized, "h2lib already initialized via init, init_AD or init_AL"
+        self.read_input(htc_path, model_path)
+        r = H2LibSignatures.init_al(self, rotor=rotor + 1, epsilon_smearing=float(epsilon_smearing))
+        self._initialized = True
+        return r
+
     def step(self):
         self.time = np.round(H2LibSignatures.step(self, restype=np.float64)[1], 6)
         return self.time
@@ -944,12 +978,13 @@ class H2LibThread(H2LibSignatures, DLLWrapper):
 
 @contextmanager
 def set_LD_LIBRARY_PATH():
-    _file__ = np.__file__
     old = os.environ.get('LD_LIBRARY_PATH', "")
-
-    if '/lib/' in _file__:  # pragma: no cover  (only on linux)
-        lib_path = _file__[:_file__.index("/lib/") + 5]
-        os.environ['LD_LIBRARY_PATH'] = f'{lib_path}:{old}'
+    import site
+    lsts = [site.getsitepackages(), site.getusersitepackages()]
+    libs = [p[:p.index('/lib/') + 5] for lst in lsts for p in (lst, [lst])[isinstance(lst, str)] if '/lib/' in p]
+    lib64s = [p[:p.index('/lib64/') + 7] for lst in lsts for p in (lst, [lst])[isinstance(lst, str)] if '/lib64/' in p]
+    lib_paths = ":".join(libs + lib64s)
+    os.environ['LD_LIBRARY_PATH'] = f'{lib_paths}:{old}'
 
     try:
         yield

h2lib/_version.py

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

h2lib/h2lib_signatures.py

@@ -298,6 +298,21 @@ end subroutine'''
     end subroutine'''
         return self.get_lib_function('init')()
 
+    def init_ad(self, rotor, tiploss_method, tiploss_shen_c2):
+        '''subroutine init_ad(rotor, tiploss_method, tiploss_shen_c2) bind(C, name="init_ad")
+    integer*8, intent(in) :: rotor
+    integer*8, intent(in) :: tiploss_method
+    REAL(c_double), intent(in) :: tiploss_shen_c2
+  end subroutine'''
+        return self.get_lib_function('init_ad')(rotor, tiploss_method, tiploss_shen_c2)
+
+    def init_al(self, rotor, epsilon_smearing):
+        '''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)
+
     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.2601.dist-info → h2lib-13.1.3102.dist-info}/METADATA

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

h2lib-13.1.3102.dist-info/RECORD

@@ -0,0 +1,10 @@
+h2lib/HAWC2Lib.dll,sha256=s-0vzTnTAkCPi7q8sNsyjB8v8PfackauKFF40WIJFvU,30970368
+h2lib/__init__.py,sha256=f3fO4I6IEFRM9LaV2O3w9Pioj3GPI8qRl7P5Tg5ONtE,528
+h2lib/_h2lib.py,sha256=Sf-lc-moYGXqhZCH7DnwtMHR1revPN_uTYwDVP4Tl-E,39366
+h2lib/_version.py,sha256=N9-xsR1zGb_HwvbhBXPpD4OJx0CzxYKb0iB_gU-SF5Q,160
+h2lib/dll_wrapper.py,sha256=ZkcHog6jdVvzRNbVFza0atmMDTlbErf-42IqYITdVRE,12897
+h2lib/h2lib_signatures.py,sha256=IbehcM2ajdjhKN6JMEHnPpo-agFtimfDF2XXcSfs4ZE,25790
+h2lib-13.1.3102.dist-info/METADATA,sha256=Fb4r8r1oY3QJepfIQcELyTda4JtzNN6vB21_ScvbQUI,862
+h2lib-13.1.3102.dist-info/WHEEL,sha256=ovhA9_Ei_7ok2fAych90j-feDV4goiAxbO7REePtvw0,101
+h2lib-13.1.3102.dist-info/top_level.txt,sha256=y_a-tUqphEZQ_0nsWSMaSb21P8Lsd8hUxUdE9g2Dcbk,6
+h2lib-13.1.3102.dist-info/RECORD,,

{h2lib-13.1.2601.dist-info → h2lib-13.1.3102.dist-info}/WHEEL

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

h2lib-13.1.2601.dist-info/RECORD

@@ -1,10 +0,0 @@
-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,,