Full dir spectra (resolved conflicts) #1332

jtgrasb · 2024-10-02T13:34:47Z

This PR is a for #1328 and attempts to resolve the merge conflicts.

…x and bodyClass

…pps case.

…v61 PR

dforbush2 · 2024-11-21T21:08:47Z

Sorry Jeff. Lets talk to Adam and see what changes were made. we may be able to add them to this PR. Apologies I didn't realize this was waiting on me for a merge.

jtgrasb · 2024-11-21T21:23:04Z

No problem. I thought I had left a comment for you to review it, but I guess I didn't

jtgrasb · 2024-11-25T18:36:16Z

To do:

Pull in latest dev branch and resolve conflicts, using body elements library from dev.
Re-add full directional spectrum variant subsystem to the body elements library.
Test full directional spectrum functionality and edit PR if necessary.

…Spectra

jtgrasb · 2024-11-26T21:28:25Z

@dforbush2 I've resolved the conflicts but haven't reviewed this PR yet. Could you send me the scripts you were using to test out the feature?

dforbush2 · 2024-11-26T23:44:53Z

@jtgrasb you can use the input data 'fullDirWave.mat' I have sent via email. These are (frequency, amplitude, direction, spread) as specified. You will need an input file with
waves = waveClass('spectrumImportFullDir');
waves.spectrumFile = ('fullWaveDir.mat');
waves.freqDepDirection.directions = fullDirWave(:,3);
waves.freqDepDirection.spreads = fullDirWave(:,4);
waves.freqDepDirection.dirRes =10 ; % for example
waves.freqDepDirection.nbins=10; % for example
waves.freqDepDirection.spreadRange=2; % for example

I recommend the Pioneer as a test case.

jtgrasb · 2024-11-27T15:38:19Z

Thanks @dforbush2. I tried the full directional spectrum with the pioneer example and I am getting some errors. I resolved some of them, but looks like there's some variable size issues, so if you could take a look at some point in the next couple weeks, that would be great.

Here's a zip for the test case: pioneerTest.zip

dforbush2 · 2024-12-10T02:14:21Z

@jtgrasb this is good to go! HOWEVER: at this time it will not work with non-linear hydro. That will require another variant subsystem and library change, and I think is best reserved for a future PR.

jtgrasb · 2024-12-10T15:32:43Z

This looks great and functionality seems to work well! A few questions/suggestions:

Looks like this doesn't work with wave markers either. Is that intentional? Since spectrum import works with the wave markers, we should be able to get this working with wave markers, right?
Can you add the Simulink variant variables (e.g. sv_fullDirIrregularWaves_b*) to the clear line in stopWecSim?

dforbush2 · 2024-12-10T16:03:19Z

Can you please post the error You are seeing when run with wave markers? I believe I fixed that…And local testing it does work. I can add the necessary clear statement to stopWecSim. Thank you for the reminder.

…

________________________________ From: jtgrasb ***@***.***> Sent: Tuesday, December 10, 2024 8:33:05 AM To: WEC-Sim/WEC-Sim ***@***.***> Cc: Forbush, Dominic Dean ***@***.***>; Mention ***@***.***> Subject: [EXTERNAL] Re: [WEC-Sim/WEC-Sim] Full dir spectra (resolved conflicts) (PR #1332) This looks great and functionality seems to work well! A few questions/suggestions: 1. Looks like this doesn't work with wave markers either. Is that intentional? Since spectrum import works with the wave markers, we should be able to get this working with wave markers, right? 2. Can you add the Simulink variant variables (e.g. sv_fullDirIrregularWaves_b*) to the clear line in stopWecSim? — Reply to this email directly, view it on GitHub<#1332 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AHF2G7HCTH2NL67RZMEOSFT2E4CTDAVCNFSM6AAAAABPHWHAZ2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDKMZSGA3TEMBUHE>. You are receiving this because you were mentioned.Message ID: ***@***.***>

jtgrasb · 2024-12-10T16:07:28Z

It doesn't produce an error, it just doesn't plot the wave markers. There's a line in initializeWecSim where the visualization is only on if typeNum is less than 30:

dforbush2 · 2024-12-10T16:22:27Z

Thanks good catch. That logic statement should also include the new typeNum which I think is 35. You can also make these changes if you want, let me know.

…

________________________________ From: jtgrasb ***@***.***> Sent: Tuesday, December 10, 2024 9:07:51 AM To: WEC-Sim/WEC-Sim ***@***.***> Cc: Forbush, Dominic Dean ***@***.***>; Mention ***@***.***> Subject: [EXTERNAL] Re: [WEC-Sim/WEC-Sim] Full dir spectra (resolved conflicts) (PR #1332) It doesn't produce an error, it just doesn't plot the wave markers. There's a line in initializeWecSim where the visualization is only on if typeNum is less than 30: image.png (view on web)<https://github.com/user-attachments/assets/0da02f49-66f6-45f4-b1c1-0ce49d1effe0> — Reply to this email directly, view it on GitHub<#1332 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AHF2G7BPGV4MTXROZASW3E32E4GVPAVCNFSM6AAAAABPHWHAZ2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDKMZSGE3DGOJWGY>. You are receiving this because you were mentioned.Message ID: ***@***.***>

dforbush2 · 2024-12-11T15:19:23Z

@jtgrasb tested on pioneer and everything works. This is ready to merge, but please give the docs a read and make sure it is clear enough. This shouldn't prevent a merge at this time, I can fix docs later, but worth some more eyes.

akeeste · 2025-08-06T15:58:38Z

source/objects/bodyClass.m

+                if obj.yaw.option ==1 && length(BEMdir)<3 || std(diff(BEMdir))>5 || max(boundDiff)>15
                    warning(['Passive yaw is not recommended without BEM data spanning a full yaw rotation -180 to 180 dg.' newline ...
                        'Please inspect BEM data for gaps'])
-                    clear BEMdir boundDiff
+                    clear boundDiff
+                end
+                if ~isempty(dirBins)
+                  BEMdir=wrapTo180(BEMdir-180);
+                  boundDiff(1)=abs(min(dirBins,[],'all') - BEMdir(1)); boundDiff(2)=min(abs(max(dirBins,[],'all') - BEMdir(end)),...
+                    abs(max(dirBins,[],'all')-180-BEMdir(1)));
+                  [obj.hydroForce.(hfName).fExt.qDofGrd,null,obj.hydroForce.(hfName).fExt.qWGrd]=ndgrid([1:nDOF],dirBins(1,:),wv); % this is necessary for nd interpolation; query grids be same size as dirBins.
+                    if length(BEMdir)<3 || max(boundDiff)>15
+                        warning(['BEM directions do not cover the directional spread bins or are too coarse to define spread bin distribution.' newline ...
+                        'Re-run with more bins']);
+                        clear boundDiff BEMdir
+                    end
                end
                [sortedDir,idx]=sort(wrapTo180(obj.hydroData(iH).simulation_parameters.direction));
-                [hdofGRD,hdirGRD,hwGRD]=ndgrid(1:6,sortedDir, obj.hydroData(iH).simulation_parameters.w);
-                [obj.hydroForce.(hfName).fExt.dofGrd,obj.hydroForce.(hfName).fExt.dirGrd,obj.hydroForce.(hfName).fExt.wGrd]=ndgrid(1:6,...
+                [hdofGRD,hdirGRD,hwGRD]=ndgrid([1:nDOF],sortedDir, obj.hydroData(iH).simulation_parameters.w);
+                 if (max(sortedDir) - min(sortedDir)) < 360
+                    warning('Full directional wave spectra requires full 360 dg BEM. You do not have that. Attempting to fix via spline extrapolation. Ideally preprocess BEM')
+                    if min(sortedDir) > -180
+                        sortedDir2=zeros(1,length(sortedDir)+1);
+                        sortedDir2(2:end)=sortedDir;
+                        sortedDir2(1)=-180;
+                        sortedDir=sortedDir2;
+                        clear sortedDir2;
+                    end
+                    if max(sortedDir) < 180
+                        sortedDir2=zeros(1,length(sortedDir2+1));
+                        sortedDir2(1:end-1)=sortedDir;
+                        sortedDir2(end)=-180;
+                        sortedDir=sortedDir2;
+                        clear sortedDir2;
+                    end
+
+                end


wave direction binning

akeeste · 2025-08-06T15:59:17Z

source/objects/bodyClass.m

+                [obj.hydroForce.(hfName).fExt.dofGrd,obj.hydroForce.(hfName).fExt.dirGrd,obj.hydroForce.(hfName).fExt.wGrd]=ndgrid([1:nDOF],...
                    sortedDir,wv);
                obj.hydroForce.(hfName).fExt.fEHRE=interpn(hdofGRD,hdirGRD,hwGRD,obj.hydroData(iH).hydro_coeffs.excitation.re(:,idx,:),...
-                    obj.hydroForce.(hfName).fExt.dofGrd,obj.hydroForce.(hfName).fExt.dirGrd,obj.hydroForce.(hfName).fExt.wGrd)*rho*g;
+                    obj.hydroForce.(hfName).fExt.dofGrd,obj.hydroForce.(hfName).fExt.dirGrd,obj.hydroForce.(hfName).fExt.wGrd,'spline')*rho*g;
                obj.hydroForce.(hfName).fExt.fEHIM=interpn(hdofGRD,hdirGRD,hwGRD,obj.hydroData(iH).hydro_coeffs.excitation.im(:,idx,:),...
-                    obj.hydroForce.(hfName).fExt.dofGrd,obj.hydroForce.(hfName).fExt.dirGrd,obj.hydroForce.(hfName).fExt.wGrd)*rho*g;
+                    obj.hydroForce.(hfName).fExt.dofGrd,obj.hydroForce.(hfName).fExt.dirGrd,obj.hydroForce.(hfName).fExt.wGrd,'spline')*rho*g;
                obj.hydroForce.(hfName).fExt.fEHMD=interpn(hdofGRD,hdirGRD,hwGRD,obj.hydroData(iH).hydro_coeffs.mean_drift(:,idx,:)...
-                    ,obj.hydroForce.(hfName).fExt.dofGrd,obj.hydroForce.(hfName).fExt.dirGrd,obj.hydroForce.(hfName).fExt.wGrd)*rho*g;
+                    ,obj.hydroForce.(hfName).fExt.dofGrd,obj.hydroForce.(hfName).fExt.dirGrd,obj.hydroForce.(hfName).fExt.wGrd,'spline')*rho*g;


grid interpolation becomes spline

dforbush2 and others added 30 commits June 28, 2023 11:37

adding bemio cleanup function

50e1523

impedance block drafts

d8f6c6e

Merge branch 'WEC-Sim:dev' into dev

da576bc

readWAMIT fix

32d6a03

cleanup, fix plot dofs for function

15bce06

remove impedance blocks and function

e27f87a

write cleaned file to new name

14d6d96

Merge branch 'WEC-Sim:dev' into dev

2a442f7

Merge branch 'WEC-Sim:dev' into dev

b653f63

drafts of IEC wave direction implementation, still need changes to sl…

3cbe1ad

…x and bodyClass

directional wave spectra commit no tests no docs

5548eeb

fix merge conflict initializeWecSim

5e7bbdf

initializeWS and body class up until hydroForcePre

9ebb6b1

merged bodyClass

7624a9c

merge simulink library changes

e8e01e0

hopefully fixes bad PR merge

9fe1fd7

variant subsystem fullDir fixed

d17967b

transpose irregular wave coeffs

97c648a

fixed some omissions for variable hydro

9eed29b

transpose phase in irregWaveMorison to fix desal apps case

1679767

tranpose phase in irregWave calculatio to solve Morison app issue

273493f

adding iH indexing to listInfo and checkInputs to fix variableHydro A…

7d1f7e2

…pps case.

flex body library relinking

e718114

typeNum fix for udf

f17eec6

flex body lib linked to rigid body changes, responseClass matched to …

af92b38

…v61 PR

variable hydro post processing align with v61 PR

47fc148

adding phase transpose for all wave cases

498440b

phase transpose in elevationGrid calculation

a29fb08

fix wave phase orientation in morison elements

bbae48e

Merge dev into PR and resolve conflicts

dd3f80d

jtgrasb mentioned this pull request Nov 21, 2024

Full dir spectra2 #1328

Closed

jtgrasb added 2 commits November 26, 2024 11:21

Merge branch 'dev' of https://github.com/WEC-Sim/WEC-Sim into DomsDir…

6df8b28

…Spectra

Add full directional excitation block back in

a6909a9

kmruehl mentioned this pull request Nov 27, 2024

Application updates for v6.1.2 release WEC-Sim/WEC-Sim_Applications#67

Merged

Resolve library issue and add spreadBins

f30a30e

akeeste mentioned this pull request Dec 3, 2024

Multi wave class bug fix v2 #1373

Merged

dforbush2 added 3 commits December 9, 2024 14:23

fix postProcessing bug in waveClass related to size

db0922f

fix bug when wave markers specified

ff4b8fd

set body library to be 2020b

6e22cf8

Adding docs. Bear witness and learn, younglings

ac9c5a4

kmruehl unassigned dforbush2 Dec 11, 2024

fix initializeWecSim for visualization

2284c19

jtgrasb merged commit a8b9dc0 into WEC-Sim:dev Dec 11, 2024
10 checks passed

akeeste mentioned this pull request Jan 16, 2025

[BUG] Applications breaking. #1400

Closed

6 tasks

jtgrasb mentioned this pull request Jan 24, 2025

Fix irregular wave elevation with multiple directions #1403

Merged

akeeste mentioned this pull request Aug 6, 2025

Fix failing tests on dev WEC-Sim/WEC-Sim_Applications#95

Merged

13 tasks

akeeste reviewed Aug 6, 2025

View reviewed changes

Full dir spectra (resolved conflicts) #1332

Full dir spectra (resolved conflicts) #1332

Conversation

jtgrasb commented Oct 2, 2024

Uh oh!

dforbush2 commented Nov 21, 2024

Uh oh!

jtgrasb commented Nov 21, 2024

Uh oh!

jtgrasb commented Nov 25, 2024

Uh oh!

jtgrasb commented Nov 26, 2024

Uh oh!

dforbush2 commented Nov 26, 2024

Uh oh!

jtgrasb commented Nov 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dforbush2 commented Dec 10, 2024

Uh oh!

jtgrasb commented Dec 10, 2024

Uh oh!

dforbush2 commented Dec 10, 2024 via email

Uh oh!

jtgrasb commented Dec 10, 2024

Uh oh!

dforbush2 commented Dec 10, 2024 via email

Uh oh!

dforbush2 commented Dec 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

akeeste Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

akeeste Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jtgrasb commented Nov 27, 2024 •

edited

Loading

dforbush2 commented Dec 11, 2024 •

edited

Loading