diff --git a/doc/content/getting_started/input_syntax.md b/doc/content/getting_started/input_syntax.md index 984900c37f..d2d6435dc7 100644 --- a/doc/content/getting_started/input_syntax.md +++ b/doc/content/getting_started/input_syntax.md @@ -316,7 +316,7 @@ are represented below, followed by the input required to construct these equatio In the `group1` and `group2` neutron flux equations below and in the input that follows, notice that the fission kernel (`CoupledFissionEigenKernel`) is only included in the fuel region ('0'), and is not included in the moderator region ('1') -since there is no fuel in the moderator region. Also, the `DelayedNeutronEigenSource` +since there is no fuel in the moderator region. Also, the `DelayedNeutronSource` kernel, which contributes neutrons from the precursor group equations, is only included as part of the `group1` or fast group equation. @@ -359,7 +359,7 @@ included as part of the `group1` or fast group equation. block = '0' [] [delayed_group1] - type = DelayedNeutronEigenSource + type = DelayedNeutronSource variable = group1 block = '0' group_number = 1 diff --git a/include/base/MoltresApp.h b/include/base/MoltresApp.h index 9f4886fc84..13db4bcaea 100644 --- a/include/base/MoltresApp.h +++ b/include/base/MoltresApp.h @@ -12,6 +12,5 @@ class MoltresApp : public MooseApp virtual ~MoltresApp(); static void registerApps(); - static void registerAll(Factory & factory, ActionFactory & action_factory, Syntax & syntax); - static void associateSyntax(Syntax & syntax, ActionFactory & action_factory); + static void registerAll(Factory & f, ActionFactory & af, Syntax & s); }; diff --git a/problems/033117_nts_temp_pre_parsed_mat/2d_axi_function_cross_sections.i b/problems/033117_nts_temp_pre_parsed_mat/2d_axi_function_cross_sections.i index 4f90d11ca7..0c36101815 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/2d_axi_function_cross_sections.i +++ b/problems/033117_nts_temp_pre_parsed_mat/2d_axi_function_cross_sections.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -17,38 +17,37 @@ diri_temp=922 [Mesh] file = '2d_lattice_structured.msh' # file = '2d_lattice_structured_jac.msh' -[../] +[] [MeshModifiers] - [./scale] + [scale] type = Transform transform = SCALE vector_value = '1 1 1' - [../] + [] [] - [Problem] coord_type = RZ [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Precursors] @@ -66,72 +65,72 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -139,80 +138,80 @@ diri_temp=922 # block = 'moder' # average_fission_heat = 'average_fission_heat' # [../] - [./temp_diffusion] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms outer_wall' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = MsreFuelTwoGrpXSFunctionMaterial block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GraphiteTwoGrpXSFunctionMaterial prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -238,52 +237,52 @@ diri_temp=922 dtmin = 1e-5 # dtmax = 1 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true ksp_norm = none - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console exodus' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console exodus' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console exodus' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'exodus console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'exodus console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} @@ -296,10 +295,10 @@ diri_temp=922 [Outputs] perf_graph = true print_linear_residuals = true - [./exodus] + [exodus] type = Exodus execute_on = 'timestep_end final' - [../] + [] [] [Debug] diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho.i b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho.i index 164aaee6d0..2d311ad491 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho.i @@ -1,12 +1,12 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 -base_height=136 -scale=.99 -height=${fparse base_height * scale} -width=145 -offset=2.5 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 +base_height = 136 +scale = .99 +height = '${fparse base_height * scale}' +width = 145 +offset = 2.5 [GlobalParams] num_groups = 2 @@ -20,45 +20,45 @@ offset=2.5 [] [Mesh] - [./file] + [file] type = FileMeshGenerator ## Default to jac_test.msh for quicker syntax check tests. ## Switch to 3D mesh for actual simulations. # file = '3d_msre_29x29_136.msh' file = jac_test.msh - [../] - [./scale] + [] + [scale] type = TransformGenerator input = file transform = SCALE vector_value = '1 1 ${scale}' - [../] + [] [] [Problem] [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE -# initial_condition = 1 + # initial_condition = 1 scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE -# initial_condition = 1 + # initial_condition = 1 scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Precursors] - [./pres] + [pres] var_name_base = pre block = 'fuel' outlet_boundaries = 'fuel_tops' @@ -75,74 +75,74 @@ offset=2.5 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 block = 'fuel' group_number = 1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -150,84 +150,84 @@ offset=2.5 # block = 'moder' # average_fission_heat = 'average_fission_heat' # [../] - [./temp_diffusion] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 0 ${flow_velocity}' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms moder_sides' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 0 ${flow_velocity}' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] - [./nt_ic_func] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] + [nt_ic_func] type = ParsedFunction - value = 'sin(pi * z / ${height}) * sin(pi * (x + ${offset}) / ${width}) * sin(pi * (y + ${offset}) / ${width})' - [../] + expression = 'sin(pi * z / ${height}) * sin(pi * (x + ${offset}) / ${width}) * sin(pi * (y + ${offset}) / ${width})' + [] [] [Materials] - [./fuel] + [fuel] type = MsreFuelTwoGrpXSFunctionMaterial block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GraphiteTwoGrpXSFunctionMaterial prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -242,64 +242,64 @@ offset=2.5 petsc_options = '-snes_converged_reason -ksp_converged_reason -snes_linesearch_monitor' petsc_options_iname = '-pc_type -pc_factor_shift_type -pc_factor_shift_amount -ksp_type' petsc_options_value = 'lu NONZERO 1e-10 preonly' -# petsc_options_iname = '-pc_type -sub_pc_type -pc_asm_overlap -sub_ksp_type -snes_linesearch_minlambda' -# petsc_options_value = 'asm lu 1 preonly 1e-3' + # petsc_options_iname = '-pc_type -sub_pc_type -pc_asm_overlap -sub_ksp_type -snes_linesearch_minlambda' + # petsc_options_value = 'asm lu 1 preonly 1e-3' # petsc_options_iname = '-snes_type' # petsc_options_value = 'test' nl_max_its = 30 l_max_its = 200 -# dtmax = 1 + # dtmax = 1 dtmin = 1e-7 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-6 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true ksp_norm = none - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} @@ -313,9 +313,9 @@ offset=2.5 perf_graph = true print_linear_residuals = true csv = true - [./out] + [out] type = Exodus - [../] + [] [] [Debug] @@ -323,32 +323,32 @@ offset=2.5 [] [ICs] -# [./temp_ic] -# type = RandomIC -# variable = temp -# min = 922 -# max = 1022 -# [../] -# [./group1_ic] -# type = RandomIC -# variable = group1 -# min = .5 -# max = 1.5 -# [../] -# [./group2_ic] -# type = RandomIC -# variable = group2 -# min = .5 -# max = 1.5 -# [../] - [./group1_ic] + # [./temp_ic] + # type = RandomIC + # variable = temp + # min = 922 + # max = 1022 + # [../] + # [./group1_ic] + # type = RandomIC + # variable = group1 + # min = .5 + # max = 1.5 + # [../] + # [./group2_ic] + # type = RandomIC + # variable = group2 + # min = .5 + # max = 1.5 + # [../] + [group1_ic] type = FunctionIC variable = group1 function = 'nt_ic_func' - [../] - [./group2_ic] + [] + [group2_ic] type = FunctionIC variable = group2 function = 'nt_ic_func' - [../] + [] [] diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho_direct.i b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho_direct.i index 6d513b3343..8b0aecca5c 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho_direct.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho_direct.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -15,7 +15,7 @@ diri_temp=922 [] [Mesh] -# file = '3d_msre_29x29_136.msh' + # file = '3d_msre_29x29_136.msh' file = split_mesh/3d_auto_diff_rho_in.e nemesis = true skip_partioning = true @@ -25,22 +25,22 @@ diri_temp=922 [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Precursors] @@ -58,72 +58,72 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -131,84 +131,84 @@ diri_temp=922 # block = 'moder' # average_fission_heat = 'average_fission_heat' # [../] - [./temp_diffusion] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 0 ${flow_velocity}' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms moder_sides' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 0 ${flow_velocity}' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'spline' block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'spline' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -220,8 +220,8 @@ diri_temp=922 solve_type = 'NEWTON' petsc_options = '-snes_converged_reason -ksp_converged_reason -snes_linesearch_monitor' -# petsc_options_iname = '-pc_type -sub_pc_type -pc_asm_overlap -sub_ksp_type -snes_linesearch_minlambda' -# petsc_options_value = 'asm lu 1 preonly 1e-3' + # petsc_options_iname = '-pc_type -sub_pc_type -pc_asm_overlap -sub_ksp_type -snes_linesearch_minlambda' + # petsc_options_value = 'asm lu 1 preonly 1e-3' # petsc_options_iname = '-snes_type' # petsc_options_value = 'test' petsc_options_iname = '-pc_type -pc_factor_shift_type -pc_factor_shift_amount -ksp_type -snes_linesearch_minlambda' @@ -229,56 +229,56 @@ diri_temp=922 nl_max_its = 30 l_max_its = 200 -# dtmax = 1 + # dtmax = 1 dtmin = 1e-5 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true ksp_norm = none - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho_restart.i b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho_restart.i index cd9bfb92c6..0b4b885198 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho_restart.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_rho_restart.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -23,25 +23,25 @@ diri_temp=922 [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_from_file_var = group1 initial_from_file_timestep = LATEST scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_from_file_var = group2 initial_from_file_timestep = LATEST scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_from_file_var = temp initial_from_file_timestep = LATEST scaling = 1e-4 - [../] + [] [] [Precursors] @@ -60,72 +60,72 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -133,84 +133,84 @@ diri_temp=922 # block = 'moder' # average_fission_heat = 'average_fission_heat' # [../] - [./temp_diffusion] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 0 ${flow_velocity}' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms moder_sides' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 0 ${flow_velocity}' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'spline' block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'spline' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -230,55 +230,55 @@ diri_temp=922 nl_max_its = 30 l_max_its = 200 -# dtmax = 1 + # dtmax = 1 dtmin = 1e-5 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} @@ -292,9 +292,9 @@ diri_temp=922 perf_graph = true print_linear_residuals = true csv = true - [./out] + [out] type = Exodus - [../] + [] [] [Debug] diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin.i b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin.i index 73a5db9e92..c1f447e224 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin.i @@ -1,9 +1,9 @@ # flow_velocity=21.7 # cm/s. See MSRE-properties.ods fuel_velocity_max_inlet = 43.4 fuel_sq_rad = 39.94 -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -25,22 +25,22 @@ diri_temp=922 [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Precursors] @@ -58,72 +58,72 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -131,84 +131,84 @@ diri_temp=922 # block = 'moder' # average_fission_heat = 'average_fission_heat' # [../] - [./temp_diffusion] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 0 ${flow_velocity}' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms moder_sides' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 0 ${flow_velocity}' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'monotone_cubic' block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'monotone_cubic' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -228,55 +228,55 @@ diri_temp=922 nl_max_its = 30 l_max_its = 200 -# dtmax = 1 + # dtmax = 1 dtmin = 1e-5 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} @@ -290,9 +290,9 @@ diri_temp=922 perf_graph = true print_linear_residuals = true csv = true - [./out] + [out] type = Exodus - [../] + [] [] [Debug] diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin_adaptive.i b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin_adaptive.i index ef1c0ea029..94dcd4e398 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin_adaptive.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin_adaptive.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -24,22 +24,22 @@ diri_temp=922 [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Precursors] @@ -57,72 +57,72 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -130,84 +130,84 @@ diri_temp=922 # block = 'moder' # average_fission_heat = 'average_fission_heat' # [../] - [./temp_diffusion] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 0 ${flow_velocity}' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms moder_sides' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 0 ${flow_velocity}' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'monotone_cubic' block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'monotone_cubic' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -227,57 +227,57 @@ diri_temp=922 nl_max_its = 30 l_max_its = 200 -# dtmax = 1 + # dtmax = 1 dtmin = 1e-5 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true # off_diag_row = 'temp pre1 pre2 pre3 pre4 pre5 pre6 temp pre1 pre2 pre3 pre4 pre5 pre6' # off_diag_column = 'group1 group1 group1 group1 group1 group1 group1 group2 group2 group2 group2 group2 group2 group2' - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} @@ -291,10 +291,10 @@ diri_temp=922 perf_graph = true print_linear_residuals = true csv = true - [./exodus] + [exodus] type = Exodus file_base = '' - [../] + [] [] [Debug] diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin_adaptive_PJFNK.i b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin_adaptive_PJFNK.i index 0a1233c9fc..aabe348a07 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin_adaptive_PJFNK.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_auto_diff_single_pin_adaptive_PJFNK.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -24,22 +24,22 @@ diri_temp=922 [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Precursors] @@ -57,72 +57,72 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -130,84 +130,84 @@ diri_temp=922 # block = 'moder' # average_fission_heat = 'average_fission_heat' # [../] - [./temp_diffusion] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 0 ${flow_velocity}' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms moder_sides' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 0 ${flow_velocity}' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'monotone_cubic' block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'monotone_cubic' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -227,57 +227,57 @@ diri_temp=922 nl_max_its = 30 l_max_its = 200 -# dtmax = 1 + # dtmax = 1 dtmin = 1e-5 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true # off_diag_row = 'temp pre1 pre2 pre3 pre4 pre5 pre6 temp pre1 pre2 pre3 pre4 pre5 pre6' # off_diag_column = 'group1 group1 group1 group1 group1 group1 group1 group2 group2 group2 group2 group2 group2 group2' - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} @@ -291,9 +291,9 @@ diri_temp=922 perf_graph = true print_linear_residuals = true csv = true - [./out] + [out] type = Exodus - [../] + [] [] [Debug] diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_nts_only.i b/problems/033117_nts_temp_pre_parsed_mat/3d_nts_only.i index 1aeec14840..65ba68fc22 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_nts_only.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_nts_only.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -23,94 +23,92 @@ diri_temp=922 [] [Variables] - [./group1] - [../] - [./group2] - [../] + [group1] + [] + [group2] + [] [] [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionEigenKernel variable = group1 group_number = 1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionEigenKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] - - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'spline' block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'spline' block = 'moder' - [../] + [] [] [Executioner] @@ -130,55 +128,55 @@ diri_temp=922 [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./bnorm] + [bnorm] type = ElmIntegTotFissNtsPostprocessor execute_on = linear - [../] - [./tot_fissions] + [] + [tot_fissions] type = ElmIntegTotFissPostprocessor execute_on = linear - [../] - [./group1norm] + [] + [group1norm] type = ElementIntegralVariablePostprocessor variable = group1 execute_on = linear - [../] - [./group1max] + [] + [group1max] type = NodalExtremeValue value_type = max variable = group1 execute_on = timestep_end - [../] - [./group1diff] + [] + [group1diff] type = ElementL2Diff variable = group1 execute_on = 'linear timestep_end' use_displaced_mesh = false - [../] - [./group2norm] + [] + [group2norm] type = ElementIntegralVariablePostprocessor variable = group2 execute_on = linear - [../] - [./group2max] + [] + [group2max] type = NodalExtremeValue value_type = max variable = group2 execute_on = timestep_end - [../] - [./group2diff] + [] + [group2diff] type = ElementL2Diff variable = group2 execute_on = 'linear timestep_end' use_displaced_mesh = false - [../] + [] [] [Outputs] diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_single_pin_velocity_function.i b/problems/033117_nts_temp_pre_parsed_mat/3d_single_pin_velocity_function.i index 97849f94e5..058df991fa 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_single_pin_velocity_function.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_single_pin_velocity_function.i @@ -1,9 +1,9 @@ # flow_velocity=21.7 # cm/s. See MSRE-properties.ods fuel_velocity_max_inlet = 43.4 fuel_sq_rad = 33.28 -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -25,22 +25,22 @@ diri_temp=922 [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Precursors] @@ -59,72 +59,72 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -132,100 +132,100 @@ diri_temp=922 # block = 'moder' # average_fission_heat = 'average_fission_heat' # [../] - [./temp_diffusion] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = VelocityFunctionTemperatureAdvection vel_x_func = vel_x_func vel_y_func = vel_y_func vel_z_func = vel_z_func variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms moder_sides' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = VelocityFunctionTemperatureOutflowBC variable = temp vel_x_func = vel_x_func vel_y_func = vel_y_func vel_z_func = vel_z_func - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] - [./vel_x_func] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] + [vel_x_func] type = ParsedFunction - value = '0' - [../] - [./vel_y_func] + expression = '0' + [] + [vel_y_func] type = ParsedFunction - value = '0' - [../] - [./vel_z_func] + expression = '0' + [] + [vel_z_func] type = ParsedFunction - value = '${fuel_velocity_max_inlet} * cos(pi * x / (2 * ${fuel_sq_rad})) * cos(pi * y / (2 * ${fuel_sq_rad}))' - [../] + expression = '${fuel_velocity_max_inlet} * cos(pi * x / (2 * ${fuel_sq_rad})) * cos(pi * y / (2 * ${fuel_sq_rad}))' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'monotone_cubic' block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'monotone_cubic' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -245,55 +245,55 @@ diri_temp=922 nl_max_its = 30 l_max_its = 200 -# dtmax = 1 + # dtmax = 1 dtmin = 1e-5 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_single_pin_velocity_function_moderator_heating.i b/problems/033117_nts_temp_pre_parsed_mat/3d_single_pin_velocity_function_moderator_heating.i index 88dec4e35e..3a3ab435f0 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_single_pin_velocity_function_moderator_heating.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_single_pin_velocity_function_moderator_heating.i @@ -1,9 +1,9 @@ # flow_velocity=21.7 # cm/s. See MSRE-properties.ods fuel_velocity_max_inlet = 43.4 fuel_sq_rad = 33.28 -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -27,29 +27,29 @@ diri_temp=922 [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 # scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [AuxVariables] - [./power_density] + [power_density] order = CONSTANT family = MONOMIAL - [../] + [] [] [Precursors] @@ -68,154 +68,154 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp block = 'fuel' - [../] - [./temp_source_mod] + [] + [temp_source_mod] type = GammaHeatSource variable = temp block = 'moder' average_fission_heat = 'average_fission_heat' - [../] - [./temp_diffusion] + [] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = VelocityFunctionTemperatureAdvection vel_x_func = vel_x_func vel_y_func = vel_y_func vel_z_func = vel_z_func variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms moder_sides' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = VelocityFunctionTemperatureOutflowBC variable = temp vel_x_func = vel_x_func vel_y_func = vel_y_func vel_z_func = vel_z_func - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] - [./vel_x_func] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] + [vel_x_func] type = ParsedFunction - value = '0' - [../] - [./vel_y_func] + expression = '0' + [] + [vel_y_func] type = ParsedFunction - value = '0' - [../] - [./vel_z_func] + expression = '0' + [] + [vel_z_func] type = ParsedFunction - value = '${fuel_velocity_max_inlet} * cos(pi * x / (2 * ${fuel_sq_rad})) * cos(pi * y / (2 * ${fuel_sq_rad}))' - [../] + expression = '${fuel_velocity_max_inlet} * cos(pi * x / (2 * ${fuel_sq_rad})) * cos(pi * y / (2 * ${fuel_sq_rad}))' + [] [] [AuxKernels] - [./fuel] + [fuel] block = 'fuel' type = FissionHeatSourceTransientAux variable = power_density - [../] - [./moderator] + [] + [moderator] block = 'moder' type = ModeratorHeatSourceTransientAux average_fission_heat = 'average_fission_heat' variable = power_density - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'monotone_cubic' @@ -224,16 +224,16 @@ diri_temp=922 prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K peak_power_density = peak_power_density controller_gain = 1e-4 - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'monotone_cubic' @@ -242,15 +242,15 @@ diri_temp=922 block = 'moder' peak_power_density = peak_power_density controller_gain = 0 - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -271,67 +271,67 @@ diri_temp=922 l_max_its = 200 line_search = none -# dtmax = 1 + # dtmax = 1 dtmin = 1e-5 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] - [./average_fission_heat] + [] + [average_fission_heat] type = AverageFissionHeat execute_on = 'linear nonlinear' outputs = 'console' block = 'fuel' - [../] - [./peak_power_density] + [] + [peak_power_density] type = ElementExtremeValue value_type = max variable = power_density execute_on = 'linear nonlinear timestep_begin' - [../] + [] [] [Outputs] diff --git a/problems/033117_nts_temp_pre_parsed_mat/3d_velocity_inletbc_by_parts.i b/problems/033117_nts_temp_pre_parsed_mat/3d_velocity_inletbc_by_parts.i index ccf37c63a8..d5d79f1289 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/3d_velocity_inletbc_by_parts.i +++ b/problems/033117_nts_temp_pre_parsed_mat/3d_velocity_inletbc_by_parts.i @@ -18,26 +18,26 @@ fuel_sq_rad = 39.94 [] [Variables] - [./vel_x] + [vel_x] order = SECOND family = LAGRANGE block = 'fuel' - [../] - [./vel_y] + [] + [vel_y] order = SECOND family = LAGRANGE block = 'fuel' - [../] - [./vel_z] + [] + [vel_z] order = SECOND family = LAGRANGE block = 'fuel' - [../] - [./p] + [] + [p] order = FIRST family = LAGRANGE block = 'fuel' - [../] + [] [] [Kernels] @@ -53,15 +53,15 @@ fuel_sq_rad = 39.94 # type = INSMomentumTimeDerivative # variable = vel_z # [../] - [./mass] + [mass] type = INSMass variable = p u = vel_x v = vel_y w = vel_z p = p - [../] - [./x_momentum_space] + [] + [x_momentum_space] type = INSMomentumLaplaceForm variable = vel_x u = vel_x @@ -69,16 +69,16 @@ fuel_sq_rad = 39.94 w = vel_z p = p component = 0 - [../] - [./y_momentum_space] + [] + [y_momentum_space] type = INSMomentumLaplaceForm variable = vel_y u = vel_x v = vel_y p = p component = 1 - [../] - [./z_momentum_space] + [] + [z_momentum_space] type = INSMomentumLaplaceForm variable = vel_z u = vel_x @@ -86,52 +86,52 @@ fuel_sq_rad = 39.94 w = vel_z p = p component = 2 - [../] + [] [] [BCs] - [./z_no_slip] + [z_no_slip] type = DirichletBC variable = vel_z boundary = 'fuel_sides' value = 0.0 - [../] - [./y_no_slip] + [] + [y_no_slip] type = DirichletBC variable = vel_y boundary = 'fuel_sides fuel_bottoms' value = 0.0 - [../] - [./x_no_slip] + [] + [x_no_slip] type = DirichletBC variable = vel_x boundary = 'fuel_sides fuel_bottoms' value = 0.0 - [../] - [./z_inlet] + [] + [z_inlet] type = FunctionDirichletBC variable = vel_z boundary = 'fuel_bottoms' function = 'inlet_func' - [../] + [] [] [Materials] - [./const] + [const] type = GenericConstantMaterial # block = 'fuel moder' block = 'fuel' prop_names = 'rho mu' prop_values = '${rho} ${mu}' - [../] + [] [] [Preconditioning] - [./smp] + [smp] type = SMP full = true solve_type = PJFNK - [../] + [] [] [Executioner] @@ -150,16 +150,16 @@ fuel_sq_rad = 39.94 [] [Outputs] - [./out] + [out] type = Exodus - [../] + [] [] [Functions] - [./inlet_func] + [inlet_func] type = ParsedFunction - # value = '${fuel_velocity_max_inlet} * (${fuel_sq_rad}^2 - x^2) * (${fuel_sq_rad}^2 - y^2) / ${fuel_sq_rad}^4' - value = '${fuel_velocity_max_inlet} * (1 - cosh(pi * y / (2 * ${fuel_sq_rad})) / cosh(pi / 2)) * cos(pi * x / (2 * ${fuel_sq_rad}))' - # value = '${fuel_velocity_max_inlet} * cos(pi * x / (2 * ${fuel_sq_rad})) * cos(pi * y / (2 * ${fuel_sq_rad}))' - [../] + # expression = '${fuel_velocity_max_inlet} * (${fuel_sq_rad}^2 - x^2) * (${fuel_sq_rad}^2 - y^2) / ${fuel_sq_rad}^4' + expression = '${fuel_velocity_max_inlet} * (1 - cosh(pi * y / (2 * ${fuel_sq_rad})) / cosh(pi / 2)) * cos(pi * x / (2 * ${fuel_sq_rad}))' + # expression = '${fuel_velocity_max_inlet} * cos(pi * x / (2 * ${fuel_sq_rad})) * cos(pi * y / (2 * ${fuel_sq_rad}))' + [] [] diff --git a/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho.i b/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho.i index f333ac1e5d..a62f3200c9 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho.i +++ b/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -22,36 +22,36 @@ diri_temp=922 # file = auto_diff_rho_in.e # nemesis = true # parallel_type = DISTRIBUTED -[../] +[] [Problem] coord_type = RZ [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [AuxVariables] - [./power_density] + [power_density] order = CONSTANT family = MONOMIAL - [../] + [] [] [Precursors] @@ -69,138 +69,138 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp block = 'fuel' - [../] - [./temp_source_mod] + [] + [temp_source_mod] type = GammaHeatSource variable = temp block = 'moder' average_fission_heat = 'average_fission_heat' - [../] - [./temp_diffusion] + [] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms outer_wall' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] + [] [] [AuxKernels] - [./fuel] + [fuel] block = 'fuel' type = FissionHeatSourceTransientAux variable = power_density - [../] - [./moderator] + [] + [moderator] block = 'moder' type = ModeratorHeatSourceTransientAux average_fission_heat = 'average_fission_heat' variable = power_density - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'spline' @@ -208,16 +208,16 @@ diri_temp=922 prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K controller_gain = 0 - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'spline' @@ -225,15 +225,15 @@ diri_temp=922 prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' controller_gain = 0 - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -260,58 +260,58 @@ diri_temp=922 dtmin = 1e-5 # dtmax = 1 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true ksp_norm = none - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] - [./average_fission_heat] + [] + [average_fission_heat] type = AverageFissionHeat execute_on = 'linear nonlinear' outputs = 'csv console' block = 'fuel' - [../] + [] [] [Outputs] diff --git a/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho_control.i b/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho_control.i index d4da4169d9..5c47da4fc6 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho_control.i +++ b/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho_control.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -22,40 +22,40 @@ diri_temp=922 # file = auto_diff_rho_in.e # nemesis = true # parallel_type = DISTRIBUTED -[../] +[] [Problem] coord_type = RZ [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [AuxVariables] - [./power_density] + [power_density] order = CONSTANT family = MONOMIAL - [../] + [] [] [Precursors] - [./pres] + [pres] var_name_base = pre block = 'fuel' outlet_boundaries = 'fuel_tops' @@ -66,143 +66,143 @@ diri_temp=922 family = MONOMIAL order = CONSTANT # jac_test = true - [../] + [] [] [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp block = 'fuel' - [../] - [./temp_source_mod] + [] + [temp_source_mod] type = GammaHeatSource variable = temp block = 'moder' average_fission_heat = 'average_fission_heat' - [../] - [./temp_diffusion] + [] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms outer_wall' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] + [] [] [AuxKernels] - [./fuel] + [fuel] block = 'fuel' type = FissionHeatSourceTransientAux variable = power_density - [../] - [./moderator] + [] + [moderator] block = 'moder' type = ModeratorHeatSourceTransientAux average_fission_heat = 'average_fission_heat' variable = power_density - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_fuel_' interp_type = 'spline' @@ -211,16 +211,16 @@ diri_temp=922 prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K peak_power_density = peak_power_density controller_gain = 1e-4 - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_mod_' interp_type = 'spline' @@ -229,15 +229,15 @@ diri_temp=922 block = 'moder' peak_power_density = peak_power_density controller_gain = 0 - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -259,64 +259,64 @@ diri_temp=922 dtmin = 1e-5 # dtmax = 1 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] - [./average_fission_heat] + [] + [average_fission_heat] type = AverageFissionHeat execute_on = 'linear nonlinear' outputs = 'csv console' block = 'fuel' - [../] - [./peak_power_density] + [] + [peak_power_density] type = ElementExtremeValue value_type = max variable = power_density execute_on = 'linear nonlinear' outputs = 'csv console' - [../] + [] [] [Outputs] diff --git a/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho_monotone_interp.i b/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho_monotone_interp.i index b8fa8f2d29..8dedf1dec1 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho_monotone_interp.i +++ b/problems/033117_nts_temp_pre_parsed_mat/auto_diff_rho_monotone_interp.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 [GlobalParams] num_groups = 2 @@ -17,29 +17,29 @@ diri_temp=922 [Mesh] file = '2d_lattice_structured.msh' # file = '2d_lattice_structured_jac.msh' -[../] +[] [Problem] coord_type = RZ [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Precursors] @@ -57,72 +57,72 @@ diri_temp=922 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -130,84 +130,84 @@ diri_temp=922 # block = 'moder' # average_fission_heat = 'average_fission_heat' # [../] - [./temp_diffusion] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms outer_wall' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'monotone_cubic' block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'monotone_cubic' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -230,51 +230,51 @@ diri_temp=922 dtmin = 1e-5 # dtmax = 1 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} @@ -288,9 +288,9 @@ diri_temp=922 perf_graph = true print_linear_residuals = true csv = true - [./out] + [out] type = Exodus - [../] + [] [] [Debug] diff --git a/problems/033117_nts_temp_pre_parsed_mat/controlled_neutronics_only.i b/problems/033117_nts_temp_pre_parsed_mat/controlled_neutronics_only.i index cc926224d6..3ce53c57d6 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/controlled_neutronics_only.i +++ b/problems/033117_nts_temp_pre_parsed_mat/controlled_neutronics_only.i @@ -1,5 +1,5 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 [GlobalParams] num_groups = 2 @@ -16,32 +16,32 @@ nt_scale=1e13 [Mesh] file = '2d_lattice_structured.msh' -[../] +[] [Problem] coord_type = RZ [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] + [] [] [AuxVariables] - [./power_density] + [power_density] order = CONSTANT family = MONOMIAL - [../] + [] [] [Precursors] @@ -59,91 +59,91 @@ nt_scale=1e13 [Kernels] # Neutronics - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./time_group2] + [] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group2 - [../] + [] [] [AuxKernels] - [./fuel] + [fuel] block = 'fuel' type = FissionHeatSourceTransientAux variable = power_density - [../] - [./moderator] + [] + [moderator] block = 'moder' type = ModeratorHeatSourceTransientAux average_fission_heat = 'average_fission_heat' variable = power_density - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'spline' @@ -152,8 +152,8 @@ nt_scale=1e13 prop_values = '.0553 1967 2.146e-3' # Robertson MSRE technical report @ 922 K peak_power_density = peak_power_density controller_gain = 1e-5 - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'spline' @@ -161,7 +161,7 @@ nt_scale=1e13 prop_values = '.312 1760 1.86e-3' # Cammi 2011 at 908 K block = 'moder' controller_gain = 0 - [../] + [] [] [Executioner] @@ -186,61 +186,61 @@ nt_scale=1e13 dtmin = 1e-5 # dtmax = 1 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./peak_power_density] + [] + [peak_power_density] type = ElementExtremeValue value_type = max variable = power_density execute_on = 'linear nonlinear timestep_begin' - [../] - [./average_fission_heat] + [] + [average_fission_heat] type = AverageFissionHeat nt_scale = ${nt_scale} # execute_on = 'linear nonlinear' outputs = 'csv console' block = 'fuel' - [../] + [] [] [Outputs] perf_graph = true print_linear_residuals = true csv = true - [./exodus] + [exodus] type = Exodus - [../] + [] [] [Debug] diff --git a/problems/033117_nts_temp_pre_parsed_mat/meigen.i b/problems/033117_nts_temp_pre_parsed_mat/meigen.i index 9257a9b052..90184a023a 100644 --- a/problems/033117_nts_temp_pre_parsed_mat/meigen.i +++ b/problems/033117_nts_temp_pre_parsed_mat/meigen.i @@ -52,50 +52,50 @@ [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops moder_sides' variable = group2 - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms moder_sides' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 0 ${flow_velocity}' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_fuel_' interp_type = 'spline' block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../property_file_dir/newt_msre_mod_' interp_type = 'spline' block = 'moder' - [../] + [] [] [Executioner] @@ -108,14 +108,13 @@ #petsc_options_iname = '-pc_type -sub_pc_type -pc_asm_overlap -sub_ksp_type -snes_linesearch_minlambda' petsc_options_iname = '-pc_type -sub_pc_type' petsc_options_value = 'asm lu ' #1 preonly 1e-3' - [../] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] #[Postprocessors] @@ -160,10 +159,10 @@ perf_graph = true print_linear_residuals = true # csv = true - [./out] + [out] type = Exodus execute_on = 'final' - [../] + [] [] [Debug] diff --git a/problems/2017_annals_pub_msre_compare/2group.i b/problems/2017_annals_pub_msre_compare/2group.i index 1db5be3b85..0f02f12f08 100644 --- a/problems/2017_annals_pub_msre_compare/2group.i +++ b/problems/2017_annals_pub_msre_compare/2group.i @@ -1,10 +1,10 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 -gamma_frac=.075 -R=73 -H=162.56 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 +gamma_frac = .075 +R = 73 +H = 162.56 [GlobalParams] num_groups = 2 @@ -24,21 +24,21 @@ H=162.56 [] [Variables] - [./temp] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [AuxVariables] - [./power_density] + [power_density] order = CONSTANT family = MONOMIAL - [../] + [] [] [Precursors] - [./pres] + [pres] var_name_base = pre block = 'fuel' outlet_boundaries = 'fuel_tops' @@ -50,7 +50,7 @@ H=162.56 family = MONOMIAL order = CONSTANT # jac_test = true - [../] + [] [] [Nt] @@ -63,85 +63,85 @@ H=162.56 [Kernels] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp block = 'fuel' - [../] - [./temp_source_mod] + [] + [temp_source_mod] type = GammaHeatSource variable = temp block = 'moder' average_fission_heat = 'average_fission_heat' gamma = gamma_func - [../] - [./temp_diffusion] + [] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./temp_diri_cg] + [temp_diri_cg] boundary = 'fuel_bottoms outer_wall' type = FlexiblePostprocessorDirichletBC postprocessor = coreEndTemp offset = -27.8 variable = temp - [../] + [] # [./temp_diri_cg] # boundary = 'moder_bottoms fuel_bottoms outer_wall' # type = FunctionDirichletBC # function = 'temp_bc_func' # variable = temp # [../] - [./temp_advection_outlet] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] + [] [] [AuxKernels] - [./fuel] + [fuel] block = 'fuel' type = FissionHeatSourceTransientAux variable = power_density - [../] - [./moderator] + [] + [moderator] block = 'moder' type = ModeratorHeatSourceTransientAux average_fission_heat = 'average_fission_heat' variable = power_density gamma = gamma_func - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] - [./gamma_func] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] + [gamma_func] type = ParsedFunction - value = '${gamma_frac} * pi^2 / 4 * cos(pi * x / (2. * ${R})) * sin(pi * y / ${H})' - [../] + expression = '${gamma_frac} * pi^2 / 4 * cos(pi * x / (2. * ${R})) * sin(pi * y / ${H})' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/serp3d2group0.78eV/2g0.78eV_fuel_' interp_type = 'spline' @@ -149,16 +149,16 @@ H=162.56 prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K controller_gain = 0 - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/serp3d2group0.78eV/2g0.78eV_moder_' interp_type = 'spline' @@ -166,15 +166,15 @@ H=162.56 prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' controller_gain = 0 - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -194,70 +194,70 @@ H=162.56 l_max_its = 100 dtmin = 1e-5 - [./TimeStepper] + [TimeStepper] type = PostprocessorDT postprocessor = limit_k dt = 1e-3 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] - [./average_fission_heat] + [] + [average_fission_heat] type = AverageFissionHeat execute_on = 'linear nonlinear' outputs = 'csv console' block = 'fuel' - [../] - [./coreEndTemp] + [] + [coreEndTemp] type = SideAverageValue variable = temp boundary = 'fuel_tops' outputs = 'csv console' execute_on = 'linear nonlinear' - [../] - [./limit_k] + [] + [limit_k] type = LimitK execute_on = 'timestep_end' k_postprocessor = multiplication growth_factor = 1.2 cutback_factor = .4 k_threshold = 1.5 - [../] + [] [] [Outputs] diff --git a/problems/2017_annals_pub_msre_compare/2group_eigen.i b/problems/2017_annals_pub_msre_compare/2group_eigen.i index 3425f3e756..f5f65a3ed5 100644 --- a/problems/2017_annals_pub_msre_compare/2group_eigen.i +++ b/problems/2017_annals_pub_msre_compare/2group_eigen.i @@ -21,22 +21,21 @@ eigen = true [] - [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/serp3d2group0.78eV/2g0.78eV_fuel_' interp_type = 'spline' block = 'fuel' temperature = 972 - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/serp3d2group0.78eV/2g0.78eV_moder_' interp_type = 'spline' block = 'moder' temperature = 972 - [../] + [] [] [Executioner] @@ -58,24 +57,24 @@ [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./bnorm] + [bnorm] type = ElmIntegTotFissNtsPostprocessor block = 'fuel' execute_on = 'nonlinear linear timestep_end' - [../] - [./group1diff] + [] + [group1diff] type = ElementL2Diff variable = group1 execute_on = 'nonlinear linear timestep_end' use_displaced_mesh = false - [../] + [] [] [Outputs] diff --git a/problems/2017_annals_pub_msre_compare/4group.i b/problems/2017_annals_pub_msre_compare/4group.i index c67c3a58a1..08dc610b67 100644 --- a/problems/2017_annals_pub_msre_compare/4group.i +++ b/problems/2017_annals_pub_msre_compare/4group.i @@ -1,10 +1,10 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 -gamma_frac=.075 -R=73 -H=162.56 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 +gamma_frac = .075 +R = 73 +H = 162.56 [GlobalParams] num_groups = 4 @@ -24,21 +24,21 @@ H=162.56 [] [Variables] - [./temp] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [AuxVariables] - [./power_density] + [power_density] order = CONSTANT family = MONOMIAL - [../] + [] [] [Precursors] - [./pres] + [pres] var_name_base = pre block = 'fuel' outlet_boundaries = 'fuel_tops' @@ -50,7 +50,7 @@ H=162.56 family = MONOMIAL order = CONSTANT # jac_test = true - [../] + [] [] [Nt] @@ -63,85 +63,85 @@ H=162.56 [Kernels] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp block = 'fuel' - [../] - [./temp_source_mod] + [] + [temp_source_mod] type = GammaHeatSource variable = temp block = 'moder' average_fission_heat = 'average_fission_heat' gamma = gamma_func - [../] - [./temp_diffusion] + [] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./temp_diri_cg] + [temp_diri_cg] boundary = 'fuel_bottoms outer_wall' type = FlexiblePostprocessorDirichletBC postprocessor = coreEndTemp offset = -27.8 variable = temp - [../] + [] # [./temp_diri_cg] # boundary = 'moder_bottoms fuel_bottoms outer_wall' # type = FunctionDirichletBC # function = 'temp_bc_func' # variable = temp # [../] - [./temp_advection_outlet] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] + [] [] [AuxKernels] - [./fuel] + [fuel] block = 'fuel' type = FissionHeatSourceTransientAux variable = power_density - [../] - [./moderator] + [] + [moderator] block = 'moder' type = ModeratorHeatSourceTransientAux average_fission_heat = 'average_fission_heat' variable = power_density gamma = gamma_func - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] - [./gamma_func] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] + [gamma_func] type = ParsedFunction - value = '${gamma_frac} * pi^2 / 4 * cos(pi * x / (2. * ${R})) * sin(pi * y / ${H})' - [../] + expression = '${gamma_frac} * pi^2 / 4 * cos(pi * x / (2. * ${R})) * sin(pi * y / ${H})' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../tutorial/step01_groupConstants/MSREProperties/msre_gentry_4g_fuel_rod0_' interp_type = 'spline' @@ -149,16 +149,16 @@ H=162.56 prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K controller_gain = 0 - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../tutorial/step01_groupConstants/MSREProperties/msre_gentry_4g_moder_rod0_' interp_type = 'spline' @@ -166,15 +166,15 @@ H=162.56 prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' controller_gain = 0 - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -194,70 +194,70 @@ H=162.56 l_max_its = 100 dtmin = 1e-5 - [./TimeStepper] + [TimeStepper] type = PostprocessorDT postprocessor = limit_k dt = 1e-3 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] - [./average_fission_heat] + [] + [average_fission_heat] type = AverageFissionHeat execute_on = 'linear nonlinear' outputs = 'csv console' block = 'fuel' - [../] - [./coreEndTemp] + [] + [coreEndTemp] type = SideAverageValue variable = temp boundary = 'fuel_tops' outputs = 'csv console' execute_on = 'linear nonlinear' - [../] - [./limit_k] + [] + [limit_k] type = LimitK execute_on = 'timestep_end' k_postprocessor = multiplication growth_factor = 1.2 cutback_factor = .4 k_threshold = 1.5 - [../] + [] [] [Outputs] diff --git a/problems/2017_annals_pub_msre_compare/4group_eigen.i b/problems/2017_annals_pub_msre_compare/4group_eigen.i index 34f2e97936..178315950b 100644 --- a/problems/2017_annals_pub_msre_compare/4group_eigen.i +++ b/problems/2017_annals_pub_msre_compare/4group_eigen.i @@ -21,20 +21,19 @@ eigen = true [] - [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../tutorial/step01_groupConstants/MSREProperties/msre_gentry_4g_fuel_rod0_' interp_type = 'spline' block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../tutorial/step01_groupConstants/MSREProperties/msre_gentry_4g_moder_rod0_' interp_type = 'spline' block = 'moder' - [../] + [] [] [Executioner] @@ -56,24 +55,24 @@ [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./bnorm] + [bnorm] type = ElmIntegTotFissNtsPostprocessor block = 'fuel' execute_on = 'nonlinear linear timestep_end' - [../] - [./group1diff] + [] + [group1diff] type = ElementL2Diff variable = group1 execute_on = 'nonlinear linear timestep_end' use_displaced_mesh = false - [../] + [] [] [Outputs] diff --git a/problems/2017_annals_pub_msre_compare/auto_diff_rho.i b/problems/2017_annals_pub_msre_compare/auto_diff_rho.i index c6b60c75ab..8efd41cfdd 100644 --- a/problems/2017_annals_pub_msre_compare/auto_diff_rho.i +++ b/problems/2017_annals_pub_msre_compare/auto_diff_rho.i @@ -1,10 +1,10 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 -diri_temp=922 -gamma_frac=.075 -R=70.1675 -H=162.56 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 +diri_temp = 922 +gamma_frac = .075 +R = 70.1675 +H = 162.56 [GlobalParams] num_groups = 4 @@ -24,21 +24,21 @@ H=162.56 [] [Variables] - [./temp] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [AuxVariables] - [./power_density] + [power_density] order = CONSTANT family = MONOMIAL - [../] + [] [] [Precursors] - [./pres] + [pres] var_name_base = pre block = 'fuel' outlet_boundaries = 'fuel_tops' @@ -50,7 +50,7 @@ H=162.56 family = MONOMIAL order = CONSTANT # jac_test = true - [../] + [] [] [Nt] @@ -63,85 +63,85 @@ H=162.56 [Kernels] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp block = 'fuel' - [../] - [./temp_source_mod] + [] + [temp_source_mod] type = GammaHeatSource variable = temp block = 'moder' average_fission_heat = 'average_fission_heat' gamma = gamma_func - [../] - [./temp_diffusion] + [] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./temp_diri_cg] + [temp_diri_cg] boundary = 'fuel_bottoms outer_wall' type = FlexiblePostprocessorDirichletBC postprocessor = coreEndTemp offset = -27.8 variable = temp - [../] + [] # [./temp_diri_cg] # boundary = 'moder_bottoms fuel_bottoms outer_wall' # type = FunctionDirichletBC # function = 'temp_bc_func' # variable = temp # [../] - [./temp_advection_outlet] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] + [] [] [AuxKernels] - [./fuel] + [fuel] block = 'fuel' type = FissionHeatSourceTransientAux variable = power_density - [../] - [./moderator] + [] + [moderator] block = 'moder' type = ModeratorHeatSourceTransientAux average_fission_heat = 'average_fission_heat' variable = power_density gamma = gamma_func - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] - [./gamma_func] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] + [gamma_func] type = ParsedFunction - value = '${gamma_frac} * pi^2 / 4 * cos(pi * x / (2. * ${R})) * sin(pi * y / ${H})' - [../] + expression = '${gamma_frac} * pi^2 / 4 * cos(pi * x / (2. * ${R})) * sin(pi * y / ${H})' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../tutorial/step01_groupConstants/MSREProperties/msre_gentry_4g_fuel_rod0_' interp_type = 'spline' @@ -149,16 +149,16 @@ H=162.56 prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K controller_gain = 0 - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../tutorial/step01_groupConstants/MSREProperties/msre_gentry_4g_moder_rod0_' interp_type = 'spline' @@ -166,15 +166,15 @@ H=162.56 prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' controller_gain = 0 - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -194,70 +194,70 @@ H=162.56 l_max_its = 100 dtmin = 1e-5 - [./TimeStepper] + [TimeStepper] type = PostprocessorDT postprocessor = limit_k dt = 1e-3 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console csv' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console csv' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'csv console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'csv console' - [../] - [./average_fission_heat] + [] + [average_fission_heat] type = AverageFissionHeat execute_on = 'linear nonlinear' outputs = 'csv console' block = 'fuel' - [../] - [./coreEndTemp] + [] + [coreEndTemp] type = SideAverageValue variable = temp boundary = 'fuel_tops' outputs = 'csv console' execute_on = 'linear nonlinear' - [../] - [./limit_k] + [] + [limit_k] type = LimitK execute_on = 'timestep_end' k_postprocessor = multiplication growth_factor = 1.2 cutback_factor = .4 k_threshold = 1.5 - [../] + [] [] [Outputs] diff --git a/problems/2021-cnrs-benchmark/phase-0/temperature.i b/problems/2021-cnrs-benchmark/phase-0/temperature.i index aa8697a398..07f1e49f75 100644 --- a/problems/2021-cnrs-benchmark/phase-0/temperature.i +++ b/problems/2021-cnrs-benchmark/phase-0/temperature.i @@ -1,12 +1,12 @@ # Step 0.3: Temperature input file # Requires neutron fluxes from Step 0.2 -density = .002 # kg cm-3 -cp = 3075 # J kg-1 K-1, 6.15 / 2.0e-3 -k = .005 # W cm-1 K-1 -gamma = 1 # W cm-3 K-1, Volumetric heat transfer coefficient -viscosity = .5 # dynamic viscosity, mu = nu * rho, kg cm-1 s-1 -alpha = 1 # INS SUPG and PSPG stabilization parameter +density = .002 # kg cm-3 +cp = 3075 # J kg-1 K-1, 6.15 / 2.0e-3 +k = .005 # W cm-1 K-1 +gamma = 1 # W cm-3 K-1, Volumetric heat transfer coefficient +viscosity = .5 # dynamic viscosity, mu = nu * rho, kg cm-1 s-1 +alpha = 1 # INS SUPG and PSPG stabilization parameter [GlobalParams] num_groups = 6 @@ -14,31 +14,31 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter group_fluxes = 'group1 group2 group3 group4 group5 group6' sss2_input = true integrate_p_by_parts = true -[../] +[] [Mesh] - [./square] + [square] type = GeneratedMeshGenerator dim = 2 nx = 200 ny = 200 -## Use a 40-by-40 mesh instead if running on a desktop/small cluster -# nx = 40 -# ny = 40 + ## Use a 40-by-40 mesh instead if running on a desktop/small cluster + # nx = 40 + # ny = 40 xmin = 0 xmax = 200 ymin = 0 ymax = 200 elem_type = QUAD4 - [../] - [./pin] + [] + [pin] type = ExtraNodesetGenerator input = square new_boundary = 'pinned_node' coord = '200 200' - [../] + [] [] [Problem] @@ -46,164 +46,164 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter [] [Variables] - [./temp] + [temp] family = LAGRANGE order = FIRST initial_condition = 900 - [../] - [./vel] + [] + [vel] family = LAGRANGE_VEC order = FIRST - [../] - [./p] + [] + [p] family = LAGRANGE order = FIRST - [../] + [] [] [AuxVariables] - [./group1] + [group1] family = LAGRANGE order = FIRST - [../] - [./group2] + [] + [group2] family = LAGRANGE order = FIRST - [../] - [./group3] + [] + [group3] family = LAGRANGE order = FIRST - [../] - [./group4] + [] + [group4] family = LAGRANGE order = FIRST - [../] - [./group5] + [] + [group5] family = LAGRANGE order = FIRST - [../] - [./group6] + [] + [group6] family = LAGRANGE order = FIRST - [../] - [./heat] + [] + [heat] family = MONOMIAL order = FIRST - [../] + [] [] [UserObjects] - [./fluxes] + [fluxes] type = SolutionUserObject mesh = './nts_exodus.e' system_variables = 'group1 group2 group3 group4 group5 group6' timestep = LATEST execute_on = INITIAL - [../] + [] [] [Kernels] # Incompressible Navier-Stokes - [./vel_mass] + [vel_mass] type = INSADMass variable = p - [../] - [./vel_pspg] + [] + [vel_pspg] type = INSADMassPSPG variable = p rho_name = 'ad_rho' - [../] - [./vel_advection] + [] + [vel_advection] type = INSADMomentumAdvection variable = vel - [../] - [./vel_viscous] + [] + [vel_viscous] type = INSADMomentumViscous variable = vel mu_name = 'ad_mu' - [../] - [./vel_pressure] + [] + [vel_pressure] type = INSADMomentumPressure variable = vel p = p - [../] - [./vel_supg] + [] + [vel_supg] type = INSADMomentumSUPG variable = vel velocity = vel - [../] + [] # Temperature - [./temp_source] + [temp_source] type = INSADEnergySource variable = temp source_variable = heat - [../] - [./temp_advection] + [] + [temp_advection] type = INSADEnergyAdvection variable = temp - [../] - [./temp_conduction] + [] + [temp_conduction] type = ADHeatConduction variable = temp thermal_conductivity = 'ad_k' - [../] - [./temp_supg] + [] + [temp_supg] type = INSADEnergySUPG variable = temp velocity = vel - [../] - [./temp_sink] + [] + [temp_sink] type = INSADEnergyAmbientConvection variable = temp alpha = ${gamma} T_ambient = 900 - [../] + [] [] [AuxKernels] - [./group1] + [group1] type = SolutionAux variable = group1 from_variable = group1 solution = fluxes - [../] - [./group2] + [] + [group2] type = SolutionAux variable = group2 from_variable = group2 solution = fluxes - [../] - [./group3] + [] + [group3] type = SolutionAux variable = group3 from_variable = group3 solution = fluxes - [../] - [./group4] + [] + [group4] type = SolutionAux variable = group4 from_variable = group4 solution = fluxes - [../] - [./group5] + [] + [group5] type = SolutionAux variable = group5 from_variable = group5 solution = fluxes - [../] - [./group6] + [] + [group6] type = SolutionAux variable = group6 from_variable = group6 solution = fluxes - [../] - [./heat_source] + [] + [heat_source] type = FissionHeatSourceAux variable = heat tot_fission_heat = 1e7 power = 1e7 - [../] + [] [] [ICs] @@ -216,41 +216,41 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter [] [BCs] - [./no_slip] + [no_slip] type = VectorDirichletBC variable = vel boundary = 'bottom left right' values = '0 0 0' - [../] - [./lid] + [] + [lid] type = VectorDirichletBC variable = vel boundary = 'top' values = '50 0 0' - [../] - [./pressure_pin] + [] + [pressure_pin] type = DirichletBC variable = p boundary = 'pinned_node' value = 0 - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../../property_file_dir/cnrs-benchmark/benchmark_' interp_type = 'linear' prop_names = 'k rho cp' prop_values = '${k} ${density} ${cp}' temperature = 900 - [../] - [./ad_mat] + [] + [ad_mat] type = ADGenericConstantMaterial prop_names = 'ad_k ad_rho ad_cp ad_mu' prop_values = '${k} ${density} ${cp} ${viscosity}' - [../] - [./ins_mat] + [] + [ins_mat] type = INSADStabilized3Eqn k_name = 'ad_k' rho_name = 'ad_rho' @@ -260,7 +260,7 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter velocity = vel pressure = p temperature = temp - [../] + [] [] [Executioner] @@ -274,17 +274,17 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] [] [VectorPostprocessors] - [./aa] + [aa] type = LineValueSampler variable = 'temp' start_point = '0 100 0' @@ -293,8 +293,8 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter sort_by = x execute_on = TIMESTEP_END outputs = 'csv' - [../] - [./bb] + [] + [bb] type = LineValueSampler variable = 'temp' start_point = '100 0 0' @@ -303,19 +303,19 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter sort_by = y execute_on = TIMESTEP_END outputs = 'csv' - [../] + [] [] [Outputs] perf_graph = true print_linear_residuals = true - [./exodus] + [exodus] type = Exodus - [../] - [./csv] + [] + [csv] type = CSV execute_on = 'final' - [../] + [] [] [Debug] diff --git a/problems/2021-cnrs-benchmark/phase-0/vel-field.i b/problems/2021-cnrs-benchmark/phase-0/vel-field.i index 3573adee92..52110536dc 100644 --- a/problems/2021-cnrs-benchmark/phase-0/vel-field.i +++ b/problems/2021-cnrs-benchmark/phase-0/vel-field.i @@ -1,36 +1,36 @@ # Step 0.1: Velocity Field input file -density = .002 # kg cm-3 -viscosity = .5 # dynamic viscosity, mu = nu * rho, kg cm-1 s-1 -alpha = 1 # INS SUPG and PSPG stabilization parameter +density = .002 # kg cm-3 +viscosity = .5 # dynamic viscosity, mu = nu * rho, kg cm-1 s-1 +alpha = 1 # INS SUPG and PSPG stabilization parameter [GlobalParams] integrate_p_by_parts = true [] [Mesh] - [./square] + [square] type = GeneratedMeshGenerator dim = 2 nx = 200 ny = 200 -## Use a 40-by-40 mesh instead if running on a desktop/small cluster -# nx = 40 -# ny = 40 + ## Use a 40-by-40 mesh instead if running on a desktop/small cluster + # nx = 40 + # ny = 40 xmin = 0 xmax = 200 ymin = 0 ymax = 200 elem_type = QUAD4 - [../] - [./corner_node] + [] + [corner_node] type = ExtraNodesetGenerator input = square new_boundary = 'pinned_node' coord = '200 200' - [../] + [] [] [Problem] @@ -38,69 +38,69 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter [] [Variables] - [./vel] + [vel] family = LAGRANGE_VEC order = FIRST - [../] - [./p] + [] + [p] family = LAGRANGE order = FIRST - [../] + [] [] [AuxVariables] - [./vel_x] + [vel_x] family = LAGRANGE order = FIRST - [../] - [./vel_y] + [] + [vel_y] family = LAGRANGE order = FIRST - [../] + [] [] [Kernels] - [./mass] + [mass] type = INSADMass variable = p - [../] - [./mass_pspg] + [] + [mass_pspg] type = INSADMassPSPG variable = p - [../] - [./momentum_advection] + [] + [momentum_advection] type = INSADMomentumAdvection variable = vel - [../] - [./momentum_viscous] + [] + [momentum_viscous] type = INSADMomentumViscous variable = vel - [../] - [./momentum_pressure] + [] + [momentum_pressure] type = INSADMomentumPressure variable = vel p = p - [../] - [./momentum_supg] + [] + [momentum_supg] type = INSADMomentumSUPG variable = vel velocity = vel - [../] + [] [] [AuxKernels] - [./vel_x] + [vel_x] type = VectorVariableComponentAux variable = vel_x vector_variable = vel component = 'x' - [../] - [./vel_y] + [] + [vel_y] type = VectorVariableComponentAux variable = vel_y vector_variable = vel component = 'y' - [../] + [] [] [ICs] @@ -113,38 +113,38 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter [] [BCs] - [./no_slip] + [no_slip] type = VectorDirichletBC variable = vel boundary = 'bottom left right' values = '0 0 0' - [../] - [./lid] + [] + [lid] type = VectorDirichletBC variable = vel boundary = 'top' values = '50 0 0' - [../] - [./pressure_pin] + [] + [pressure_pin] type = DirichletBC variable = p boundary = 'pinned_node' value = 0 - [../] + [] [] [Materials] - [./ad_mat] + [ad_mat] type = ADGenericConstantMaterial prop_names = 'rho mu' prop_values = '${density} ${viscosity}' - [../] - [./ins_mat] + [] + [ins_mat] type = INSADTauMaterial alpha = ${alpha} velocity = vel pressure = p - [../] + [] [] [Executioner] @@ -158,7 +158,7 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter [] [VectorPostprocessors] - [./aa] + [aa] type = LineValueSampler variable = 'vel_x vel_y' start_point = '0 100 0' @@ -167,8 +167,8 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter sort_by = x execute_on = FINAL outputs = 'csv' - [../] - [./bb] + [] + [bb] type = LineValueSampler variable = 'vel_x vel_y' start_point = '100 0 0' @@ -177,25 +177,25 @@ alpha = 1 # INS SUPG and PSPG stabilization parameter sort_by = y execute_on = FINAL outputs = 'csv' - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Outputs] - [./exodus] + [exodus] type = Exodus execute_on = 'final' - [../] - [./csv] + [] + [csv] type = CSV execute_on = 'final' - [../] + [] [] [Debug] diff --git a/problems/2021-cnrs-benchmark/phase-1/buoyancy.i b/problems/2021-cnrs-benchmark/phase-1/buoyancy.i index 38c58887be..b3486f523a 100644 --- a/problems/2021-cnrs-benchmark/phase-1/buoyancy.i +++ b/problems/2021-cnrs-benchmark/phase-1/buoyancy.i @@ -1,41 +1,41 @@ # Step 1.3: Buoyancy input file -density = .002 # kg cm-3 -cp = 3075 # J kg-1 K-1, 6.15 / 2.0e-3 -k = .005 # W cm-1 K-1 -gamma = 1 # W cm-3 K-1, Volumetric heat transfer coefficient -viscosity = .5 # dynamic viscosity -alpha = 1 # SUPG stabilization parameter -t_alpha = 2e-4 # K-1, Thermal expansion coefficient +density = .002 # kg cm-3 +cp = 3075 # J kg-1 K-1, 6.15 / 2.0e-3 +k = .005 # W cm-1 K-1 +gamma = 1 # W cm-3 K-1, Volumetric heat transfer coefficient +viscosity = .5 # dynamic viscosity +alpha = 1 # SUPG stabilization parameter +t_alpha = 2e-4 # K-1, Thermal expansion coefficient [GlobalParams] temperature = temp integrate_p_by_parts = true -[../] +[] [Mesh] - [./square] + [square] type = GeneratedMeshGenerator dim = 2 nx = 200 ny = 200 -## Use a 40-by-40 mesh instead if running on a desktop/small cluster -# nx = 40 -# ny = 40 + ## Use a 40-by-40 mesh instead if running on a desktop/small cluster + # nx = 40 + # ny = 40 xmin = 0 xmax = 200 ymin = 0 ymax = 200 elem_type = QUAD4 - [../] - [./corner_node] + [] + [corner_node] type = ExtraNodesetGenerator input = square new_boundary = 'pinned_node' coord = '200 200' - [../] + [] [] [Problem] @@ -43,177 +43,177 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient [] [Variables] - [./temp] + [temp] family = LAGRANGE order = FIRST scaling = 1e-3 - [../] - [./vel] + [] + [vel] family = LAGRANGE_VEC order = FIRST - [../] - [./p] + [] + [p] family = LAGRANGE order = FIRST - [../] + [] [] [AuxVariables] - [./velx] + [velx] family = LAGRANGE order = FIRST - [../] - [./vely] + [] + [vely] family = LAGRANGE order = FIRST - [../] - [./heat] + [] + [heat] family = MONOMIAL order = FIRST - [../] + [] [] [Kernels] - [./mass] + [mass] type = INSADMass variable = p - [../] - [./mass_pspg] + [] + [mass_pspg] type = INSADMassPSPG variable = p - [../] - [./momentum_time] + [] + [momentum_time] type = INSADMomentumTimeDerivative variable = vel - [../] - [./momentum_advection] + [] + [momentum_advection] type = INSADMomentumAdvection variable = vel - [../] - [./momentum_viscous] + [] + [momentum_viscous] type = INSADMomentumViscous variable = vel - [../] - [./momentum_pressure] + [] + [momentum_pressure] type = INSADMomentumPressure variable = vel pressure = p - [../] - [./momentum_supg] + [] + [momentum_supg] type = INSADMomentumSUPG variable = vel velocity = vel - [../] - [./buoyancy] + [] + [buoyancy] type = INSADBoussinesqBodyForce variable = vel # gravity vector, cm s-2 gravity = '0 -981 0' alpha_name = 't_alpha' ref_temp = 'temp_ref' - [../] - [./gravity] + [] + [gravity] type = INSADGravityForce variable = vel # gravity vector, cm s-2 gravity = '0 -981 0' - [../] + [] - [./temp_time] + [temp_time] type = INSADHeatConductionTimeDerivative variable = temp - [../] - [./temp_source] + [] + [temp_source] type = INSADEnergySource variable = temp source_variable = heat - [../] - [./temp_advection] + [] + [temp_advection] type = INSADEnergyAdvection variable = temp - [../] - [./temp_conduction] + [] + [temp_conduction] type = ADHeatConduction variable = temp thermal_conductivity = 'k' - [../] - [./temp_supg] + [] + [temp_supg] type = INSADEnergySUPG variable = temp velocity = vel - [../] - [./temp_sink] + [] + [temp_sink] type = INSADEnergyAmbientConvection variable = temp # alpha is the heat transfer coefficient. alpha = ${gamma} T_ambient = 900 - [../] + [] [] [AuxKernels] - [./vel_x] + [vel_x] type = VectorVariableComponentAux variable = velx vector_variable = vel component = 'x' - [../] - [./vel_y] + [] + [vel_y] type = VectorVariableComponentAux variable = vely vector_variable = vel component = 'y' - [../] + [] [] [ICs] - [./vel_ic] + [vel_ic] type = VectorConstantIC x_value = 1e-15 y_value = 1e-15 variable = vel - [../] + [] [] [BCs] - [./no_slip] + [no_slip] type = VectorDirichletBC variable = vel boundary = 'bottom left right' values = '0 0 0' - [../] - [./lid] + [] + [lid] type = VectorDirichletBC variable = vel boundary = 'top' values = '50 0 0' - [../] - [./pressure_pin] + [] + [pressure_pin] type = DirichletBC variable = p boundary = 'pinned_node' value = 0 - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericConstantMaterial prop_names = 'temp_ref' prop_values = '900' - [../] - [./ad_mat] + [] + [ad_mat] type = ADGenericConstantMaterial prop_names = 'k rho cp mu t_alpha' prop_values = '${k} ${density} ${cp} ${viscosity} ${t_alpha}' - [../] - [./ins_temp] + [] + [ins_temp] type = INSADStabilized3Eqn alpha = ${alpha} velocity = vel pressure = p temperature = temp - [../] + [] [] [Executioner] @@ -225,16 +225,16 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient petsc_options_iname = '-pc_type -sub_pc_type -ksp_gmres_restart -pc_gasm_overlap -sub_pc_factor_shift_type -pc_gasm_blocks -sub_pc_factor_mat_solver_type' petsc_options_value = 'gasm lu 200 1 NONZERO 16 superlu_dist' -## Use the settings below instead if running on a desktop/small cluster -# petsc_options_iname = '-pc_type -sub_pc_type -ksp_gmres_restart -pc_asm_overlap -sub_pc_factor_shift_type' -# petsc_options_value = 'asm lu 200 1 NONZERO' + ## Use the settings below instead if running on a desktop/small cluster + # petsc_options_iname = '-pc_type -sub_pc_type -ksp_gmres_restart -pc_asm_overlap -sub_pc_factor_shift_type' + # petsc_options_value = 'asm lu 200 1 NONZERO' nl_abs_tol = 1e-8 dtmin = 1e-1 dtmax = 10 steady_state_detection = true - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-1 cutback_factor = .5 @@ -242,21 +242,21 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient optimal_iterations = 20 iteration_window = 4 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] [] [VectorPostprocessors] - [./vel_aa] + [vel_aa] type = LineValueSampler variable = 'velx vely' start_point = '0 100 0' @@ -265,8 +265,8 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient sort_by = x execute_on = FINAL outputs = 'csv' - [../] - [./vel_bb] + [] + [vel_bb] type = LineValueSampler variable = 'velx vely' start_point = '100 0 0' @@ -275,8 +275,8 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient sort_by = y execute_on = FINAL outputs = 'csv' - [../] - [./temp_aa] + [] + [temp_aa] type = LineValueSampler variable = 'temp' start_point = '0 100 0' @@ -285,8 +285,8 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient sort_by = x execute_on = FINAL outputs = 'csv' - [../] - [./temp_bb] + [] + [temp_bb] type = LineValueSampler variable = 'temp' start_point = '100 0 0' @@ -295,60 +295,56 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient sort_by = y execute_on = FINAL outputs = 'csv' - [../] + [] [] [MultiApps] - [./ntsApp] + [ntsApp] type = FullSolveMultiApp app_type = MoltresApp execute_on = timestep_begin positions = '0 0 0' input_files = 'buoyancy-nts.i' - [../] + [] [] [Transfers] - [./to_sub_temp] + [to_sub_temp] type = MultiAppProjectionTransfer - direction = to_multiapp - multi_app = ntsApp + to_multi_app = ntsApp source_variable = temp variable = temp - [../] - [./to_sub_vel_x] + [] + [to_sub_vel_x] type = MultiAppProjectionTransfer - direction = to_multiapp - multi_app = ntsApp + to_multi_app = ntsApp source_variable = velx variable = vel_x - [../] - [./to_sub_vel_y] + [] + [to_sub_vel_y] type = MultiAppProjectionTransfer - direction = to_multiapp - multi_app = ntsApp + to_multi_app = ntsApp source_variable = vely variable = vel_y - [../] - [./from_sub] + [] + [from_sub] type = MultiAppProjectionTransfer - direction = from_multiapp - multi_app = ntsApp + from_multi_app = ntsApp source_variable = heat variable = heat - [../] + [] [] [Outputs] perf_graph = true print_linear_residuals = true - [./exodus] + [exodus] type = Exodus - [../] - [./csv] + [] + [csv] type = CSV execute_on = FINAL - [../] + [] [] [Debug] diff --git a/problems/2021-cnrs-benchmark/phase-1/full-coupling.i b/problems/2021-cnrs-benchmark/phase-1/full-coupling.i index 6715111b05..4ba8b6f840 100644 --- a/problems/2021-cnrs-benchmark/phase-1/full-coupling.i +++ b/problems/2021-cnrs-benchmark/phase-1/full-coupling.i @@ -1,39 +1,39 @@ -density = .002 # kg cm-3 -cp = 3075 # J kg-1 K-1, 6.15 / 2.0e-3 -k = .005 # W cm-1 K-1 -gamma = 1 # W cm-3 K-1, Volumetric heat transfer coefficient -viscosity = .5 # dynamic viscosity -alpha = 1 # SUPG stabilization parameter -t_alpha = 2e-4 # K-1, Thermal expansion coefficient +density = .002 # kg cm-3 +cp = 3075 # J kg-1 K-1, 6.15 / 2.0e-3 +k = .005 # W cm-1 K-1 +gamma = 1 # W cm-3 K-1, Volumetric heat transfer coefficient +viscosity = .5 # dynamic viscosity +alpha = 1 # SUPG stabilization parameter +t_alpha = 2e-4 # K-1, Thermal expansion coefficient [GlobalParams] temperature = temp integrate_p_by_parts = true -[../] +[] [Mesh] - [./square] + [square] type = GeneratedMeshGenerator dim = 2 nx = 200 ny = 200 -## Use a 40-by-40 mesh instead if running on a desktop/small cluster -# nx = 40 -# ny = 40 + ## Use a 40-by-40 mesh instead if running on a desktop/small cluster + # nx = 40 + # ny = 40 xmin = 0 xmax = 200 ymin = 0 ymax = 200 elem_type = QUAD4 - [../] - [./corner_node] + [] + [corner_node] type = ExtraNodesetGenerator input = square new_boundary = 'pinned_node' coord = '200 200' - [../] + [] [] [Problem] @@ -41,146 +41,146 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient [] [Variables] - [./temp] + [temp] family = LAGRANGE order = FIRST scaling = 1e-3 - [../] - [./vel] + [] + [vel] family = LAGRANGE_VEC order = FIRST - [../] - [./p] + [] + [p] family = LAGRANGE order = FIRST - [../] + [] [] [AuxVariables] - [./velx] + [velx] family = LAGRANGE order = FIRST - [../] - [./vely] + [] + [vely] family = LAGRANGE order = FIRST - [../] - [./heat] + [] + [heat] family = MONOMIAL order = FIRST - [../] + [] [] [Kernels] - [./mass] + [mass] type = INSADMass variable = p - [../] - [./mass_pspg] + [] + [mass_pspg] type = INSADMassPSPG variable = p - [../] - [./momentum_time] + [] + [momentum_time] type = INSADMomentumTimeDerivative variable = vel - [../] - [./momentum_advection] + [] + [momentum_advection] type = INSADMomentumAdvection variable = vel - [../] - [./momentum_viscous] + [] + [momentum_viscous] type = INSADMomentumViscous variable = vel - [../] - [./momentum_pressure] + [] + [momentum_pressure] type = INSADMomentumPressure variable = vel pressure = p - [../] - [./momentum_supg] + [] + [momentum_supg] type = INSADMomentumSUPG variable = vel velocity = vel - [../] - [./buoyancy] + [] + [buoyancy] type = INSADBoussinesqBodyForce variable = vel # gravity vector, cm s-2 gravity = '0 -981 0' alpha_name = 't_alpha' ref_temp = 'temp_ref' - [../] - [./gravity] + [] + [gravity] type = INSADGravityForce variable = vel # gravity vector, cm s-2 gravity = '0 -981 0' - [../] + [] - [./temp_time] + [temp_time] type = INSADHeatConductionTimeDerivative variable = temp - [../] - [./temp_source] + [] + [temp_source] type = INSADEnergySource variable = temp source_variable = heat - [../] - [./temp_advection] + [] + [temp_advection] type = INSADEnergyAdvection variable = temp - [../] - [./temp_conduction] + [] + [temp_conduction] type = ADHeatConduction variable = temp thermal_conductivity = 'k' - [../] - [./temp_supg] + [] + [temp_supg] type = INSADEnergySUPG variable = temp velocity = vel - [../] - [./temp_sink] + [] + [temp_sink] type = INSADEnergyAmbientConvection variable = temp # alpha is the heat transfer coefficient. alpha = ${gamma} T_ambient = 900 - [../] + [] [] [AuxKernels] - [./vel_x] + [vel_x] type = VectorVariableComponentAux variable = velx vector_variable = vel component = 'x' - [../] - [./vel_y] + [] + [vel_y] type = VectorVariableComponentAux variable = vely vector_variable = vel component = 'y' - [../] + [] [] [ICs] - [./vel_ic] + [vel_ic] type = VectorConstantIC x_value = 1e-15 y_value = 1e-15 variable = vel - [../] + [] [] [BCs] - [./no_slip] + [no_slip] type = VectorDirichletBC variable = vel boundary = 'bottom left right' values = '0 0 0' - [../] - [./lid] + [] + [lid] type = VectorDirichletBC variable = vel boundary = 'top' @@ -188,33 +188,33 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient # Change to 10, 20, 30, 40 for different velocity boundary conditions # at U_lid = 0.1, 0.2, 0.3, 0.4 m s-1. values = '50 0 0' - [../] - [./pressure_pin] + [] + [pressure_pin] type = DirichletBC variable = p boundary = 'pinned_node' value = 0 - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericConstantMaterial prop_names = 'temp_ref' prop_values = '900' - [../] - [./ad_mat] + [] + [ad_mat] type = ADGenericConstantMaterial prop_names = 'k rho cp mu t_alpha' prop_values = '${k} ${density} ${cp} ${viscosity} ${t_alpha}' - [../] - [./ins_temp] + [] + [ins_temp] type = INSADStabilized3Eqn alpha = ${alpha} velocity = vel pressure = p temperature = temp - [../] + [] [] [Executioner] @@ -227,16 +227,16 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient petsc_options_value = 'gasm lu 200 1 NONZERO 16 superlu_dist' line_search = none -## Use the settings below instead if running on a desktop/small cluster -# petsc_options_iname = '-pc_type -sub_pc_type -ksp_gmres_restart -pc_asm_overlap -sub_pc_factor_shift_type' -# petsc_options_value = 'asm lu 200 1 NONZERO' + ## Use the settings below instead if running on a desktop/small cluster + # petsc_options_iname = '-pc_type -sub_pc_type -ksp_gmres_restart -pc_asm_overlap -sub_pc_factor_shift_type' + # petsc_options_value = 'asm lu 200 1 NONZERO' nl_abs_tol = 1e-8 dtmin = 1e-1 dtmax = 10 steady_state_detection = true - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-1 cutback_factor = .5 @@ -244,14 +244,14 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient optimal_iterations = 10 iteration_window = 4 linear_iteration_ratio = 1000 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] @@ -261,52 +261,48 @@ t_alpha = 2e-4 # K-1, Thermal expansion coefficient [] [MultiApps] - [./ntsApp] + [ntsApp] type = FullSolveMultiApp app_type = MoltresApp execute_on = timestep_begin positions = '0 0 0' input_files = 'full-coupling-nts.i' - [../] + [] [] [Transfers] - [./to_sub_temp] + [to_sub_temp] type = MultiAppProjectionTransfer - direction = to_multiapp - multi_app = ntsApp + to_multi_app = ntsApp source_variable = temp variable = temp - [../] - [./to_sub_vel_x] + [] + [to_sub_vel_x] type = MultiAppProjectionTransfer - direction = to_multiapp - multi_app = ntsApp + to_multi_app = ntsApp source_variable = velx variable = vel_x - [../] - [./to_sub_vel_y] + [] + [to_sub_vel_y] type = MultiAppProjectionTransfer - direction = to_multiapp - multi_app = ntsApp + to_multi_app = ntsApp source_variable = vely variable = vel_y - [../] - [./from_sub] + [] + [from_sub] type = MultiAppProjectionTransfer - direction = from_multiapp - multi_app = ntsApp + from_multi_app = ntsApp source_variable = heat variable = heat - [../] + [] [] [Outputs] perf_graph = true print_linear_residuals = true - [./exodus] + [exodus] type = Exodus - [../] + [] [] [Debug] diff --git a/problems/2021-cnrs-benchmark/phase-2/README.MD b/problems/2021-cnrs-benchmark/phase-2/README.MD index 9b4e068313..137aafb40c 100644 --- a/problems/2021-cnrs-benchmark/phase-2/README.MD +++ b/problems/2021-cnrs-benchmark/phase-2/README.MD @@ -8,7 +8,7 @@ clusters with at least 64 independent processors and 64 GB of RAM. The transient case with the shortest perturbation period took ~0.67h to complete one period (200 timesteps) and 16.67h in total (5000 timesteps) to reach reasonable convergence of the gain and phase shift -values on the 512 MPI processes on Blue Water. Conversely, the case with the +values on the 512 MPI processes on Blue Waters. Conversely, the case with the longest perturbation period took x2.25 longer due to the longer simulation time needed to reach convergence. diff --git a/squirrel b/squirrel index d4f54d6b3b..2cafe667e4 160000 --- a/squirrel +++ b/squirrel @@ -1 +1 @@ -Subproject commit d4f54d6b3b7ea653d7adfa941fee4f192018ace2 +Subproject commit 2cafe667e4497610e0f832b75c697f5c37856649 diff --git a/src/base/MoltresApp.C b/src/base/MoltresApp.C index e9735b0e2c..1f2b9656b0 100644 --- a/src/base/MoltresApp.C +++ b/src/base/MoltresApp.C @@ -9,11 +9,6 @@ InputParameters MoltresApp::validParams() { InputParameters params = MooseApp::validParams(); - - params.set("use_legacy_uo_initialization") = false; - params.set("use_legacy_uo_aux_computation") = false; - params.set("use_legacy_output_syntax") = false; - return params; } @@ -29,45 +24,41 @@ MoltresApp::MoltresApp(InputParameters parameters) MoltresApp::~MoltresApp() {} -// External entry point for dynamic application loading -extern "C" void -MoltresApp__registerApps() +void +MoltresApp::registerAll(Factory & f, ActionFactory & af, Syntax & s) { - MoltresApp::registerApps(); + ModulesApp::registerAllObjects(f, af, s); + Registry::registerObjectsTo(f, {"MoltresApp"}); + Registry::registerActionsTo(af, {"MoltresApp"}); + + // register objects from Squirrel + SquirrelApp::registerAll(f, af, s); + + // register custom execute flags, action syntax, etc. here + s.registerActionSyntax("NtAction", "Nt"); + s.registerActionSyntax("PrecursorAction", "Precursors/*"); } + void MoltresApp::registerApps() { registerApp(MoltresApp); } +/************************************************************************************************** + *********************** Dynamic Library Entry Points - DO NOT MODIFY ***************************** + *************************************************************************************************/ + // External entry point for object registration extern "C" void -MoltresApp__registerAll(Factory & factory, ActionFactory & action_factory, Syntax & syntax) +MoltresApp__registerAll(Factory & f, ActionFactory & af, Syntax & s) { - MoltresApp::registerAll(factory, action_factory, syntax); + MoltresApp::registerAll(f, af, s); } -void -MoltresApp::registerAll(Factory & factory, ActionFactory & action_factory, Syntax & syntax) -{ - Registry::registerObjectsTo(factory, {"MoltresApp"}); - Registry::registerActionsTo(action_factory, {"MoltresApp"}); - MoltresApp::associateSyntax(syntax, action_factory); - ModulesApp::registerAll(factory, action_factory, syntax); - SquirrelApp::registerAll(factory, action_factory, syntax); -} - -// External entry point for dynamic syntax association +// External entry point for dynamic application loading extern "C" void -MoltresApp__associateSyntax(Syntax & syntax, ActionFactory & action_factory) -{ - MoltresApp::associateSyntax(syntax, action_factory); -} -void -MoltresApp::associateSyntax(Syntax & syntax, ActionFactory & action_factory) +MoltresApp__registerApps() { - Registry::registerActionsTo(action_factory, {"MoltresApp"}); - syntax.registerActionSyntax("PrecursorAction", "Precursors/*"); - syntax.registerActionSyntax("NtAction", "Nt"); + MoltresApp::registerApps(); } diff --git a/tests/bcs/coupled_bc_test.i b/tests/bcs/coupled_bc_test.i index 57a395562e..c264db4d23 100644 --- a/tests/bcs/coupled_bc_test.i +++ b/tests/bcs/coupled_bc_test.i @@ -1,5 +1,5 @@ [Mesh] - [./box] + [box] type = GeneratedMeshGenerator dim = 2 nx = 20 @@ -8,71 +8,71 @@ xmax = 1 ymin = 0 ymax = 1 - [../] + [] [] [Variables] - [./u] + [u] order = CONSTANT family = MONOMIAL - [../] + [] [] [AuxVariables] - [./v] + [v] order = FIRST family = LAGRANGE - [../] + [] [] [Kernels] - [./diff] + [diff] type = Diffusion variable = u - [../] + [] [] [DGKernels] - [./dg_advection] + [dg_advection] type = DGCoupledAdvection variable = u uvel = 0 vvel = v - [../] + [] [] [AuxKernels] - [./v_aux] + [v_aux] type = FunctionAux variable = v function = vel_func - [../] + [] [] [BCs] - [./u_inlet] + [u_inlet] type = PostprocessorCoupledInflowBC variable = u boundary = 'bottom' postprocessor = 1 uvel = 0 vvel = v - [../] - [./u_outlet] + [] + [u_outlet] type = CoupledOutflowBC variable = u boundary = 'top' uvel = 0 vvel = v - [../] + [] [] [Functions] # Parabolic, upward flow - [./vel_func] + [vel_func] type = ParsedFunction - value = '-(x - 0) * (x - 1)' - [../] + expression = '-(x - 0) * (x - 1)' + [] [] [Executioner] @@ -81,7 +81,7 @@ [] [Outputs] - [./out] + [out] type = Exodus - [../] + [] [] diff --git a/tests/coupled/auto_diff_rho.i b/tests/coupled/auto_diff_rho.i index 319bf6131f..06964f7b61 100644 --- a/tests/coupled/auto_diff_rho.i +++ b/tests/coupled/auto_diff_rho.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -ini_temp=922 -diri_temp=922 -nt_scale=1e13 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +ini_temp = 922 +diri_temp = 922 +nt_scale = 1e13 [GlobalParams] num_groups = 2 @@ -15,31 +15,31 @@ nt_scale=1e13 [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Mesh] coord_type = RZ file = '2d_lattice_structured.msh' -[../] +[] [Precursors] - [./pres] + [pres] var_name_base = pre block = 'fuel' outlet_boundaries = 'fuel_tops' @@ -51,100 +51,100 @@ nt_scale=1e13 family = MONOMIAL order = CONSTANT # jac_test = true - [../] + [] [] [Kernels] #--------------------------------------------------------------------- # Group 1 Neutronics #--------------------------------------------------------------------- - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 block = 'fuel' - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 block = 'fuel' - group_number=1 - [../] + group_number = 1 + [] #--------------------------------------------------------------------- # Group 2 Neutronics #--------------------------------------------------------------------- - [./time_group2] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 block = 'fuel' - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] #--------------------------------------------------------------------- # Temperature #--------------------------------------------------------------------- - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] - [./temp_diffusion] + [] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -155,70 +155,70 @@ nt_scale=1e13 [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group2 - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms outer_wall' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_fuel_' interp_type = 'spline' block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_mod_' interp_type = 'spline' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -233,7 +233,7 @@ nt_scale=1e13 petsc_options_iname = '-pc_type -pc_factor_shift_type' petsc_options_value = 'lu NONZERO' line_search = 'none' - # petsc_options_iname = '-snes_type' + # petsc_options_iname = '-snes_type' # petsc_options_value = 'test' nl_max_its = 30 @@ -244,51 +244,51 @@ nt_scale=1e13 dtmin = 1e-5 # dtmax = 1 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 5 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console exodus' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console exodus' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console exodus' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'exodus console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'exodus console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} @@ -301,11 +301,11 @@ nt_scale=1e13 [Outputs] perf_graph = true print_linear_residuals = true - [./exodus] + [exodus] type = Exodus file_base = 'auto_diff_rho' execute_on = 'final' - [../] + [] [] [Debug] diff --git a/tests/coupled/auto_diff_rho_serpent.i b/tests/coupled/auto_diff_rho_serpent.i index b00ecfddf6..8254e43376 100644 --- a/tests/coupled/auto_diff_rho_serpent.i +++ b/tests/coupled/auto_diff_rho_serpent.i @@ -1,7 +1,7 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -ini_temp=922 -diri_temp=922 -nt_scale=1e13 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +ini_temp = 922 +diri_temp = 922 +nt_scale = 1e13 [GlobalParams] num_groups = 2 @@ -15,31 +15,31 @@ nt_scale=1e13 [] [Variables] - [./group1] + [group1] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./group2] + [] + [group2] order = FIRST family = LAGRANGE initial_condition = 1 scaling = 1e4 - [../] - [./temp] + [] + [temp] initial_condition = ${ini_temp} scaling = 1e-4 - [../] + [] [] [Mesh] coord_type = RZ file = '2d_lattice_structured.msh' -[../] +[] [Precursors] - [./pres] + [pres] var_name_base = pre block = 'fuel' outlet_boundaries = 'fuel_tops' @@ -51,100 +51,100 @@ nt_scale=1e13 family = MONOMIAL order = CONSTANT # jac_test = true - [../] + [] [] [Kernels] #--------------------------------------------------------------------- # Group 1 Neutronics #--------------------------------------------------------------------- - [./time_group1] + [time_group1] type = NtTimeDerivative variable = group1 group_number = 1 - [../] - [./sigma_r_group1] + [] + [sigma_r_group1] type = SigmaR variable = group1 group_number = 1 - [../] - [./diff_group1] + [] + [diff_group1] type = GroupDiffusion variable = group1 group_number = 1 - [../] - [./inscatter_group1] + [] + [inscatter_group1] type = InScatter variable = group1 group_number = 1 - [../] - [./fission_source_group1] + [] + [fission_source_group1] type = CoupledFissionKernel variable = group1 group_number = 1 block = 'fuel' - [../] - [./delayed_group1] + [] + [delayed_group1] type = DelayedNeutronSource variable = group1 block = 'fuel' - group_number=1 - [../] + group_number = 1 + [] #--------------------------------------------------------------------- # Group 2 Neutronics #--------------------------------------------------------------------- - [./time_group2] + [time_group2] type = NtTimeDerivative variable = group2 group_number = 2 - [../] - [./sigma_r_group2] + [] + [sigma_r_group2] type = SigmaR variable = group2 group_number = 2 - [../] - [./diff_group2] + [] + [diff_group2] type = GroupDiffusion variable = group2 group_number = 2 - [../] - [./fission_source_group2] + [] + [fission_source_group2] type = CoupledFissionKernel variable = group2 group_number = 2 block = 'fuel' - [../] - [./inscatter_group2] + [] + [inscatter_group2] type = InScatter variable = group2 group_number = 2 - [../] + [] #--------------------------------------------------------------------- # Temperature #--------------------------------------------------------------------- - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] - [./temp_diffusion] + [] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_source_fuel] + [] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' - [../] + [] # [./temp_source_mod] # type = GammaHeatSource # variable = temp @@ -155,70 +155,70 @@ nt_scale=1e13 [] [BCs] - [./vacuum_group1] + [vacuum_group1] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group1 - [../] - [./vacuum_group2] + [] + [vacuum_group2] type = VacuumConcBC boundary = 'fuel_bottoms fuel_tops moder_bottoms moder_tops outer_wall' variable = group2 - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] - [./temp_diri_cg] + [] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms outer_wall' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' - [../] + expression = '${ini_temp} - (${ini_temp} - ${diri_temp}) * tanh(t/1e-2)' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_converted_to_serpent/serpent_msre_fuel_' interp_type = 'spline' block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_converted_to_serpent/serpent_msre_mod_' interp_type = 'spline' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -233,7 +233,7 @@ nt_scale=1e13 petsc_options_iname = '-pc_type -pc_factor_shift_type' petsc_options_value = 'lu NONZERO' line_search = 'none' - # petsc_options_iname = '-snes_type' + # petsc_options_iname = '-snes_type' # petsc_options_value = 'test' nl_max_its = 30 @@ -244,51 +244,51 @@ nt_scale=1e13 dtmin = 1e-5 # dtmax = 1 # dt = 1e-3 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-3 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 5 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./group1_current] + [group1_current] type = IntegralNewVariablePostprocessor variable = group1 outputs = 'console exodus' - [../] - [./group1_old] + [] + [group1_old] type = IntegralOldVariablePostprocessor variable = group1 outputs = 'console exodus' - [../] - [./multiplication] + [] + [multiplication] type = DivisionPostprocessor value1 = group1_current value2 = group1_old outputs = 'console exodus' - [../] - [./temp_fuel] + [] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'exodus console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'exodus console' - [../] + [] # [./average_fission_heat] # type = AverageFissionHeat # nt_scale = ${nt_scale} @@ -301,11 +301,11 @@ nt_scale=1e13 [Outputs] perf_graph = true print_linear_residuals = true - [./exodus] + [exodus] type = Exodus file_base = 'auto_diff_rho_serpent' execute_on = 'final' - [../] + [] [] [Debug] diff --git a/tests/coupled/coupled_eigenvalue.i b/tests/coupled/coupled_eigenvalue.i index edfa92a660..914cf1c8e0 100644 --- a/tests/coupled/coupled_eigenvalue.i +++ b/tests/coupled/coupled_eigenvalue.i @@ -1,4 +1,4 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods [GlobalParams] num_groups = 2 @@ -14,7 +14,7 @@ flow_velocity=21.7 # cm/s. See MSRE-properties.ods [Mesh] coord_type = RZ file = '2d_lattice_structured.msh' -[../] +[] [Nt] var_name_base = group @@ -25,7 +25,7 @@ flow_velocity=21.7 # cm/s. See MSRE-properties.ods [] [Precursors] - [./pres] + [pres] var_name_base = pre block = 'fuel' outlet_boundaries = 'fuel_tops' @@ -38,24 +38,24 @@ flow_velocity=21.7 # cm/s. See MSRE-properties.ods order = CONSTANT transient = false eigen = true - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_converted_to_serpent/serpent_msre_fuel_' interp_type = 'spline' block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_converted_to_serpent/serpent_msre_mod_' interp_type = 'spline' prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] + [] [] [Executioner] @@ -78,10 +78,10 @@ flow_velocity=21.7 # cm/s. See MSRE-properties.ods [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] @@ -137,10 +137,10 @@ flow_velocity=21.7 # cm/s. See MSRE-properties.ods [Outputs] perf_graph = true print_linear_residuals = true - [./exodus] + [exodus] type = Exodus file_base = 'coupled_eigenvalue' - [../] + [] [] [Debug] diff --git a/tests/decay_heat/decay_heat.i b/tests/decay_heat/decay_heat.i index 69f701b461..196ec4dd60 100644 --- a/tests/decay_heat/decay_heat.i +++ b/tests/decay_heat/decay_heat.i @@ -1,5 +1,5 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -global_temperature=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +global_temperature = 922 [GlobalParams] num_groups = 2 @@ -10,122 +10,122 @@ global_temperature=922 decay_heat_constants = '1 .1 .01' temperature = ${global_temperature} sss2_input = false -[../] +[] [Mesh] coord_type = RZ file = '2d_lattice_structured_smaller.msh' -[../] +[] [Problem] kernel_coverage_check = false [] [Variables] - [./heat1] + [heat1] order = CONSTANT family = MONOMIAL block = 'fuel' - [../] - [./heat2] + [] + [heat2] order = CONSTANT family = MONOMIAL block = 'fuel' - [../] - [./heat3] + [] + [heat3] order = CONSTANT family = MONOMIAL block = 'fuel' - [../] + [] [] [Kernels] - [./decay_heat1_source] + [decay_heat1_source] type = HeatPrecursorSource variable = heat1 decay_heat_group_number = 1 block = 'fuel' - [../] - [./decay_heat1_decay] + [] + [decay_heat1_decay] type = HeatPrecursorDecay variable = heat1 decay_heat_group_number = 1 block = 'fuel' - [../] - [./decay_heat2_source] + [] + [decay_heat2_source] type = HeatPrecursorSource variable = heat2 decay_heat_group_number = 2 block = 'fuel' - [../] - [./decay_heat2_decay] + [] + [decay_heat2_decay] type = HeatPrecursorDecay variable = heat2 decay_heat_group_number = 2 block = 'fuel' - [../] - [./decay_heat3_source] + [] + [decay_heat3_source] type = HeatPrecursorSource variable = heat3 decay_heat_group_number = 3 block = 'fuel' - [../] - [./decay_heat3_decay] + [] + [decay_heat3_decay] type = HeatPrecursorDecay variable = heat3 decay_heat_group_number = 3 block = 'fuel' - [../] + [] [] [DGKernels] - [./decay_heat1_convection] + [decay_heat1_convection] type = DGConvection variable = heat1 velocity = '0 ${flow_velocity} 0' block = 'fuel' - [../] - [./decay_heat2_convection] + [] + [decay_heat2_convection] type = DGConvection variable = heat2 velocity = '0 ${flow_velocity} 0' block = 'fuel' - [../] - [./decay_heat3_convection] + [] + [decay_heat3_convection] type = DGConvection variable = heat3 velocity = '0 ${flow_velocity} 0' block = 'fuel' - [../] + [] [] [BCs] - [./decay_heat1_outflow] + [decay_heat1_outflow] type = OutflowBC variable = heat1 velocity = '0 ${flow_velocity} 0' boundary = 'fuel_tops' - [../] - [./decay_heat2_outflow] + [] + [decay_heat2_outflow] type = OutflowBC variable = heat2 velocity = '0 ${flow_velocity} 0' boundary = 'fuel_tops' - [../] - [./decay_heat3_outflow] + [] + [decay_heat3_outflow] type = OutflowBC variable = heat3 velocity = '0 ${flow_velocity} 0' boundary = 'fuel_tops' - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_fuel_' interp_type = 'spline' - [../] + [] [] [Executioner] @@ -144,20 +144,19 @@ global_temperature=922 [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] - [Outputs] perf_graph = true print_linear_residuals = true csv = true - [./out] + [out] type = Exodus - [../] + [] [] [Debug] diff --git a/tests/diracHX/sub.i b/tests/diracHX/sub.i index 9e4d198ba6..5cac8823b8 100644 --- a/tests/diracHX/sub.i +++ b/tests/diracHX/sub.i @@ -2,7 +2,7 @@ # test does a sinusoid heat removal in the loop # Courant # = 0.5 -flow_velocity=0.5 # cm/s. See MSRE-properties.ods +flow_velocity = 0.5 # cm/s. See MSRE-properties.ods [Mesh] type = GeneratedMesh @@ -10,46 +10,44 @@ flow_velocity=0.5 # cm/s. See MSRE-properties.ods nx = 100 xmax = 100 elem_type = EDGE2 -[../] +[] [Variables] - [./temp] + [temp] initial_condition = 930 #approx steady outlet of other problem scaling = 1e-4 family = MONOMIAL order = CONSTANT - [../] + [] [] [Kernels] # Temperature - [./temp_time_derivative] + [temp_time_derivative] type = MatINSTemperatureTimeDerivative variable = temp - [../] + [] [] [DGKernels] - [./temp_adv] + [temp_adv] type = DGTemperatureAdvection variable = temp velocity = '${flow_velocity} 0 0' - [../] + [] [] - [DiracKernels] - [./heat_exchanger] + [heat_exchanger] type = DiracHX variable = temp power = 100 # see controls point = '50 0 0' - [../] + [] [] - [BCs] - [./fuel_bottoms_looped] + [fuel_bottoms_looped] boundary = 'left' type = TemperatureInflowBC variable = temp @@ -57,44 +55,44 @@ flow_velocity=0.5 # cm/s. See MSRE-properties.ods vv = 0 ww = 0 inlet_conc = 930 - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'right' type = TemperatureOutflowBC variable = temp velocity = '${flow_velocity} 0 0' - [../] + [] [] [Functions] - [./heatRemovalFcn] + [heatRemovalFcn] type = ParsedFunction - value = '1e2 + 1e2 * sin(t/5) ' # start losing cooling at t=50s - [../] + expression = '1e2 + 1e2 * sin(t/5) ' # start losing cooling at t=50s + [] [] [Controls] - [./hxFuncCtrl] + [hxFuncCtrl] type = RealFunctionControl parameter = DiracKernels/heat_exchanger/power function = heatRemovalFcn execute_on = 'initial timestep_begin' - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericConstantMaterial prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 - [../] + [] [] [Executioner] @@ -110,40 +108,40 @@ flow_velocity=0.5 # cm/s. See MSRE-properties.ods petsc_options_iname = '-pc_type -sub_pc_type -pc_asm_overlap -sub_ksp_type -snes_linesearch_minlambda' petsc_options_value = 'asm lu 1 preonly 1e-3' - [./TimeStepper] + [TimeStepper] type = ConstantDT dt = 1 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./temp_fuel] + [temp_fuel] type = ElementAverageValue variable = temp outputs = 'exodus console' - [../] - [./loopEndTemp] + [] + [loopEndTemp] type = SideAverageValue variable = temp boundary = 'right' - [../] + [] [] [Outputs] perf_graph = true print_linear_residuals = true - [./exodus] + [exodus] type = Exodus file_base = 'sub' execute_on = 'timestep_begin' - [../] + [] [] [Debug] diff --git a/tests/kernels/scalar_advection_art_diff_test.i b/tests/kernels/scalar_advection_art_diff_test.i index abaf287238..c9fbcb5394 100644 --- a/tests/kernels/scalar_advection_art_diff_test.i +++ b/tests/kernels/scalar_advection_art_diff_test.i @@ -17,70 +17,70 @@ [] [Variables] - [./phi1] + [phi1] family = LAGRANGE order = FIRST - [../] - [./phi2] + [] + [phi2] family = LAGRANGE order = FIRST - [../] + [] [] [Kernels] # Equivalent to MatDiffusion with D = 0.161363 - [./phi1_art_diff] + [phi1_art_diff] type = ScalarAdvectionArtDiff variable = phi1 u_def = 1 v_def = 1 w_def = 0 diffusivity = diff1 - [../] + [] # Equivalent to MatDiffusion with D = 0.706107 - [./phi2_art_diff] + [phi2_art_diff] type = ScalarAdvectionArtDiff variable = phi2 u_def = 1 v_def = 1 w_def = 0 diffusivity = diff2 - [../] + [] - [./phi1_source] + [phi1_source] type = BodyForce variable = phi1 value = 1 - [../] - [./phi2_source] + [] + [phi2_source] type = BodyForce variable = phi2 value = 1 - [../] + [] [] [BCs] - [./phi1_dirichlet] + [phi1_dirichlet] type = DirichletBC variable = phi1 boundary = 'left right top bottom' value = 0 - [../] - [./phi2_dirichlet] + [] + [phi2_dirichlet] type = DirichletBC variable = phi2 boundary = 'left right top bottom' value = 0 - [../] + [] [] [Materials] - [./square] + [square] type = GenericConstantMaterial prop_names = 'diff1 diff2' prop_values = '1 1e-3' - [../] + [] [] [Executioner] @@ -92,10 +92,10 @@ [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Outputs] diff --git a/tests/laminar_flow/boussinesq_square.i b/tests/laminar_flow/boussinesq_square.i index 21a5c55407..9901d72a9e 100644 --- a/tests/laminar_flow/boussinesq_square.i +++ b/tests/laminar_flow/boussinesq_square.i @@ -1,5 +1,5 @@ -xmax=.05 -ymax=.05 +xmax = .05 +ymax = .05 [GlobalParams] #integrate_p_by_parts = false @@ -7,7 +7,7 @@ ymax=.05 [] [Mesh] - [./generate] + [generate] type = GeneratedMeshGenerator dim = 2 xmax = ${xmax} @@ -16,24 +16,23 @@ ymax=.05 ny = 20 elem_type = QUAD9 [] - [./bottom_left] + [bottom_left] type = ExtraNodesetGenerator input = generate new_boundary = corner coord = '0 0' - [../] + [] [] - [Problem] [] [Preconditioning] - [./Newton_SMP] + [Newton_SMP] type = SMP full = true solve_type = 'NEWTON' - [../] + [] [] [Executioner] @@ -46,7 +45,7 @@ ymax=.05 petsc_options_value = 'lu NONZERO 1e-10' # petsc_options_iname = '-snes_type' # petsc_options_value = 'test' - line_search = 'none' + line_search = 'none' nl_rel_tol = 1e-12 nl_max_its = 20 l_tol = 1e-6 @@ -64,141 +63,139 @@ ymax=.05 [] [Debug] - show_var_residual_norms = true + show_var_residual_norms = true [] [Outputs] perf_graph = true print_linear_residuals = true - [./out] + [out] type = Exodus execute_on = 'final' [] [] [Variables] - [./ux] + [ux] family = LAGRANGE order = SECOND - [../] - [./uy] + [] + [uy] family = LAGRANGE order = SECOND - [../] - [./p] + [] + [p] family = LAGRANGE order = FIRST - [../] - [./temp] + [] + [temp] family = LAGRANGE order = SECOND initial_condition = 340 scaling = 1e-4 - [../] + [] [] - [BCs] - [./ux_dirichlet] + [ux_dirichlet] type = DirichletBC boundary = 'left right bottom top' variable = ux value = 0 - [../] - [./uy_dirichlet] + [] + [uy_dirichlet] type = DirichletBC boundary = 'left right bottom top' variable = uy value = 0 - [../] - [./p_zero] + [] + [p_zero] type = DirichletBC boundary = corner variable = p value = 0 - [../] - [./temp_insulate] + [] + [temp_insulate] type = NeumannBC variable = temp value = 0 # no conduction through side walls boundary = 'top bottom' # not top - [../] - [./coldOnTop] + [] + [coldOnTop] type = DirichletBC variable = temp boundary = left value = 300 - [../] - [./hotOnBottom] + [] + [hotOnBottom] type = DirichletBC variable = temp boundary = right value = 400 - [../] + [] [] - [Kernels] - [./mass] + [mass] type = INSMass variable = p u = ux v = uy pressure = p - [../] - [./x_time_deriv] + [] + [x_time_deriv] type = INSMomentumTimeDerivative variable = ux - [../] - [./y_time_deriv] + [] + [y_time_deriv] type = INSMomentumTimeDerivative variable = uy - [../] - [./x_momentum_space] + [] + [x_momentum_space] type = INSMomentumLaplaceForm variable = ux u = ux v = uy pressure = p component = 0 - [../] - [./y_momentum_space] + [] + [y_momentum_space] type = INSMomentumLaplaceForm variable = uy u = ux v = uy pressure = p component = 1 - [../] - [./tempTimeDeriv] + [] + [tempTimeDeriv] type = MatINSTemperatureTimeDerivative variable = temp - [../] - [./tempAdvectionDiffusion] + [] + [tempAdvectionDiffusion] type = INSTemperature variable = temp u = ux v = uy - [../] - [./buoyancy_x] + [] + [buoyancy_x] type = INSBoussinesqBodyForce variable = ux component = 0 temperature = temp - [../] - [./buoyancy_y] + [] + [buoyancy_y] type = INSBoussinesqBodyForce variable = uy component = 1 temperature = temp - [../] + [] [] [Materials] - [./const] + [const] type = GenericConstantMaterial # alpha = coefficient of thermal expansion where rho = rho0 -alpha * rho0 * delta T - prop_names = 'mu rho temp_ref alpha k cp' + prop_names = 'mu rho temp_ref alpha k cp' prop_values = '30.74e-6 .5757 900 2.9e-3 46.38e-3 1054' - [../] + [] [] diff --git a/tests/materials/gmm_linear.i b/tests/materials/gmm_linear.i index a63239bb74..ccc6be89ee 100644 --- a/tests/materials/gmm_linear.i +++ b/tests/materials/gmm_linear.i @@ -34,7 +34,7 @@ xdiff = 'group1diff' bx_norm = 'bnorm' k0 = 1 -#solve_type = 'PJFNK' + #solve_type = 'PJFNK' solve_type = 'NEWTON' petsc_options = '-snes_converged_reason -ksp_converged_reason -snes_linesearch_monitor' petsc_options_iname = '-pc_type' diff --git a/tests/materials/gmm_monotone_cubic.i b/tests/materials/gmm_monotone_cubic.i index e5dcfe02b2..2fa9ca4297 100644 --- a/tests/materials/gmm_monotone_cubic.i +++ b/tests/materials/gmm_monotone_cubic.i @@ -34,7 +34,7 @@ xdiff = 'group1diff' bx_norm = 'bnorm' k0 = 1 -#solve_type = 'PJFNK' + #solve_type = 'PJFNK' solve_type = 'NEWTON' petsc_options = '-snes_converged_reason -ksp_converged_reason -snes_linesearch_monitor' petsc_options_iname = '-pc_type' diff --git a/tests/materials/gmm_spline.i b/tests/materials/gmm_spline.i index b93cb55fa1..8a90c82c9a 100644 --- a/tests/materials/gmm_spline.i +++ b/tests/materials/gmm_spline.i @@ -34,7 +34,7 @@ xdiff = 'group1diff' bx_norm = 'bnorm' k0 = 1 -#solve_type = 'PJFNK' + #solve_type = 'PJFNK' solve_type = 'NEWTON' petsc_options = '-snes_converged_reason -ksp_converged_reason -snes_linesearch_monitor' petsc_options_iname = '-pc_type' diff --git a/tests/postprocessors/side_weighted_integral.i b/tests/postprocessors/side_weighted_integral.i index 54a3706d2b..0e12640407 100644 --- a/tests/postprocessors/side_weighted_integral.i +++ b/tests/postprocessors/side_weighted_integral.i @@ -1,5 +1,5 @@ [Mesh] - [./box] + [box] type = GeneratedMeshGenerator dim = 2 nx = 200 @@ -8,59 +8,59 @@ xmax = 2 ymin = 0 ymax = 1 - [../] + [] [] [Variables] - [./u] + [u] order = FIRST family = LAGRANGE - [../] + [] [] [AuxVariables] - [./v] + [v] order = FIRST family = LAGRANGE - [../] + [] [] [Kernels] - [./diff] + [diff] type = Diffusion variable = u - [../] + [] [] [AuxKernels] - [./v_aux] + [v_aux] type = FunctionAux variable = v function = parabolic_func - [../] + [] [] [BCs] - [./u_top] + [u_top] type = DirichletBC variable = u boundary = 'top' value = 1 - [../] - [./u_bottom] + [] + [u_bottom] type = DirichletBC variable = u boundary = 'bottom' value = 0 - [../] + [] [] [Functions] # Parabola function for v - [./parabolic_func] + [parabolic_func] type = ParsedFunction - value = '-1 * (x - 0) * (x - 2)' - [../] + expression = '-1 * (x - 0) * (x - 2)' + [] [] [Executioner] @@ -71,34 +71,34 @@ [Postprocessors] # Test integral of u=1 across top boundary, weighted by parabola v # Solution = 4/3 - [./weight_parabolic] + [weight_parabolic] type = SideWeightedIntegralPostprocessor variable = u boundary = 'top' weight = v - [../] + [] # Test integral of parabola v across top boundary, weighted by u=1 # Solution = 4/3 - [./variable_parabolic] + [variable_parabolic] type = SideWeightedIntegralPostprocessor variable = v boundary = 'top' weight = u - [../] + [] # Test integral of parabola v across top boundary, weighted by parabola v # Solution = 16/15 - [./both_parabolic] + [both_parabolic] type = SideWeightedIntegralPostprocessor variable = v boundary = 'top' weight = v - [../] + [] [] [Outputs] - [./out] + [out] type = Exodus - [../] + [] [] diff --git a/tests/postprocessors/side_weighted_integral_RZ.i b/tests/postprocessors/side_weighted_integral_RZ.i index 1607460b7e..45fc12844a 100644 --- a/tests/postprocessors/side_weighted_integral_RZ.i +++ b/tests/postprocessors/side_weighted_integral_RZ.i @@ -1,6 +1,6 @@ [Mesh] coord_type = RZ - [./box] + [box] type = GeneratedMeshGenerator dim = 2 nx = 200 @@ -9,59 +9,59 @@ xmax = 2 ymin = 0 ymax = 1 - [../] + [] [] [Variables] - [./u] + [u] order = FIRST family = LAGRANGE - [../] + [] [] [AuxVariables] - [./v] + [v] order = FIRST family = LAGRANGE - [../] + [] [] [Kernels] - [./diff] + [diff] type = Diffusion variable = u - [../] + [] [] [AuxKernels] - [./v_aux] + [v_aux] type = FunctionAux variable = v function = parabolic_func - [../] + [] [] [BCs] - [./u_top] + [u_top] type = DirichletBC variable = u boundary = 'top' value = 1 - [../] - [./u_bottom] + [] + [u_bottom] type = DirichletBC variable = u boundary = 'bottom' value = 0 - [../] + [] [] [Functions] # Parabola function for v - [./parabolic_func] + [parabolic_func] type = ParsedFunction - value = '1 - (x / 2)^2' - [../] + expression = '1 - (x / 2)^2' + [] [] [Executioner] @@ -72,34 +72,34 @@ [Postprocessors] # Test integral of u=1 across top boundary, weighted by parabola v # Solution = 2*pi - [./weight_parabolic] + [weight_parabolic] type = SideWeightedIntegralPostprocessor variable = u boundary = 'top' weight = v - [../] + [] # Test integral of parabola v across top boundary, weighted by u=1 # Solution = 2*pi - [./variable_parabolic] + [variable_parabolic] type = SideWeightedIntegralPostprocessor variable = v boundary = 'top' weight = u - [../] + [] # Test integral of parabola v across top boundary, weighted by parabola v # Solution = 4 * pi / 3 - [./both_parabolic] + [both_parabolic] type = SideWeightedIntegralPostprocessor variable = v boundary = 'top' weight = v - [../] + [] [] [Outputs] - [./out] + [out] type = Exodus - [../] + [] [] diff --git a/tests/pre/pre.i b/tests/pre/pre.i index e81a9c32a8..aef409cdc5 100644 --- a/tests/pre/pre.i +++ b/tests/pre/pre.i @@ -1,5 +1,5 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -global_temperature=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +global_temperature = 922 [GlobalParams] num_groups = 2 @@ -8,19 +8,19 @@ global_temperature=922 temperature = ${global_temperature} sss2_input = false transient = false -[../] +[] [Mesh] coord_type = RZ file = '2d_lattice_structured_smaller.msh' -[../] +[] [Problem] kernel_coverage_check = false [] [Precursors] - [./pres] + [pres] var_name_base = pre outlet_boundaries = 'fuel_tops' u_def = 0 @@ -31,15 +31,15 @@ global_temperature=922 family = MONOMIAL order = CONSTANT block = 'fuel' - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_fuel_' interp_type = 'spline' - [../] + [] [] [Executioner] @@ -58,20 +58,19 @@ global_temperature=922 [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] - [Outputs] perf_graph = true print_linear_residuals = true csv = true - [./out] + [out] type = Exodus - [../] + [] [] [Debug] diff --git a/tests/pre/pre_loop.i b/tests/pre/pre_loop.i index 7be5700fd1..7e661c900a 100644 --- a/tests/pre/pre_loop.i +++ b/tests/pre/pre_loop.i @@ -1,5 +1,5 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -global_temperature=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +global_temperature = 922 [GlobalParams] num_groups = 2 @@ -8,19 +8,19 @@ global_temperature=922 temperature = ${global_temperature} sss2_input = false transient = true -[../] +[] [Mesh] coord_type = RZ file = '2d_lattice_structured_smaller.msh' -[../] +[] [Problem] kernel_coverage_check = false [] [Precursors] - [./pres] + [pres] var_name_base = pre outlet_boundaries = 'fuel_tops' u_def = 0 @@ -34,15 +34,15 @@ global_temperature=922 is_loopapp = false inlet_boundaries = 'fuel_bottoms' block = 'fuel' - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_fuel_' interp_type = 'spline' - [../] + [] [] [Executioner] @@ -62,41 +62,40 @@ global_temperature=922 fixed_point_abs_tol = 1e-5 dtmin = 1e-2 dtmax = 5 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-2 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] - [Outputs] perf_graph = true print_linear_residuals = true csv = true - [./out] + [out] type = Exodus execute_on = 'final' - [../] + [] [] [MultiApps] - [./loopApp] + [loopApp] type = TransientMultiApp app_type = MoltresApp execute_on = timestep_begin positions = '200.0 200.0 0.0' input_files = 'sub.i' - [../] + [] [] [Debug] diff --git a/tests/pre/pre_loop_ins.i b/tests/pre/pre_loop_ins.i index bfc2b943ef..b37f353cdc 100644 --- a/tests/pre/pre_loop_ins.i +++ b/tests/pre/pre_loop_ins.i @@ -1,7 +1,7 @@ -flow_velocity=20 -global_temperature=922 -xmax=50 -ymax=100 +flow_velocity = 20 +global_temperature = 922 +xmax = 50 +ymax = 100 [GlobalParams] num_groups = 2 @@ -16,7 +16,7 @@ ymax=100 [Mesh] coord_type = RZ - [./box] + [box] type = GeneratedMeshGenerator dim = 2 xmin = 0 @@ -25,13 +25,13 @@ ymax=100 ymax = ${ymax} nx = 20 ny = 20 - [../] - [./corner_node] + [] + [corner_node] type = ExtraNodesetGenerator input = box new_boundary = corner coord = '0 ${ymax}' - [../] + [] [] [Problem] @@ -39,7 +39,7 @@ ymax=100 [] [Precursors] - [./pres] + [pres] var_name_base = pre outlet_boundaries = 'top' outlet_vel = uy @@ -53,129 +53,129 @@ ymax=100 multi_app = loopApp is_loopapp = false inlet_boundaries = 'bottom' - [../] + [] [] [Variables] - [./ux] + [ux] family = LAGRANGE order = FIRST initial_condition = 0 - [../] - [./uy] + [] + [uy] family = LAGRANGE order = FIRST initial_condition = ${flow_velocity} - [../] - [./p] + [] + [p] family = LAGRANGE order = FIRST - [../] + [] [] [AuxVariables] - [./group1] + [group1] family = LAGRANGE order = FIRST - [../] - [./group2] + [] + [group2] family = LAGRANGE order = FIRST - [../] + [] [] [Kernels] # Use Navier-Stokes flow at steady state for quicker run - [./mass] + [mass] type = INSMassRZ variable = p u = ux v = uy pressure = p - [../] - [./ux_momentum] + [] + [ux_momentum] type = INSMomentumLaplaceFormRZ variable = ux u = ux v = uy pressure = p component = 0 - [../] - [./uy_momentum] + [] + [uy_momentum] type = INSMomentumLaplaceFormRZ variable = uy u = ux v = uy pressure = p component = 1 - [../] + [] [] [AuxKernels] - [./group1_flux] + [group1_flux] type = FunctionAux variable = group1 function = fluxFunc - [../] - [./group2_flux] + [] + [group2_flux] type = FunctionAux variable = group2 function = fluxFunc - [../] + [] [] [BCs] - [./ux_no_slip] + [ux_no_slip] type = DirichletBC variable = ux boundary = 'right' value = 0 - [../] - [./uy_no_slip] + [] + [uy_no_slip] type = DirichletBC variable = uy boundary = 'right' value = 0 - [../] - [./ux_inlet] + [] + [ux_inlet] type = DirichletBC variable = ux boundary = 'bottom' value = 0 - [../] - [./uy_inlet] + [] + [uy_inlet] type = FunctionDirichletBC variable = uy boundary = 'bottom' function = velFunc - [../] - [./p_pin] + [] + [p_pin] type = DirichletBC variable = p boundary = 'corner' value = 0 - [../] + [] [] [Functions] - [./velFunc] + [velFunc] type = ParsedFunction - value = '2 * ${flow_velocity} * (1 - (x/${xmax})^2)' - [../] - [./fluxFunc] + expression = '2 * ${flow_velocity} * (1 - (x/${xmax})^2)' + [] + [fluxFunc] type = ParsedFunction - value = 'cos(pi / 2 * x / ${xmax}) * sin(pi * y / ${ymax})' - [../] + expression = 'cos(pi / 2 * x / ${xmax}) * sin(pi * y / ${ymax})' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_fuel_' interp_type = 'spline' prop_names = 'rho mu' prop_values = '1e-3 1' - [../] + [] [] [Executioner] @@ -195,41 +195,40 @@ ymax=100 fixed_point_abs_tol = 1e-5 dtmin = 1e-2 dtmax = 4 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-2 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] - [Outputs] perf_graph = true print_linear_residuals = true csv = true - [./out] + [out] type = Exodus execute_on = 'final' - [../] + [] [] [MultiApps] - [./loopApp] + [loopApp] type = TransientMultiApp app_type = MoltresApp execute_on = timestep_begin positions = '200.0 200.0 0.0' input_files = 'sub_ins.i' - [../] + [] [] [Debug] diff --git a/tests/pre/sub.i b/tests/pre/sub.i index 078608e678..b84213f90d 100644 --- a/tests/pre/sub.i +++ b/tests/pre/sub.i @@ -1,5 +1,5 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -global_temperature=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +global_temperature = 922 [GlobalParams] num_groups = 0 @@ -15,10 +15,10 @@ global_temperature=922 nx = 14 xmax = 150 elem_type = EDGE2 -[../] +[] [Precursors] - [./core] + [core] var_name_base = pre outlet_boundaries = 'right' u_def = ${flow_velocity} @@ -31,16 +31,16 @@ global_temperature=922 multi_app = loopApp is_loopapp = true inlet_boundaries = 'left' - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial num_groups = 2 property_tables_root = '../../property_file_dir/newt_msre_fuel_' interp_type = 'spline' - [../] + [] [] [Executioner] @@ -57,20 +57,20 @@ global_temperature=922 l_max_its = 50 dtmin = 1e-2 dtmax = 5 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-2 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] @@ -79,10 +79,10 @@ global_temperature=922 [Outputs] perf_graph = true print_linear_residuals = true - [./out] + [out] type = Exodus execute_on = 'final' - [../] + [] [] [Debug] diff --git a/tests/pre/sub_ins.i b/tests/pre/sub_ins.i index 167abaded5..9c24eb0320 100644 --- a/tests/pre/sub_ins.i +++ b/tests/pre/sub_ins.i @@ -1,5 +1,5 @@ -flow_velocity=20 -global_temperature=922 +flow_velocity = 20 +global_temperature = 922 [GlobalParams] num_groups = 0 @@ -15,10 +15,10 @@ global_temperature=922 nx = 20 xmax = 100 elem_type = EDGE2 -[../] +[] [Precursors] - [./core] + [core] var_name_base = pre outlet_boundaries = 'right' u_def = ${flow_velocity} @@ -31,16 +31,16 @@ global_temperature=922 multi_app = loopApp is_loopapp = true inlet_boundaries = 'left' - [../] + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial num_groups = 2 property_tables_root = '../../property_file_dir/newt_msre_fuel_' interp_type = 'spline' - [../] + [] [] [Executioner] @@ -57,20 +57,20 @@ global_temperature=922 l_max_its = 50 dtmin = 1e-2 dtmax = 4 - [./TimeStepper] + [TimeStepper] type = IterationAdaptiveDT dt = 1e-2 cutback_factor = 0.4 growth_factor = 1.2 optimal_iterations = 20 - [../] + [] [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] @@ -79,10 +79,10 @@ global_temperature=922 [Outputs] perf_graph = true print_linear_residuals = true - [./out] + [out] type = Exodus execute_on = 'final' - [../] + [] [] [Debug] diff --git a/tests/temp/hx_steady.i b/tests/temp/hx_steady.i index 3c292d41e6..6732f883c7 100644 --- a/tests/temp/hx_steady.i +++ b/tests/temp/hx_steady.i @@ -1,40 +1,40 @@ # Expected solution is u = cosh(x) / cosh(1) [Mesh] - [./square] + [square] type = GeneratedMeshGenerator dim = 1 nx = 100 xmin = -1 xmax = 1 - [../] + [] [] [Variables] - [./u] - [../] + [u] + [] [] [Kernels] - [./diffusion] + [diffusion] type = Diffusion variable = u - [../] - [./heat_sink] + [] + [heat_sink] type = ConvectiveHeatExchanger variable = u htc = 1 tref = 0 - [../] + [] [] [BCs] - [./dirichlet] + [dirichlet] type = DirichletBC variable = u boundary = 'left right' value = 1 - [../] + [] [] [Executioner] diff --git a/tests/temp/hx_transient.i b/tests/temp/hx_transient.i index 0fc03b8a24..8c355fa9f9 100644 --- a/tests/temp/hx_transient.i +++ b/tests/temp/hx_transient.i @@ -1,69 +1,69 @@ [Mesh] - [./square] + [square] type = GeneratedMeshGenerator dim = 1 nx = 100 xmin = -1 xmax = 1 - [../] + [] [] [Variables] - [./u] - [../] + [u] + [] [] [Kernels] - [./time_derivative] + [time_derivative] type = TimeDerivative variable = u - [../] - [./diffusion] + [] + [diffusion] type = Diffusion variable = u - [../] - [./heat_sink] + [] + [heat_sink] type = ConvectiveHeatExchanger variable = u htc = 1 tref = 0 - [../] + [] [] [BCs] - [./dirichlet] + [dirichlet] type = DirichletBC variable = u boundary = 'left right' value = 1 - [../] + [] [] [ICs] - [./u_ic] + [u_ic] type = FunctionIC variable = u function = 'ic_func' - [../] + [] [] [Controls] - [./htc_control] + [htc_control] type = RealFunctionControl parameter = '*/*/htc' function = 'htc_func' - [../] + [] [] [Functions] - [./htc_func] + [htc_func] type = ParsedFunction - value = 'exp(-t)' - [../] - [./ic_func] + expression = 'exp(-t)' + [] + [ic_func] type = ParsedFunction - value = 'cosh(x) / cosh(1)' - [../] + expression = 'cosh(x) / cosh(1)' + [] [] [Executioner] diff --git a/tests/temp/temp.i b/tests/temp/temp.i index d55e1132b7..c644099444 100644 --- a/tests/temp/temp.i +++ b/tests/temp/temp.i @@ -1,6 +1,6 @@ -flow_velocity=21.7 # cm/s. See MSRE-properties.ods -nt_scale=1e13 -ini_temp=922 +flow_velocity = 21.7 # cm/s. See MSRE-properties.ods +nt_scale = 1e13 +ini_temp = 922 [GlobalParams] num_groups = 2 @@ -15,56 +15,56 @@ ini_temp=922 [] [Variables] - [./temp] + [temp] initial_condition = ${ini_temp} - [../] + [] [] [Kernels] - [./temp_source_fuel] + [temp_source_fuel] type = TransientFissionHeatSource variable = temp - nt_scale=${nt_scale} + nt_scale = ${nt_scale} block = 'fuel' group_fluxes = '1 1' - [../] - [./temp_diffusion] + [] + [temp_diffusion] type = MatDiffusion diffusivity = 'k' variable = temp - [../] - [./temp_advection_fuel] + [] + [temp_advection_fuel] type = ConservativeTemperatureAdvection velocity = '0 ${flow_velocity} 0' variable = temp block = 'fuel' - [../] + [] [] [BCs] - [./temp_diri_cg] + [temp_diri_cg] boundary = 'moder_bottoms fuel_bottoms outer_wall' type = FunctionDirichletBC function = 'temp_bc_func' variable = temp - [../] - [./temp_advection_outlet] + [] + [temp_advection_outlet] boundary = 'fuel_tops' type = TemperatureOutflowBC variable = temp velocity = '0 ${flow_velocity} 0' - [../] + [] [] [Functions] - [./temp_bc_func] + [temp_bc_func] type = ParsedFunction - value = '${ini_temp}' - [../] + expression = '${ini_temp}' + [] [] [Materials] - [./fuel] + [fuel] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_fuel_' interp_type = 'spline' @@ -72,16 +72,16 @@ ini_temp=922 block = 'fuel' prop_names = 'k cp' prop_values = '.0553 1967' # Robertson MSRE technical report @ 922 K - [../] - [./rho_fuel] + [] + [rho_fuel] type = DerivativeParsedMaterial - f_name = rho - function = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '2.146e-3 * exp(-1.8 * 1.18e-4 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'fuel' - [../] - [./moder] + [] + [moder] type = GenericMoltresMaterial property_tables_root = '../../property_file_dir/newt_msre_mod_' interp_type = 'spline' @@ -89,15 +89,15 @@ ini_temp=922 prop_names = 'k cp' prop_values = '.312 1760' # Cammi 2011 at 908 K block = 'moder' - [../] - [./rho_moder] + [] + [rho_moder] type = DerivativeParsedMaterial - f_name = rho - function = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' - args = 'temp' + property_name = rho + expression = '1.86e-3 * exp(-1.8 * 1.0e-5 * (temp - 922))' + coupled_variables = 'temp' derivative_order = 1 block = 'moder' - [../] + [] [] [Executioner] @@ -115,33 +115,33 @@ ini_temp=922 [] [Preconditioning] - [./SMP] + [SMP] type = SMP full = true - [../] + [] [] [Postprocessors] - [./temp_fuel] + [temp_fuel] type = ElementAverageValue variable = temp block = 'fuel' outputs = 'console' - [../] - [./temp_moder] + [] + [temp_moder] type = ElementAverageValue variable = temp block = 'moder' outputs = 'console' - [../] + [] [] [Outputs] perf_graph = true print_linear_residuals = true - [./out] + [out] type = Exodus - [../] + [] [] [Debug] diff --git a/tutorial/eigenvalue/mesh.i b/tutorial/eigenvalue/mesh.i index a033de51cb..a610d99513 100644 --- a/tutorial/eigenvalue/mesh.i +++ b/tutorial/eigenvalue/mesh.i @@ -1,5 +1,5 @@ [Mesh] - [./fuel_left] + [fuel_left] type = GeneratedMeshGenerator dim = 2 xmin = 0 @@ -9,7 +9,7 @@ nx = 2 ny = 15 [] - [./fuel_right] + [fuel_right] type = GeneratedMeshGenerator dim = 2 xmin = 4.375 @@ -19,7 +19,7 @@ nx = 2 ny = 15 [] - [./moderator] + [moderator] type = GeneratedMeshGenerator dim = 2 xmin = 0.625 @@ -29,27 +29,27 @@ nx = 6 ny = 15 [] - [./unit_mesh] + [unit_mesh] type = StitchedMeshGenerator inputs = 'fuel_left moderator fuel_right' stitch_boundaries_pairs = 'right left; right left; right left' [] - [./mod_block] + [mod_block] type = SubdomainBoundingBoxGenerator input = unit_mesh block_id = 1 bottom_left = '0.625 0 0' top_right = '4.375 150 0' [] - [./patterned_mesh] + [patterned_mesh] type = PatternedMeshGenerator inputs = 'mod_block' pattern = '0 0 0 0 0 0 0 0 0 0 0 0 0' x_width = 5 [] - [./fuel_last] + [fuel_last] type = GeneratedMeshGenerator dim = 2 xmin = 65 @@ -59,7 +59,7 @@ nx = 2 ny = 15 [] - [./mod_last] + [mod_last] type = GeneratedMeshGenerator dim = 2 xmin = 65.625 @@ -69,49 +69,49 @@ nx = 6 ny = 15 [] - [./full_mesh] + [full_mesh] type = StitchedMeshGenerator inputs = 'patterned_mesh fuel_last mod_last' stitch_boundaries_pairs = 'right left; right left; right left' [] - [./mod_last_block] + [mod_last_block] type = SubdomainBoundingBoxGenerator input = full_mesh block_id = 1 bottom_left = '65.625 0 0' top_right = '69.375 150 0' [] - [./fuel_top_boundary] + [fuel_top_boundary] type = SideSetsAroundSubdomainGenerator input = mod_last_block block = 0 new_boundary = 'fuel_top' normal = '0 1 0' [] - [./mod_top_boundary] + [mod_top_boundary] type = SideSetsAroundSubdomainGenerator input = fuel_top_boundary block = 1 new_boundary = 'mod_top' normal = '0 1 0' [] - [./fuel_bottom_boundary] + [fuel_bottom_boundary] type = SideSetsAroundSubdomainGenerator input = mod_top_boundary block = 0 new_boundary = 'fuel_bottom' normal = '0 -1 0' [] - [./mod_bottom_boundary] + [mod_bottom_boundary] type = SideSetsAroundSubdomainGenerator input = fuel_bottom_boundary block = 1 new_boundary = 'mod_bottom' normal = '0 -1 0' [] - [./delete_boundaries] + [delete_boundaries] type = BoundaryDeletionGenerator input = mod_bottom_boundary boundary_names = 'top bottom' diff --git a/tutorial/eigenvalue/nts-action.i b/tutorial/eigenvalue/nts-action.i index 000cd8ebea..3c62e3a7c7 100644 --- a/tutorial/eigenvalue/nts-action.i +++ b/tutorial/eigenvalue/nts-action.i @@ -10,16 +10,13 @@ [] [Mesh] + coord_type = RZ [mesh] type = FileMeshGenerator file = 'mesh.e' [] [] -[Problem] - coord_type = RZ -[] - [Nt] var_name_base = group vacuum_boundaries = 'fuel_bottom mod_bottom right fuel_top mod_top' @@ -53,7 +50,7 @@ base_file = 'xsdata.json' material_key = 'fuel' interp_type = LINEAR - prop_names ='' + prop_names = '' prop_values = '' [] [graphite] @@ -62,7 +59,7 @@ base_file = 'xsdata.json' material_key = 'graphite' interp_type = LINEAR - prop_names ='' + prop_names = '' prop_values = '' [] [] @@ -102,6 +99,7 @@ [Postprocessors] [bnorm] type = ElmIntegTotFissNtsPostprocessor + block = 0 execute_on = linear [] [tot_fissions] diff --git a/tutorial/eigenvalue/nts.i b/tutorial/eigenvalue/nts.i index 538db97685..0188b9fe1f 100644 --- a/tutorial/eigenvalue/nts.i +++ b/tutorial/eigenvalue/nts.i @@ -10,16 +10,13 @@ [] [Mesh] + coord_type = RZ [mesh] type = FileMeshGenerator file = 'mesh.e' [] [] -[Problem] - coord_type = RZ -[] - [Variables] [group1] order = FIRST @@ -77,10 +74,10 @@ block = '0' [] [delayed_group1] - type = DelayedNeutronEigenSource + type = DelayedNeutronSource variable = group1 block = '0' - group_number=1 + group_number = 1 [] #--------------------------------------------------------------------- @@ -129,7 +126,7 @@ base_file = 'xsdata.json' material_key = 'fuel' interp_type = LINEAR - prop_names ='' + prop_names = '' prop_values = '' [] [graphite] @@ -138,7 +135,7 @@ base_file = 'xsdata.json' material_key = 'graphite' interp_type = LINEAR - prop_names ='' + prop_names = '' prop_values = '' [] [] @@ -178,6 +175,7 @@ [Postprocessors] [bnorm] type = ElmIntegTotFissNtsPostprocessor + block = 0 execute_on = linear [] [tot_fissions] diff --git a/tutorial/transient/transient.i b/tutorial/transient/transient.i index 7a0161a93d..25492244e4 100644 --- a/tutorial/transient/transient.i +++ b/tutorial/transient/transient.i @@ -10,16 +10,13 @@ [] [Mesh] + coord_type = RZ [mesh] type = FileMeshGenerator file = '../eigenvalue/mesh.e' [] [] -[Problem] - coord_type = RZ -[] - [Variables] [group1] order = FIRST @@ -87,7 +84,7 @@ type = DelayedNeutronSource variable = group1 block = '0' - group_number=1 + group_number = 1 [] #--------------------------------------------------------------------- @@ -186,15 +183,15 @@ [Functions] [temp_bc_func] type = ParsedFunction - value = '1000 - (1000-965) * tanh(t/1)' + expression = '1000 - (1000-965) * tanh(t/1)' [] [dt_func] type = ParsedFunction - value = 'if(t<50, if(t<30, .4, 5), 10)' + expression = 'if(t<50, if(t<30, .4, 5), 10)' [] [ic_func] type = ParsedFunction - value = '1e5 * (-x^2+70^2) * (-y * (y-150))' + expression = '1e5 * (-x^2+70^2) * (-y * (y-150))' [] [] @@ -205,7 +202,7 @@ base_file = '../eigenvalue/xsdata.json' material_key = 'fuel' interp_type = LINEAR - prop_names ='rho k cp' + prop_names = 'rho k cp' prop_values = '2.146e-3 .0553 1967' [] [graphite] @@ -214,7 +211,7 @@ base_file = '../eigenvalue/xsdata.json' material_key = 'graphite' interp_type = LINEAR - prop_names ='rho k cp' + prop_names = 'rho k cp' prop_values = '1.86e-3 .312 1760' [] [] @@ -244,13 +241,13 @@ type = FunctionDT function = dt_func [] -# [TimeStepper] -# type = IterationAdaptiveDT -# dt = .2 -# cutback_factor = 0.4 -# growth_factor = 1.2 -# optimal_iterations = 20 -# [] + # [TimeStepper] + # type = IterationAdaptiveDT + # dt = .2 + # cutback_factor = 0.4 + # growth_factor = 1.2 + # optimal_iterations = 20 + # [] [] [Preconditioning] @@ -309,7 +306,7 @@ [Outputs] perf_graph = true -# print_linear_residuals = true + # print_linear_residuals = true [exodus] type = Exodus [] @@ -320,5 +317,5 @@ [] [Debug] -# show_var_residual_norms = true + # show_var_residual_norms = true [] diff --git a/unit/Makefile b/unit/Makefile index 4b61c258fc..fc1ce88471 100644 --- a/unit/Makefile +++ b/unit/Makefile @@ -26,20 +26,30 @@ include $(FRAMEWORK_DIR)/moose.mk ################################## MODULES #################################### # set desired physics modules equal to 'yes' to enable them -CHEMICAL_REACTIONS := no -CONTACT := no -FLUID_PROPERTIES := no -HEAT_CONDUCTION := no -MISC := no -NAVIER_STOKES := yes -PHASE_FIELD := yes -RDG := no -RICHARDS := no -STOCHASTIC_TOOLS := no -TENSOR_MECHANICS := no -XFEM := no -POROUS_FLOW := no -LEVEL_SET := no +CHEMICAL_REACTIONS := no +CONTACT := no +ELECTROMAGNETICS := no +EXTERNAL_PETSC_SOLVER := no +FLUID_PROPERTIES := no +FSI := no +FUNCTIONAL_EXPANSION_TOOLS := no +GEOCHEMISTRY := no +HEAT_CONDUCTION := no +LEVEL_SET := no +MISC := no +NAVIER_STOKES := yes +OPTIMIZATION := no +PERIDYNAMICS := no +PHASE_FIELD := yes +POROUS_FLOW := no +RAY_TRACING := no +REACTOR := yes +RDG := no +RICHARDS := no +STOCHASTIC_TOOLS := no +THERMAL_HYDRAULICS := no +TENSOR_MECHANICS := no +XFEM := no include $(MOOSE_DIR)/modules/modules.mk ###############################################################################