Skip to content

Fix bugs in compute quantities#2218

Open
unalmis wants to merge 10 commits into
ku/available_energyfrom
ku/compute_bugs
Open

Fix bugs in compute quantities#2218
unalmis wants to merge 10 commits into
ku/available_energyfrom
ku/compute_bugs

Conversation

@unalmis

@unalmis unalmis commented May 19, 2026

Copy link
Copy Markdown
Collaborator
  • Fixes bugs in e_rho_rr, e_theta_rtt, e_zeta_rzz, iota_num_rr limit. and fix so that redl bootrap uses independent ion density gradient Te * d_ne_d_s + Ti * d_ni_d_s.

@unalmis unalmis requested review from a team, YigitElma, ddudt, dpanici, f0uriest and rahulgaur104 and removed request for a team May 19, 2026 01:04
unalmis added 2 commits May 18, 2026 18:07
Co-authored-by: Kaya Unalmis <kayaunalmis@proton.me>
Co-authored-by: Kaya Unalmis <kayaunalmis@proton.me>
@unalmis unalmis added the bug fix Something was fixed label May 19, 2026
@unalmis unalmis self-assigned this May 19, 2026

@YigitElma YigitElma left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good to me. This PR looks isolated from the other PRs; if so, I think we can merge this to master directly. Otherwise, it will have to wait for all the other ones.

@rahulgaur104 rahulgaur104 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Minor questions. I agree with Yigit, this PR is completely independent of available energy so pointing and merging in master would be faster and more sensible.

I can approve without any delay if you point to master.

Comment thread desc/compute/_equil.py
Comment thread desc/compute/_profiles.py
@unalmis

unalmis commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator Author

I can approve without any delay if you point to master.

This is not how git works. If it points to master, all head PRs will be merged simultaneously.

@unalmis

unalmis commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator Author

This will wait until head PRs are merged.

@rahulgaur104

Copy link
Copy Markdown
Collaborator

I can approve without any delay if you point to master.

This is not how git works. If it points to master, all head PRs will be merged simultaneously.

Can any of the rest of the @PlasmaControl/desc-dev developers explain this to me? I don't understand what that sentence means. I thought if we pointed this PR to master all commits of this PR will be merged into master and then master can be merged into the new PR, inheriting the merged commits.

Comment thread desc/compute/_equil.py
label="\\sqrt{g}(B^{\\theta} \\nabla \\zeta - B^{\\zeta} \\nabla \\theta)",
units="T \\cdot m^{2}",
units_long="Tesla * square meter",
label="\\sqrt{g}(B^{\\zeta} \\nabla \\theta - B^{\\theta} \\nabla \\zeta)",

@rahulgaur104 rahulgaur104 Jun 10, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Sign flip in the definition. @dpanici Does this match the DESC paper? Were you trying to code the new label or the old label.

@YigitElma

Copy link
Copy Markdown
Collaborator

I thought if we pointed this PR to master all commits of this PR will be merged into master

This branch has the commits from ku/available_energy too; they don't show up here because GitHub only shows the changes from the base branch. If we point this one to master, it will become very big.

When I was suggesting pointing this to the master, I was actually implying to create a new PR with cherry-picked commits from this one. But if Kaya doesn't want to do it, it can wait for the other ones.

@rahulgaur104

rahulgaur104 commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

Thank, Yigit! That makes more sense but it is kind of confusing. Yeah, I can easily copy all these changes to a new PR in 10 minutes and point them directly to master. It's mostly name/label changes and some algebra corrections which would become relevant when generalized toroidal angle comes online but nothing that would cause anything to fail right now.

We can wait as well.

@unalmis

unalmis commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator Author

It will cause many merge conflicts if you duplicate my work into new PR. Don't do that

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants