search

YingyiLiu / HAMS

An open-source computer program for the analysis of wave diffraction and radiation of three-dimensional floating or submerged structures
Apache License 2.0
100 stars 50 forks source link

pyHAMS is now conda-installable! #31

Closed gbarter closed 12 months ago

gbarter commented 1 year ago

Good news! The pyHAMS extension of HAMS is now conda installable!

The only change to the source code required to make this possible was changing calls from atan2d() to atan2()*180/pi. This is because the windows gfortran compiler available in Anacoda is very old (~v5.3) and doesn't support some of the newer library functions. Credit to Yingyi that the simple atan2d change was the only one needed to support this old windows gfortran compiler.

YingyiLiu commented 1 year ago

Dear Garrett,

Thank you for your great effort. Your decent work is very much appreciated.

By the way, I'm really sorry for my late response due to the summer vacation. Now I see three options to merge the pull request: 1. Create a merge commit; 2. Squash and merge; 3. Rebase and merge. But the third option seems not to work any more since the message says "This branch cannot be rebased due to conflicts". So which one of the other two do you recommend me to choose? Your suggestion will be helpful to me. Thanks.

Best wishes, Yingyi

gbarter commented 1 year ago

@YingyiLiu : I see no conflicts on this page and you should see a green merge button. Is this not the case?

YingyiLiu commented 12 months ago

@gbarter I see that the button of "rebase and merge" is in grey and not enabled (see the screenshot here https://share.iii.kyushu-u.ac.jp/public/bEopwLII2ly0hCEXONBhAVe7o-1yaGi7XNhj4H7cbOFZ ). But "Create a merge commit" or "Squash and merge" is enabled. I would like to know which one is best suited to choose.

(Please copy the above link to the web browser since directly clicking seems not to work.)

gbarter commented 12 months ago

I don't understand why my view says "This branch has no conflicts with the base branch" but yours says there are conflicts that need to be resolved. I think the "Create a merge commit" is the standard and recommended approach.

If it helps, here is some Github documentation.

YingyiLiu commented 12 months ago

OK, let me choose the "Create a merge commit" approach.