Merge remote-tracking branch 'upstream/master'

Author: RyanDavies19

.clang-format-ignore

@@ -0,0 +1 @@
+source/Eigen/*

.github/workflows/build-test.yml

@@ -125,7 +125,7 @@ jobs:
           mkdir -p ${{github.workspace}}/install
 
     - name: Configure CMake (Linux)
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=ON -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=ON -DBUILD_TESTING=ON
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=ON -DRUST_WRAPPER:BOOL=ON -DUSE_VTK=ON -DBUILD_TESTING=ON
       if: runner.os == 'Linux'
 
     - name: Configure CMake (MacOS)

.github/workflows/matlab.yml

@@ -0,0 +1,93 @@
+name: Test MATLAB MEX
+
+on:
+  push:
+    branches: [ $default-branch, master ]
+  pull_request:
+    branches:
+      - "**"
+
+env:
+  BUILD_TYPE: Release
+  LD_LIBRARY_PATH: ${{github.workspace}}/install/lib:${{github.workspace}}/install/lib64
+  DYLD_LIBRARY_PATH: ${{github.workspace}}/install/lib
+
+jobs:
+  test:
+    name: Test MATLAB MEX
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # MATLAB requires an old version of Windows
+        # Ubuntu dropped because of libcstd++ incompatibilities
+        os: [macos-latest]
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Create install folder
+        run: |
+            mkdir -p ${{github.workspace}}/install
+
+      - name: Configure CMake (Linux)
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DMATLAB_WRAPPER:BOOL=OFF -DUSE_VTK=OFF -DBUILD_TESTING=OFF
+
+      - name: Build
+        id: build
+        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+      - name: Install
+        run: cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+      - name: Set up MATLAB
+        uses: matlab-actions/setup-matlab@v2
+
+      - name: Compile and run
+        uses: matlab-actions/run-command@v2
+        with:
+          command: |
+              mex('-setup', '-v', 'C');
+              cd('wrappers/matlab/');
+              fnames = struct2table(dir('*.cpp')).name;
+              for i = 1:length(fnames)
+                  fname = cell2mat(fnames(i));
+                  mex('-v', fname, '-I./', '-I${{github.workspace}}/install/include/moordyn', '-L${{github.workspace}}/install/lib', '-L${{github.workspace}}/install/lib64', '-lmoordyn');
+              end
+              % Run the same minimal test we have on matlab_bindings.m.in
+              system = MoorDynM_Create('../../tests/Mooring/lines.txt');
+              %% 3 coupled points x 3 components per point = 9 DoF
+              x = zeros(9,1);
+              dx = zeros(9,1);
+              %% Get the initial positions from the system itself
+              for i=1:3
+                %% 4 = first fairlead id
+                point = MoorDynM_GetPoint(system, i + 3);
+                x(1 + 3 * (i - 1):3 * i) = MoorDynM_GetPointPos(point);
+              end
+              %% Setup the initial condition
+              MoorDynM_Init(system, x, dx);
+              %% Make the points move at 0.5 m/s to the positive x direction
+              for i=1:3
+                dx(1 + 3 * (i - 1)) = 0.5;
+              end
+              t = 0.0;
+              dt = 0.5;
+              [t, f] = MoorDynM_Step(system, x, dx, t, dt);
+              %% Print the position and tension of the line nodes
+              n_lines = MoorDynM_GetNumberLines(system);
+              for line_id=1:n_lines
+                line_id
+                line = MoorDynM_GetLine(system, line_id);
+                n_nodes = MoorDynM_GetLineNumberNodes(line);
+                for node_id=1:n_nodes
+                  node_id
+                  pos = MoorDynM_GetLineNodePos(line, node_id - 1);
+                  pos
+                  ten = MoorDynM_GetLineNodeTen(line, node_id - 1);
+                  ten
+                end
+              end
+              %% Alright, time to finish!
+              MoorDynM_Close(system);

.github/workflows/python-wheels-emulated.yml

@@ -39,7 +39,7 @@ jobs:
         os: ${{ fromJSON(inputs.os) }}
     env:
       # Skip 32-bit windows wheels builds.
-      CIBW_SKIP: "*-win32* pp38-* pp39-* pp310-*"
+      CIBW_SKIP: "*-win32* pp38-* pp39-* pp310-* pp311-*"
       CIBW_ARCHS: ${{inputs.arch}}
       CIBW_ENVIRONMENT_LINUX: "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/project/install/lib"
       CIBW_BEFORE_ALL_LINUX: >
@@ -142,7 +142,7 @@ jobs:
         if: runner.os == 'Linux'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.20.0
+        uses: pypa/cibuildwheel@v2.23.1
         with:
             output-dir: dist
 

.gitignore

@@ -53,6 +53,7 @@ compile/SO/test*
 .eggs
 moordyn.egg-info
 tests/__pycache__
+wrappers/python/moordyn/__pycache__
 /out/build
 /.vs/MoorDyn/FileContentIndex
 /.vs
@@ -65,4 +66,4 @@ dist
 
 /source/.vscode
 .vscode/*
-docs/_build/*
+docs/_build/*