wawi 0.0.7__tar.gz → 0.0.8__tar.gz

{wawi-0.0.7/wawi.egg-info → wawi-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wawi
-Version: 0.0.7
+Version: 0.0.8
 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.7 → wawi-0.0.8}/wawi/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.7"
+__version__ = "0.0.8"
 
 __pdoc__ = dict()
 __pdoc__['wawi.abq'] = False

{wawi-0.0.7 → wawi-0.0.8}/wawi/io.py

@@ -355,25 +355,25 @@ def import_wadam_hydro_transfer(wadam_file):
         6-by-len(theta)-by-len(omega)
     '''
 
-    string = ('.+W A V E  P E R I O D.+=\s+(?P<period>.+):.+\n.+'
-              'H E A D I N G   A N G L E.+=\s+(?P<theta>.+):(?:.*\n){5,10}'
+    string = (r'.+W A V E  P E R I O D.+=\s+(?P<period>.+):.+\n.+'
+              r'H E A D I N G   A N G L E.+=\s+(?P<theta>.+):(?:.*\n){5,10}'
               
-              '.+EXCITING FORCES AND MOMENTS FROM THE HASKIN RELATIONS(?:.*\n){4,6}\s+'
+              r'.+EXCITING FORCES AND MOMENTS FROM THE HASKIN RELATIONS(?:.*\n){4,6}\s+'
               
-              '-F1-\s+(?P<F1_real>[-?.E\d+]+)\s+(?P<F1_imag>[-?.E\d+]+)\s.+\n\s+'
-              '-F2-\s+(?P<F2_real>[-?.E\d+]+)\s+(?P<F2_imag>[-?.E\d+]+)\s.+\n\s+'
-              '-F3-\s+(?P<F3_real>[-?.E\d+]+)\s+(?P<F3_imag>[-?.E\d+]+)\s.+\n\s+'
-              '-F4-\s+(?P<F4_real>[-?.E\d+]+)\s+(?P<F4_imag>[-?.E\d+]+)\s.+\n\s+'
-              '-F5-\s+(?P<F5_real>[-?.E\d+]+)\s+(?P<F5_imag>[-?.E\d+]+)\s.+\n\s+'
-              '-F6-\s+(?P<F6_real>[-?.E\d+]+)\s+(?P<F6_imag>[-?.E\d+]+)\s.+\n')
+              r'-F1-\s+(?P<F1_real>[-?.E\d+]+)\s+(?P<F1_imag>[-?.E\d+]+)\s.+\n\s+'
+              r'-F2-\s+(?P<F2_real>[-?.E\d+]+)\s+(?P<F2_imag>[-?.E\d+]+)\s.+\n\s+'
+              r'-F3-\s+(?P<F3_real>[-?.E\d+]+)\s+(?P<F3_imag>[-?.E\d+]+)\s.+\n\s+'
+              r'-F4-\s+(?P<F4_real>[-?.E\d+]+)\s+(?P<F4_imag>[-?.E\d+]+)\s.+\n\s+'
+              r'-F5-\s+(?P<F5_real>[-?.E\d+]+)\s+(?P<F5_imag>[-?.E\d+]+)\s.+\n\s+'
+              r'-F6-\s+(?P<F6_real>[-?.E\d+]+)\s+(?P<F6_imag>[-?.E\d+]+)\s.+\n')
     regex = re.compile(string) 
     
-    nondim_string = ('\s+NON-DIMENSIONALIZING FACTORS:\n(?:.*\n)+'
-                     '\s+RO\s+=\s+(?P<rho>[-?.E\d+]+)\n'
-                     '\s+G\s+=\s+(?P<g>[-?.E\d+]+)\n'
-                     '\s+VOL\s+=\s+(?P<vol>[-?.E\d+]+)\n'
-                     '\s+L\s+=\s+(?P<l>[-?.E\d+]+)\n'
-                     '\s+WA\s+=\s+(?P<wa>[-?.E\d+]+)')
+    nondim_string = (r'\s+NON-DIMENSIONALIZING FACTORS:\n(?:.*\n)+'
+                     r'\s+RO\s+=\s+(?P<rho>[-?.E\d+]+)\n'
+                     r'\s+G\s+=\s+(?P<g>[-?.E\d+]+)\n'
+                     r'\s+VOL\s+=\s+(?P<vol>[-?.E\d+]+)\n'
+                     r'\s+L\s+=\s+(?P<l>[-?.E\d+]+)\n'
+                     r'\s+WA\s+=\s+(?P<wa>[-?.E\d+]+)')
     
     regex_nondim = re.compile(nondim_string) 
     

{wawi-0.0.7 → wawi-0.0.8}/wawi/plot.py

@@ -9,9 +9,9 @@ from scipy.interpolate import RectBivariateSpline, interp1d
 
 def plot_ads(ad_dict, v, terms='stiffness', num=None, test_v=dict(), test_ad=dict(), zasso_type=False, ranges=None):
     # v: v or K
-    if terms is 'stiffness':
+    if terms == 'stiffness':
         terms = [['P4', 'P6', 'P3'], ['H6', 'H4', 'H3'], ['A6', 'A4', 'A3']]
-    elif terms is 'damping':
+    elif terms == 'damping':
         terms = [['P1', 'P5', 'P2'], ['H5', 'H1', 'H2'], ['A5', 'A1', 'A2']]
 
     # Create exponent defs for K_normalized plotting
@@ -60,9 +60,9 @@ def plot_ads(ad_dict, v, terms='stiffness', num=None, test_v=dict(), test_ad=dic
     
     for col_ix in range(len(terms)):
         if zasso_type:
-            ax[-1, col_ix].set_xlabel('$K$')
+            ax[-1, col_ix].set_xlabel(r'$K$')
         else:
-            ax[-1, col_ix].set_xlabel('$V/(B\cdot \omega)$')
+            ax[-1, col_ix].set_xlabel(r'$V/(B\cdot \omega)$')
     
     fig.tight_layout()
     return fig, ax
@@ -98,7 +98,7 @@ def plot_dir_and_crests(theta0, Tp, arrow_length=100, origin=np.array([0,0]),
     wave_length = 2*np.pi/get_kappa(2*np.pi/Tp, U=0.0)
 
     plt.arrow(origin[0],origin[1], arrow_length*v[0], arrow_length*v[1], **arr_opts)
-    plt.text(origin[0], origin[1], f'$\\theta_0$ = {theta0}$^o$\n $T_p$={Tp} s\n $\lambda=${wave_length:.0f} m')
+    plt.text(origin[0], origin[1], f'$\\theta_0$ = {theta0}$^o$\n $T_p$={Tp} s\n $\\lambda=${wave_length:.0f} m')
 
     dv = v*wave_length
     for n in range(n_repeats):
@@ -317,7 +317,10 @@ def _set_axes_radius(ax, origin, radius):
     ax.set_ylim3d([y - radius, y + radius])
     ax.set_zlim3d([z - radius, z + radius])
 
-def equal_3d(ax=plt.gca()):
+def equal_3d(ax=None):
+    if ax is None:
+        ax = plt.gca()
+
     x_lims = np.array(ax.get_xlim())
     y_lims = np.array(ax.get_ylim())
     z_lims = np.array(ax.get_zlim())

{wawi-0.0.7 → wawi-0.0.8/wawi.egg-info}/PKG-INFO

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