From 42b0eba07f21ab067c19599f92ab5e0e36a7da55 Mon Sep 17 00:00:00 2001 From: Timothy Nunn Date: Thu, 8 Feb 2024 11:37:33 +0000 Subject: [PATCH 1/2] Remove scaling of net electric to allow negative net electric --- process/power.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/process/power.py b/process/power.py index a2f3dd39de..e1e810ae7e 100644 --- a/process/power.py +++ b/process/power.py @@ -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 From 670b13556ee5557089343365f3e6f159bd825825 Mon Sep 17 00:00:00 2001 From: Timothy Nunn Date: Wed, 14 Feb 2024 13:26:44 +0000 Subject: [PATCH 2/2] Remove pnetelmw scaling from ife --- source/fortran/ife.f90 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/fortran/ife.f90 b/source/fortran/ife.f90 index 00cae3f68b..0215e5388b 100644 --- a/source/fortran/ife.f90 +++ b/source/fortran/ife.f90 @@ -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