Skip to content

2994 new eccd current drive model to account for zeff and te with a cutoff function#2999

Merged
jonmaddock merged 12 commits intomainfrom
2994-new-eccd-current-drive-model-to-account-for-zeff-and-te-with-a-cutoff-function
Dec 14, 2023
Merged

2994 new eccd current drive model to account for zeff and te with a cutoff function#2999
jonmaddock merged 12 commits intomainfrom
2994-new-eccd-current-drive-model-to-account-for-zeff-and-te-with-a-cutoff-function

Conversation

@chris-ashe
Copy link
Copy Markdown
Collaborator

@chris-ashe chris-ashe commented Nov 24, 2023

Description

New model has been input to account for ECCD cutoff as a function of electron temperature and effective charge

  • Dependance of the harmonic number has been verified
  • Dependance between O and X mode has been verified
  • Quantified the difference between effrfss & effcd
  • ECRH HARE model seems to be removed. Should tidy up
  • Update plotting dependencies eg plot_proc.

Checklist

I confirm that I have completed the following checks:

  • I have justified any large differences in the regression tests caused by this pull request in the comments.
  • I have added new tests where appropriate for the changes I have made.
  • If I have had to change any existing unit or integration tests, I have justified this change in the pull request comments.
  • If I have made documentation changes, I have checked they render correctly.
  • I have added documentation for my change, if appropriate.

@chris-ashe chris-ashe self-assigned this Nov 24, 2023
@chris-ashe chris-ashe requested review from timothy-nunn and removed request for timothy-nunn November 28, 2023 10:42
@chris-ashe chris-ashe added Physics Relating to the physics models and removed Documentation labels Nov 28, 2023
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.

Couple of questions that need addressing.

Comment thread process/current_drive.py Outdated
Comment thread process/current_drive.py Outdated
Comment thread process/current_drive.py Outdated
Comment thread process/current_drive.py Outdated
@timothy-nunn
Copy link
Copy Markdown
Collaborator

Also @chris-ashe, if you have some reference values would it be possible to add in a quick test for this

@chris-ashe
Copy link
Copy Markdown
Collaborator Author

Test is now covered in #3013

@chris-ashe chris-ashe force-pushed the 2994-new-eccd-current-drive-model-to-account-for-zeff-and-te-with-a-cutoff-function branch from f260d57 to f319f5e Compare December 14, 2023 11:49
@chris-ashe chris-ashe changed the title WIP:2994 new eccd current drive model to account for zeff and te with a cutoff function 2994 new eccd current drive model to account for zeff and te with a cutoff function Dec 14, 2023
Copy link
Copy Markdown
Contributor

@jonmaddock jonmaddock left a comment

Choose a reason for hiding this comment

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

Looks great after rebasing.

@jonmaddock
Copy link
Copy Markdown
Contributor

As Tim's questions have been answered and Chris is keen to get this in, I hope you don't mind me merging this Tim!

@jonmaddock jonmaddock merged commit 87f0442 into main Dec 14, 2023
@jonmaddock jonmaddock deleted the 2994-new-eccd-current-drive-model-to-account-for-zeff-and-te-with-a-cutoff-function branch December 14, 2023 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Physics Relating to the physics models

Projects

None yet

Development

Successfully merging this pull request may close these issues.

New ECCD current drive model to account for Zeff and Te with a cutoff function

3 participants