Wind io2p0p1

.github/workflows/python-package-conda.yml

@@ -68,11 +68,11 @@ jobs:
           export MPLBACKEND=Agg
           python 2_sonata_IEA22.py
 
-      - name: Run example 5
-        run: |
-          cd examples/5_IEA_5MW
-          export MPLBACKEND=Agg
-          python 5_sonata_IEA5.py
+      # - name: Run example 5
+      #   run: |
+      #     cd examples/5_NREL_5MW
+      #     export MPLBACKEND=Agg
+      #     python 5_sonata_NREL_5MW.py
 
       - name: Run example 6
         run: |

SONATA/cbm/classCBM.py

@@ -728,7 +728,7 @@ def cbm_run_viscoelastic(self, test_elastic=True, test_tau0=True):
 
             if not (self.materials[MatID].viscoelastic == {}):
                 time_scale_list += self.materials[MatID]\
-                                    .viscoelastic['time_scales_v'].tolist()
+                                    .viscoelastic['time_scales_v']
 
         time_scale_list = np.sort(np.unique(time_scale_list)).tolist()
 
@@ -743,7 +743,7 @@ def cbm_run_viscoelastic(self, test_elastic=True, test_tau0=True):
                 mat = self.materials[MatID]
 
                 if hasattr(mat, 'viscoelastic') and not (mat.viscoelastic=={}):
-                    found_time_scale = tau in mat.viscoelastic['time_scales_v'].tolist()
+                    found_time_scale = tau in mat.viscoelastic['time_scales_v']
                 else:
                     found_time_scale = False
 
@@ -758,7 +758,7 @@ def cbm_run_viscoelastic(self, test_elastic=True, test_tau0=True):
                 else:
                     # find index of time scale
                     time_scale_ind = np.argmax(tau
-                                          == mat.viscoelastic['time_scales_v'])
+                                          == np.array(mat.viscoelastic['time_scales_v']))
 
                 if found_time_scale and mat.orth == 0:
 

SONATA/cbm/classCBMConfig.py

@@ -10,10 +10,9 @@
 
 # Third party modules
 import numpy as np
-import yaml
 
 # First party modules
-from SONATA.classMaterial import find_material, read_materials
+from SONATA.classMaterial import find_material
 from SONATA.anbax.classANBAXConfig import ANBAXConfig
 
 if __name__ == "__main__":
@@ -144,20 +143,3 @@ def read_yaml_cbm(self, yml, materials):
         if yml.get("trim_mass"):
             self.bw = yml.get("trim_mass")  #
             self.setup["BalanceWeight"] = True
-
-
-if __name__ == "__main__":
-
-    # classic configuration file:
-    os.chdir("/media/gu32kij/work/TPflumm/SONATA")
-    # fname = 'jobs/VariSpeed/advanced/sec_config.yml'
-    fname = "examples/sec_config.yml"
-    cfg = CBMConfig(fname)
-
-    with open("jobs/VariSpeed/UH-60A_adv.yml", "r") as myfile:
-        inputs = myfile.read()
-
-    yml = yaml.load(inputs)
-    materials = read_materials(yml.get("materials"))
-    yml = yml.get("components").get("blade").get("2d_fem").get("sections")[0]
-    wt_cfg = CBMConfig(yml, materials)

SONATA/classAirfoil.py

@@ -7,7 +7,6 @@
 import os
 
 # Third party modules
-import matplotlib.pyplot as plt
 import numpy as np
 # PythonOCC Libraries
 from OCC.Core.gp import gp_Pnt
@@ -129,7 +128,7 @@ def gen_OCCtopo(self, angular_deflection = 30 ):
         self.wire = build_wire_from_BSplineLst(self.BSplineLst, twoD=False)
         return self.wire
 
-    def trsf_to_blfr(self, loc, pa_loc, chord, twist):
+    def trsf_to_blfr(self, loc, soy, chord, twist):
         """
         transforms the nondim. airfoil to the blade reference frame location
         and pitch-axis information, scales it with chord information and rotates
@@ -139,8 +138,8 @@ def trsf_to_blfr(self, loc, pa_loc, chord, twist):
         ----------
         loc : array
             [x,y,z] position in blade reference coordinates
-        pa_loc : float
-            nondim. pitch axis location
+        soy : float
+            dim. pitch axis location
         chord : float
             chordlength
         twist : float
@@ -151,7 +150,7 @@ def trsf_to_blfr(self, loc, pa_loc, chord, twist):
         wire : TopoDS_Wire
 
         """
-        Trsf = trsf_af_to_blfr(loc, pa_loc, chord, twist)
+        Trsf = trsf_af_to_blfr(loc, soy, chord, twist)
         if self.wire is None or self.BSplineLst is None:
             self.gen_OCCtopo()
 
@@ -237,28 +236,3 @@ def transformed(self, airfoil2, k=0.5):
         trf_af.coordinates = self.interpolate_shapes(self.coordinates, airfoil2.coordinates, k)
 
         return trf_af
-
-
-
-if __name__ == "__main__":
-    plt.close("all")
-    import yaml
-
-    with open("jobs/VariSpeed/UH-60A_adv.yml", "r") as f:
-        data = yaml.load(f.read())
-
-    airfoils = [Airfoil(af) for af in data["airfoils"]]
-
-    for af in airfoils:
-        af.gen_OCCtopo()
-
-    af1 = airfoils[0]
-    af2 = airfoils[1]
-    res = af1.transformed(af2, 1.0)
-    res.gen_OCCtopo()
-
-    with open("data1.yml", "w") as outfile:
-        yaml.dump(af1.write_yaml_airfoil(), outfile)
-
-    with open("data2.yml", "w") as outfile:
-        yaml.dump(af2.write_yaml_airfoil(), outfile)