4582 possible duplicate variable

examples/single_model_evaluation.ex.py

@@ -58,8 +58,7 @@
 def print_values():
     """Function to print values of some variables"""
     print(
-        "W frac = "
-        f"{single_run.data.impurity_radiation.f_nd_impurity_electron_array[13]:.3e}"
+        f"W frac = {single_run.data.impurity_radiation.f_nd_impurity_electrons[13]:.3e}"
     )
     print(f"p_plasma_rad_mw = {single_run.data.physics.p_plasma_rad_mw:.3e}")
     print(
@@ -74,7 +73,7 @@ def print_values():
 # the divertor power.
 
 # %%
-single_run.data.impurity_radiation.f_nd_impurity_electron_array[13] = 5.0e-5
+single_run.data.impurity_radiation.f_nd_impurity_electrons[13] = 5.0e-5
 single_run.models.physics.run()
 print_values()
 
@@ -101,7 +100,7 @@ def run_impurities(w_imp_fracs):
     # Loop over W impurity values, evaluate model and store responses at each point
     for i, imp_frac in enumerate(w_imp_fracs):
         # Set W impurity fraction, then run physics model
-        single_run.data.impurity_radiation.f_nd_impurity_electron_array[13] = imp_frac
+        single_run.data.impurity_radiation.f_nd_impurity_electrons[13] = imp_frac
         single_run.models.physics.run()
 
         # Evaluate constraint equation 15 (L-H threshold constraint)

process/core/init.py

@@ -23,7 +23,6 @@
     InboardBlanketConfiguration,
     TFCSRadialConfiguration,
 )
-from process.data_structure.impurity_radiation_variables import N_IMPURITIES
 from process.data_structure.numerics import FiguresOfMerit, PROCESSRunMode
 from process.data_structure.pfcoil_variables import PFConductorModel
 from process.data_structure.physics_variables import (
@@ -409,12 +408,6 @@ def check_process(inputs, data):  # noqa: ARG001
             " or set to the default value 0.1D0."
         )
 
-    # Impurity fractions
-    for imp in range(N_IMPURITIES):
-        data.impurity_radiation.f_nd_impurity_electron_array[imp] = (
-            data.impurity_radiation.f_nd_impurity_electrons[imp]
-        )
-
     # Stop the run if j_tf_coil_full_area is used as an optimisation variable
     # As the current density is now calculated from b_plasma_toroidal_on_axis
     # without constraint 10

process/core/scan.py

@@ -105,8 +105,6 @@ def set(self, data: DataStructure, sweep_val: float):
         if "__" in self.name:
             name, index = self.name.split("__")
             getattr(var_area, name)[int(index) - 1] = sweep_val
-            if name == "f_nd_impurity_electrons":
-                var_area.f_nd_impurity_electron_array[int(index - 1)] = sweep_val
         else:
             setattr(var_area, self.name, sweep_val)
             name = self.name

process/core/solver/iteration_variables.py

@@ -108,95 +108,95 @@ class IterationVariable:
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=2,
     ),
     126: IterationVariable(
         "f_nd_impurity_electrons(04)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=3,
     ),
     127: IterationVariable(
         "f_nd_impurity_electrons(05)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=4,
     ),
     128: IterationVariable(
         "f_nd_impurity_electrons(06)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=5,
     ),
     129: IterationVariable(
         "f_nd_impurity_electrons(07)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=6,
     ),
     130: IterationVariable(
         "f_nd_impurity_electrons(08)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=7,
     ),
     131: IterationVariable(
         "f_nd_impurity_electrons(09)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=8,
     ),
     132: IterationVariable(
         "f_nd_impurity_electrons(10)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=9,
     ),
     133: IterationVariable(
         "f_nd_impurity_electrons(11)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=10,
     ),
     134: IterationVariable(
         "f_nd_impurity_electrons(12)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=11,
     ),
     135: IterationVariable(
         "f_nd_impurity_electrons(13)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=12,
     ),
     136: IterationVariable(
         "f_nd_impurity_electrons(14)",
         "impurity_radiation",
         1e-8,
         0.01,
-        target_name="f_nd_impurity_electron_array",
+        target_name="f_nd_impurity_electrons",
         array_index=13,
     ),
     138: IterationVariable(

process/data_structure/impurity_radiation_variables.py

@@ -104,23 +104,13 @@ class ImpurityRadiationData:
     )
     """Full ion charge of impurity species"""
 
-    impurity_arr_label: list[str] = field(
-        default_factory=lambda: np.full(N_IMPURITIES, "  ")
-    )
-    """Array of impurity labels for internal use"""
-
     impurity_arr_z: list[float] = field(default_factory=lambda: np.zeros(N_IMPURITIES))
 
     m_impurity_amu_array: list[float] = field(
         default_factory=lambda: np.zeros(N_IMPURITIES)
     )
     """2D array of impurity atomic masses in Atomic Mass Units (amu)"""
 
-    f_nd_impurity_electron_array: list[float] = field(
-        default_factory=lambda: np.zeros(N_IMPURITIES)
-    )
-    """2D array of impurity relative densities (n_imp/n_e)"""
-
     impurity_arr_len_tab: list[int] = field(
         default_factory=lambda: np.full(N_IMPURITIES, 0)
     )