🔄 Rename pedgeradpv to pden_plasma_outer_rad_mw for clarity and consi…

…stency

process/physics.py

@@ -2136,14 +2136,14 @@ def physics(self):
         radpwrdata = physics_funcs.calculate_radiation_powers(self.plasma_profile)
         physics_variables.pden_plasma_sync_mw = radpwrdata.pden_plasma_sync_mw
         physics_variables.pden_plasma_core_rad_mw = radpwrdata.pden_plasma_core_rad_mw
-        physics_variables.pedgeradpv = radpwrdata.pedgeradpv
+        physics_variables.pden_plasma_outer_rad_mw = radpwrdata.pden_plasma_outer_rad_mw
         physics_variables.pden_plasma_rad_mw = radpwrdata.pden_plasma_rad_mw
 
         physics_variables.p_plasma_inner_rad_mw = (
             physics_variables.pden_plasma_core_rad_mw * physics_variables.vol_plasma
         )
         physics_variables.p_plasma_outer_rad_mw = (
-            physics_variables.pedgeradpv * physics_variables.vol_plasma
+            physics_variables.pden_plasma_outer_rad_mw * physics_variables.vol_plasma
         )
         physics_variables.p_plasma_rad_mw = (
             physics_variables.pden_plasma_rad_mw * physics_variables.vol_plasma

process/physics_functions.py

@@ -551,7 +551,7 @@ class RadpwrData:
 
     pden_plasma_sync_mw: float
     pden_plasma_core_rad_mw: float
-    pedgeradpv: float
+    pden_plasma_outer_rad_mw: float
     pden_plasma_rad_mw: float
 
 
@@ -570,7 +570,7 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData:
         RadpwrData: A dataclass containing the following radiation power densities:
             - pden_plasma_sync_mw (float): Synchrotron radiation power per unit volume (MW/m^3).
             - pden_plasma_core_rad_mw (float): Total core radiation power per unit volume (MW/m^3).
-            - pedgeradpv (float): Edge radiation power per unit volume (MW/m^3).
+            - pden_plasma_outer_rad_mw (float): Edge radiation power per unit volume (MW/m^3).
             - pden_plasma_rad_mw (float): Total radiation power per unit volume (MW/m^3).
 
     Author:
@@ -579,7 +579,7 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData:
     imp_rad = impurity.ImpurityRadiation(plasma_profile)
     imp_rad.calculate_imprad()
 
-    pedgeradpv = imp_rad.radtot - imp_rad.radcore
+    pden_plasma_outer_rad_mw = imp_rad.radtot - imp_rad.radcore
 
     # Synchrotron radiation power/volume; assumed to be from core only.
     pden_plasma_sync_mw = psync_albajar_fidone()
@@ -591,7 +591,10 @@ def calculate_radiation_powers(plasma_profile: PlasmaProfile) -> RadpwrData:
     pden_plasma_rad_mw = imp_rad.radtot + pden_plasma_sync_mw
 
     return RadpwrData(
-        pden_plasma_sync_mw, pden_plasma_core_rad_mw, pedgeradpv, pden_plasma_rad_mw
+        pden_plasma_sync_mw,
+        pden_plasma_core_rad_mw,
+        pden_plasma_outer_rad_mw,
+        pden_plasma_rad_mw,
     )
 
 

process/stellarator.py

@@ -4281,19 +4281,23 @@ def stphys(self, output):
         radpwr_data = physics_funcs.calculate_radiation_powers(self.plasma_profile)
         physics_variables.pden_plasma_sync_mw = radpwr_data.pden_plasma_sync_mw
         physics_variables.pden_plasma_core_rad_mw = radpwr_data.pden_plasma_core_rad_mw
-        physics_variables.pedgeradpv = radpwr_data.pedgeradpv
+        physics_variables.pden_plasma_outer_rad_mw = (
+            radpwr_data.pden_plasma_outer_rad_mw
+        )
         physics_variables.pden_plasma_rad_mw = radpwr_data.pden_plasma_rad_mw
 
         physics_variables.pden_plasma_core_rad_mw = max(
             physics_variables.pden_plasma_core_rad_mw, 0.0e0
         )
-        physics_variables.pedgeradpv = max(physics_variables.pedgeradpv, 0.0e0)
+        physics_variables.pden_plasma_outer_rad_mw = max(
+            physics_variables.pden_plasma_outer_rad_mw, 0.0e0
+        )
 
         physics_variables.p_plasma_inner_rad_mw = (
             physics_variables.pden_plasma_core_rad_mw * physics_variables.vol_plasma
         )  # Should probably be vol_core
         physics_variables.p_plasma_outer_rad_mw = (
-            physics_variables.pedgeradpv * physics_variables.vol_plasma
+            physics_variables.pden_plasma_outer_rad_mw * physics_variables.vol_plasma
         )
 
         physics_variables.p_plasma_rad_mw = (

source/fortran/physics_variables.f90

@@ -621,7 +621,7 @@ module physics_variables
   real(dp) :: p_plasma_outer_rad_mw
   !! radiation power from outer zone (MW)
 
-  real(dp) :: pedgeradpv
+  real(dp) :: pden_plasma_outer_rad_mw
   !! edge radiation power per volume (MW/m3)
 
   real(dp) :: phiint
@@ -1040,7 +1040,7 @@ subroutine init_physics_variables
     dt_power_total = 0.0D0
     dt_power_plasma = 0.0D0
     p_plasma_outer_rad_mw = 0.0D0
-    pedgeradpv = 0.0D0
+    pden_plasma_outer_rad_mw = 0.0D0
     charged_particle_power = 0.0D0
     phiint = 0.0D0
     pflux_fw_rad_mw = 0.0D0

tests/integration/ref_dicts.json

@@ -3504,7 +3504,7 @@
         "peakpoloidalpower": 0.0,
         "pflux_fw_rad_max_mw": 0.0,
         "ped": null,
-        "pedgeradpv": 0.0,
+        "pden_plasma_outer_rad_mw": 0.0,
         "pfbldgm3": 20000.0,
         "pfcaseth": 0.0,
         "pfckts": 0.0,
@@ -10263,7 +10263,7 @@
         "peakmva": "peak MVA requirement",
         "peakpoloidalpower": "Peak absolute rate of change of stored energy in poloidal field (MW)",
         "pflux_fw_rad_max_mw": "Peak radiation wall load (MW/m^2) (`constraint equation 67`)",
-        "pedgeradpv": "edge radiation power per volume (MW/m3)",
+        "pden_plasma_outer_rad_mw": "edge radiation power per volume (MW/m3)",
         "pfbldgm3": "volume of PF coil power supply building (m3)",
         "pfcaseth": "steel case thickness for PF coil i (m)",
         "pfckts": "number of PF coil circuits",
@@ -19188,7 +19188,7 @@
             "dt_power_total",
             "dt_power_plasma",
             "p_plasma_outer_rad_mw",
-            "pedgeradpv",
+            "pden_plasma_outer_rad_mw",
             "charged_particle_power",
             "phiint",
             "pflux_fw_rad_mw",