search

NorESMhub / BLOM

Bergen Layered Ocean Model
GNU Lesser General Public License v3.0
16 stars 25 forks source link

Fix for omp bug found in the github actions #307

Closed mvertens closed 7 months ago

jmaerz commented 7 months ago

@JorgSchwinger and @mvertens , can we first do/finalize the PR #305 to get a better overview on the applied changes?

mvertens commented 7 months ago

@jmaerz - yes that's fine. I need to finalize the minor changes from @jmaerz.

JorgSchwinger commented 7 months ago

You can select to view only the last two commits, which worked fine for me to see only the w***_const updates

jmaerz commented 7 months ago

Dear @mvertens , I felt so free to merge in #305. Now it seems as if it would be good to merge master into your omp_bug_fix branch to update it - so that only real differences appear.

mvertens commented 7 months ago

I think its fine to go ahead and merge this!

jmaerz commented 7 months ago

@mvertens then go ahead and take the risk. I don't understand, why there are so many file differences showing up and was also a bit hesitant wrt to your latest changes in #305 (of which I am uncertain, whether they are in or not). But you're probably right to merge it.

mvertens commented 7 months ago

So I merged this branch to master and then pushed back. Now only 3 files are different. I feel much better. Lets make sure that the CI tests pass and then I'll merge.

jmaerz commented 7 months ago

Tomas is busy these days - I thus removed him as reviewer.

jmaerz commented 7 months ago

@mvertens many thanks!

jmaerz commented 7 months ago

@JorgSchwinger , with this latest merge, master is ready for some further styling from your side, Jörg :-)