Skip to content

Conversation

@salhus
Copy link
Contributor

@salhus salhus commented Oct 8, 2021

No description provided.

@salhus salhus requested a review from akeeste October 8, 2021 21:58
@kmruehl kmruehl added Visualization Visualization and Paraview Wave Class Wave Classs (waveClass.m) labels Oct 9, 2021
@akeeste
Copy link
Contributor

akeeste commented Oct 11, 2021

@salhus This mask fix looks good! However there were other changes to the Frames library on Friday. Can you base this on the most recent version of dev and the copy your mask update back into the library? Or if you give me push access I'm happy to do this too.

No need to open another PR, I would recommend force pushing any changes to this same branch. After that I'll quickly review once more to ensure things work on dev.

Thanks!
Adam

@salhus
Copy link
Contributor Author

salhus commented Oct 11, 2021

@akeeste Thanks! I gave you access to the branch.
I didn't quite follow how to force push though. When i open the branch in browser, it gives me an option to fetch master and not dev// So i was confused how to do that without a new PR..

@akeeste
Copy link
Contributor

akeeste commented Oct 11, 2021

Hi @salhus

I don't know how to do this on GitHub in a browser; I would usually do this locally in the git command line with something like:

git reset --hard upstream/dev
*make mask change on top of dev and commit*
git push --force salhus/indexFix

There is likely a similar process if you are using GitHub Desktop

You could try the library merge tool too, but if your mask change is isolated in one block it is likely easier to reset to dev and put your changes on top. I can take a look in the next couple of days when I get a chance.

Adam

@salhus
Copy link
Contributor Author

salhus commented Oct 11, 2021

Hi @akeeste ! thanks ! I learnt something new. Didn't know how to do this before...!!

Copy link
Contributor

@akeeste akeeste left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@salhus, per @kmruehl's request, I put these changes on top of dev and force pushed to your branch so that other library changes can continue. I also:

  • added the marker elevation calculation to the noWave and noWaveCIC cases. The marker does not provide any information in this case of course, but now it will not break.
  • added a warning to the etaImport case. We do not currently support markers or gauges in this wave case so created a warning and updated the variant subsystem logic to skip the marker visualization in this case
  • minor clean up to the mask initialization logic

Everything looks good for me. Thanks Sal!

@salhus
Copy link
Contributor Author

salhus commented Oct 12, 2021

@akeeste Cheers mate !

Thanks for helping with the finishing touches :)

@akeeste akeeste merged commit a84af82 into WEC-Sim:dev Oct 12, 2021
@salhus salhus deleted the indexFix branch October 13, 2021 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Visualization Visualization and Paraview Wave Class Wave Classs (waveClass.m)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants