diff --git a/.github/workflows/run-tests-reusable.yml b/.github/workflows/run-tests-reusable.yml index 0a1b051f..0da0ceba 100644 --- a/.github/workflows/run-tests-reusable.yml +++ b/.github/workflows/run-tests-reusable.yml @@ -59,6 +59,14 @@ jobs: ls ../WEC-Sim/source/functions/moorDyn shell: bash working-directory: './MoorDyn' + - name: Install MinGW (for MATLAB accelerator/rapid-accelerator) + if: (matrix.folder == 'Mooring' || matrix.folder == 'Paraview_Visualization') && matrix.os == 'windows-latest' + uses: egor-tensin/setup-mingw@v3 + with: + version: 8.1 + - name: Add MATLAB MinGW environment variable + if: (matrix.folder == 'Mooring' || matrix.folder == 'Paraview_Visualization') && matrix.os == 'windows-latest' + run: echo "MW_MINGW64_LOC=C:\ProgramData\chocolatey\lib\mingw\tools\install" >> $GITHUB_ENV - name: Install MATLAB uses: matlab-actions/setup-matlab@v3 with: diff --git a/Mooring/MooringMatrix/wecSimInputFile.m b/Mooring/MooringMatrix/wecSimInputFile.m index e9c2afd0..0d4d9392 100644 --- a/Mooring/MooringMatrix/wecSimInputFile.m +++ b/Mooring/MooringMatrix/wecSimInputFile.m @@ -45,5 +45,3 @@ mooring(1).matrix.stiffness(1,1) = 1e5; mooring(1).matrix.damping = zeros(6,6); mooring(1).matrix.preTension = zeros(1,6); - - diff --git a/OWC/FloatingOWC/wecSimInputFile.m b/OWC/FloatingOWC/wecSimInputFile.m index 48f5f1bd..b9afc683 100644 --- a/OWC/FloatingOWC/wecSimInputFile.m +++ b/OWC/FloatingOWC/wecSimInputFile.m @@ -132,4 +132,4 @@ Izz = 0.5* waterColumnMass * (airChamber(1).owcDiameter/2)^2; Ixx = waterColumnMass * (3 * (airChamber(1).owcDiameter/2)^2 + waterColumnHeight^2) /12; -body(2).inertia = [Ixx Ixx Izz]; \ No newline at end of file +body(2).inertia = [Ixx Ixx Izz]; diff --git a/OWC/OrificeModel/wecSimInputFile.m b/OWC/OrificeModel/wecSimInputFile.m index 237d254a..3a1b8ed3 100644 --- a/OWC/OrificeModel/wecSimInputFile.m +++ b/OWC/OrificeModel/wecSimInputFile.m @@ -68,3 +68,4 @@ C = 0.62; % discharge coefficient rhoAir = 1.2; % air density kg/m^3 thresh = 0.3; % threshold above which compressibility is an issue + diff --git a/Paraview_Visualization/OSWEC_NonLinear_Viz/wecSimInputFile.m b/Paraview_Visualization/OSWEC_NonLinear_Viz/wecSimInputFile.m index 7e542da0..e4e1f107 100644 --- a/Paraview_Visualization/OSWEC_NonLinear_Viz/wecSimInputFile.m +++ b/Paraview_Visualization/OSWEC_NonLinear_Viz/wecSimInputFile.m @@ -47,4 +47,3 @@ pto(1).stiffness = 0; pto(1).damping = 0; pto(1).location = [0 0 -8.9]; - diff --git a/Paraview_Visualization/RM3_MoorDyn_Viz/wecSimInputFile.m b/Paraview_Visualization/RM3_MoorDyn_Viz/wecSimInputFile.m index a697e1a8..a93a2075 100644 --- a/Paraview_Visualization/RM3_MoorDyn_Viz/wecSimInputFile.m +++ b/Paraview_Visualization/RM3_MoorDyn_Viz/wecSimInputFile.m @@ -55,3 +55,4 @@ mooring(1).moorDynLines = 3; % Specify number of lines mooring(1).moorDynNodes = [21 21 21]; % Specify number of nodes per line mooring(1).initial.displacement = [0 0 0]; % Initial Displacement (includes body cg and body initial displacement) + diff --git a/Variable_Hydro/Variable_Mass/sphereVarMass.slx b/Variable_Hydro/Variable_Mass/sphereVarMass.slx index b17048b0..50b37b3f 100644 Binary files a/Variable_Hydro/Variable_Mass/sphereVarMass.slx and b/Variable_Hydro/Variable_Mass/sphereVarMass.slx differ