Updates to openfast_io to match current dev branch API

.github/workflows/automated-dev-tests.yml

@@ -534,7 +534,8 @@ jobs:
       - name: Run Interface / API tests
         working-directory: ${{runner.workspace}}/openfast/build
         run: |
-          ctest -VV -L "cpp|python|fastlib"
+          ctest -VV -L "cpp|python|fastlib" \
+              -LE "openfast_io"
       - name: Failing test artifacts
         uses: actions/upload-artifact@v4
         if: failure()
@@ -600,6 +601,51 @@ jobs:
             !${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast/UAE_VI
             !${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast/WP_Baseline
 
+  rtest-openfast_io:
+    runs-on: ubuntu-22.04
+    needs: build-openfast-release
+    steps:
+      - name: Cache the workspace
+        uses: actions/cache@v4
+        with:
+          path: ${{runner.workspace}}
+          key: build-openfast-release-${{ github.sha }}
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - name: Install dependencies
+        run: |
+          pip install -r requirements.txt
+          sudo apt-get update -y
+          sudo apt-get install -y libopenblas-dev libopenblas-openmp-dev
+          sudo apt-get install -y libhdf5-dev libnetcdf-dev libopenmpi-dev libyaml-cpp-dev
+      - name: Install openfast_io
+        working-directory: ${{runner.workspace}}/openfast/openfast_io
+        run: |
+          pip install -e .
+      - name: Configure Tests
+        working-directory: ${{runner.workspace}}/openfast/build
+        run: |
+          cmake \
+            -DPython_ROOT_DIR:STRING=${{env.pythonLocation}} \
+            -DBUILD_TESTING:BOOL=ON \
+            -DCTEST_PLOT_ERRORS:BOOL=ON \
+            ${GITHUB_WORKSPACE}
+          cmake --build . --target regression_test_controllers
+      - name: Run openfast_io tests
+        working-directory: ${{runner.workspace}}/openfast/build
+        run: |
+          ctest -VV -j4 \
+          -L openfast_io 
+      - name: Failing test artifacts
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: rtest-openfast_io
+          path: |
+            ${{runner.workspace}}/openfast/build/reg_tests/openfast_io
+
 
   rtest-OF-simulink:
     runs-on: ubuntu-22.04

.github/workflows/deploy.yml

@@ -4,36 +4,71 @@
 # repository. The build cache is stored in GitHub actions.
 name: deploy
 
-on:
-  workflow_dispatch:
+# on:
+  # workflow_dispatch:
 
-  release:
-    types:
-      - released
+  # release:
+  #   types:
+  #     - released
+on:
+  push:
 
 jobs:
-  publish-to-pypi:
+  # publish-to-pypi:
+    # runs-on: ubuntu-latest
+    # permissions:
+    #   id-token: write
+    #   contents: read
+
+    # steps:
+    #   - name: Checkout Repository
+    #     uses: actions/checkout@v4
+
+    #   - name: Install Poetry
+    #     uses: snok/[email protected]
+
+    #   - name: Build a binary wheel and a source tarball
+    #     run: poetry build
+    #     working-directory: openfast_python
+
+    #   - name: Publish package distributions to PyPI
+    #     uses: pypa/[email protected]
+    #     with:
+    #       packages-dir: openfast_python/dist
+
+# name: Build and publish python package
+
+# on:
+#   release:
+#     types: [ published ]
+
+# jobs:
+  publish-to-test-pypi:
     runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
 
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
-      - name: Install Poetry
-        uses: snok/[email protected]
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+          cache: 'pip'
 
-      - name: Build a binary wheel and a source tarball
-        run: poetry build
-        working-directory: openfast_python
+      - name: Install Hatch
+        uses: pypa/hatch@install
 
-      - name: Publish package distributions to PyPI
-        uses: pypa/[email protected]
-        with:
-          packages-dir: openfast_python/dist
 
+      - name: Build package
+        run: hatch build
+        working-directory: openfast_io
+
+      - name: Publish to PyPI
+        env:
+          HATCH_INDEX_USER: __token__
+          HATCH_INDEX_AUTH: ${{ secrets.PYPI_TOKEN }}
+        run: hatch publish -r test
+        working-directory: openfast_io
 
   docker-build-and-push:
     runs-on: ubuntu-latest

.gitignore

@@ -58,3 +58,6 @@ vs-build/
 #Simulink cache files
 varcache
 *.slxc
+
+# Python cache files
+openfast_io/dist/

modules/hydrodyn/src/WAMIT2.f90

@@ -4252,7 +4252,7 @@ SUBROUTINE Read_DataFile4D( InitInp, Filename4D, Data4D, ErrStat, Errmsg )
                         ! See if the diagonal mirror one (WvDir2,WvDir1) value is not filled, set it and its flag
                      IF ( .NOT. Data4D%DataMask(TmpCoord(1), TmpCoord(2), TmpCoord(4), TmpCoord(3), TmpCoord(5))  ) THEN
                         Data4D%DataSet(TmpCoord(1), TmpCoord(2), TmpCoord(4), TmpCoord(3), TmpCoord(5) ) = &
-                              Data4D%DataSet(TmpCoord(1), TmpCoord(2), TmpCoord(3), TmpCoord(3), TmpCoord(5) )
+                              Data4D%DataSet(TmpCoord(1), TmpCoord(2), TmpCoord(3), TmpCoord(4), TmpCoord(5) )
                         Data4D%DataMask(TmpCoord(1), TmpCoord(2), TmpCoord(4), TmpCoord(3), TmpCoord(5) ) = .TRUE.
                      ENDIF
 

modules/openfast-library/src/FAST_Subs.f90

@@ -8673,7 +8673,7 @@ SUBROUTINE WrVTK_WaveElevVisGrid(t_global, p_FAST, y_FAST, SeaSt)
 
    do ix=1,p_FAST%VTK_surface%NWaveElevPts(1)
       do iy=1,p_FAST%VTK_surface%NWaveElevPts(2)
-         WRITE(Un,VTK_AryFmt) p_FAST%VTK_surface%WaveElevVisX(ix), p_FAST%VTK_surface%WaveElevVisX(iy), p_FAST%VTK_surface%WaveElevVisGrid(y_FAST%VTK_LastWaveIndx,ix,iy)
+         WRITE(Un,VTK_AryFmt) p_FAST%VTK_surface%WaveElevVisX(ix), p_FAST%VTK_surface%WaveElevVisY(iy), p_FAST%VTK_surface%WaveElevVisGrid(y_FAST%VTK_LastWaveIndx,ix,iy)
       end do
    end do
 

openfast_python/openfast_io/FAST_output_reader.py → openfast_io/openfast_io/FAST_output_reader.py

@@ -211,16 +211,20 @@ def fread(fid, n, type):
 
 
 if __name__=="__main__":
-    d,i = load_binary_output('Test18.T1.outb')
-    types = []
-    for j in range(39):
-        types.append('f8')
-    print(type(i['attribute_names']))
 
-    print(np.dtype({'names':tuple(i['attribute_names']), 'formats': tuple(types) }))
-    print(type(d))
-    print(np.array(d,dtype=np.dtype({'names':tuple(i['attribute_names']), 'formats': tuple(types) })))
+    from openfast_io.FileTools import check_rtest_cloned
+
+    parent_dir = os.path.dirname( os.path.dirname( os.path.dirname( os.path.realpath(__file__) ) ) ) + os.sep
+
+    of_outputfile = os.path.join(parent_dir, 'reg_tests', 'r-test', 'glue-codes', 
+                                 'openfast', '5MW_Land_BD_DLL_WTurb', '5MW_Land_BD_DLL_WTurb.outb')
 
+    check_rtest_cloned(of_outputfile)
+
+    d,i,p = load_binary_output(of_outputfile)
+
+    print(tuple(i['attribute_names']))
+    print(type(d))
     print(i)
     print(len(i['attribute_names']))
     print(np.shape(d))