Skip to content

#392 Sauter's formulae for plasma current and geometric parameters.#3128

Merged
mkovari merged 4 commits intomainfrom
392-olivier-sauters-formulas-including-negative-triangularity
Apr 18, 2024
Merged

#392 Sauter's formulae for plasma current and geometric parameters.#3128
mkovari merged 4 commits intomainfrom
392-olivier-sauters-formulas-including-negative-triangularity

Conversation

@mkovari
Copy link
Copy Markdown
Collaborator

@mkovari mkovari commented Apr 5, 2024

Minor refactor of culcur in physics.py, as described in #392:
Update docstring.
Rename qpsi in culcur as q95.
Eliminate curhat since it's not necessary.
Test for a range of values of triangularity.

@mkovari mkovari linked an issue Apr 5, 2024 that may be closed by this pull request
@mkovari mkovari requested a review from timothy-nunn April 5, 2024 11:39
@mkovari mkovari force-pushed the 392-olivier-sauters-formulas-including-negative-triangularity branch from f84b700 to 00132d7 Compare April 5, 2024 12:20
@mkovari mkovari changed the title #392 Sauter's formula for plasma current only - no change required. Minor refactor. #392 Sauter's formulae for plasma current and geometric parameters. Apr 9, 2024
@mkovari
Copy link
Copy Markdown
Collaborator Author

mkovari commented Apr 9, 2024

See detailed comments in the issue #392.
I think this is now ready for review and merge. @timothy-nunn
Please close the issue and delete the branch if everything is OK.

@mkovari mkovari requested a review from jonmaddock April 9, 2024 14:28
Copy link
Copy Markdown
Collaborator

@timothy-nunn timothy-nunn left a comment

Choose a reason for hiding this comment

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

One minor change for code quality, one question to ensure this change is utilised to its fullest potential

Comment thread process/plasma_geometry.py Outdated

return xsect0

def Sauter_geometry(self, a, r0, kap, tri):
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.

Even though its a persons name, I think Sauter should be lower case


# Cross-sectional area
physics_variables.xarea = self.xsecta(xi, thetai, xo, thetao)
# icurr = 8 specifies use of the Sauter geometry as well as plasma current.
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.

Will it ever make sense to use Sauter geometry without using the Sauter plasma current?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Yes, I suppose so. That would involve a new switch. Maybe a new issue?

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.

Ok. If you make this into a new issue we can discuss it there

@mkovari mkovari removed the request for review from jonmaddock April 18, 2024 07:49
@mkovari mkovari merged commit 5e54254 into main Apr 18, 2024
@mkovari mkovari deleted the 392-olivier-sauters-formulas-including-negative-triangularity branch April 18, 2024 07:50
chris-ashe pushed a commit that referenced this pull request Apr 22, 2024
…3128)

* Minor refactor of  culcur option icurr=8

* Replaced qpsi by q95 in unit tests for culcur.

* Sauter's geometric formulae. Improved test for negative temperature in temperature margin calc.

* Correct sauter_geometry method name

---------

Co-authored-by: Michael Kovari <michael.kovari@ukaea.uk>
Co-authored-by: Timothy Nunn <timothy.nunn@ukaea.uk>
chris-ashe pushed a commit that referenced this pull request May 1, 2024
…3128)

* Minor refactor of  culcur option icurr=8

* Replaced qpsi by q95 in unit tests for culcur.

* Sauter's geometric formulae. Improved test for negative temperature in temperature margin calc.

* Correct sauter_geometry method name

---------

Co-authored-by: Michael Kovari <michael.kovari@ukaea.uk>
Co-authored-by: Timothy Nunn <timothy.nunn@ukaea.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Olivier Sauter's formulae including negative triangularity

2 participants