From 75a9cae33e28d32c46182eafd64b830fb498686d Mon Sep 17 00:00:00 2001 From: Kelley Ruehl Date: Mon, 16 Sep 2024 14:07:49 -0600 Subject: [PATCH] Pulling main into dev for v6.1 (#70) * Rebase PR #58 to main - Fixing inconsistent sign in the RM3 example (#60) * Fixing the inconsistent sign in the RM3 example * Fix sign bug on OSWEC Hydraulic PTO examples * Update wecSimInputFile.m * Add files via upload Fixes a bug, the main .xls file is replaced with the main .xls file for this example * Fixes bugs with PTO-Sim * fix in wecSimInputFile for morisonElement * Control Test Folder Selection with Dynamic Workflows (#63) * Test dispatch workflow with automatic folder discovery * Set MATLAB version to 2023b * I forgot the R * Check out the correct branch for test discovery * Try it without toJSON * Update workflow for other events Also remove dev workflow as it should work on any branch now. * Need fetch depth for git diff * Set branch correctly and don't run of no folder * Be more explicit with the empty condition * Try and examine what is in the folder variable * Try checking againt empty JSON array string * Test diffed folder * Try diffing two folders and echoing reusable workflow inputs * Try reordering the matrix * Try using a fixed os * Try to prevent included cases running when no folder * Curb my ambition! * Exclude matching cases rather than include * Remove the include conditions * Record required MATLAB packages in each test directory * Export products into test matrix * Dynamically create include cases * Debug input names * Examine the include input variables * Fix length one include array * Consider the base ref for pull requests * Explicitly set the checkout repo * Include repository in the reusable test inputs * Use full repo name * Set runs-on from matrix * Update README * Update badges * Link to process-events workflow * Try adding concurrency term to stop runs for each PR commit * Switch to shields.io badges to customize the labels Also prettify the file. * Split process events workflow to allow sensible badges Badges set to a particular branch don't capture the status of repository dispatch events. * Refactor test workflows Test workflows are refactored to split out those triggered by WEC-Sim commits (wec-sim-***-tests) from those triggered by modifications to the applications (changed-tests). --------- Co-authored-by: Jorge Leon <72461917+jleonqu@users.noreply.github.com> Co-authored-by: Mohamed Shabara <84589678+MShabara@users.noreply.github.com> Co-authored-by: Shabara Co-authored-by: Forbush Co-authored-by: Mathew Topper --- Morison_Element/morisonElement/wecSimInputFile.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Morison_Element/morisonElement/wecSimInputFile.m b/Morison_Element/morisonElement/wecSimInputFile.m index c6a49794..e026d721 100644 --- a/Morison_Element/morisonElement/wecSimInputFile.m +++ b/Morison_Element/morisonElement/wecSimInputFile.m @@ -8,10 +8,10 @@ simu.solver = 'ode4'; simu.rho = 1025; simu.cicEndTime = 30; -simu.rampTime = 100; % Wave Ramp Time [s] 200 -simu.endTime = 400; % Simulation End Time [s] 400 +simu.rampTime = 1; % Wave Ramp Time [s] 200 +simu.endTime = 100; % Simulation End Time [s] 400 simu.dt = 0.01; -simu.stateSpace = 1; +simu.stateSpace = 0; %% Wave Cases % % No wave @@ -31,8 +31,8 @@ waves.phaseSeed = 5; % Set Random Phase Seed waves.direction = [0,30,90]; % Wave Directionality [deg] waves.spread = [0.1,0.2,0.7]; % Wave Directional Spreading [%} - -waves.bem.range = [0 10]; % Must define wave frequency range without an .h5 / hydro body +% +waves.bem.range = [0.001 10]; % Must define wave frequency range without an .h5 / hydro body waves.waterDepth = 30; % Must define water depth without an .h5 / hydro body %% Body Data