diff --git a/reg_tests/CTestList.cmake b/reg_tests/CTestList.cmake index 429d65e73c..0c5f204e5f 100644 --- a/reg_tests/CTestList.cmake +++ b/reg_tests/CTestList.cmake @@ -212,6 +212,9 @@ if(NOT ENABLE_CUDA AND NOT ENABLE_ROCM) add_test_r(KOChannelEdge 4) add_test_r(KEChannelEdge 4) add_test_r_rst(SSTAMSChannelEdge 4) + add_test_r_rst(SSTLRAMSChannelEdge 4) + add_test_r_rst(KOAMSChannelEdge 4) + add_test_r_rst(KEAMSChannelEdge 4) #add_test_r_rst(SSTAMSOversetRotCylinder 2) add_test_r(ablNeutralNGPHypre 2) add_test_r(ablNeutralNGPHypreSegregated 2) diff --git a/reg_tests/test_files/KEAMSChannelEdge/KEAMSChannelEdge.yaml b/reg_tests/test_files/KEAMSChannelEdge/KEAMSChannelEdge.yaml new file mode 100644 index 0000000000..15abd18877 --- /dev/null +++ b/reg_tests/test_files/KEAMSChannelEdge/KEAMSChannelEdge.yaml @@ -0,0 +1,200 @@ +Simulations: + - name: sim1 + time_integrator: ti_1 + optimizer: opt1 + +linear_solvers: + + - name: solve_scalar + type: tpetra + method: gmres + preconditioner: riluk + tolerance: 1e-5 + max_iterations: 200 + kspace: 200 + output_level: 0 + + - name: solve_cont + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 50 + kspace: 75 + output_level: 0 + bamg_coarsen_type: 8 + bamg_interp_type: 6 + bamg_cycle_type: 1 + +realms: + + - name: realm_1 + mesh: ../../mesh/periodicChannel.g + use_edges: yes + check_for_missing_bcs: yes + automatic_decomposition_type: rcb + + time_step_control: + target_courant: 1.0 + time_step_change_factor: 1.2 + + equation_systems: + name: theEqSys + max_iterations: 4 + + solver_system_specification: + velocity: solve_scalar + turbulent_ke: solve_scalar + total_dissipation_rate: solve_scalar + pressure: solve_cont + ndtw: solve_cont + + systems: + - WallDistance: + name: myNDTW + max_iterations: 1 + convergence_tolerance: 1.0e-8 + + - LowMachEOM: + name: myLowMach + max_iterations: 1 + convergence_tolerance: 1e-8 + + - ChienKEpsilon: + name: myKE + max_iterations: 1 + convergence_tolerance: 1e-8 + + initial_conditions: + - constant: ic_1 + target_name: Unspecified-2-HEX + value: + pressure: 0 + velocity: [22.0,0.0,0.0] + turbulent_ke: 0.0005 + total_dissipation_rate: 0.0005 + + material_properties: + target_name: Unspecified-2-HEX + specifications: + - name: density + type: constant + value: 1.0 + - name: viscosity + type: constant + value: 9.99488e-4 + + boundary_conditions: + + - wall_boundary_condition: bc_bot + target_name: bottom + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - wall_boundary_condition: bc_top + target_name: top + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - periodic_boundary_condition: bc_inlet_outlet + target_name: [inlet, outlet] + periodic_user_data: + search_tolerance: 0.001 + + - periodic_boundary_condition: bc_front_back + target_name: [front, back] + periodic_user_data: + search_tolerance: 0.001 + + solution_options: + name: myOptions + turbulence_model: ke + projected_timescale_type: momentum_diag_inv + + fix_pressure_at_node: + value: 0.0 + node_lookup_type: spatial_location + location: [ 1.0, 1.0, 1.0 ] + search_target_part: [Unspecified-2-HEX] + search_method: stk_kdtree + + options: + - hybrid_factor: + velocity: 1.0 + turbulent_ke: 1.0 + total_dissipation_rate: 1.0 + + - alpha_upw: + velocity: 1.0 + turbulent_ke: 1.0 + total_dissipation_rate: 1.0 + + - upw_factor: + velocity: 1.0 + turbulent_ke: 0.0 + total_dissipation_rate: 0.0 + + - noc_correction: + pressure: yes + + - limiter: + pressure: no + velocity: yes + turbulent_ke: yes + total_dissipation_rate: yes + + - projected_nodal_gradient: + velocity: element + pressure: element + turbulent_ke: element + total_dissipation_rate: element + ndtw: element + + - relaxation_factor: + velocity: 1.0 + pressure: 1.0 + turbulent_ke: 1.0 + total_dissipation_rate: 1.0 + + - source_terms: + momentum: body_force + + - source_term_parameters: + momentum: [1.00, 0.0, 0.0] + + restart: + restart_data_base_name: KEAMSChannelEdge.rst + restart_frequency: 10 + restart_start: 0 + + output: + output_data_base_name: KEAMSChannelEdge.e + output_frequency: 10 + output_node_set: no + output_variables: + - velocity + - pressure + - pressure_force + - tau_wall + - turbulent_ke + - total_dissipation_rate + - minimum_distance_to_wall + - turbulent_viscosity + - element_courant + +Time_Integrators: + - StandardTimeIntegrator: + name: ti_1 + start_time: 0 + time_step: 2.0e-3 + termination_step_count: 10 + time_stepping_type: fixed + time_step_count: 0 + second_order_accuracy: yes + + realms: + - realm_1 diff --git a/reg_tests/test_files/KEAMSChannelEdge/KEAMSChannelEdge_rst.yaml b/reg_tests/test_files/KEAMSChannelEdge/KEAMSChannelEdge_rst.yaml new file mode 100644 index 0000000000..901a252b57 --- /dev/null +++ b/reg_tests/test_files/KEAMSChannelEdge/KEAMSChannelEdge_rst.yaml @@ -0,0 +1,220 @@ +Simulations: + - name: sim1 + time_integrator: ti_1 + optimizer: opt1 + +linear_solvers: + + - name: solve_scalar + type: tpetra + method: gmres + preconditioner: riluk + tolerance: 1e-5 + max_iterations: 200 + kspace: 200 + output_level: 0 + + - name: solve_cont + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 50 + kspace: 75 + output_level: 0 + bamg_coarsen_type: 8 + bamg_interp_type: 6 + bamg_cycle_type: 1 + +realms: + + - name: realm_1 + mesh: KEAMSChannelEdge.rst + use_edges: yes + check_for_missing_bcs: yes + support_inconsistent_multi_state_restart: yes + + time_step_control: + target_courant: 1.0 + time_step_change_factor: 1.2 + + equation_systems: + name: theEqSys + max_iterations: 4 + + solver_system_specification: + velocity: solve_scalar + turbulent_ke: solve_scalar + total_dissipation_rate: solve_scalar + pressure: solve_cont + ndtw: solve_cont + + systems: + - WallDistance: + name: myNDTW + max_iterations: 1 + convergence_tolerance: 1.0e-8 + + - LowMachEOM: + name: myLowMach + max_iterations: 1 + convergence_tolerance: 1e-8 + + - ChienKEpsilon: + name: myKE + max_iterations: 1 + convergence_tolerance: 1e-8 + + initial_conditions: + - constant: ic_1 + target_name: Unspecified-2-HEX + value: + pressure: 0 + velocity: [22.0,0.0,0.0] + turbulent_ke: 0.0005 + total_dissipation_rate: 0.0005 + average_velocity: [22.78,0.0,0.0] + average_tke_resolved: 0.0 + average_dudx: 0.0 + k_ratio: 1.0 + avg_res_adequacy_parameter: 1.0 + + material_properties: + target_name: Unspecified-2-HEX + specifications: + - name: density + type: constant + value: 1.0 + - name: viscosity + type: constant + value: 9.99488e-4 + + boundary_conditions: + + - wall_boundary_condition: bc_bot + target_name: bottom + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - wall_boundary_condition: bc_top + target_name: top + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - periodic_boundary_condition: bc_inlet_outlet + target_name: [inlet, outlet] + periodic_user_data: + search_tolerance: 0.001 + + - periodic_boundary_condition: bc_front_back + target_name: [front, back] + periodic_user_data: + search_tolerance: 0.001 + + solution_options: + name: myOptions + turbulence_model: ke_ams + reset_AMS_averages_on_init: true + projected_timescale_type: momentum_diag_inv + + fix_pressure_at_node: + value: 0.0 + node_lookup_type: spatial_location + location: [ 1.0, 1.0, 1.0 ] + search_target_part: [Unspecified-2-HEX] + search_method: stk_kdtree + + options: + - hybrid_factor: + velocity: 1.0 + turbulent_ke: 1.0 + total_dissipation_rate: 1.0 + + - alpha_upw: + velocity: 1.0 + turbulent_ke: 1.0 + total_dissipation_rate: 1.0 + + - upw_factor: + velocity: 1.0 + turbulent_ke: 0.0 + total_dissipation_rate: 0.0 + + - noc_correction: + pressure: yes + + - limiter: + pressure: no + velocity: yes + turbulent_ke: yes + total_dissipation_rate: yes + + - projected_nodal_gradient: + velocity: element + pressure: element + turbulent_ke: element + total_dissipation_rate: element + ndtw: element + + - relaxation_factor: + velocity: 1.0 + pressure: 1.0 + turbulent_ke: 1.0 + total_dissipation_rate: 1.0 + + - turbulence_model_constants: + forcingFactor: 32.0 + + - source_terms: + momentum: body_force + + - source_term_parameters: + momentum: [1.00, 0.0, 0.0] + + restart: + restart_data_base_name: KEAMSChannelEdge-ams.rst + restart_frequency: 10 + restart_start: 0 + restart_time: 100 + + output: + output_data_base_name: KEAMSChannelEdge-ams.e + output_frequency: 10 + output_node_set: no + output_variables: + - velocity + - average_velocity + - pressure + - pressure_force + - tau_wall + - turbulent_ke + - total_dissipation_rate + - minimum_distance_to_wall + - turbulent_viscosity + - k_ratio + - rans_time_scale + - average_mass_flow_rate + - average_tke_resolved + - avg_res_adequacy_parameter + - resolution_adequacy_parameter + - metric_tensor + - element_courant + - average_production + - average_dudx + +Time_Integrators: + - StandardTimeIntegrator: + name: ti_1 + start_time: 0 + time_step: 2.0e-3 + termination_step_count: 20 + time_stepping_type: fixed + time_step_count: 0 + second_order_accuracy: yes + + realms: + - realm_1 diff --git a/reg_tests/test_files/KOAMSChannelEdge/KOAMSChannelEdge.yaml b/reg_tests/test_files/KOAMSChannelEdge/KOAMSChannelEdge.yaml new file mode 100644 index 0000000000..36326ef274 --- /dev/null +++ b/reg_tests/test_files/KOAMSChannelEdge/KOAMSChannelEdge.yaml @@ -0,0 +1,203 @@ +Simulations: + - name: sim1 + time_integrator: ti_1 + optimizer: opt1 + +linear_solvers: + + - name: solve_scalar + type: tpetra + method: gmres + preconditioner: riluk + tolerance: 1e-5 + max_iterations: 200 + kspace: 200 + output_level: 0 + + - name: solve_cont + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 50 + kspace: 75 + output_level: 0 + bamg_coarsen_type: 8 + bamg_interp_type: 6 + bamg_cycle_type: 1 + +realms: + + - name: realm_1 + mesh: ../../mesh/periodicChannel.g + use_edges: yes + check_for_missing_bcs: yes + automatic_decomposition_type: rcb + + time_step_control: + target_courant: 1.0 + time_step_change_factor: 1.2 + + equation_systems: + name: theEqSys + max_iterations: 4 + + solver_system_specification: + velocity: solve_scalar + turbulent_ke: solve_scalar + specific_dissipation_rate: solve_scalar + pressure: solve_cont + ndtw: solve_cont + + systems: + - WallDistance: + name: myNDTW + max_iterations: 1 + convergence_tolerance: 1.0e-8 + + - LowMachEOM: + name: myLowMach + max_iterations: 1 + convergence_tolerance: 1e-8 + + - WilcoxKOmega: + name: myKO + max_iterations: 1 + convergence_tolerance: 1e-8 + + initial_conditions: + - constant: ic_1 + target_name: Unspecified-2-HEX + value: + pressure: 0 + velocity: [22.0,0.0,0.0] + turbulent_ke: 0.05 + specific_dissipation_rate: 3528.0 + + material_properties: + target_name: Unspecified-2-HEX + specifications: + - name: density + type: constant + value: 1.0 + - name: viscosity + type: constant + value: 9.99488e-4 + + boundary_conditions: + + - wall_boundary_condition: bc_bot + target_name: bottom + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - wall_boundary_condition: bc_top + target_name: top + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - periodic_boundary_condition: bc_inlet_outlet + target_name: [inlet, outlet] + periodic_user_data: + search_tolerance: 0.001 + + - periodic_boundary_condition: bc_front_back + target_name: [front, back] + periodic_user_data: + search_tolerance: 0.001 + + solution_options: + name: myOptions + turbulence_model: ko + projected_timescale_type: momentum_diag_inv + + fix_pressure_at_node: + value: 0.0 + node_lookup_type: spatial_location + location: [ 1.0, 1.0, 1.0 ] + search_target_part: [Unspecified-2-HEX] + search_method: stk_kdtree + + options: + - hybrid_factor: + velocity: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - alpha_upw: + velocity: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - upw_factor: + velocity: 1.0 + turbulent_ke: 0.0 + specific_dissipation_rate: 0.0 + + - noc_correction: + pressure: yes + + - limiter: + pressure: no + velocity: yes + turbulent_ke: yes + specific_dissipation_rate: yes + + - projected_nodal_gradient: + velocity: element + pressure: element + turbulent_ke: element + specific_dissipation_rate: element + ndtw: element + + - relaxation_factor: + velocity: 1.0 + pressure: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - turbulence_model_constants: + SDRWallFactor: 0.625 + + - source_terms: + momentum: body_force + + - source_term_parameters: + momentum: [1.00, 0.0, 0.0] + + restart: + restart_data_base_name: KOAMSChannelEdge.rst + restart_frequency: 10 + restart_start: 0 + + output: + output_data_base_name: KOAMSChannelEdge.e + output_frequency: 10 + output_node_set: no + output_variables: + - velocity + - pressure + - pressure_force + - tau_wall + - turbulent_ke + - specific_dissipation_rate + - minimum_distance_to_wall + - turbulent_viscosity + - element_courant + +Time_Integrators: + - StandardTimeIntegrator: + name: ti_1 + start_time: 0 + time_step: 2.0e-3 + termination_step_count: 10 + time_stepping_type: fixed + time_step_count: 0 + second_order_accuracy: yes + + realms: + - realm_1 diff --git a/reg_tests/test_files/KOAMSChannelEdge/KOAMSChannelEdge_rst.yaml b/reg_tests/test_files/KOAMSChannelEdge/KOAMSChannelEdge_rst.yaml new file mode 100644 index 0000000000..6be7d75583 --- /dev/null +++ b/reg_tests/test_files/KOAMSChannelEdge/KOAMSChannelEdge_rst.yaml @@ -0,0 +1,221 @@ +Simulations: + - name: sim1 + time_integrator: ti_1 + optimizer: opt1 + +linear_solvers: + + - name: solve_scalar + type: tpetra + method: gmres + preconditioner: riluk + tolerance: 1e-5 + max_iterations: 200 + kspace: 200 + output_level: 0 + + - name: solve_cont + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 50 + kspace: 75 + output_level: 0 + bamg_coarsen_type: 8 + bamg_interp_type: 6 + bamg_cycle_type: 1 + +realms: + + - name: realm_1 + mesh: KOAMSChannelEdge.rst + use_edges: yes + check_for_missing_bcs: yes + support_inconsistent_multi_state_restart: yes + + time_step_control: + target_courant: 1.0 + time_step_change_factor: 1.2 + + equation_systems: + name: theEqSys + max_iterations: 4 + + solver_system_specification: + velocity: solve_scalar + turbulent_ke: solve_scalar + specific_dissipation_rate: solve_scalar + pressure: solve_cont + ndtw: solve_cont + + systems: + - WallDistance: + name: myNDTW + max_iterations: 1 + convergence_tolerance: 1.0e-8 + + - LowMachEOM: + name: myLowMach + max_iterations: 1 + convergence_tolerance: 1e-8 + + - WilcoxKOmega: + name: myKO + max_iterations: 1 + convergence_tolerance: 1e-8 + + initial_conditions: + - constant: ic_1 + target_name: Unspecified-2-HEX + value: + pressure: 0 + velocity: [22.0,0.0,0.0] + turbulent_ke: 0.05 + specific_dissipation_rate: 3528.0 + average_velocity: [22.78,0.0,0.0] + average_tke_resolved: 0.0 + average_dudx: 0.0 + k_ratio: 1.0 + avg_res_adequacy_parameter: 1.0 + + material_properties: + target_name: Unspecified-2-HEX + specifications: + - name: density + type: constant + value: 1.0 + - name: viscosity + type: constant + value: 9.99488e-4 + + boundary_conditions: + + - wall_boundary_condition: bc_bot + target_name: bottom + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - wall_boundary_condition: bc_top + target_name: top + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - periodic_boundary_condition: bc_inlet_outlet + target_name: [inlet, outlet] + periodic_user_data: + search_tolerance: 0.001 + + - periodic_boundary_condition: bc_front_back + target_name: [front, back] + periodic_user_data: + search_tolerance: 0.001 + + solution_options: + name: myOptions + turbulence_model: ko_ams + reset_AMS_averages_on_init: true + projected_timescale_type: momentum_diag_inv + + fix_pressure_at_node: + value: 0.0 + node_lookup_type: spatial_location + location: [ 1.0, 1.0, 1.0 ] + search_target_part: [Unspecified-2-HEX] + search_method: stk_kdtree + + options: + - hybrid_factor: + velocity: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - alpha_upw: + velocity: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - upw_factor: + velocity: 1.0 + turbulent_ke: 0.0 + specific_dissipation_rate: 0.0 + + - noc_correction: + pressure: yes + + - limiter: + pressure: no + velocity: yes + turbulent_ke: yes + specific_dissipation_rate: yes + + - projected_nodal_gradient: + velocity: element + pressure: element + turbulent_ke: element + specific_dissipation_rate: element + ndtw: element + + - relaxation_factor: + velocity: 1.0 + pressure: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - turbulence_model_constants: + SDRWallFactor: 0.625 + forcingFactor: 32.0 + + - source_terms: + momentum: body_force + + - source_term_parameters: + momentum: [1.00, 0.0, 0.0] + + restart: + restart_data_base_name: KOAMSChannelEdge-ams.rst + restart_frequency: 10 + restart_start: 0 + restart_time: 100 + + output: + output_data_base_name: KOAMSChannelEdge-ams.e + output_frequency: 10 + output_node_set: no + output_variables: + - velocity + - average_velocity + - pressure + - pressure_force + - tau_wall + - turbulent_ke + - specific_dissipation_rate + - minimum_distance_to_wall + - turbulent_viscosity + - k_ratio + - rans_time_scale + - average_mass_flow_rate + - average_tke_resolved + - avg_res_adequacy_parameter + - resolution_adequacy_parameter + - metric_tensor + - element_courant + - average_production + - average_dudx + +Time_Integrators: + - StandardTimeIntegrator: + name: ti_1 + start_time: 0 + time_step: 2.0e-3 + termination_step_count: 20 + time_stepping_type: fixed + time_step_count: 0 + second_order_accuracy: yes + + realms: + - realm_1 diff --git a/reg_tests/test_files/SSTAMSChannelEdge/SSTAMSChannelEdge_rst.yaml b/reg_tests/test_files/SSTAMSChannelEdge/SSTAMSChannelEdge_rst.yaml index 52a15f392b..4d96070d42 100644 --- a/reg_tests/test_files/SSTAMSChannelEdge/SSTAMSChannelEdge_rst.yaml +++ b/reg_tests/test_files/SSTAMSChannelEdge/SSTAMSChannelEdge_rst.yaml @@ -30,7 +30,7 @@ realms: - name: realm_1 mesh: SSTAMSChannelEdge.rst - use_edges: yes + use_edges: yes check_for_missing_bcs: yes support_inconsistent_multi_state_restart: yes @@ -48,7 +48,6 @@ realms: specific_dissipation_rate: solve_scalar pressure: solve_cont ndtw: solve_cont - time_averaged_model_split: solve_cont systems: - WallDistance: @@ -78,7 +77,7 @@ realms: average_tke_resolved: 0.0 average_dudx: 0.0 k_ratio: 1.0 - avg_res_adequacy_parameter: 1.0 + avg_res_adequacy_parameter: 1.0 material_properties: target_name: Unspecified-2-HEX @@ -88,7 +87,7 @@ realms: value: 1.0 - name: viscosity type: constant - value: 9.99488e-4 + value: 9.99488e-4 boundary_conditions: @@ -119,7 +118,7 @@ realms: solution_options: name: myOptions turbulence_model: sst_ams - reset_AMS_averages_on_init: true + reset_AMS_averages_on_init: true projected_timescale_type: momentum_diag_inv fix_pressure_at_node: @@ -162,7 +161,7 @@ realms: ndtw: element - relaxation_factor: - velocity: 1.0 + velocity: 1.0 pressure: 1.0 turbulent_ke: 1.0 specific_dissipation_rate: 1.0 diff --git a/reg_tests/test_files/SSTAMSOversetRotCylinder/SSTAMSOversetRotCylinder_rst.yaml b/reg_tests/test_files/SSTAMSOversetRotCylinder/SSTAMSOversetRotCylinder_rst.yaml index ae9f7609e5..70d641e91f 100644 --- a/reg_tests/test_files/SSTAMSOversetRotCylinder/SSTAMSOversetRotCylinder_rst.yaml +++ b/reg_tests/test_files/SSTAMSOversetRotCylinder/SSTAMSOversetRotCylinder_rst.yaml @@ -40,7 +40,6 @@ realms: specific_dissipation_rate: solve_scalar pressure: solve_cont ndtw: solve_cont - time_averaged_model_split: solve_cont systems: - WallDistance: diff --git a/reg_tests/test_files/SSTLRAMSChannelEdge/SSTLRAMSChannelEdge.yaml b/reg_tests/test_files/SSTLRAMSChannelEdge/SSTLRAMSChannelEdge.yaml new file mode 100644 index 0000000000..2500eb8e69 --- /dev/null +++ b/reg_tests/test_files/SSTLRAMSChannelEdge/SSTLRAMSChannelEdge.yaml @@ -0,0 +1,205 @@ +Simulations: + - name: sim1 + time_integrator: ti_1 + optimizer: opt1 + +linear_solvers: + + - name: solve_scalar + type: tpetra + method: gmres + preconditioner: riluk + tolerance: 1e-5 + max_iterations: 200 + kspace: 200 + output_level: 0 + + - name: solve_cont + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 50 + kspace: 75 + output_level: 0 + bamg_coarsen_type: 8 + bamg_interp_type: 6 + bamg_cycle_type: 1 + +realms: + + - name: realm_1 + mesh: ../../mesh/periodicChannel.g + use_edges: yes + check_for_missing_bcs: yes + automatic_decomposition_type: rcb + + time_step_control: + target_courant: 1.0 + time_step_change_factor: 1.2 + + equation_systems: + name: theEqSys + max_iterations: 4 + + solver_system_specification: + velocity: solve_scalar + turbulent_ke: solve_scalar + specific_dissipation_rate: solve_scalar + pressure: solve_cont + ndtw: solve_cont + + systems: + - WallDistance: + name: myNDTW + max_iterations: 1 + convergence_tolerance: 1.0e-8 + + - LowMachEOM: + name: myLowMach + max_iterations: 1 + convergence_tolerance: 1e-8 + + - ShearStressTransport: + name: mySST + max_iterations: 1 + convergence_tolerance: 1e-8 + + initial_conditions: + - constant: ic_1 + target_name: Unspecified-2-HEX + value: + pressure: 0 + velocity: [22.0,0.0,0.0] + turbulent_ke: 0.05 + specific_dissipation_rate: 3528.0 + + material_properties: + target_name: Unspecified-2-HEX + specifications: + - name: density + type: constant + value: 1.0 + - name: viscosity + type: constant + value: 9.99488e-4 + + boundary_conditions: + + - wall_boundary_condition: bc_bot + target_name: bottom + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - wall_boundary_condition: bc_top + target_name: top + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - periodic_boundary_condition: bc_inlet_outlet + target_name: [inlet, outlet] + periodic_user_data: + search_tolerance: 0.001 + + - periodic_boundary_condition: bc_front_back + target_name: [front, back] + periodic_user_data: + search_tolerance: 0.001 + + solution_options: + name: myOptions + turbulence_model: sstlr + projected_timescale_type: momentum_diag_inv + + fix_pressure_at_node: + value: 0.0 + node_lookup_type: spatial_location + location: [ 1.0, 1.0, 1.0 ] + search_target_part: [Unspecified-2-HEX] + search_method: stk_kdtree + + options: + - hybrid_factor: + velocity: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - alpha_upw: + velocity: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - upw_factor: + velocity: 1.0 + turbulent_ke: 0.0 + specific_dissipation_rate: 0.0 + + - noc_correction: + pressure: yes + + - limiter: + pressure: no + velocity: yes + turbulent_ke: yes + specific_dissipation_rate: yes + + - projected_nodal_gradient: + velocity: element + pressure: element + turbulent_ke: element + specific_dissipation_rate: element + ndtw: element + + - relaxation_factor: + velocity: 1.0 + pressure: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - turbulence_model_constants: + SDRWallFactor: 0.625 + sigmaKOne: 0.5 + sigmaWOne: 0.5 + + - source_terms: + momentum: body_force + + - source_term_parameters: + momentum: [1.00, 0.0, 0.0] + + restart: + restart_data_base_name: SSTLRAMSChannelEdge.rst + restart_frequency: 10 + restart_start: 0 + + output: + output_data_base_name: SSTLRAMSChannelEdge.e + output_frequency: 10 + output_node_set: no + output_variables: + - velocity + - pressure + - pressure_force + - tau_wall + - turbulent_ke + - specific_dissipation_rate + - minimum_distance_to_wall + - turbulent_viscosity + - element_courant + +Time_Integrators: + - StandardTimeIntegrator: + name: ti_1 + start_time: 0 + time_step: 2.0e-3 + termination_step_count: 10 + time_stepping_type: fixed + time_step_count: 0 + second_order_accuracy: yes + + realms: + - realm_1 diff --git a/reg_tests/test_files/SSTLRAMSChannelEdge/SSTLRAMSChannelEdge_rst.yaml b/reg_tests/test_files/SSTLRAMSChannelEdge/SSTLRAMSChannelEdge_rst.yaml new file mode 100644 index 0000000000..abf1b829c9 --- /dev/null +++ b/reg_tests/test_files/SSTLRAMSChannelEdge/SSTLRAMSChannelEdge_rst.yaml @@ -0,0 +1,223 @@ +Simulations: + - name: sim1 + time_integrator: ti_1 + optimizer: opt1 + +linear_solvers: + + - name: solve_scalar + type: tpetra + method: gmres + preconditioner: riluk + tolerance: 1e-5 + max_iterations: 200 + kspace: 200 + output_level: 0 + + - name: solve_cont + type: hypre + method: hypre_gmres + preconditioner: boomerAMG + tolerance: 1e-5 + max_iterations: 50 + kspace: 75 + output_level: 0 + bamg_coarsen_type: 8 + bamg_interp_type: 6 + bamg_cycle_type: 1 + +realms: + + - name: realm_1 + mesh: SSTLRAMSChannelEdge.rst + use_edges: yes + check_for_missing_bcs: yes + support_inconsistent_multi_state_restart: yes + + time_step_control: + target_courant: 1.0 + time_step_change_factor: 1.2 + + equation_systems: + name: theEqSys + max_iterations: 4 + + solver_system_specification: + velocity: solve_scalar + turbulent_ke: solve_scalar + specific_dissipation_rate: solve_scalar + pressure: solve_cont + ndtw: solve_cont + + systems: + - WallDistance: + name: myNDTW + max_iterations: 1 + convergence_tolerance: 1.0e-8 + + - LowMachEOM: + name: myLowMach + max_iterations: 1 + convergence_tolerance: 1e-8 + + - ShearStressTransport: + name: mySST + max_iterations: 1 + convergence_tolerance: 1e-8 + + initial_conditions: + - constant: ic_1 + target_name: Unspecified-2-HEX + value: + pressure: 0 + velocity: [22.0,0.0,0.0] + turbulent_ke: 0.0005 + specific_dissipation_rate: 0.0005 + average_velocity: [22.78,0.0,0.0] + average_tke_resolved: 0.0 + average_dudx: 0.0 + k_ratio: 1.0 + avg_res_adequacy_parameter: 1.0 + + material_properties: + target_name: Unspecified-2-HEX + specifications: + - name: density + type: constant + value: 1.0 + - name: viscosity + type: constant + value: 9.99488e-4 + + boundary_conditions: + + - wall_boundary_condition: bc_bot + target_name: bottom + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - wall_boundary_condition: bc_top + target_name: top + wall_user_data: + velocity: [0,0,0] + turbulent_ke: 0.0 + use_wall_function: no + + - periodic_boundary_condition: bc_inlet_outlet + target_name: [inlet, outlet] + periodic_user_data: + search_tolerance: 0.001 + + - periodic_boundary_condition: bc_front_back + target_name: [front, back] + periodic_user_data: + search_tolerance: 0.001 + + solution_options: + name: myOptions + turbulence_model: sstlr_ams + reset_AMS_averages_on_init: true + projected_timescale_type: momentum_diag_inv + + fix_pressure_at_node: + value: 0.0 + node_lookup_type: spatial_location + location: [ 1.0, 1.0, 1.0 ] + search_target_part: [Unspecified-2-HEX] + search_method: stk_kdtree + + options: + - hybrid_factor: + velocity: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - alpha_upw: + velocity: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - upw_factor: + velocity: 1.0 + turbulent_ke: 0.0 + specific_dissipation_rate: 0.0 + + - noc_correction: + pressure: yes + + - limiter: + pressure: no + velocity: yes + turbulent_ke: yes + specific_dissipation_rate: yes + + - projected_nodal_gradient: + velocity: element + pressure: element + turbulent_ke: element + specific_dissipation_rate: element + ndtw: element + + - relaxation_factor: + velocity: 1.0 + pressure: 1.0 + turbulent_ke: 1.0 + specific_dissipation_rate: 1.0 + + - turbulence_model_constants: + SDRWallFactor: 0.625 + forcingFactor: 32.0 + sigmaKOne: 0.5 + sigmaWOne: 0.5 + + - source_terms: + momentum: body_force + + - source_term_parameters: + momentum: [1.00, 0.0, 0.0] + + restart: + restart_data_base_name: SSTLRAMSChannelEdge-ams.rst + restart_frequency: 10 + restart_start: 0 + restart_time: 100 + + output: + output_data_base_name: SSTLRAMSChannelEdge-ams.e + output_frequency: 10 + output_node_set: no + output_variables: + - velocity + - average_velocity + - pressure + - pressure_force + - tau_wall + - turbulent_ke + - specific_dissipation_rate + - minimum_distance_to_wall + - turbulent_viscosity + - k_ratio + - rans_time_scale + - average_mass_flow_rate + - average_tke_resolved + - avg_res_adequacy_parameter + - resolution_adequacy_parameter + - metric_tensor + - element_courant + - average_production + - average_dudx + +Time_Integrators: + - StandardTimeIntegrator: + name: ti_1 + start_time: 0 + time_step: 2.0e-3 + termination_step_count: 20 + time_stepping_type: fixed + time_step_count: 0 + second_order_accuracy: yes + + realms: + - realm_1 diff --git a/reg_tests/test_files/ablNeutralEdgeAMS/ablNeutralEdgeAMS.yaml b/reg_tests/test_files/ablNeutralEdgeAMS/ablNeutralEdgeAMS.yaml index 75c6af29dc..035b7215cd 100644 --- a/reg_tests/test_files/ablNeutralEdgeAMS/ablNeutralEdgeAMS.yaml +++ b/reg_tests/test_files/ablNeutralEdgeAMS/ablNeutralEdgeAMS.yaml @@ -68,7 +68,6 @@ realms: specific_dissipation_rate: solve_scalar pressure: solve_cont ndtw: solve_cont - time_averaged_model_split: solve_cont # This defines the equation systems, maximum number of inner iterations, # and scaled nonlinear residual tolerance. @@ -77,14 +76,14 @@ realms: name: myNDTW max_iterations: 1 convergence_tolerance: 1e-8 - + - LowMachEOM: name: myLowMach max_iterations: 1 convergence_tolerance: 1e-8 - ShearStressTransport: - name: mySST + name: mySST max_iterations: 1 convergence_tolerance: 1e-8 @@ -138,7 +137,7 @@ realms: - periodic_boundary_condition: bc_east_west target_name: [east, west] periodic_user_data: - search_tolerance: 0.0001 + search_tolerance: 0.0001 - abltop_boundary_condition: bc_upper target_name: upper @@ -241,7 +240,7 @@ realms: - source_terms: momentum: - - EarthCoriolis + - EarthCoriolis - abl_forcing - user_constants: diff --git a/reg_tests/test_files/amsChannelEdge/amsChannelEdge.yaml b/reg_tests/test_files/amsChannelEdge/amsChannelEdge.yaml index e4018bb48e..89386bef5c 100644 --- a/reg_tests/test_files/amsChannelEdge/amsChannelEdge.yaml +++ b/reg_tests/test_files/amsChannelEdge/amsChannelEdge.yaml @@ -30,7 +30,7 @@ realms: - name: realm_1 mesh: ../../mesh/periodicChannel.g - use_edges: yes + use_edges: yes check_for_missing_bcs: yes automatic_decomposition_type: rcb @@ -48,7 +48,6 @@ realms: specific_dissipation_rate: solve_scalar pressure: solve_cont ndtw: solve_cont - time_averaged_model_split: solve_cont systems: - WallDistance: @@ -73,12 +72,12 @@ realms: pressure: 0 velocity: [22.0,0.0,0.0] turbulent_ke: 0.05 - specific_dissipation_rate: 3528.0 + specific_dissipation_rate: 3528.0 average_velocity: [22.78,0.0,0.0] average_tke_resolved: 0.0 average_dudx: 0.0 k_ratio: 1.0 - avg_res_adequacy_parameter: 1.0 + avg_res_adequacy_parameter: 1.0 material_properties: target_name: Unspecified-2-HEX @@ -88,7 +87,7 @@ realms: value: 1.0 - name: viscosity type: constant - value: 9.99488e-4 + value: 9.99488e-4 boundary_conditions: @@ -119,7 +118,7 @@ realms: solution_options: name: myOptions turbulence_model: sst_ams - reset_AMS_averages_on_init: true + reset_AMS_averages_on_init: true projected_timescale_type: momentum_diag_inv fix_pressure_at_node: @@ -162,7 +161,7 @@ realms: ndtw: element - relaxation_factor: - velocity: 1.0 + velocity: 1.0 pressure: 1.0 turbulent_ke: 1.0 specific_dissipation_rate: 1.0 diff --git a/reg_tests/test_files/amsChannelEdge/amsChannelEdge_rst.yaml b/reg_tests/test_files/amsChannelEdge/amsChannelEdge_rst.yaml index 54c65f5a51..e981ec61ff 100644 --- a/reg_tests/test_files/amsChannelEdge/amsChannelEdge_rst.yaml +++ b/reg_tests/test_files/amsChannelEdge/amsChannelEdge_rst.yaml @@ -30,7 +30,7 @@ realms: - name: realm_1 mesh: amsChannelEdge.rst - use_edges: yes + use_edges: yes check_for_missing_bcs: yes support_inconsistent_multi_state_restart: yes @@ -48,7 +48,6 @@ realms: specific_dissipation_rate: solve_scalar pressure: solve_cont ndtw: solve_cont - time_averaged_model_split: solve_cont systems: - WallDistance: @@ -78,7 +77,7 @@ realms: average_tke_resolved: 0.0 average_dudx: 0.0 k_ratio: 1.0 - avg_res_adequacy_parameter: 1.0 + avg_res_adequacy_parameter: 1.0 material_properties: target_name: Unspecified-2-HEX @@ -88,7 +87,7 @@ realms: value: 1.0 - name: viscosity type: constant - value: 9.99488e-4 + value: 9.99488e-4 boundary_conditions: @@ -119,7 +118,7 @@ realms: solution_options: name: myOptions turbulence_model: sst_ams - reset_AMS_averages_on_init: false + reset_AMS_averages_on_init: false projected_timescale_type: momentum_diag_inv fix_pressure_at_node: @@ -162,7 +161,7 @@ realms: ndtw: element - relaxation_factor: - velocity: 1.0 + velocity: 1.0 pressure: 1.0 turbulent_ke: 1.0 specific_dissipation_rate: 1.0