wawi 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

examples/3 Software interfacing/Abaqus model export/bergsoysund-export.py

@@ -42,25 +42,29 @@ with open('element.json', 'w') as f:
 phi_full_disp = wawi.ext.abq.get_nodal_phi(step_obj, nodes, flatten_components=True, field_outputs=['UT', 'UR'])
 
 #%% Get pontoon data
-node_matrix_pontoons = wawi.ext.abq.get_element_matrices(region_hydro, obj=part)
+pontoon_sets = ['P1', 'P2', 'P3', 'P4', 'P5', 'P6', 'P7']
+pontoon_types = ['p17', 'p26', 'p345', 'p345', 'p345', 'p26', 'p17']
+rotations = np.array([13.944407004001892, 9.2962713360012632, 4.6481356680006325, 0.0,
+                     -4.6481356680006334, -9.2962713360012632, -13.944407004001883])
+
+node_matrix_pontoons = np.vstack([wawi.ext.abq.get_element_matrices(db.rootAssembly.nodeSets[pset], obj=part) for pset in pontoon_sets])
 node_labels_pontoons = node_matrix_pontoons[:,0]
-nodes_pontoons = wawi.ext.abq.create_list_of_nodes(part, node_labels_pontoons)
-phi_h = wawi.ext.abq.get_nodal_phi(step_obj, nodes_pontoons, flatten_components=True, field_outputs=['UT', 'UR'])
 
 # Export pontoon.json
-pontoon_types = ['ptype_1']*7   
-rotations = -np.array([13.944407004001892, 9.2962713360012632, 4.6481356680006325, 0.0,
-                     -4.6481356680006334, -9.2962713360012632, -13.944407004001883])
-
 pontoon_data = OrderedDict()
 
 for ix, node in enumerate(node_labels_pontoons):
-    key = 'P'+str (ix+1)
+    key = pontoon_sets[ix]
     pontoon_data[key] = dict(coordinates=node_matrix_pontoons[ix, 1:].tolist(),
                             node=node,
                             rotation=rotations[ix],
                             pontoon_type=pontoon_types[ix])
 
+
+nodes_pontoons = wawi.ext.abq.create_list_of_nodes(part, node_labels_pontoons)
+phi_h = wawi.ext.abq.get_nodal_phi(step_obj, nodes_pontoons, flatten_components=True, field_outputs=['UT', 'UR'])
+
+
 with open('pontoon.json', 'w') as f:
     json.dump(pontoon_data, f)
 

examples/3 Software interfacing/Abaqus model export/hardanger-export.py

@@ -0,0 +1,47 @@
+from sys import path
+from collections import OrderedDict
+
+path.append('C:/Users/knutankv/git-repos/wawi/')   # this is an easy quick fix to enable importing wawi package in Abaqus environment
+savefolder = 'C:/Temp/'
+
+# NOTE: Only linear *beam* elements are supported in relevant sets!!
+
+import wawi.ext.abq
+import json
+import numpy as np
+
+#%% Get database object (ODB) 
+db = wawi.ext.abq.get_db('odb')
+
+#%% Definitions
+frequency_step = 'Step-11'  # define set name to extract modal properties from
+part = db.rootAssembly.instances['PART-1-1']    # define part 
+step_obj = db.steps[frequency_step]             
+
+part.ElementSet('ALL', part.elements)   # get all elements (for full element and node matrix)
+
+#%% Grab regions
+region_full = part.elementSets['ALL']
+
+#%% Get modal parameters
+fn, m = wawi.ext.abq.get_modal_parameters(frequency_step)
+
+#%% Get wind elements and mode shapes
+node_matrix, element_matrix = wawi.ext.abq.get_element_matrices(region_full, obj=part)
+node_labels = node_matrix[:,0]
+nodes = wawi.ext.abq.create_list_of_nodes(part, node_labels)
+
+# Export element definitions as json
+el_data = dict(node_matrix=node_matrix.tolist(), 
+               element_matrix=element_matrix.tolist())
+
+with open('element.json', 'w') as f:
+    json.dump(el_data, f)
+
+phi_full_disp = wawi.ext.abq.get_nodal_phi(step_obj, nodes, flatten_components=True, field_outputs=['U', 'UR'])
+
+## ------------------- EXPORT MODES ----------------
+modal_data = dict(omega_n=(fn*2*np.pi).tolist(), m=m.tolist(), phi=dict(full=phi_full_disp.tolist()))
+
+with open('modal.json', 'w') as f:
+    json.dump(modal_data, f)

tests/test_IABSE_step11a.py

@@ -3,10 +3,10 @@ import pytest
 import numpy as np
 from math import isclose
 
-# 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'))
+# use the local wawi 
+#import sys
+#import os
+#sys.path.insert(0, r'C:\Users\aksef\OneDrive - Multiconsult\project\wawi\wawi_keep')
 
 # import functions
 from wawi.io import import_folder
@@ -108,7 +108,6 @@ def test_mean_speed_45():
     # PSD response
     S_exp = np.transpose(np.array( [ [0.0167, -0.007j], [0.007j, 0.00293] ] ))
 
-
     model = import_folder(model_folder)
     model.aero.windstate = iabse_11a_windstate(V)
 
@@ -121,11 +120,11 @@ def test_mean_speed_45():
     omega = np.array([0.001, f])*np.pi*2
     HH = eval_3d_fun(model.get_frf_fun(opt = 1), omega)
 
-    model.aero.sections['girder0'].Admittance = lambda fred: np.full((4, 3), davenport(fred))
+    model.aero.sections['girder0'].admittance = lambda fred: np.full((4, 3), davenport(fred))
     model.run_freqsim(omega,
                     include_selfexcited=['aero'], 
                     include_action=['aero'],
-                    print_progress=False, merge_aero_sections=True)
+                    print_progress=False)
 
     global_dof_ix = np.array([2,3])
     S = model.get_result_psd(key='full', 
@@ -170,12 +169,14 @@ def test_response_spectra(Vbuff, RS_vert_exp, RS_tors_exp):
     model.aero.windstate = iabse_11a_windstate(Vbuff)
     model.modal_dry.xi0 = .3e-2
     model.aero.sections['girder0'].ADs = ADs(**flatplate_ads())
-    model.aero.sections['girder0'].Admittance = lambda fred: np.full((4, 3), davenport(fred))
+    model.aero.sections['girder0'].admittance = lambda fred: np.full((4, 3), davenport(fred))
     
     model.run_freqsim(omega_axis,
                     include_selfexcited=['aero'], 
                     include_action=['aero'],
-                    print_progress=False, merge_aero_sections=True)
+                    print_progress=False, 
+                    #merge_aero_sections=True
+                    )
 
     global_dof_ix = np.array([2,3])
     S = model.get_result_psd(key='full', 
@@ -204,12 +205,12 @@ def test_RMS_response(Vbuff, RMS_vert_exp, RMS_tors_exp):
     model.aero.windstate = iabse_11a_windstate(Vbuff)
     model.modal_dry.xi0 = .3e-2
     model.aero.sections['girder0'].ADs = ADs(**flatplate_ads())
-    model.aero.sections['girder0'].Admittance = lambda fred: np.full((4, 3), davenport(fred))
+    model.aero.sections['girder0'].admittance = lambda fred: np.full((4, 3), davenport(fred))
 
     model.run_freqsim(omega_axis,
                     include_selfexcited=['aero'], 
                     include_action=['aero'],
-                    print_progress=False, merge_aero_sections=True)
+                    print_progress=False)
     
     stds = model.get_result_std(key = 'full')
 

tests/test_IABSE_step11c.py

@@ -5,9 +5,9 @@ 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 sys
+#import os
+#sys.path.insert(0, os.path.abspath('C:\\Users\\aksef\\Documents\\GitHub\\wawi'))
 
 # import functions
 from wawi.io import import_folder
@@ -166,11 +166,11 @@ def test_mean_speed_45():
     omega = np.array([0.001, f])*np.pi*2
     HH = eval_3d_fun(model.get_frf_fun(opt = 1), omega)
 
-    model.aero.sections['girder0'].Admittance = lambda fred: np.full((4, 3), davenport(fred))
+    model.aero.sections['girder0'].admittance = lambda fred: np.full((4, 3), davenport(fred))
     model.run_freqsim(omega,
                     include_selfexcited=['aero'], 
                     include_action=['aero'],
-                    print_progress=False, merge_aero_sections=True)
+                    print_progress=False)
 
     global_dof_ix = np.array([1,2,3])
     S = model.get_result_psd(key='full', 
@@ -225,13 +225,13 @@ def test_response_spectra(Vbuff, RS_horz_exp, RS_vert_exp, RS_tors_exp):
         AD_funs = dill.load(file)
     AD_s = AD_dict(AD_funs)
     model.aero.sections['girder0'].ADs = ADs(**AD_s)
-    model.aero.sections['girder0'].Admittance = lambda fred: np.full((4, 3), davenport(fred))
+    model.aero.sections['girder0'].admittance = lambda fred: np.full((4, 3), davenport(fred))
 
     # run analysis
     model.run_freqsim(omega_axis,
                       include_selfexcited=['aero'], 
                       include_action=['aero'],
-                      print_progress=False, merge_aero_sections=True)
+                      print_progress=False)
     
     # extract PSD
     global_dof_ix = np.array([1,2,3])
@@ -265,13 +265,13 @@ def test_RMS_response(Vbuff, RMS_horz_exp, RMS_vert_exp, RMS_tors_exp):
         AD_funs = dill.load(file)
     AD_s = AD_dict(AD_funs)
     model.aero.sections['girder0'].ADs = ADs(**AD_s)
-    model.aero.sections['girder0'].Admittance = lambda fred: np.full((4, 3), davenport(fred))
+    model.aero.sections['girder0'].admittance = lambda fred: np.full((4, 3), davenport(fred))
     
     # run analysis
     model.run_freqsim(omega_axis,
                     include_selfexcited=['aero'], 
                     include_action=['aero'],
-                    print_progress=False, merge_aero_sections=True)
+                    print_progress=False)
     
     # RMS responses
     stds = model.get_result_std(key = 'full')

tests/test_IABSE_step2a.py

@@ -4,9 +4,9 @@ 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 sys
+#import os
+#sys.path.insert(0, os.path.abspath('C:\\Users\\aksef\\Documents\\GitHub\\wawi'))
 
 from wawi.io import import_folder
 from wawi.model import Windstate
@@ -184,14 +184,14 @@ def test_RS_spectra():
     model.aero.windstate = iabse_2a_windstate(V)
     # admittance
     for key in model.aero.sections:
-        model.aero.sections[key].Admittance = lambda fred: np.full((4, 3), davenport(fred))
+        model.aero.sections[key].admittance = lambda fred: np.full((4, 3), davenport(fred))
 
     # run analysis
     model.run_freqsim(omega,
                         include_selfexcited=['aero'], 
                         include_action=['aero'],
-                        print_progress=False, merge_aero_sections=True,
-                                            ensure_at_peaks=False) # keep the given frequency axis
+                        print_progress=False,
+                        ensure_at_peaks=False) # keep the given frequency axis
 
 
     # extract PSD - at the midpsan
@@ -237,7 +237,7 @@ def test_RMS_response(Vbuff, RMS_horz_exp1, RMS_vert_exp1, RMS_tors_exp1, RMS_ho
     model.aero.windstate = iabse_2a_windstate(Vbuff)
     # admittance
     for key in model.aero.sections:
-        model.aero.sections[key].Admittance = lambda fred: np.full((4, 3), davenport(fred))
+        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) # alters integration 
 
@@ -245,7 +245,7 @@ def test_RMS_response(Vbuff, RMS_horz_exp1, RMS_vert_exp1, RMS_tors_exp1, RMS_ho
     model.run_freqsim(omega,
                         include_selfexcited=['aero'], 
                         include_action=['aero'],
-                        print_progress=False, merge_aero_sections=True) 
+                        print_progress=False) 
     # RMS responses
     stds = model.get_result_std(key = 'full')
     # global dofs

wawi/__init__.py

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

wawi/io.py

@@ -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
     ---------------

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
             
@@ -192,7 +193,7 @@ def iteig(K, C, M, omega=None, omega_ref=0, input_functions=True, itmax=None, to
         q[:, m] = phi[:,0]
 
         if print_progress:
-            pp(m+2,2*ndofs, sym='>', postfix=' finished with iterative modal analysis.')
+            pp(m+2,2*ndofs+1, sym='>', postfix=' finished with iterative modal analysis.')
 
     if print_progress:
         print(' ')
@@ -323,7 +324,7 @@ def iteig_freq(K, C, M, omega=None, itmax=15, reference_omega=0, input_functions
         q[:, m] = qi[:, m] 
 
         if print_progress:
-            pp(m+2,2*ndofs, sym='>', postfix=' finished with iterative modal analysis.')
+            pp(m+2 ,2*ndofs+1, sym='>', postfix=' finished with iterative modal analysis.')
 
     if print_progress:
         print(' ')

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

@@ -16,6 +16,8 @@ from wawi.structural import freqsim
 from wawi.tools import print_progress as pp
 from wawi.wave import stochastic_linearize, waveaction_fft, harmonic_linearize
 from wawi.wind import windaction, windaction_static
+# from wawi.io import import_folder
+
 import dill
 
 
@@ -266,6 +268,17 @@ class Model:
             
         self.Cquad_lin = 0.0
     
+    # Not used due to circular referencing.
+    # @staticmethod
+    # def from_folder(*args, **kwargs):
+    #     '''
+    #     Alternative constructor. Passes all inputs to `wawi.io.import_folder`.
+    #     '''
+
+    #     model = import_folder(*args, **kwargs)
+        
+    #     return model
+    
 
     @staticmethod    #alternative constructor
     def from_wwi(path):
@@ -568,7 +581,7 @@ class Model:
             pl.add_point_labels(np.vstack([wind_origin]), [f'U={self.aero.windstate.U0:.2f} m/s from heading {self.aero.windstate.direction:.1f} deg (CW)'])
             
         # Plot wave arrow        
-        if plot_wave_direction and self.hydro.seastate is not None:
+        if plot_wave_direction and self.hydro is not None and self.hydro.seastate is not None:
             if self.hydro.seastate.homogeneous:
                 if wave_origin=='center':
                     wave_origin = origin*1
@@ -1030,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)
@@ -1056,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):
@@ -1131,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:
@@ -1335,4 +1356,10 @@ class Model:
         return ix
     
     def get_node_ixs(self, nodelabels):
-        return [self.get_node_ix(nodelabel) for nodelabel in nodelabels]
+        return [self.get_node_ix(nodelabel) for nodelabel in nodelabels]
+    
+    def get_aerosection_phi_and_x(self, key):
+        ixs = self.aero.phi_ixs[key]
+        x = np.vstack([node.coordinates for node in self.aero.eldef[key].nodes])
+
+        return ixs, x

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.11.dist-info → wawi-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wawi
-Version: 0.0.11
+Version: 0.0.13
 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,7 +48,7 @@ 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.
 
@@ -68,6 +68,11 @@ 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.png)
+
 Quick start
 =======================
 Assuming a premade WAWI-model is created and saved as `MyModel.wwi´, it can be imported as follows:

{wawi-0.0.11.dist-info → wawi-0.0.13.dist-info}/RECORD

@@ -1,15 +1,15 @@
-examples/3 Software interfacing/Abaqus model export/bergsoysund-export.py,sha256=-1jrDNmevOcB1IV0iLOiW0z-QiNkOv8GkGk-7K8CcK0,2606
-examples/3 Software interfacing/Abaqus model export/test.py,sha256=kAmol3XZQ2jkO2qujEQrqx38Q24LbzrYZzqE5ng5-E8,2188
-tests/test_IABSE_step11a.py,sha256=guRsaP9gpERvSp0Ui3hO-WH764BcIe6Qx8vC4QVTAoU,8013
-tests/test_IABSE_step11c.py,sha256=U_NcL6BAmnQG7MSjkr8KYk9hH8ZPdZgg17pM9ugUBzo,10412
-tests/test_IABSE_step2a.py,sha256=L5AyTOJZ_sPmcmW_4h-sQfRwvVW71LZkXc1yz33DABM,10203
+examples/3 Software interfacing/Abaqus model export/bergsoysund-export.py,sha256=3HSV009z5oqIUgM6B7xucUpGeh2f8SzC9FSiyP0zd7A,2760
+examples/3 Software interfacing/Abaqus model export/hardanger-export.py,sha256=YiqS-TxnkydwVHE7k-57nP6CDsxqSXgWR3f8UytAubY,1603
+tests/test_IABSE_step11a.py,sha256=zTWOxR78F0PNhNqiqodEcL65vdJXyMP78nkJumhy-RA,7915
+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=rH8H6W3AN1iZb8rU9K_8k-mycRSvQNxFq97Biy0-hzw,183
+wawi/__init__.py,sha256=XwztcgUqHaXYX8ywshKc0BVsSVDStFgeENuVdN3PWuk,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=WjNGFsk0C3tYRy18Q9WNRCatmGJtq1JSv0WrkGV02Eo,20247
+wawi/io.py,sha256=3cPgyVGpZcne60-vXQZYXVj9e5m044XDeR3eMZ3BF7Y,25359
+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=34qblCqGpIKwbsa38CJ3a8KbHYyX8LDWOFQhdRwK98Q,52504
+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.11.dist-info/licenses/LICENSE,sha256=bH1aWhrNbbPLrYnVFRaoYYzcUr-figHjry-kGB7Tc54,1076
-wawi-0.0.11.dist-info/METADATA,sha256=TPaFfAkztMCRaw4F8U5JT6XqOK2IjY3orqmBmguLoaY,6530
-wawi-0.0.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-wawi-0.0.11.dist-info/top_level.txt,sha256=Nk5G_ZwgZRCb9ZMWZdr1M3QIskX6kCnlqeMl67N3zg8,20
-wawi-0.0.11.dist-info/RECORD,,
+wawi-0.0.13.dist-info/licenses/LICENSE,sha256=bH1aWhrNbbPLrYnVFRaoYYzcUr-figHjry-kGB7Tc54,1076
+wawi-0.0.13.dist-info/METADATA,sha256=aYeyNdzi5eAyQn3TvytkWoKeuWncwMNiWwBpLu_-MyI,6991
+wawi-0.0.13.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+wawi-0.0.13.dist-info/top_level.txt,sha256=Nk5G_ZwgZRCb9ZMWZdr1M3QIskX6kCnlqeMl67N3zg8,20
+wawi-0.0.13.dist-info/RECORD,,

{wawi-0.0.11.dist-info → wawi-0.0.13.dist-info}/WHEEL

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

examples/3 Software interfacing/Abaqus model export/test.py

@@ -1,67 +0,0 @@
-from sys import path
-from collections import OrderedDict
-
-path.append('C:/Users/knutankv/git-repos/wawi/')   # this is an easy quick fix to enable importing wawi package in Abaqus environment
-savefolder = 'C:/Temp/'
-
-import wawi.ext.abq
-import json
-import numpy as np
-
-#%% Get (O) database object
-db = wawi.ext.abq.get_db('odb')
-
-#%% Definitions
-frequency_step = 'Step-6'
-part = db.rootAssembly.instances['BRIDGE-1']
-step_obj = db.steps[frequency_step]
-
-if 'ALL' not in part.elementSets:   #CREATE SET OF ALL ELEMENTS IN PART
-    part.ElementSet('ALL', part.elements)
-
-#%% Grab regions
-region_full = part.elementSets['ALL']
-region_hydro = part.nodeSets['SPRING']
-
-#%% Get modal parameters
-fn, m = wawi.ext.abq.get_modal_parameters(frequency_step)
-
-#%% Get wind elements and mode shapes
-node_matrix, element_matrix = wawi.ext.abq.get_element_matrices(region_full, obj=part)
-node_labels = node_matrix[:,0]
-
-# Export element definitions as json
-el_data = dict(node_matrix=node_matrix.tolist(), element_matrix=element_matrix.tolist())
-
-with open('element.json', 'w') as f:
-    json.dump(el_data, f)
-
-phi_full_disp = wawi.ext.abq.get_nodal_phi(step_obj, node_labels, flatten_components=True)
-
-#%% Get pontoon data
-node_matrix_pontoons = wawi.ext.abq.get_element_matrices(region_hydro, obj=part, sort_nodes_fun=None)
-node_labels = node_matrix_pontoons[:,0]
-phi_h = wawi.ext.abq.get_nodal_phi(step_obj, node_labels, flatten_components=True)
-
-# Export pontoon.json
-pontoon_types = ['ptype_1']*48
-rotations = np.zeros(48)
-
-pontoon_data = OrderedDict()
-
-for ix, node in enumerate(node_labels):
-    key = 'P'+str (ix+1)
-    pontoon_data[key] = dict(coordinates=node_matrix_pontoons[ix, 1:].tolist(),
-                            node=node,
-                            rotation=rotations[ix],
-                            pontoon_type=pontoon_types[ix])
-
-with open('pontoon.json', 'w') as f:
-    json.dump(pontoon_data, f)
-
-## ------------------- EXPORT MODES ----------------
-modal_data = dict(omega_n=(fn*2*np.pi).tolist(), m=m.tolist(), phi=dict(full=phi_full_disp.tolist(),
-                                     hydro=phi_h.tolist()))
-
-with open('modal.json', 'w') as f:
-    json.dump(modal_data, f)