From cc2e59845a6d61c6508420fc3f7f93dca2223570 Mon Sep 17 00:00:00 2001 From: Wendy-Ji Date: Tue, 23 Jul 2024 15:50:11 -0500 Subject: [PATCH] Update DED examples for forward compatibility with MOOSE PR refs #25736 --- .../cylinder/master_app_mechanical.i | 13 ++++++------- .../cylinder/sub_app_thermal.i | 5 +++-- .../hollow_cylinder/master_app_mechanical.i | 13 ++++++------- .../hollow_cylinder/sub_app_thermal.i | 5 +++-- moose | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/directed_energy_deposition/cylinder/master_app_mechanical.i b/examples/directed_energy_deposition/cylinder/master_app_mechanical.i index 2d7caef6..a75e270e 100644 --- a/examples/directed_energy_deposition/cylinder/master_app_mechanical.i +++ b/examples/directed_energy_deposition/cylinder/master_app_mechanical.i @@ -132,8 +132,7 @@ dt = 200 [QuasiStatic] strain = FINITE incremental = true - generate_output = 'stress_xx stress_yy stress_zz stress_xy stress_yz stress_xz strain_yy strain_xx ' - 'strain_zz strain_xy strain_xz strain_yz' + generate_output = 'stress_xx stress_yy stress_zz stress_xy stress_yz stress_xz strain_yy strain_xx strain_zz strain_xy strain_xz strain_yz' use_automatic_differentiation = true [product] block = '2' @@ -241,7 +240,7 @@ dt = 200 [] [] -[UserObjects] +[MeshModifiers] [activated_elem_uo_beam] type = CoupledVarThresholdElementSubdomainModifier execute_on = 'TIMESTEP_BEGIN' @@ -250,8 +249,9 @@ dt = 200 subdomain_id = 2 criterion_type = ABOVE threshold = ${T_melt} - moving_boundary_name = 'moving_boundary' - apply_initial_conditions = false + moving_boundaries = 'moving_boundary' + moving_boundary_subdomain_pairs = '2 1' + reinitialize_subdomains = '' [] [] @@ -286,8 +286,7 @@ dt = 200 type = Transient solve_type = 'NEWTON' - petsc_options_iname = '-ksp_type -pc_type -pc_factor_mat_solver_package -pc_factor_shift_type ' - '-pc_factor_shift_amount' + petsc_options_iname = '-ksp_type -pc_type -pc_factor_mat_solver_package -pc_factor_shift_type -pc_factor_shift_amount' petsc_options_value = 'preonly lu superlu_dist NONZERO 1e-10' line_search = 'none' diff --git a/examples/directed_energy_deposition/cylinder/sub_app_thermal.i b/examples/directed_energy_deposition/cylinder/sub_app_thermal.i index 05ca264a..ffc580e9 100644 --- a/examples/directed_energy_deposition/cylinder/sub_app_thermal.i +++ b/examples/directed_energy_deposition/cylinder/sub_app_thermal.i @@ -244,7 +244,7 @@ dt = 200 [] [] -[UserObjects] +[MeshModifiers] [activated_elem_uo_beam] type = CoupledVarThresholdElementSubdomainModifier execute_on = 'TIMESTEP_BEGIN' @@ -253,7 +253,8 @@ dt = 200 subdomain_id = 2 criterion_type = ABOVE threshold = ${T_melt} - moving_boundary_name = 'moving_boundary' + moving_boundaries = 'moving_boundary' + moving_boundary_subdomain_pairs = '2 1' [] [] diff --git a/examples/directed_energy_deposition/hollow_cylinder/master_app_mechanical.i b/examples/directed_energy_deposition/hollow_cylinder/master_app_mechanical.i index 963e1e6f..733c7979 100644 --- a/examples/directed_energy_deposition/hollow_cylinder/master_app_mechanical.i +++ b/examples/directed_energy_deposition/hollow_cylinder/master_app_mechanical.i @@ -132,8 +132,7 @@ dt = 20 [QuasiStatic] strain = FINITE incremental = true - generate_output = 'stress_xx stress_yy stress_zz stress_xy stress_yz stress_xz strain_yy strain_xx ' - 'strain_zz strain_xy strain_xz strain_yz' + generate_output = 'stress_xx stress_yy stress_zz stress_xy stress_yz stress_xz strain_yy strain_xx strain_zz strain_xy strain_xz strain_yz' use_automatic_differentiation = true [product] block = '2' @@ -241,7 +240,7 @@ dt = 20 [] [] -[UserObjects] +[MeshModifiers] [activated_elem_uo_beam] type = CoupledVarThresholdElementSubdomainModifier execute_on = 'TIMESTEP_BEGIN' @@ -250,8 +249,9 @@ dt = 20 subdomain_id = 2 criterion_type = ABOVE threshold = ${T_melt} - moving_boundary_name = 'moving_boundary' - apply_initial_conditions = false + moving_boundaries = 'moving_boundary' + moving_boundary_subdomain_pairs = '2 1' + reinitialize_subdomains = '' [] [] @@ -286,8 +286,7 @@ dt = 20 type = Transient solve_type = 'NEWTON' - petsc_options_iname = '-ksp_type -pc_type -pc_factor_mat_solver_package -pc_factor_shift_type ' - '-pc_factor_shift_amount' + petsc_options_iname = '-ksp_type -pc_type -pc_factor_mat_solver_package -pc_factor_shift_type -pc_factor_shift_amount' petsc_options_value = 'preonly lu superlu_dist NONZERO 1e-10' line_search = 'none' diff --git a/examples/directed_energy_deposition/hollow_cylinder/sub_app_thermal.i b/examples/directed_energy_deposition/hollow_cylinder/sub_app_thermal.i index 076de7d5..7cd06bb6 100644 --- a/examples/directed_energy_deposition/hollow_cylinder/sub_app_thermal.i +++ b/examples/directed_energy_deposition/hollow_cylinder/sub_app_thermal.i @@ -249,7 +249,7 @@ dt = 20 [] [] -[UserObjects] +[MeshModifiers] [activated_elem_uo_beam] type = CoupledVarThresholdElementSubdomainModifier execute_on = 'TIMESTEP_BEGIN' @@ -258,7 +258,8 @@ dt = 20 subdomain_id = 2 criterion_type = ABOVE threshold = ${T_melt} - moving_boundary_name = 'moving_boundary' + moving_boundaries = 'moving_boundary' + moving_boundary_subdomain_pairs = '2 1' [] [] diff --git a/moose b/moose index 0b976b0d..2ad07eeb 160000 --- a/moose +++ b/moose @@ -1 +1 @@ -Subproject commit 0b976b0d30a90abd89b2444af43fffc0307d01fa +Subproject commit 2ad07eebb90073b1839bf2ff475d133e86be3b62