wawi 0.0.12__py3-none-any.whl → 0.0.16__py3-none-any.whl

wawi/__init__.py

@@ -3,7 +3,7 @@
 '''
 __pdoc__ = {'wawi.ext.abq': False}
 
-__version__ = "0.0.12"
+__version__ = "0.0.16"
 
 # Other packages
 import numpy as np

wawi/io.py

@@ -11,7 +11,7 @@ from wawi.model import ModalDry, PontoonType, Node, Model, Aero, AeroSection
 def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_sections.json',
                 modal='modal.json', pontoon='pontoon.json', eldef='element.json', orientations='orientations.json',
                 drag_elements='drag_elements.json', pontoon_types='pontoon_types.json', 
-                sort_nodes_by_x=True, interpolation_kind='quadratic'):
+                sort_nodes_by_x=True, interpolation_kind='linear'):
     
     '''
     Import folder containing files defining a WAWI model.
@@ -39,7 +39,7 @@ def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_s
     sort_nodes_by_x : True, optional
         whether or not to sort the nodes of eldef by their x-coordinate
     interpolation_kind : {'quadratic', 'linear', ...}
-        interpolation kind used for hydrodynamic transfer function 
+        interpolation kind used for hydrodynamic transfer function and hydrodynamic system matrices
 
     Returns
     ---------------
@@ -148,7 +148,7 @@ def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_s
         ptypes[name] = PontoonType.from_numeric(interpolation_kind=interpolation_kind, A=P['M'], B=P['C'], 
                          omega=P['omega'], Q=P['Q'], theta=P['theta_Q'], omegaQ=P['omega_Q'], label=name, 
                          stl_path=f'{model_folder}/{pontoon_stl}', **{**ACd, **pontoon_type_settings[name]})    
-    
+
     
     # Modal dry object 
     if 'xi0' in modal:

wawi/modal.py

@@ -155,6 +155,7 @@ def iteig(K, C, M, omega=None, omega_ref=0, input_functions=True, itmax=None, to
                 lambdai = lambdai[m]
 
             w = abs(np.imag(lambdai))
+
             if mean_w:
                 w = (wprev+w)/2
             

wawi/model/_hydro.py

@@ -480,7 +480,7 @@ SEASTATE CLASS
 '''
 
 class Seastate:
-    def __init__(self, Tp, Hs, gamma, theta0, s, depth=None, origin=None, ranges=None, 
+    def __init__(self, Tp, Hs, gamma, theta0, s=np.inf, depth=None, origin=None, ranges=None, 
                  options={}, pontoon_options={}, name=None, plot_label=None, centered_dirdist=True,
                  U=None, thetaU=None, use_robust_D=True, angle_unit='deg'):
 
@@ -529,7 +529,7 @@ class Seastate:
 
         self.x0 = self.origin[0]
         self.y0 = self.origin[1]    
-        self.options = {'keep_coherence': True}
+        self.options = {'keep_coherence': True}     #default options
         self.options.update(**options)       
         
         self.pontoon_options = {'current_affects_Q': True, 'current_affects_k': True}
@@ -616,9 +616,12 @@ thetaU (current)={self.thetaU*180/np.pi:.1f}deg
         if return_phases:
             eta, t, phase = output
             return eta, t, phase
-        else:
+        elif time_history:
             eta, t = output
             return eta, t
+        else:
+            return output
+
             
 
     @staticmethod
@@ -821,7 +824,7 @@ class PontoonType:
     
             
     @classmethod
-    def from_numeric(cls, interpolation_kind='linear', A=None, M0=None, B=None, Kh=None, 
+    def from_numeric(cls, interpolation_kind='linear', fill_value_added='extrapolate', A=None, M0=None, B=None, Kh=None, 
                      omega=None, Q=None, theta=None, omegaQ=None, **kwargs):
         
         if omegaQ is None:
@@ -834,12 +837,12 @@ class PontoonType:
                 A = np.zeros([M0.shape + [len(omega)]])
             elif M0 is None:
                 M0 = A[:,:,0]*0
-            M = interp1d(omega, (A.T+M0.T).T, axis=2, fill_value='extrapolate', kind=interpolation_kind)
+            M = interp1d(omega, (A.T+M0.T).T, axis=2, fill_value=fill_value_added, kind=interpolation_kind)
         
         if B is None:
             C = None
         else:
-            C = interp1d(omega, B, axis=2, fill_value='extrapolate', kind=interpolation_kind)
+            C = interp1d(omega, B, axis=2, fill_value=fill_value_added, kind=interpolation_kind)
         
         if Kh is not None:
             K = lambda omega: Kh
@@ -853,7 +856,7 @@ class PontoonType:
 
 
     @classmethod
-    def from_wadam(cls, path, interpolation_kind='linear', 
+    def from_wadam(cls, path, interpolation_kind='linear', fill_value_added='extrapolate',
                    include=['added mass', 'added damping', 'restoring stiffness', 'inertia'], **kwargs):
         
         from wawi.io import import_wadam_mat, import_wadam_hydro_transfer
@@ -873,10 +876,10 @@ class PontoonType:
         if 'inertia' not in include:
             M0 = M0*0
             
-        M = interp1d(omega, (A.T+M0.T).T, axis=2, fill_value='extrapolate', kind=interpolation_kind)
-        C = interp1d(omega, B, axis=2, fill_value='extrapolate', kind=interpolation_kind)
+        M = interp1d(omega, (A.T+M0.T).T, axis=2, fill_value=fill_value_added, kind=interpolation_kind)
+        C = interp1d(omega, B, axis=2, fill_value=fill_value_added, kind=interpolation_kind)
         K = lambda omega: Kh
         
-        Q = interp1d(omega_Q, Q, fill_value='extrapolate', kind=interpolation_kind, axis=2)
+        Q = interp1d(omega_Q, Q, fill_value=0.0, kind=interpolation_kind, axis=2)
         
         return cls(M=M, C=C, K=K, Q=Q, original_omega=omega, theta=theta, **kwargs)

wawi/model/_model.py

@@ -1043,7 +1043,7 @@ class Model:
     
        
     def get_waveaction(self, omega_k, max_rel_error=0.01, 
-                       theta_interpolation='linear', theta_int=None):
+                       theta_interpolation='linear', theta_int=None, transform_by_phi=True):
         
         if theta_int is None and self.theta_int is None:
             theta_int = self.get_theta_int(omega_k, max_rel_error=max_rel_error)
@@ -1069,8 +1069,11 @@ class Model:
         
         if not self.hydro.seastate.options['keep_coherence']:
             Sqq0 = block_diag(*[Sqq0[i*6:(i+1)*6, i*6:(i+1)*6] for i in range(int(Sqq0.shape[0]/6))])
-
-        return self.hydro.phi.T @ Sqq0 @ self.hydro.phi
+        
+        if transform_by_phi:
+            return self.hydro.phi.T @ Sqq0 @ self.hydro.phi
+        else:
+            return Sqq0
 
     
     def evaluate_windaction(self, omega=None, aero_sections=None, print_progress=True, static=False, **kwargs):
@@ -1144,15 +1147,20 @@ class Model:
 
 
     def evaluate_waveaction(self, omega, max_rel_error=0.01, print_progress=True, theta_int=None,
-                            theta_interpolation='quadratic', **kwargs):
+                            theta_interpolation='quadratic', transform_by_phi=True, **kwargs):
         
         if theta_int is None:
             theta_int = self.theta_int
 
-        ndofs = self.hydro.phi.shape[1]
+        if transform_by_phi:
+            ndofs = self.hydro.phi.shape[1]
+        else:
+            ndofs = self.hydro.phi.shape[0]
+        
         Sqq = np.zeros([ndofs, ndofs, len(omega)]).astype('complex')
+
         for k, omega_k in enumerate(omega):
-            Sqq[:,:,k] = self.get_waveaction(omega_k, max_rel_error=max_rel_error, theta_int=theta_int,
+            Sqq[:,:,k] = self.get_waveaction(omega_k, max_rel_error=max_rel_error, theta_int=theta_int, transform_by_phi=transform_by_phi,
                                              theta_interpolation=theta_interpolation, **kwargs)
             
             if print_progress:

wawi/wave.py

@@ -120,7 +120,6 @@ def xsim(x, y, S, D, omega, fs=None, theta=None, n_theta=40, grid_mode=True, pri
     if theta is None:
         theta = np.linspace(-np.pi, np.pi, n_theta)
     
-    
     if not isfunction(S):
         Sfun = lambda x, y: S
     else:

{wawi-0.0.12.dist-info → wawi-0.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wawi
-Version: 0.0.12
+Version: 0.0.16
 Summary: WAve and WInd response prediction
 Author-email: "Knut A. Kvåle" <knut.a.kvale@ntnu.no>, Ole Øiseth <ole.oiseth@ntnu.no>, Aksel Fenerci <aksel.fenerci@ntnu.no>, Øivind Wiig Petersen <oyvind.w.petersen@ntnu.no>
 License: MIT License
@@ -48,9 +48,30 @@ Dynamic: license-file
 ![WAWI logo](https://raw.githubusercontent.com/knutankv/wawi/main/wawi-logo-animated.svg)
 =======================
 
-What is wawi?
+What is WAWI?
 =======================
-WAWI is a Python toolbox for prediction of response of structures exposed to wind and wave excitation. The package is still under development in its alpha stage, and documentation and testing will be completed along the way.
+WAWI is a Python toolbox for prediction of response of structures exposed to wind and wave excitation, using a multimodal frequency-domain approach. It supports special features such as:
+
+* Hydrodynamic added mass, radiation damping and hydrodynamic force transfer function from e.g. WAMIT analysis
+* Quasisteady wind forcing for buffeting analysis
+* Combined effects of wind and waves
+* Iterative multimodal flutter
+* Iterative modal analysis
+* Modelling of motion-induced aerodynamic forces using aerodynamic derivatives
+* Inhomogeneous sea states
+* Inhomogeneous mean wind (other parameters planned for)
+* Current effects on wave excitation
+* Stochastic linearization methodology to support linearized effect of quadratic drag damping (both line elements and pontoon objects)
+* Object-oriented model setup, including FE description (using Python package BEEF) of beams exposed to aerodynamic forcing
+
+Planned implemented in the near future:
+
+* Fully inhomogeneous wind state definition (all wind field parameters)
+* Hydrodynamic interaction effects from multibody analyses
+* Second-order wave excitation effects
+* Definition of ADs (aerodynamic derivatives) using rational functions
+
+The package is still under development in its alpha stage, and documentation and testing will be completed along the way.
 
 
 Installation 
@@ -68,6 +89,21 @@ pip install git+https://www.github.com/knutankv/wawi.git@main
 ```
 
 
+How does WAWI work?
+======================
+By representing both aerodynamic and hydrodynamic motion-induced forces and excitation using a coordinate basis defined by the dry in-vacuum mode shapes of the structure, WAWI is able to versatily predict response based on input from any commercial FE software. The main structure used for response prediction is given in this figure:
+![Model](https://raw.githubusercontent.com/knutankv/wawi/main/docs/flowchart.svg)
+
+The object structure of a WAWI model is given here:
+![Modelattributes](https://raw.githubusercontent.com/knutankv/wawi/main/docs/structure.svg)
+
+Further details regarding hydrodynamic definitions initiated by the `Hydro` class is given below:
+![Hydro](https://raw.githubusercontent.com/knutankv/wawi/main/docs/hydro_part.svg)
+
+Further details regarding aerodynamic definitions initiated by the `Aero` class is given below:
+![Aero](https://raw.githubusercontent.com/knutankv/wawi/main/docs/aero_part.svg)
+
+
 Quick start
 =======================
 Assuming a premade WAWI-model is created and saved as `MyModel.wwi´, it can be imported as follows:
@@ -143,6 +179,14 @@ The examples are structured in the following folders based on their topic:
 
 References
 =======================
+The following papers provide background for the implementation:
+
+* Beam (FE) description of aerodynamic forces: [Øiseth et al. (2012)](https://www.sciencedirect.com/science/article/abs/pii/S0168874X11001880)
+* Wave modelling and response prediction: [Kvåle et al. (2016)](https://www.sciencedirect.com/science/article/abs/pii/S004579491500334X)
+* Inhomogeneous wave modelling: [Kvåle et al. (2024)](https://www.sciencedirect.com/science/article/pii/S0141118723003437)
+* Hydrodynamic interaction effects: [Fenerci et al. (2022)](https://www.sciencedirect.com/science/article/pii/S095183392200017X)
+* Wave-current interaction: [Fredriksen et al. (2024)](https://www.researchgate.net/profile/Arnt-Fredriksen/publication/386453916_On_the_wave-current_interaction_effect_on_linear_motion_for_floating_bridges/links/6751a40fabddbb448c65cbef/On-the-wave-current-interaction-effect-on-linear-motion-for-floating-bridges.pdf)
+
 
 Citation
 =======================

{wawi-0.0.12.dist-info → wawi-0.0.16.dist-info}/RECORD

@@ -4,12 +4,12 @@ tests/test_IABSE_step11a.py,sha256=zTWOxR78F0PNhNqiqodEcL65vdJXyMP78nkJumhy-RA,7
 tests/test_IABSE_step11c.py,sha256=TfxPlP70dhujKlSYbA-Gj4U-EJmYZ3jt6yjvX9wSXcA,10337
 tests/test_IABSE_step2a.py,sha256=9pAd1em2IEY4k5N-jAigV3VGup0QsbUxnwSiziuMbUg,10134
 tests/test_wind.py,sha256=r4rx6f8Tn-u4fn4gGPBMrL_JJQ2SVHGQiQ9sQuMQCPo,1707
-wawi/__init__.py,sha256=7vUvWFZzW67YG3yHPiBO_bsphhLLgEF4N7wdUkJeEq8,183
+wawi/__init__.py,sha256=jBTtfY__jKUq4iwxWldOiudzVb-9eGu0ot2i6J5diC0,183
 wawi/fe.py,sha256=22QKI1GlfsG7o_TpFXaKJfzmbO2_2zdIMaoJmaIZdmY,4001
 wawi/general.py,sha256=xHRoDkcchrL6Y7pTUqGsjBHh8YBLvX9dYcNXXCjQap8,13787
 wawi/identification.py,sha256=bVB6EVRR6J39OO9ckuzNJ6f0FwIo4cLqfYgrsIN89TE,1748
-wawi/io.py,sha256=cr8XLF7bwpTCxpZ84YjOyWjc5uuu-JjGv8vY9UKH-HI,25327
-wawi/modal.py,sha256=L1Rs_YVEADOmsQL-hJ43eb8Nt5VpYuB1VHOjYK2O9X0,20252
+wawi/io.py,sha256=th_hHucLOemFFh7OHyR8EyO4NkH1YSnUlt4kok3XDqg,25352
+wawi/modal.py,sha256=SOmzjviDMBw4OwQAUq3EXo_FJyv6uoZg-fsE3fizXHk,20253
 wawi/plot.py,sha256=jllJcjZxTBqjzBoT4k9jLXVUnie8oqNr8371IJvCd3c,19791
 wawi/prob.py,sha256=0nCdKdwkNf4M6sHyCZuYlt06gD0NmqRNfl4KesgySWA,215
 wawi/random.py,sha256=MHPpyTlRJSJFkCmeTAmw4Q5K1BPoFVb0Nxg0jDhkuIM,871
@@ -17,7 +17,7 @@ wawi/signal.py,sha256=9HJs7VUhXOccuYPo12A0IUVoBIAJ2e_9F3rL-q3JuP4,1179
 wawi/structural.py,sha256=t25ohH4uBbzUJ7Hqn_kUfYhxcikZkRp8da-9dn7aEbw,8341
 wawi/time_domain.py,sha256=q8-H2xceP-2BmtOfbRQqYhD1JSb0z7jGq-dL_MzAX40,6122
 wawi/tools.py,sha256=-hFBvf0qK4AMn2MQRhrOitDMMMKm2QuRkVfbPBefEkQ,332
-wawi/wave.py,sha256=hhKg3KhKMBhOoCI7g8PFOGUbYgVhDyGmnYdBEdJ8mkY,16064
+wawi/wave.py,sha256=Ye-5JnJJhWA1lcPQUvFTCRTzcY6LB_hu92VO8z2i01I,16059
 wawi/wind.py,sha256=VHy07IbrCJxlqR0Z5O5WRc9YE4jb-MqFbULPiXhj0NA,38211
 wawi/wind_code.py,sha256=8OKLPpqc84obNNKBoYb2NunKjcn6a3i_pAWpIFEwg4Q,223
 wawi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,11 +28,11 @@ wawi/ext/sofistik.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wawi/model/__init__.py,sha256=u6B-dugP76LBkOUVMs0KAoQ81PeRHwFL0M8MbNeAaJA,218
 wawi/model/_aero.py,sha256=tvWMjMoVi9ZVBc3NZ_s-wSofbEk1cc5jf5s-Swv2RxQ,9337
 wawi/model/_dry.py,sha256=KpmFlSinoY6DrSyc3Y0M8w1-cCC7VCFep-uzcqZsHz4,3940
-wawi/model/_hydro.py,sha256=1tUj19OgvEjItNtBxXuPHf0zWtKv_ioTrOcgl9Ov3dg,26960
-wawi/model/_model.py,sha256=ynZkyoU00crTAlu7sN0CmJsn-J8vwK7BDbMCh0pb-hI,53061
+wawi/model/_hydro.py,sha256=7kzOqKou9RV1KoYXC-6oVw8gtnqfC-NfeohLFDiL-uI,27107
+wawi/model/_model.py,sha256=m6UF3onrQFgsJUNDzuot2maAuJpqTxoP4hHCBHbDuMs,53322
 wawi/model/_screening.py,sha256=NRYkKq928z2lqMSUTpbQLls04td_9R_4dhkjU3Gv1oQ,3716
-wawi-0.0.12.dist-info/licenses/LICENSE,sha256=bH1aWhrNbbPLrYnVFRaoYYzcUr-figHjry-kGB7Tc54,1076
-wawi-0.0.12.dist-info/METADATA,sha256=lXTUPijzmyd6QOJ2LmCPJaF7H_NWkysiOZkJkhlKqlU,6530
-wawi-0.0.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-wawi-0.0.12.dist-info/top_level.txt,sha256=Nk5G_ZwgZRCb9ZMWZdr1M3QIskX6kCnlqeMl67N3zg8,20
-wawi-0.0.12.dist-info/RECORD,,
+wawi-0.0.16.dist-info/licenses/LICENSE,sha256=bH1aWhrNbbPLrYnVFRaoYYzcUr-figHjry-kGB7Tc54,1076
+wawi-0.0.16.dist-info/METADATA,sha256=mMH-uf9JkCUNj4-8gSN3sI0A7bMUhddpWkg9GqoyhY8,9502
+wawi-0.0.16.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+wawi-0.0.16.dist-info/top_level.txt,sha256=Nk5G_ZwgZRCb9ZMWZdr1M3QIskX6kCnlqeMl67N3zg8,20
+wawi-0.0.16.dist-info/RECORD,,

{wawi-0.0.12.dist-info → wawi-0.0.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any