3131 errror in calculation of temperature margin bug#3142
Conversation
|
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? |
|
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.
|
|
Anyway - there are now no merge conflicts. |
mkovari
force-pushed
the
3131-errror-in-calculation-of-temperature-margin-bug
branch
from
42ac072 to
37e5a42
Compare
|
I believe this is now ready to merge. I did both the things we discussed:
|
jonmaddock
left a comment
jonmaddock
left a comment
There was a problem hiding this comment.
Hi Michael, I don't see anything wrong with these changes, other than the large amount of churn on this PR which makes it confusing. Please rebase and fix up these commits to simplify the history, and then I don't see any reason not to merge.
|
|
||
| deltaj_hijc_rebco = jcrit0 - jsc | ||
| return deltaj_hijc_rebco | ||
| # def deltaj_nbti(temperature): |
There was a problem hiding this comment.
There's a lot that's commented out here, and the commit title "incomplete changes to hijc_rebco" suggests that this is an intermediary commit. Can this be fixed up please to reduce the churn in this PR?
| # assert pytest.approx(pfv.rjohc) == -7.728453e9 | ||
|
|
||
|
|
||
| def test_efc(pfcoil: PFCoil[CsFatigue], monkeypatch: pytest.MonkeyPatch): |
There was a problem hiding this comment.
pfcoil: PFCoil[CsFatigue]: I'm not sure that's the correct type hint.
|
|
||
|
|
||
| def test_efc(pfcoil, monkeypatch): | ||
| # def test_pfcoil(monkeypatch, pfcoil): |
There was a problem hiding this comment.
As all this is commented back in later, can this be fixed up to reduce churn in this PR?
|
|
||
| # assert pytest.approx(pfv.bpf[4]) == 9.299805e2 | ||
| # assert pytest.approx(pfv.rjohc) == -7.728453e9 | ||
| def test_pfcoil(monkeypatch, pfcoil): |
There was a problem hiding this comment.
Commenting back in of commented-out function: please reduce churn.
There was a problem hiding this comment.
Will do using rebase
mkovari
force-pushed
the
3131-errror-in-calculation-of-temperature-margin-bug
branch
from
ec3b934 to
cad1ed2
Compare
|
Can you resolve the conflicts please? |
|
I think the conflict is resolved now. |
|
I'm afraid there are still conflicts that need to be resolved. Please resolve them by rebasing, then re-request a review. Thanks. |
|
GitHub says this branch has no conflicts with the base branch. What conflicts are you thinking of? |
mkovari
force-pushed
the
3131-errror-in-calculation-of-temperature-margin-bug
branch
from
f29a035 to
45e0187
Compare
jonmaddock
deleted the
3131-errror-in-calculation-of-temperature-margin-bug
branch
2 participants
Description
I have replaced the home-made Newton-Raphson solver and the secant solver with
newtonfor calculating the temperature margin of superconductors.Checklist
I confirm that I have completed the following checks: