Merge pull request #203 from WISDEM/numpy_fix

Latest WISDEM update for Numpy 1.24 compatibility

.github/workflows/CI_WEIS.yml

@@ -6,33 +6,40 @@ on: [push, pull_request]
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build:
-    name: Build (${{ matrix.os }})
+    name: Build (${{ matrix.os }} Python ${{ matrix.python-version }})
     runs-on: ${{ matrix.os }}
+
+    defaults:
+        run:
+            shell: bash -l {0}
+
     strategy:
       fail-fast: true
       matrix:
         os: ["ubuntu-latest"] #, "macOS-latest"]
-        python-version: ["3.8"]
+        python-version: ["3.9","3.10"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # This is the more official way to do miniconda, but it messes with the GitHub worker environment and shell quite a bit
       #- uses: conda-incubator/setup-miniconda@v2
       #  # https://github.com/marketplace/actions/setup-miniconda
       #  with:
-      #    #miniconda-version: "latest"
+      #    miniconda-version: "latest"
       #    channels: conda-forge
       #    auto-update-conda: true
-      #    python-version: 3.8
+      #    python-version: ${{ matrix.python-version }}
       #    environment-file: environment.yml
+      #    activate-environment: test
+      #    auto-activate-base: false
 
       # This is a less official, but more lightweight way to do miniconda
       - uses: s-weigand/setup-conda@v1
         # https://github.com/marketplace/actions/setup-conda
         with:
           update-conda: true
-          python-version: 3.8
+          python-version: ${{ matrix.python-version }}
           conda-channels: conda-forge
           activate-conda: true
       - run: conda env update --file environment.yml

.github/workflows/run_exhaustive_examples.yml

@@ -5,34 +5,41 @@ on: [pull_request]
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build:
-    name: Build (${{ matrix.os }})
+    name: Build (${{ matrix.os }} Python ${{ matrix.python-version }})
     runs-on: ${{ matrix.os }}
     # if: "contains(github.event.head_commit.message, 'exhaustive_CI')"  # This line could be used to have commit-specific instructions
+
+    defaults:
+        run:
+            shell: bash -l {0}
+
     strategy:
       fail-fast: true
       matrix:
         os: ["ubuntu-latest"] #, "macOS-latest"]
-        python-version: ["3.8"]
+        python-version: ["3.9","3.10"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # This is the more official way to do miniconda, but it messes with the GitHub worker environment and shell quite a bit
       #- uses: conda-incubator/setup-miniconda@v2
       #  # https://github.com/marketplace/actions/setup-miniconda
       #  with:
-      #    #miniconda-version: "latest"
+      #    miniconda-version: "latest"
       #    channels: conda-forge
       #    auto-update-conda: true
-      #    python-version: 3.8
+      #    python-version: ${{ matrix.python-version }}
       #    environment-file: environment.yml
+      #    activate-environment: test
+      #    auto-activate-base: false
 
       # This is a less official, but more lightweight way to do miniconda
       - uses: s-weigand/setup-conda@v1
         # https://github.com/marketplace/actions/setup-conda
         with:
           update-conda: true
-          python-version: 3.8
+          python-version: ${{ matrix.python-version }}
           conda-channels: conda-forge
           activate-conda: true
       - run: conda env update --file environment.yml

RAFT/.gitignore

@@ -11,4 +11,11 @@ dist/s
 raft/data/cylinder/Output/Hams_format/
 raft/data/cylinder/Output/Hydrostar_format/
 
-.vscode/
+.vscode/
+
+# BEM meshing processes generated data
+raft/BEM/
+raft/HullMesh.pnl
+raft/platform.gdf
+tests/BEM/
+tests/platform.gdf

RAFT/NOTICE.txt

@@ -0,0 +1,15 @@
+Copyright (c) 2022 Alliance for Sustainable Energy, LLC
+
+    RAFT (Response Amplitudes of Floating Turbines)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this software except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

RAFT/designs/OC3spar.yaml

@@ -1,11 +1,12 @@
 type: input file for RAFT
 name: 5MW with OC3-Hywind spar
 
+
 settings:                   # global Settings
-    min_freq     :  0.01    #  [Hz]       lowest frequency to consider, also the frequency bin width 
-    max_freq     :  1.00    #  [Hz]       highest frequency to consider
+    min_freq     :  0.005   #  [Hz]       lowest frequency to consider, also the frequency bin width 
+    max_freq     :  0.40    #  [Hz]       highest frequency to consider
     XiStart      :   0      # sets initial amplitude of each DOF for all frequencies
-    nIter        :   0      # sets how many iterations to perform in Model.solveDynamics()
+    nIter        :  10      # sets how many iterations to perform in Model.solveDynamics()
 
 site:
     water_depth : 200        # [m]      uniform water depth

RAFT/designs/OC4semi.yaml

@@ -1,10 +1,24 @@
 type: input file for RAFT
 name: 5MW with OC4-DeepCWind semi-sub
-comments: Revised example with "super-member" type inputs, including one for the tower
 
-# Global Settings
-potModMaster:   0   # [int] master switch for potMod variables; 0=keeps all member potMod vars the same, 1=turns all potMod vars to False (no HAMS), 2=turns all potMod vars to True (no strip)
 
+settings:                   # global Settings
+    min_freq     :  0.005   #  [Hz]       lowest frequency to consider, also the frequency bin width 
+    max_freq     :  0.40    #  [Hz]       highest frequency to consider
+    XiStart      :   0      # sets initial amplitude of each DOF for all frequencies
+    nIter        :  10      # sets how many iterations to perform in Model.solveDynamics()
+
+site:
+    water_depth : 200        # [m]      uniform water depth
+    rho_water   : 1025.0     # [kg/m^3] water density
+    rho_air     : 1.225      # [kg/m^3] air density
+    mu_air      : 1.81e-05   #          air dynamic viscosity
+    shearExp    : 0.12       #          shear exponent
+
+cases:
+    keys : [wind_speed, wind_heading, turbulence, turbine_status, yaw_misalign, wave_spectrum, wave_period, wave_height, wave_heading  ]
+    data :  #   m/s        deg    % or e.g. 2B_NTM    string            deg         string          (s)         (m)         (deg)
+        -  [    12,         0,            0.01,       operating,          0,        JONSWAP,         13.1,        8.5,           0        ]
 
 
 turbine:
@@ -1046,6 +1060,11 @@ turbine:
 
 platform:
 
+    min_freq_BEM : 0.03   #  [Hz]  lowest frequency and frequency interval to use in BEM analysis
+    dz_BEM       : 3.0    #  [m]   axial discretization panel length target for BEM analysis
+    da_BEM       : 2.0    #  [m]   azimuthal discretization panel length target for BEM analysis
+    potModMaster : 1
+
     members:   # list all members here
 
       - name      :  main_column               # [-]    an identifier (no longer has to be number)       
@@ -1089,8 +1108,8 @@ platform:
         CaEnd     :  0.6                       # [-]    end axial added mass coefficient  (optional, scalar or list of same length as stations)
         rho_shell :  7850                      # [kg/m3]   material density
         # --- ballast ---
-        l_fill    :  [5.0418, 0, 7.77, 0]                    # [m]
-        rho_fill  :  [1025.0, 0, 1025.0, 0]                  # [kg/m3]
+        l_fill    :  [5.0418, 0, 7.77]         # [m]
+        rho_fill  :  [1025.0, 0, 1025.0]       # [kg/m3]
         # --- handling of end caps or any internal structures if we need them ---
         # (These will only be *within* the inner diameter of the outer shell, so they don't interrupt the outer shell.)
         cap_stations :  [ -20, -14, -14, 12]             # [m]  location along member of any inner structures (in same scaling as set by 'stations')

RAFT/designs/VolturnUS-S.yaml

@@ -1,6 +1,5 @@
 type: input file for RAFT
 name: IEA 15 MW with VolturnUS-S steel semi
-comments: Revised example with "super-member" type inputs, including one for the tower
 
 
 settings:                   # global Settings
@@ -17,7 +16,6 @@ site:
     shearExp    : 0.12       #          shear exponent
 
 cases:
-
     keys : [wind_speed, wind_heading, turbulence, turbine_status, yaw_misalign, wave_spectrum, wave_period, wave_height, wave_heading  ]
     data :  #   m/s        deg    % or e.g. 2B_NTM    string            deg         string          (s)         (m)         (deg)
         -  [    12,         0,            0.01,       operating,          0,        JONSWAP,         13.1,        8.5,           0        ]
@@ -40,7 +38,7 @@ turbine:
     precone     : 4.0     # [deg]
     shaft_tilt  : 6.0     # [deg]
     overhang    : 12.0313 # [m]
-    aeroServoMod : 1          # 0 aerodynamics off; 1 aerodynamics on (no control); 2 aerodynamics and control on
+    aeroServoMod : 2          # 0 aerodynamics off; 1 aerodynamics on (no control); 2 aerodynamics and control on
 
     blade: 
         precurveTip : -3.9999999999999964  #