🔄 Rename jbus to j_tf_bus for clarity and consistency;

ukaea · Nov 29, 2024 · cfa51d3 · cfa51d3
1 parent 1d5f5b5
commit cfa51d3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/process/power.py b/process/power.py
@@ -2473,8 +2473,8 @@ def tfpwr(self, output: bool):
 
             # Cross-sectional area of bus
             # tfcoil_variables.cpttf  - current per TFC turn (A)
-            # tfcoil_variables.jbus   - bus current density (A/m2)
-            abus = tfcoil_variables.cpttf / tfcoil_variables.jbus
+            # tfcoil_variables.j_tf_bus   - bus current density (A/m2)
+            abus = tfcoil_variables.cpttf / tfcoil_variables.j_tf_bus
 
             # Bus resistance [ohm]
             # Bus resistivity (tfcoil_variables.rho_tf_bus)
@@ -2546,7 +2546,7 @@ def tfpwr(self, output: bool):
         po.oheadr(self.outfile, "Resistive TF Coil Power Conversion")
         po.ovarre(self.outfile, "Bus resistance (ohm)", "(tfbusres)", tfbusres, "OP ")
         po.ovarre(
-            self.outfile, "Bus current density (A/m2)", "(jbus)", tfcoil_variables.jbus
+            self.outfile, "Bus current density (A/m2)", "(j_tf_bus)", tfcoil_variables.j_tf_bus
         )
         po.ovarre(
             self.outfile,

diff --git a/source/fortran/input.f90 b/source/fortran/input.f90
@@ -330,7 +330,7 @@ subroutine parse_input_file(in_file,out_file,show_changes)
       casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, &
       thicndut, tftmp, oacdcp, tmax_croco, ptempalw, tmargmin_tf, tmpcry, &
       sig_tf_case_max, dztop, dcond, str_cs_con_res, etapump, drtop, vcool, dcondins, &
-      i_tf_tresca, dhecoil, tmaxpro, n_tf_coils, tcpav, fcutfsu, jbus, &
+      i_tf_tresca, dhecoil, tmaxpro, n_tf_coils, tcpav, fcutfsu, j_tf_bus, &
       casthi_fraction, tmargmin_cs, vdalw, dcase, t_turn_tf,&
       cpttf_max, tdmptf, casths, i_tf_turns_integer, quench_model, &
       tcritsc, layer_ins, tinstf, n_layer, tcoolin, ripmax, frhocp, &
@@ -1656,8 +1656,8 @@ subroutine parse_input_file(in_file,out_file,show_changes)
        case ('i_str_wp')
          call parse_int_variable('i_str_wp', i_str_wp, 0, 1, &
               'Switch for the TF coil strain behavior')
-       case ('jbus')
-          call parse_real_variable('jbus', jbus, 1.0D4, 1.0D8, &
+       case ('j_tf_bus')
+          call parse_real_variable('j_tf_bus', j_tf_bus, 1.0D4, 1.0D8, &
                'TF coil bus current density (A/m2)')
        case ('n_pancake')
           call parse_int_variable('n_pancake', n_pancake, 1, 100, &

diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90
@@ -305,7 +305,7 @@ module tfcoil_variables
   !! stress analysis. This is the layers of one turn, not the entire WP.
   !! Default: 5. void, conductor, copper, conduit, insulation.
 
-  real(dp) :: jbus
+  real(dp) :: j_tf_bus
   !! bussing current density (A/m2)
 
   real(dp) :: j_crit_str_tf
@@ -903,7 +903,7 @@ subroutine init_tfcoil_variables
     n_tf_graded_layers = 1
     n_tf_stress_layers = 0
     n_tf_wp_layers = 5
-    jbus = 1.25D6
+    j_tf_bus = 1.25D6
     j_crit_str_tf = 0.0D0
     j_crit_str_0 = &
       (/596905475.80390120D0,1925501534.8512938D0,&

diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json
@@ -2868,7 +2868,7 @@
         "j_plus_ib": 0.237,
         "j_plus_ob": 0.686,
         "jacket": null,
-        "jbus": 1250000.0,
+        "j_tf_bus": 1250000.0,
         "jscoh_bop": 0.0,
         "jscoh_eof": 0.0,
         "jcableoh_bop": 0.0,
@@ -9933,7 +9933,7 @@
         "j_plus_ib": "",
         "j_plus_ob": "",
         "jacket": "",
-        "jbus": "bussing current density (A/m2)",
+        "j_tf_bus": "bussing current density (A/m2)",
         "jscoh_bop": "central solenoid superconductor critical current density (A/m2) at beginning-of-pulse",
         "jscoh_eof": "central solenoid superconductor critical current density (A/m2) at end-of-flattop",
         "jcableoh_bop": "central solenoid cable critical current density (A/m2) at beginning-of-pulse",
@@ -13544,7 +13544,7 @@
             "lb": 1,
             "ub": 2
         },
-        "jbus": {
+        "j_tf_bus": {
             "lb": 10000.0,
             "ub": 100000000.0
         },
@@ -19589,7 +19589,7 @@
             "n_tf_graded_layers",
             "n_tf_stress_layers",
             "n_tf_wp_layers",
-            "jbus",
+            "j_tf_bus",
             "jwdgcrt",
             "jwdgpro",
             "jwptf",
@@ -20520,7 +20520,7 @@
         "itcycl": "int_variable",
         "iwalld": "int_variable",
         "ixc": "int_array",
-        "jbus": "real_variable",
+        "j_tf_bus": "real_variable",
         "kallenbach_scan_end": "real_variable",
         "kallenbach_scan_num": "int_variable",
         "kallenbach_scan_start": "real_variable",

diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT
@@ -1613,7 +1613,7 @@ tftmp = 20.0
 * DESCRIPTION:   TF coil bus (feeders) resistivity (ohm-m) 
 * JUSTIFICATION: Unknown, assuming default
 
-* jbus =  
+* j_tf_bus =  
 * DESCRIPTION:   Bussing Current Density (A/m2) 
 * JUSTIFICATION: Unknown