wawi 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

wawi/__init__.py

@@ -1,7 +1,7 @@
-__version__ = "0.0.3"
+__version__ = "0.0.5"
 
 __pdoc__ = dict()
-__pdoc__['module.name'] = False
+__pdoc__['wawi.abq'] = False
 
 # Other packages
 import numpy as np

wawi/general.py

@@ -162,8 +162,6 @@ def merge_tr_phi(phi_trans, phi_rot, thread_stack=True):
         thread_stack: specify if the matrices should be thread in or not (if True, 3 translational DOFs and 3 rotational DOFs ...) (default = True)
     Returns:
         phi_combined: phi matrix with all DOFs
-
-    AAJ / Knut Andreas Kvaale, 2017
     """
 
     Ndofs = phi_trans.shape[0]*2
@@ -204,7 +202,6 @@ def interp1z(z,mat,znew):
     Returns:
         matnew: interpolated 3D matrix (Numpy array)
 
-    NTNU / Knut Andreas Kvaale, 2018
     """   
         
     matnew = np.zeros([1,len(mat[0]),len(mat[0][0])])
@@ -226,7 +223,6 @@ def interpolate_3d(z, mat, zi):
     Returns:
         mati: interpolated matrix
 
-    NTNU / Knut Andreas Kvaale, 2017
     """
     mat_shape = np.shape(mat)
     mati = np.zeros([mat_shape[0], mat_shape[1], len(zi)])
@@ -280,7 +276,6 @@ def rodrot(theta, rotaxis=[0, 0, 1], style='row'):
     Returns:
         T: transformation matrix in NumPy format
 
-    NTNU / Knut Andreas Kvaale, 2017
     """
 
     axis = np.asarray(rotaxis)

wawi/io.py

@@ -48,7 +48,7 @@ def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_s
 
     Notes
     ---------------
-    Add info here describing the structure and contents of all files. 
+    TODO: Add info here describing the structure and contents of all files. 
     
     See `importing-folder.ipynb` for a full example.
     '''
@@ -105,7 +105,7 @@ def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_s
                 common_ptype_settings = pontoon_type_settings.pop('*')
             
         except:
-            print('Valid pontoon types file not found. No pontoon_types definitions applied.')
+            print('Valid pontoon type settings file not found. No definitions applied.')
             pontoon_type_settings = {}
 
     else:
@@ -152,22 +152,28 @@ def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_s
     
     # Modal dry object 
     if 'xi0' in modal:
-        xi0 = np.array(modal['xi0'])
+        xi0 = np.array(modal.pop('xi0'))
     else:
         xi0 = 0.0
         
     if 'm_min' in modal:
-        m_min = modal['m_min']
+        m_min = modal.pop('m_min')
     else:
         m_min = 0.0
         
     if 'phi_x' in modal:
-        phi_x = modal['phi_x']
+        phi_x = modal.pop('phi_x')
     else:
         phi_x = None
-        
-    modal_dry = ModalDry(modal['phi'], m=np.array(modal['m']), k=np.array(modal['k']), 
-                         local_phi=modal['local'], xi0=xi0, phi_x=phi_x, m_min=m_min)
+    
+    if 'local' in modal:
+        local_phi = modal.pop('local')
+    else:
+        local_phi = False    
+    
+    phi = modal.pop('phi')
+
+    modal_dry = ModalDry(phi, xi0=xi0, local_phi=local_phi, phi_x=phi_x, m_min=m_min, **modal)
     
     # Element definition
     if element_data != {}:
@@ -184,7 +190,25 @@ def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_s
         node_matrix = np.array(element_data['node_matrix'])
         node_matrix[:,0] = node_matrix[:,0].astype(int)
         element_matrix = np.array(element_data['element_matrix'])
-        
+        element_matrix = element_matrix.astype(int)
+
+        # Remove elements without valid nodes
+        remove_ix = []
+        remove_els = []
+
+        for ix,row in enumerate(element_matrix):
+            el,node1,node2 = row
+            # print(row)
+
+            if (node1 not in node_matrix[:,0].astype(int)) or (node2 not in node_matrix[:,0].astype(int)):
+               remove_ix.append(ix) 
+               remove_els.append(el)
+
+        if len(remove_els)>0:
+            print(f'Elements {remove_els} do not have valid nodes - not included in model.')
+            
+        element_matrix = np.delete(element_matrix, remove_ix, axis=0)            
+
         eldef = Part(node_matrix, element_matrix, sections=sections,
                      assemble=False, forced_ndofs=6)
             
@@ -211,7 +235,6 @@ def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_s
             for el_label in elements:
                 el = eldef.get_element(int(el_label))
 
-
                 el.assign_e2(e2)
                 el.assign_e3(e3)
 
@@ -219,7 +242,7 @@ def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_s
     else:
         eldef = None
 
-    # Create model object
+    # Create model object (only hydro part)
     model = Model.from_nodes_and_types(pontoon_nodes, [ptypes[pt] for pt in pontoon_types], modal_dry=modal_dry, 
                                        rotation=pontoon_rotation, eldef=eldef, labels=pontoon_names)
     
@@ -249,7 +272,7 @@ def import_folder(model_folder, pontoon_stl='pontoon.stl', aero_sections='aero_s
             model.assign_drag_elements(data)
         except:
             print('Specified drag_elements file found or invalid. No drag elements defined.')
-            
+    
     model.connect_eldef()
     model.assign_dry_modes()
     

wawi/wind.py

@@ -610,10 +610,10 @@ def generic_kaimal_matrix(omega, nodes, T_wind, A, sigma, C, Lx, U, options=None
     return SvSv
 
 
-def loadmatrix_fe(V, load_coefficients, rho, B, D, Admittance = None):
+def loadmatrix_fe(V, load_coefficients, rho, B, D, admittance=None):
 
-    if Admittance is None :
-        Admittance = lambda omega_k: np.ones( (4,3) )
+    if admittance is None :
+        admittance = lambda omega_k: np.ones( (4,3) )
 
     Cd = load_coefficients['Cd']
     dCd = load_coefficients['dCd']
@@ -623,7 +623,7 @@ def loadmatrix_fe(V, load_coefficients, rho, B, D, Admittance = None):
     dCm = load_coefficients['dCm']
     
     # Equation 7 from Oiseth, 2010
-    BqBq = lambda omega_k: 1/2*rho*V*B*Admittance(omega_k*B/V/2/np.pi)*np.array([[0,            0,          0],
+    BqBq = lambda omega_k: 1/2*rho*V*B*admittance(omega_k*B/V/2/np.pi)*np.array([[0,            0,          0],
                                                                                 [0,     2*D/B*Cd,          (D/B*dCd-Cl)],
                                                                                 [0,         2*Cl,          (dCl+D/B*Cd)],
                                                                                 [0,      -2*B*Cm,          -B*dCm]])
@@ -636,10 +636,10 @@ def loadmatrix_fe_static(V, load_coefficients, rho, B, D ):
     Cl = load_coefficients['Cl']
     Cm = load_coefficients['Cm']
         
-    BqBq = 1/2*rho*V**2*B*np.array([[ 0,            0       , 0 ],
-                                    [ D/B*Cd,       0       , 0 ],
-                                    [ 0,            0       , Cl  ],
-                                    [ 0,            B*Cm    , 0  ]])
+    BqBq = 1/2*rho*V**2*B*np.array([[ 0 ],
+                                    [ D/B*Cd ],
+                                    [ Cl  ],
+                                    [ -B*Cm ]])
     return BqBq
 
 def loadvector(T_el, Bq, T_wind, L, static = False):
@@ -660,15 +660,16 @@ def loadvector(T_el, Bq, T_wind, L, static = False):
  
     # Transform from wind coordinates to local element coordinates 
     
-    if static is False:
-        T = T_el @ T_wind.T   
-    else:
-        T = T_el @ T_wind.T @ np.ones( [3,1] )
+    T = T_el @ T_wind.T   
     
     T_full = blkdiag(T_el, 4)     # Block diagonal - repeated 4 times to transform both trans and rot DOFs at each node (2+2)
     
     # T_full.T transforms L-->G
-    R =  T_full.T @ G @ Bq @ T 
+    if static is False:
+        R =  T_full.T @ G @ Bq @ T 
+    else:
+        R =  T_full.T @ G @ Bq 
+        
     R1 =  R[0:6]         # Element node 1
     R2 =  R[6:12]        # Element node 2
 
@@ -678,7 +679,7 @@ def loadvector(T_el, Bq, T_wind, L, static = False):
 
 def windaction(omega, S, load_coefficients, elements, T_wind, 
                phi, B, D, U, omega_reduced=None, rho=1.225, print_progress=True,
-               section_lookup=None, nodes=None, Admittance = None):
+               section_lookup=None, nodes=None, admittance=None):
     
     if nodes is None:
         nodes = list(set([a for b in [el.nodes for el in elements] for a in b]))
@@ -704,7 +705,7 @@ def windaction(omega, S, load_coefficients, elements, T_wind,
         lc_fun = lambda el: load_coefficients
         B_fun = lambda el: B
         D_fun = lambda el: D
-        Admittance_fun = lambda el: Admittance
+        admittance_fun = lambda el: admittance
     else:
         def get_sec(el):
             for key in section_lookup:
@@ -715,7 +716,7 @@ def windaction(omega, S, load_coefficients, elements, T_wind,
         B_fun = lambda el: B[get_sec(el)]
         D_fun = lambda el: D[get_sec(el)]
     
-    if Admittance is None: # omit the frequency loop if ADmittance is not included - faster !
+    if admittance is None: # omit the frequency loop if ADmittance is not included - faster !
         RG = np.zeros([len(nodes)*n_dofs, 3])
         for el in elements:            
             node1_dofs = el.nodes[0].global_dofs
@@ -724,7 +725,7 @@ def windaction(omega, S, load_coefficients, elements, T_wind,
             mean_wind = U(el.get_cog())         
             Vn = normal_wind(T_wind, el.T0)*mean_wind        # Find the normal wind
             BqBq = loadmatrix_fe(Vn, lc_fun(el), rho, B_fun(el), D_fun(el))
-            R1, R2 = loadvector(el.T0, BqBq, T_wind, el.L) # Obtain the load vector for each element
+            R1, R2 = loadvector(el.T0, BqBq(1), T_wind, el.L) # Obtain the load vector for each element
 
             RG[node1_dofs, :] = RG[node1_dofs, :] + R1   # Add the contribution from the element (end 1) to the system
             RG[node2_dofs, :] = RG[node2_dofs, :] + R2   # Add the contribution from the element (end 2) to the system
@@ -747,7 +748,7 @@ def windaction(omega, S, load_coefficients, elements, T_wind,
                 genSqSq_reduced[:, :, k] = phiT_RG_block @ S(omega_k) @ phiT_RG_block.T  # to modal coordinates
 
     else: # admittance is given - triple loop (the old way, slower)
-        Admittance_fun = lambda el: Admittance[get_sec(el)]
+        admittance_fun = lambda el: admittance[get_sec(el)]
 
         for k, omega_k in enumerate(omega_reduced): 
             if print_progress:
@@ -763,7 +764,7 @@ def windaction(omega, S, load_coefficients, elements, T_wind,
 
                 mean_wind = U(el.get_cog())         
                 Vn = normal_wind(T_wind, el.T0)*mean_wind        # Find the normal wind
-                BqBq = loadmatrix_fe(Vn, lc_fun(el), rho, B_fun(el), D_fun(el), Admittance = Admittance_fun(el))
+                BqBq = loadmatrix_fe(Vn, lc_fun(el), rho, B_fun(el), D_fun(el), admittance=admittance_fun(el))
                 R1, R2 = loadvector(el.T0, BqBq(omega_k), T_wind, el.L) # Obtain the load vector for each element
 
                 RG[node1_dofs, :] = RG[node1_dofs, :] + R1   # Add the contribution from the element (end 1) to the system

{wawi-0.0.3.dist-info → wawi-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wawi
-Version: 0.0.3
+Version: 0.0.5
 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

{wawi-0.0.3.dist-info → wawi-0.0.5.dist-info}/RECORD

@@ -1,9 +1,8 @@
-wawi/__init__.py,sha256=QHZAh_Xn6XY-OJjNJfylCc7nxgq1uXVgu1IQtnv1VPI,161
-wawi/abq.py,sha256=Sb58fd_REKbOmWngLzzB3_3PxCR-iO_HK1CpdM8sjKs,42660
+wawi/__init__.py,sha256=UmlmJ1lvY8_pmiLPeP6iSfUoh1tH7dgtviM54FItU8Y,158
 wawi/fe.py,sha256=22QKI1GlfsG7o_TpFXaKJfzmbO2_2zdIMaoJmaIZdmY,4001
-wawi/general.py,sha256=BWlI7oNnYTwfEwztwySl_j45YD6s634rczFO5D8iolI,13935
+wawi/general.py,sha256=xHRoDkcchrL6Y7pTUqGsjBHh8YBLvX9dYcNXXCjQap8,13787
 wawi/identification.py,sha256=bVB6EVRR6J39OO9ckuzNJ6f0FwIo4cLqfYgrsIN89TE,1748
-wawi/io.py,sha256=XANKEHBPGC_1-Rn2QPlI_ygpntAR1Haw962IovER8jA,24586
+wawi/io.py,sha256=5p3q_lQStQR85yo5hZ1Syl25RS2C__zIyV6e_2qRRw4,25308
 wawi/modal.py,sha256=c8cZ98y8BZuFcfrwweE75AAX7QGFDfjLeYK07hzAvCo,20249
 wawi/plot.py,sha256=XVaQjkjXv26Kt-G8xtAULa4KbWcCIErTQfB6euPACLg,19750
 wawi/prob.py,sha256=0nCdKdwkNf4M6sHyCZuYlt06gD0NmqRNfl4KesgySWA,215
@@ -13,10 +12,10 @@ wawi/structural.py,sha256=t25ohH4uBbzUJ7Hqn_kUfYhxcikZkRp8da-9dn7aEbw,8341
 wawi/time_domain.py,sha256=Oe-jviwDtBgpSmA7ZVmKEqQ5tdvsekXwOakYO1qUsN4,3841
 wawi/tools.py,sha256=-hFBvf0qK4AMn2MQRhrOitDMMMKm2QuRkVfbPBefEkQ,332
 wawi/wave.py,sha256=hhKg3KhKMBhOoCI7g8PFOGUbYgVhDyGmnYdBEdJ8mkY,16064
-wawi/wind.py,sha256=uyKuNugXmkXDGFDRvddbPCAfoGfWkJR7Ge6qNm-uiLM,38548
+wawi/wind.py,sha256=kyDT-CuVoRdyynDWFW4BLxCj08qrz073c5bi3TgMJFs,38451
 wawi/wind_code.py,sha256=8OKLPpqc84obNNKBoYb2NunKjcn6a3i_pAWpIFEwg4Q,223
-wawi-0.0.3.dist-info/LICENSE,sha256=bH1aWhrNbbPLrYnVFRaoYYzcUr-figHjry-kGB7Tc54,1076
-wawi-0.0.3.dist-info/METADATA,sha256=Wl2EVbB9D3m0LPJsgJX6D4jCNIUKpCYh3Jl40bBnuAg,3133
-wawi-0.0.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wawi-0.0.3.dist-info/top_level.txt,sha256=sE2NH_xVXnDKTGeIYzeX5IyU_j5vYDLl32v5uLiOMT4,5
-wawi-0.0.3.dist-info/RECORD,,
+wawi-0.0.5.dist-info/LICENSE,sha256=bH1aWhrNbbPLrYnVFRaoYYzcUr-figHjry-kGB7Tc54,1076
+wawi-0.0.5.dist-info/METADATA,sha256=SM_H-uu51J62GxpCklSaS5af_vanAGTVTrEB23Ws36M,3133
+wawi-0.0.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wawi-0.0.5.dist-info/top_level.txt,sha256=sE2NH_xVXnDKTGeIYzeX5IyU_j5vYDLl32v5uLiOMT4,5
+wawi-0.0.5.dist-info/RECORD,,