wawi 0.0.3__tar.gz → 0.0.5__tar.gz

{wawi-0.0.3 → wawi-0.0.5}/PKG-INFO

@@ -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 → wawi-0.0.5}/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-0.0.3 → wawi-0.0.5}/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-0.0.3 → wawi-0.0.5}/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-0.0.3 → wawi-0.0.5}/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 → wawi-0.0.5}/wawi.egg-info/PKG-INFO

@@ -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 → wawi-0.0.5}/wawi.egg-info/SOURCES.txt

@@ -1,13 +1,11 @@
 LICENSE
 README.md
 pyproject.toml
-tests/test_IABSE_step11a - Copy.py
 tests/test_IABSE_step11a.py
 tests/test_IABSE_step11c.py
 tests/test_IABSE_step2a.py
 tests/test_wind.py
 wawi/__init__.py
-wawi/abq.py
 wawi/fe.py
 wawi/general.py
 wawi/identification.py

wawi-0.0.3/tests/test_IABSE_step11a - Copy.py

@@ -1,104 +0,0 @@
-
-import pytest
-import numpy as np
-from math import isclose
-import dill
-
-# use the local wawi (Github folder) instead of the installed version (remove this when using the installed version)
-import sys
-import os
-sys.path.insert(0, os.path.abspath('C:\\Users\\aksef\\Documents\\GitHub\\wawi'))
-
-# import functions
-from wawi.io import import_folder
-from wawi.model import Windstate
-from wawi.wind import ADs, flatplate_ads
-from wawi.wind import itflutter_cont_naive
-from wawi.general import eval_3d_fun
-
-model_folder = './tests/models/model_2a'
-
-def AD_dict(AD_funs):
-    AD_s = dict(
-        A1 = lambda v: -AD_funs['a_fun'][0](v), # sign convention
-        A2 = AD_funs['a_fun'][1],
-        A3 = AD_funs['a_fun'][2],
-        A4 = lambda v: -AD_funs['a_fun'][3](v),
-        A5 = lambda v: -AD_funs['a_fun'][4](v),
-        A6 = lambda v: -AD_funs['a_fun'][5](v),
-        
-        H1 = AD_funs['h_fun'][0],
-        H2 = lambda v: -AD_funs['h_fun'][1](v),
-        H3 = lambda v: -AD_funs['h_fun'][2](v),
-        H4 = AD_funs['h_fun'][3],
-        H5 = AD_funs['h_fun'][4],
-        H6 = AD_funs['h_fun'][5],
-        
-        P1 = AD_funs['p_fun'][0],
-        P2 = lambda v: -AD_funs['p_fun'][1](v),
-        P3 = lambda v: -AD_funs['p_fun'][2](v),
-        P4 = AD_funs['p_fun'][3],
-        P5 = AD_funs['p_fun'][4],
-        P6 = AD_funs['p_fun'][5],
-        )
-    return AD_s
-
-def iabse_2a_windstate(mean_v):
-    windstate = Windstate(mean_v, 
-                                  90, 
-                                  Iu=0.1, 
-                                  Iw=0.05, 
-                                  Au=6.8, Aw=9.4,  # not used in von Karman
-                                  Cuy=10.0, Cwy=6.5,
-                                  Cuz=10.0, Cwz=3.0,
-                                  Lux=200.0, Lwx=20.0,
-                                  x_ref=[0,0,0], rho=1.22,
-                                    options = {
-                                        'spectra_type': 'vonKarman'
-                                        }
-                                  )
-
-    return windstate
-
-davenport = lambda fred: 2*(7*fred-1+np.exp(-7*fred))/(7*fred)**2
-
-omega = np.linspace(0.001, 6, 1000)
-
-# import the model and assign properties
-model = import_folder(model_folder)
-model.modal_dry.xi0 = .3e-2
-
-# assign ADs (BB3 ADs)
-with open( model_folder + '/AD_funs_BB3_scanlan.pkl', 'rb') as file:
-    AD_funs = dill.load(file)
-AD_s = AD_dict(AD_funs)
-for key in model.aero.sections:
-    model.aero.sections[key].ADs = ADs(**AD_s)
-
-V = 30
-# assign windstate
-model.aero.windstate = iabse_2a_windstate(30)
-# admittance
-for key in model.aero.sections:
-    model.aero.sections[key].Admittance = lambda fred: np.full((4, 3), davenport(fred))
-
-model.run_eig(w_initial=model.modal_dry.omega_n.tolist(), freq_kind=True, itmax=100)
-
-# run analysis
-model.run_freqsim(omega,
-                    include_selfexcited=['aero'], 
-                    include_action=['aero'],
-                    print_progress=False, merge_aero_sections=True) 
-# RMS responses
-stds = model.get_result_std(key = 'full')
-# global dofs
-global_dof_ix1 = model.eldef.node_dof_lookup(36)[1:4]
-global_dof_ix2 = model.eldef.node_dof_lookup(26)[1:4]
-
-assert isclose(stds[global_dof_ix1][0], RMS_horz_exp1, rel_tol = 10e-2) # midspan horizontal 
-assert isclose(stds[global_dof_ix1][1], RMS_vert_exp1, rel_tol = 10e-2) # midspan vertical 
-assert isclose(stds[global_dof_ix1][2]*31/2, RMS_tors_exp1, rel_tol = 10e-2) # midspan torsional 
-
-assert isclose(stds[global_dof_ix2][0], RMS_horz_exp2, rel_tol = 15e-2) # q-span horizontal 
-assert isclose(stds[global_dof_ix2][1], RMS_vert_exp2, rel_tol = 15e-2) # q-span vertical 
-assert isclose(stds[global_dof_ix2][2]*31/2, RMS_tors_exp2, rel_tol = 20e-2) # q-span torsional