Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1541 calling of avail from stellaratorife does not take into account iavail #3037

Conversation

chris-ashe
Copy link
Collaborator

Description

As per discussion in !601, IFE/Stellarator call the availability model. However, they both call the avail subroutine without taking into account the iavail flag. However, other calls to availability models take into account the iavail flag:

if cv.iavail > 1:
    self.avail_2(output)  # Morris model (2015)
else:
    self.avail(output)  # Taylor and Ward model (1999)

Upon further inspection it has been seen that avail is specifcally for IFE use so has not been changed.
Though for the stellarator model any of the avaialbility models can be used as the same components are used between the model (tokamak) and the stellarator.
The stellarator module now runs availability.run(output=True) to allow the user to specify the avail switch for their preferred model.

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 requested a review from jonmaddock January 30, 2024 09:09
@chris-ashe chris-ashe self-assigned this Jan 30, 2024
@chris-ashe chris-ashe requested a review from j-a-foster January 30, 2024 09:13
Copy link
Collaborator

@j-a-foster j-a-foster left a comment

Choose a reason for hiding this comment

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

The TODO has been correctly done and matches calling the same model elsewhere in the code.

@chris-ashe chris-ashe merged commit dcf36fd into main Jan 30, 2024
20 checks passed
chris-ashe added a commit that referenced this pull request Apr 22, 2024
…iavail (#3037)

* fix avail for IFE

* stellerator avail fix
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.

2 participants