Skip to content

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

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.

Sign up for GitHub

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

Merged
timothy-nunn merged 2 commits into from
Feb 14, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42b0eba
Remove scaling of net electric to allow negative net electric
timothy-nunn Feb 8, 2024
670b135
Remove pnetelmw scaling from ife
timothy-nunn Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions process/power.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,17 +922,6 @@ def power2(self, output: bool):
heat_transport_variables.pgrossmw - heat_transport_variables.precircmw
)

# Scaling to prevent negative heat_transport_variables.pnetelmw
# Do NOT rescale if this is the last run through.
if (
(heat_transport_variables.pnetelmw < 1.0e0)
and (cost_variables.ipnet == 0)
and (not output)
):
heat_transport_variables.pnetelmw = 1.0e0 / (
1.0e0 + abs(heat_transport_variables.pnetelmw - 1.0e0)
)

# Recirculating power fraction
cirpowfr = (
heat_transport_variables.pgrossmw - heat_transport_variables.pnetelmw
Expand Down
5 changes: 0 additions & 5 deletions source/fortran/ife.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2087,11 +2087,6 @@ subroutine ifepw2(outfile,iprint)
! Net electric power
pnetelmw = pgrossmw - precircmw

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

end if

if (iprint == 0) return
Expand Down