3131 errror in calculation of temperature margin bug

ukaea / PROCESS

PROCESS is a systems code at UKAEA that calculates in a self-consistent manner the parameters of a fusion power plant with a specified performance, ensuring that its operating limits are not violated, and with the option to optimise to a given function of these parameters.

https://ukaea.github.io/PROCESS/

MIT License

35 stars 11 forks source link

3131 errror in calculation of temperature margin bug #3142

Closed mkovari closed 4 months ago

mkovari commented 5 months ago

Description

I have replaced the home-made Newton-Raphson solver and the secant solver with newton for calculating the temperature margin of superconductors.

Checklist

I confirm that I have completed the following checks:

[X] No large differences in the regression tests except for constraint residues.
[X] No new tests
[X] No doc changes

jonmaddock commented 5 months ago

Hi Michael. Can you resolve the conflicts on this branch, then possibly tidy up the commit history with an interactive rebase if you feel that would make these changes clearer?

mkovari commented 5 months ago

Jon, I have had a look at the conflict but I don’t I understand what has caused it. I have attempted to resolve it by simply restoring my code, but now the tests are failing when they weren’t yesterday. I am afraid I don’t know what’s going on.

mkovari commented 5 months ago

Anyway - there are now no merge conflicts. I don't know what an interactive rebase is.

mkovari commented 5 months ago

I believe this is now ready to merge. I did both the things we discussed:

Replaced brentq by newton.
Restored the commented-out integration tests, changed the value of rohc to something more sensible, and changed the two assertions that failed as a result.

jonmaddock commented 4 months ago

Can you resolve the conflicts please?

mkovari commented 4 months ago

I think the conflict is resolved now.

jonmaddock commented 4 months ago

I'm afraid there are still conflicts that need to be resolved. Please resolve them by rebasing, then re-request a review. Thanks.

mkovari commented 4 months ago

GitHub says this branch has no conflicts with the base branch. What conflicts are you thinking of?