👽️ More changes

Fusion-Power-Plant-Framework · Dec 6, 2024 · 259f809 · 259f809
1 parent d6bd312
commit 259f809
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/bluemira/codes/process/_teardown.py b/bluemira/codes/process/_teardown.py
@@ -280,12 +280,7 @@ def _derive_radial_build_params(self, data: dict) -> dict[str, float]:
         length) of the TF coil, so this must be taken into consideration
         when translating the geometry into the mid-plane.
         """
-        try:
-            shield_th = data["thshield"]
-        except KeyError:
-            # PROCESS updated their parameter names in v2.4.0, splitting
-            # 'thshield' into 'thshield_ib', 'thshield_ob', and 'thshield_vb'
-            shield_th = data["thshield_ib"]
+        shield_th = data["thshield_ib"]
 
         try:
             rtfin = data["bore"] + data["ohcth"] + data["precomp"] + data["gapoh"]

diff --git a/examples/data/codes/process/ST_IN.DAT b/examples/data/codes/process/ST_IN.DAT
@@ -106,7 +106,7 @@ tfcth    = 1.0500e+00 * Inboard tf coil thickness; (centrepost for st) (m)
 vgap_vv_thermalshield    = 0.061 * Vertical gap between vacuum vessel and tf coil (m)
 vgap_xpoint_divertor   = 1.60 * Vertical gap between x-point and divertor (m)
 tftsgap = 0.02
-thshield = 0.05
+thshield_ib = 0.05
 vvblgap = 0.02
 *---------------Buildings Variables----------------*
 *---------------Constraint Variables---------------*
@@ -266,7 +266,8 @@ lpulse   = 1 * Switch for reactor model;
 *SWEEP = 3.1, 3.2
 *--------------Stellarator Variables---------------*
 *-----------------Tfcoil Variables-----------------*
-alstrtf  = 5.50d8 * Allowable von mises stress in tf coil structural material (pa)
+sig_tf_case_max  = 5.50d8 * Allowable von mises stress in tf coil structural material (pa)
+sig_tf_wp_max  = 5.50d8 * Allowable von mises stress in tf coil structural material (pa)
 casthi   = 0.05 * Inboard tf coil case inner (plasma side) thickness (m)
 casths   = 0.10 * Inboard tf coil sidewall case thickness (m)
 cpttf    = 7.5e+04 * Tf coil current per turn (a);

diff --git a/tests/codes/process/test_data/mfile_data.json b/tests/codes/process/test_data/mfile_data.json
@@ -1259,11 +1259,11 @@
     "var_mod": "Plasma",
     "scan01": 164.21
   },
-  "pdivt/rmajor": {
+  "pdivmax_over_rmajor": {
     "var_mod": "Plasma",
     "scan01": 18.694
   },
-  "pdivtbt/qar": {
+  "pdivtbt_over_qar": {
     "var_mod": "Plasma",
     "scan01": 9.2
   },
@@ -1659,7 +1659,15 @@
     "var_mod": "Radial Build",
     "scan01": 0.05
   },
-  "thshield": {
+  "thshield_ib": {
+    "var_mod": "Radial Build",
+    "scan01": 0.05
+  },
+  "thshield_ob": {
+    "var_mod": "Radial Build",
+    "scan01": 0.05
+  },
+  "thshield_vb": {
     "var_mod": "Radial Build",
     "scan01": 0.05
   },
@@ -1903,7 +1911,11 @@
     "var_mod": "Divertor build and plasma position",
     "scan01": 2.0024
   },
-  "alstrtf": {
+  "sig_tf_case_max": {
+    "var_mod": "TF coils",
+    "scan01": 580000000.0
+  },
+  "sig_tf_wp_max": {
     "var_mod": "TF coils",
     "scan01": 580000000.0
   },