diff --git a/process/hcpb.py b/process/hcpb.py index a5081119..c6abd913 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -569,7 +569,7 @@ def powerflow_calc(self, output: bool): + fwbs_variables.pnucblkt ) primary_pumping_variables.htpmw_fw_blkt = ( - 24.0 / 90.0 * fpump / (1 - fpump) * p_plasma + primary_pumping_variables.pump_factor * fpump / (1 - fpump) * p_plasma ) # For divertor and shield, mechanical pumping power is a fraction of thermal @@ -630,6 +630,13 @@ def powerflow_calc(self, output: bool): primary_pumping_variables.htpmw_fw_blkt, "OP ", ) + po.ovarre( + self.outfile, + "Pumping power for FW and Blanket multiplier factor", + "(pump_factor)", + primary_pumping_variables.pump_factor, + "IP ", + ) po.ovarre( self.outfile, "Mechanical pumping power for divertor (MW)", diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 7f884432..a82aac8f 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -318,7 +318,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use pulse_variables, only: lpulse, dtstor, itcycl, istore, bctmp use primary_pumping_variables, only: t_in_bb, t_out_bb, dp_he, p_he, gamma_he, & - dp_fw_blkt, dp_fw, dp_blkt, dp_liq + dp_fw_blkt, dp_fw, dp_blkt, dp_liq, pump_factor use scan_module, only: isweep_2, nsweep, isweep, scan_dim, nsweep_2, & sweep_2, sweep, ipnscns, ipnscnv @@ -2341,7 +2341,9 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('p_he') call parse_real_variable('p_he', p_he, 0.0D0, 100.0D6, & 'Pressure in FW and blanket coolant at pump exit') - + case ('pump_factor') + call parse_real_variable('pump_factor', pump_factor, 0.0D0, 10.0D0, & + 'Pumping power for FW and Blanket multiplier factor') case ('gamma_he') call parse_real_variable('gamma_he', gamma_he, 1.0D0, 2.0D0, & 'Ratio of specific heats for helium or for another Gas') diff --git a/source/fortran/primary_pumping_variables.f90 b/source/fortran/primary_pumping_variables.f90 index 9ca8823d..90426483 100644 --- a/source/fortran/primary_pumping_variables.f90 +++ b/source/fortran/primary_pumping_variables.f90 @@ -50,6 +50,9 @@ module primary_pumping_variables !! mechanical pumping power for FW and blanket including heat exchanger and !! pipes (`primary_pumping=3`) [MW] + real(dp) :: pump_factor + !! Pumping power for FW and Blanket multiplier factor + contains subroutine init_primary_pumping_variables @@ -68,6 +71,7 @@ subroutine init_primary_pumping_variables dp_blkt = 3.5D3 ! Pa dp_liq = 1.0D7 ! Pa htpmw_fw_blkt = 0.0D0 + pump_factor = 1.0D0 end subroutine init_primary_pumping_variables