Skip to content

Remove scaling of net electric to allow negative net electric#3047

Merged
timothy-nunn merged 2 commits intoukaea:mainfrom
timothy-nunn:1870-normalised-objective-function-behaving-weirdly
Feb 14, 2024
Merged

Remove scaling of net electric to allow negative net electric#3047
timothy-nunn merged 2 commits intoukaea:mainfrom
timothy-nunn:1870-normalised-objective-function-behaving-weirdly

Conversation

@timothy-nunn
Copy link
Copy Markdown
Collaborator

@timothy-nunn timothy-nunn commented Feb 8, 2024

Description

Remove the scaling of net electric as negative net electric is physically meaningful

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.

@timothy-nunn timothy-nunn requested a review from mkovari February 8, 2024 11:49
@timothy-nunn timothy-nunn self-assigned this Feb 8, 2024
@timothy-nunn timothy-nunn linked an issue Feb 8, 2024 that may be closed by this pull request
@mkovari
Copy link
Copy Markdown
Collaborator

mkovari commented Feb 8, 2024

Note the the same scaling is still done in ife.f90:

      !  Scaling to prevent negative pnetelmw
      if ( (pnetelmw < 1.0D0).and.(ipnet == 0) ) then
        pnetelmw = 1.0D0 / ( 1.0D0 + abs(pnetelmw-1.0D0))
      end if

@timothy-nunn timothy-nunn merged commit 2c2ffb9 into ukaea:main Feb 14, 2024
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.

Normalised objective function behaving weirdly

2 participants