diff --git a/src/bcs/EconomouDielectricBC.C b/src/bcs/EconomouDielectricBC.C index 70af8ab44b8..09fa908ebe8 100644 --- a/src/bcs/EconomouDielectricBC.C +++ b/src/bcs/EconomouDielectricBC.C @@ -19,19 +19,6 @@ EconomouDielectricBC::validParams() params.addRequiredParam("dielectric_constant", "The dielectric constant of the material."); params.addRequiredParam("thickness", "The thickness of the material."); params.addRequiredParam("position_units", "Units of position."); - - params.addRequiredCoupledVar("mean_en", "The mean energy."); - params.deprecateCoupledVar("mean_en", "electron_energy", "06/01/2024"); - params.addRequiredCoupledVar("em", "The electron density."); - params.deprecateCoupledVar("em", "electrons", "06/01/2024"); - params.addRequiredCoupledVar("ip", "The ion density."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); - params.addRequiredCoupledVar("potential_ion", "The ion potential"); - params.deprecateCoupledVar("potential_ion", "ion_potentials", "06/01/2024"); - params.addParam>( - "users_gamma", "A secondary electron emission coeff. only used for this BC."); - params.deprecateParam("users_gamma", "emission_coeffs", "06/01/2024"); - params.addRequiredCoupledVar("electron_energy", "The mean electron energy density. In log form"); params.addRequiredCoupledVar("electrons", "The electron density in log form"); params.addRequiredCoupledVar("ions", "A list of ion densities in log form"); diff --git a/src/bcs/ElectronTemperatureDirichletBC.C b/src/bcs/ElectronTemperatureDirichletBC.C index 8e44077e4fd..915d292fe9b 100644 --- a/src/bcs/ElectronTemperatureDirichletBC.C +++ b/src/bcs/ElectronTemperatureDirichletBC.C @@ -17,8 +17,6 @@ ElectronTemperatureDirichletBC::validParams() { InputParameters params = ADNodalBC::validParams(); params.addRequiredParam("value", "Value of the BC"); - params.addRequiredCoupledVar("em", "The electron density."); - params.deprecateCoupledVar("em", "electrons", "06/01/2024"); params.addRequiredCoupledVar("electrons", "The electron density in log form"); params.addParam("penalty_value", 1.0, "The penalty value for the Dirichlet BC."); params.addClassDescription("Electron temperature boundary condition"); diff --git a/src/bcs/FieldEmissionBC.C b/src/bcs/FieldEmissionBC.C index 9f81dd79df8..26a1bc06982 100644 --- a/src/bcs/FieldEmissionBC.C +++ b/src/bcs/FieldEmissionBC.C @@ -18,8 +18,6 @@ FieldEmissionBC::validParams() InputParameters params = ADIntegratedBC::validParams(); params.addRequiredParam("r", "The reflection coefficient"); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("ip", "The ion density."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "A list of ion densities in log form"); params.addRequiredParam>( "emission_coeffs", @@ -36,7 +34,7 @@ FieldEmissionBC::FieldEmissionBC(const InputParameters & parameters) _r_units(1. / getParam("position_units")), _r(getParam("r")), - _num_ions(coupledComponents("ip")), + _num_ions(coupledComponents("ions")), // Coupled Variables _grad_potential(adCoupledGradient("potential")), diff --git a/src/bcs/HagelaarElectronBC.C b/src/bcs/HagelaarElectronBC.C index 3bf6f482cae..cc8d111f01e 100644 --- a/src/bcs/HagelaarElectronBC.C +++ b/src/bcs/HagelaarElectronBC.C @@ -18,8 +18,6 @@ HagelaarElectronBC::validParams() InputParameters params = ADIntegratedBC::validParams(); params.addRequiredParam("r", "The reflection coefficient"); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("mean_en", "The mean energy."); - params.deprecateCoupledVar("mean_en", "electron_energy", "06/01/2024"); params.addRequiredCoupledVar("electron_energy", "The mean electron energy density in log form"); params.addRequiredParam("position_units", "Units of position."); diff --git a/src/bcs/HagelaarEnergyAdvectionBC.C b/src/bcs/HagelaarEnergyAdvectionBC.C index 78e0a600e84..50bc857bb1c 100644 --- a/src/bcs/HagelaarEnergyAdvectionBC.C +++ b/src/bcs/HagelaarEnergyAdvectionBC.C @@ -18,8 +18,6 @@ HagelaarEnergyAdvectionBC::validParams() InputParameters params = ADIntegratedBC::validParams(); params.addRequiredParam("r", "The reflection coefficient"); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("ip", "The ion density."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "A list of ion densities in log form"); params.addRequiredParam>( "emission_coeffs", diff --git a/src/bcs/HagelaarEnergyBC.C b/src/bcs/HagelaarEnergyBC.C index 18adef833a1..e64b9f004e4 100644 --- a/src/bcs/HagelaarEnergyBC.C +++ b/src/bcs/HagelaarEnergyBC.C @@ -18,8 +18,6 @@ HagelaarEnergyBC::validParams() InputParameters params = ADIntegratedBC::validParams(); params.addRequiredParam("r", "The reflection coefficient"); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("em", "The electron density."); - params.deprecateCoupledVar("em", "electrons", "06/01/2024"); params.addRequiredCoupledVar("electrons", "The electron density in log form"); params.addRequiredParam("position_units", "Units of position."); return params; @@ -32,7 +30,7 @@ HagelaarEnergyBC::HagelaarEnergyBC(const InputParameters & parameters) // Coupled Variables _grad_potential(adCoupledGradient("potential")), - _em(adCoupledValue("em")), + _em(adCoupledValue("electrons")), _massem(getMaterialProperty("massem")), _e(getMaterialProperty("e")), diff --git a/src/bcs/LymberopoulosElectronBC.C b/src/bcs/LymberopoulosElectronBC.C index a2d2fe638db..1aca762cd96 100644 --- a/src/bcs/LymberopoulosElectronBC.C +++ b/src/bcs/LymberopoulosElectronBC.C @@ -17,15 +17,10 @@ LymberopoulosElectronBC::validParams() { InputParameters params = ADIntegratedBC::validParams(); params.addRequiredParam("ks", "The recombination coefficient"); - params.addRequiredParam>("gamma", "The secondary electron coefficient"); - params.deprecateParam("gamma", "emission_coeffs", "06/01/2024"); params.addRequiredParam>( "emission_coeffs", "The species-dependent secondary electron emission coefficients"); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("ion", "The ion density."); - params.deprecateCoupledVar("ion", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "A list of ion densities in log form"); - params.addRequiredParam("position_units", "Units of position."); params.addClassDescription("Simpified kinetic electron boundary condition" "(Based on DOI: https://doi.org/10.1063/1.352926)"); @@ -55,10 +50,10 @@ LymberopoulosElectronBC::LymberopoulosElectronBC(const InputParameters & paramet // refers to a single ion species. for (unsigned int i = 0; i < _num_ions; ++i) { - _ion_var[i] = getVar("ion", i); - _ion[i] = &adCoupledValue("ion", i); - _muion[i] = &getADMaterialProperty("mu" + (*getVar("ion", i)).name()); - _sgnion[i] = &getMaterialProperty("sgn" + (*getVar("ion", i)).name()); + _ion_var[i] = getVar("ions", i); + _ion[i] = &adCoupledValue("ions", i); + _muion[i] = &getADMaterialProperty("mu" + (*getVar("ions", i)).name()); + _sgnion[i] = &getMaterialProperty("sgn" + (*getVar("ions", i)).name()); } } diff --git a/src/bcs/NeumannCircuitVoltageMoles_KV.C b/src/bcs/NeumannCircuitVoltageMoles_KV.C index ae2dc20b1d4..75eb4114877 100644 --- a/src/bcs/NeumannCircuitVoltageMoles_KV.C +++ b/src/bcs/NeumannCircuitVoltageMoles_KV.C @@ -24,19 +24,9 @@ NeumannCircuitVoltageMoles_KV::validParams() "data_provider", "The name of the UserObject that can provide some data to materials, bcs, etc."); - params.addRequiredCoupledVar("ip", "The ion density."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "A list of ion densities in log-molar form"); - - params.addRequiredCoupledVar("em", "The log of the electron density."); - params.deprecateCoupledVar("em", "electrons", "06/01/2024"); params.addRequiredCoupledVar("electrons", "The electron density in log form"); - - params.addRequiredCoupledVar( - "mean_en", "The log of the product of the mean energy and the electron density."); - params.deprecateCoupledVar("mean_en", "electron_energy", "06/01/2024"); params.addRequiredCoupledVar("electron_energy", "The mean electron energy density in log form"); - params.addRequiredParam>( "emission_coeffs", "The secondary electron emission coefficient for each ion provided in `ions`"); @@ -107,7 +97,7 @@ NeumannCircuitVoltageMoles_KV::NeumannCircuitVoltageMoles_KV(const InputParamete for (unsigned int i = 0; i < _ip.size(); ++i) { _ip[i] = &adCoupledValue("ions", i); - _grad_ip[i] = &adCoupledGradient("ip", i); + _grad_ip[i] = &adCoupledGradient("ions", i); _T_heavy[i] = &getADMaterialProperty("T" + (*getVar("ions", i)).name()); _muip[i] = &getADMaterialProperty("mu" + (*getVar("ions", i)).name()); _Dip[i] = &getADMaterialProperty("diff" + (*getVar("ions", i)).name()); diff --git a/src/bcs/PenaltyCircuitPotential.C b/src/bcs/PenaltyCircuitPotential.C index c7996c9cbe2..4ea58162b6c 100644 --- a/src/bcs/PenaltyCircuitPotential.C +++ b/src/bcs/PenaltyCircuitPotential.C @@ -31,19 +31,9 @@ PenaltyCircuitPotential::validParams() params.addRequiredParam( "data_provider", "The name of the UserObject that can provide some data to materials, bcs, etc."); - - params.addRequiredCoupledVar("em", "The electron variable."); - params.deprecateCoupledVar("em", "electrons", "06/01/2024"); params.addRequiredCoupledVar("electrons", "The electron density in log form."); - - params.addRequiredCoupledVar("ip", "The ion variable."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "The ion density in log form."); - - params.addRequiredCoupledVar("mean_en", "The mean electron energy density in log form."); - params.deprecateCoupledVar("mean_en", "electron_energy", "06/01/2024"); params.addRequiredCoupledVar("electron_energy", "The mean electron energy density in log form."); - params.addParam("area", "Must be provided when the number of dimensions equals 1."); params.addRequiredParam("potential_units", "The potential units."); params.addRequiredParam("position_units", "Units of position."); diff --git a/src/bcs/SakiyamaElectronDiffusionBC.C b/src/bcs/SakiyamaElectronDiffusionBC.C index 244be0f13c2..cdb1443738c 100644 --- a/src/bcs/SakiyamaElectronDiffusionBC.C +++ b/src/bcs/SakiyamaElectronDiffusionBC.C @@ -16,8 +16,6 @@ InputParameters SakiyamaElectronDiffusionBC::validParams() { InputParameters params = ADIntegratedBC::validParams(); - params.addRequiredCoupledVar("mean_en", "The mean energy."); - params.deprecateCoupledVar("mean_en", "electron_energy", "06/01/2024"); params.addRequiredCoupledVar("electron_energy", "The mean electron energy density in log form"); params.addRequiredParam("position_units", "Units of position."); params.addClassDescription("Kinetic electron boundary condition" diff --git a/src/bcs/SakiyamaEnergyDiffusionBC.C b/src/bcs/SakiyamaEnergyDiffusionBC.C index 27f3259b0ba..e6b0bb81601 100644 --- a/src/bcs/SakiyamaEnergyDiffusionBC.C +++ b/src/bcs/SakiyamaEnergyDiffusionBC.C @@ -16,8 +16,6 @@ InputParameters SakiyamaEnergyDiffusionBC::validParams() { InputParameters params = ADIntegratedBC::validParams(); - params.addRequiredCoupledVar("em", "The electron density."); - params.deprecateCoupledVar("em", "electrons", "06/01/2024"); params.addRequiredCoupledVar("electrons", "The electron density in log form"); params.addRequiredParam("position_units", "Units of position."); params.addClassDescription("Kinetic advective electron energy boundary condition" diff --git a/src/bcs/SakiyamaEnergySecondaryElectronBC.C b/src/bcs/SakiyamaEnergySecondaryElectronBC.C index b70b1df4788..25aabf43d91 100644 --- a/src/bcs/SakiyamaEnergySecondaryElectronBC.C +++ b/src/bcs/SakiyamaEnergySecondaryElectronBC.C @@ -16,26 +16,16 @@ InputParameters SakiyamaEnergySecondaryElectronBC::validParams() { InputParameters params = ADIntegratedBC::validParams(); - params.addRequiredParam>("se_coeff", - "The secondary electron coefficient"); - params.deprecateParam("se_coeff", "emission_coeffs", "06/01/2024"); params.addRequiredParam>( "emission_coeffs", "The secondary electron emission coefficient for each ion provided in `ions`"); params.addRequiredParam( "Tse_equal_Te", "The secondary electron temperature equal the electron temperature in eV"); params.addParam( - "user_se_energy", 1.0, "The user's value of the secondary electron temperature in eV"); - params.deprecateParam("user_se_energy", "secondary_electron_energy", "06/01/2024"); - params.addParam("secondary_electron_energy", "The secondary electron temperature in eV"); + "secondary_electron_energy", 1.0, "The secondary electron temperature in eV"); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("em", "The electron density."); - params.deprecateCoupledVar("em", "electrons", "06/01/2024"); params.addRequiredCoupledVar("electrons", "The electron density in log form"); - params.addRequiredCoupledVar("ip", "The ion density."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "A list of ion densities in log form"); - params.addRequiredParam("position_units", "Units of position."); params.addClassDescription( "Kinetic secondary electron for mean electron energy boundary condition" @@ -54,7 +44,7 @@ SakiyamaEnergySecondaryElectronBC::SakiyamaEnergySecondaryElectronBC( // Coupled Variables _grad_potential(adCoupledGradient("potential")), - _em(adCoupledValue("em")), + _em(adCoupledValue("electrons")), _user_se_energy(getParam("secondary_electron_energy")), _a(0.5), diff --git a/src/bcs/SakiyamaSecondaryElectronBC.C b/src/bcs/SakiyamaSecondaryElectronBC.C index 4c82aad912d..df09e6477bc 100644 --- a/src/bcs/SakiyamaSecondaryElectronBC.C +++ b/src/bcs/SakiyamaSecondaryElectronBC.C @@ -17,13 +17,8 @@ SakiyamaSecondaryElectronBC::validParams() { InputParameters params = ADIntegratedBC::validParams(); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("ip", "The ion density."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "A list of ion densities in log form"); params.addRequiredParam("position_units", "Units of position."); - params.addRequiredParam>( - "users_gamma", "A secondary electron emission coeff. only used for this BC."); - params.deprecateParam("users_gamma", "emission_coeffs", "06/01/2024"); params.addRequiredParam>( "emission_coeffs", "A list of species-dependent secondary electron emission coefficients"); params.addClassDescription("Kinetic secondary electron boundary condition" diff --git a/src/bcs/SchottkyEmissionBC.C b/src/bcs/SchottkyEmissionBC.C index 7c7d90d104c..a0d07f748b7 100644 --- a/src/bcs/SchottkyEmissionBC.C +++ b/src/bcs/SchottkyEmissionBC.C @@ -18,11 +18,7 @@ SchottkyEmissionBC::validParams() InputParameters params = ADIntegratedBC::validParams(); params.addRequiredParam("r", "The reflection coefficient"); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("mean_en", "The mean energy."); - params.deprecateCoupledVar("mean_en", "electron_energy", "06/01/204"); params.addRequiredCoupledVar("electron_energy", "The mean electron energy density in log form"); - params.addRequiredCoupledVar("ip", "The ion density."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "A list of ion densities in log form"); params.addRequiredParam>( "emission_coeffs", diff --git a/src/bcs/SecondaryElectronBC.C b/src/bcs/SecondaryElectronBC.C index f21db84a134..b6b960f63a1 100644 --- a/src/bcs/SecondaryElectronBC.C +++ b/src/bcs/SecondaryElectronBC.C @@ -19,11 +19,7 @@ SecondaryElectronBC::validParams() params.addRequiredParam("r", "The reflection coefficient of the electrons."); params.addParam("r_ion", 0, "The reflection coefficient of the ions."); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("mean_en", "The mean energy."); - params.deprecateCoupledVar("mean_en", "electron_energy", "06/01/2024"); params.addRequiredCoupledVar("electron_energy", "The mean electron energy density in log form"); - params.addRequiredCoupledVar("ip", "The ion density."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "A list of ion densities in log form"); params.addRequiredParam("position_units", "Units of position."); params.addRequiredParam>( diff --git a/src/bcs/SecondaryElectronEnergyBC.C b/src/bcs/SecondaryElectronEnergyBC.C index 49b3772f998..609ef968a7a 100644 --- a/src/bcs/SecondaryElectronEnergyBC.C +++ b/src/bcs/SecondaryElectronEnergyBC.C @@ -19,12 +19,7 @@ SecondaryElectronEnergyBC::validParams() params.addRequiredParam("r", "The reflection coefficient of the electrons."); params.addParam("r_ion", 0, "The reflection coefficient of the ions."); params.addRequiredCoupledVar("potential", "The electric potential"); - params.addRequiredCoupledVar("em", "The electron density."); - params.deprecateCoupledVar("em", "electrons", "06/01/2024"); params.addRequiredCoupledVar("electrons", "The electron density in log form"); - - params.addRequiredCoupledVar("ip", "The ion density."); - params.deprecateCoupledVar("ip", "ions", "06/01/2024"); params.addRequiredCoupledVar("ions", "A list of ion densities in log form"); params.addRequiredParam("position_units", "Units of position."); params.addRequiredParam>(