Stellarator module update

.gitignore

@@ -49,6 +49,7 @@ dist/*
 documentation/io/vardes.md
 lcov_results/
 env/
+env_process/
 .venv
 *.DAT
 !scenario_examples/*/*.DAT

process/data_structure/stellarator_variables.py

@@ -1,15 +1,24 @@
 # These variables were from stellarator.f90
-f_n: float = None
+f_st_n_coils: float = None
+"""Actual number of coils to reference value from stella_config file"""
 
-f_r: float = None
+f_st_rmajor: float = None
+"""Actual major radius to reference value from stella_config file"""
 
-f_aspect: float = None
+f_st_aspect: float = None
+"""Actual aspect ratio to reference value from stella_config file"""
 
-f_b: float = None
+f_st_coil_aspect: float = None
+"""Scaling factor for (stellarator major radius / coil radius ratio)"""
 
-f_i: float = None
+f_st_b: float = None
+"""Actual b_plasma_toroidal_on_axis to reference value from stella_config file """
 
-f_a: float = None
+f_st_i_total: float = None
+"""Actual total coil current to reference value from stella_config file"""
+
+f_st_rminor: float = None
+"""Actual minor radius to reference value from stella_config file"""
 
 first_call: bool = None
 
@@ -97,16 +106,17 @@ def init_stellarator_variables():
     global \
         first_call, \
         first_call_stfwbs, \
-        f_n, \
-        f_r, \
-        f_a, \
-        f_b, \
-        f_i, \
+        f_st_n_coils, \
+        f_st_rmajor, \
+        f_st_rminor, \
+        f_st_b, \
+        f_st_i_total, \
         istell, \
         bmn, \
         f_asym, \
         f_rad, \
         f_w, \
+        f_st_coil_aspect, \
         fdivwet, \
         flpitch, \
         hportamax, \
@@ -127,11 +137,11 @@ def init_stellarator_variables():
 
     first_call = True
     first_call_stfwbs = True
-    f_n = 0.0
-    f_r = 0.0
-    f_a = 0.0
-    f_b = 0.0
-    f_i = 0.0
+    f_st_n_coils = 0.0
+    f_st_rmajor = 0.0
+    f_st_rminor = 0.0
+    f_st_b = 0.0
+    f_st_i_total = 0.0
     istell = 0
     bmn = 1e-3
     f_asym = 1.0
@@ -143,7 +153,7 @@ def init_stellarator_variables():
     hportpmax = 0.0
     hporttmax = 0.0
     iotabar = 1.0
-    isthtr = 3
+    isthtr = 1
     m_res = 5
     n_res = 5
     shear = 0.5

process/init.py

@@ -59,7 +59,7 @@
 from process.exceptions import ProcessValidationError
 from process.input import parse_input_file
 from process.log import logging_model_handler
-from process.stellarator import stinit
+from process.stellarator.initialization import st_init
 
 
 def init_process():
@@ -86,7 +86,7 @@ def init_process():
     set_device_type()
 
     # Initialise the Stellarator
-    stinit()
+    st_init()
 
     # Check input data for errors/ambiguities
     check_process(inputs)

process/input.py

@@ -707,6 +707,9 @@ def __post_init__(self):
         data_structure.tfcoil_variables, float, range=(0.0, 1.0)
     ),
     "f_w": InputVariable(data_structure.stellarator_variables, float, range=(0.1, 1.0)),
+    "f_st_coil_aspect": InputVariable(
+        data_structure.stellarator_variables, float, range=(0.1, 10.0)
+    ),
     "f_z_cryostat": InputVariable(
         data_structure.build_variables, float, range=(2.0, 10.0)
     ),

process/iteration_variables.py

@@ -288,6 +288,9 @@ class IterationVariable:
     ),
     174: IterationVariable("triang", data_structure.physics_variables, 0.00, 1.00),
     175: IterationVariable("kappa", data_structure.physics_variables, 0.00, 10.00),
+    176: IterationVariable(
+        "f_st_coil_aspect", data_structure.stellarator_variables, 0.70, 1.30
+    ),
 }
 
 

process/main.py

@@ -101,8 +101,9 @@
 from process.pulse import Pulse
 from process.resistive_tf_coil import AluminiumTFCoil, CopperTFCoil, ResistiveTFCoil
 from process.scan import Scan
+from process.stellarator.neoclassics import Neoclassics
+from process.stellarator.stellarator import Stellarator
 from process.shield import Shield
-from process.stellarator import Neoclassics, Stellarator
 from process.structure import Structure
 from process.superconducting_tf_coil import SuperconductingTFCoil
 from process.tf_coil import TFCoil
@@ -689,18 +690,20 @@ def __init__(self):
             plasma_profile=self.plasma_profile,
         )
         self.neoclassics = Neoclassics()
-        self.stellarator = Stellarator(
-            availability=self.availability,
-            buildings=self.buildings,
-            vacuum=self.vacuum,
-            costs=self.costs,
-            power=self.power,
-            plasma_profile=self.plasma_profile,
-            hcpb=self.ccfe_hcpb,
-            current_drive=self.current_drive,
-            physics=self.physics,
-            neoclassics=self.neoclassics,
-        )
+        if data_structure.stellarator_variables.istell != 0:
+            self.stellarator = Stellarator(
+                availability=self.availability,
+                buildings=self.buildings,
+                vacuum=self.vacuum,
+                costs=self.costs,
+                power=self.power,
+                plasma_profile=self.plasma_profile,
+                hcpb=self.ccfe_hcpb,
+                current_drive=self.current_drive,
+                physics=self.physics,
+                neoclassics=self.neoclassics,
+            )
+
         self.dcll = DCLL(fw=self.fw)
 
     @property

process/profiles.py

@@ -310,6 +310,7 @@ def calculate_profile_y(
             logger.info(
                 f"TPROFILE: temperature pedestal is higher than core temperature. {temp_plasma_pedestal_kev = }, {t0 = }"
             )
+
         rho_index = rho <= radius_plasma_pedestal_temp_norm
         self.profile_y[rho_index] = (
             temp_plasma_pedestal_kev