From 4cb5bb2dd92e3f095ce7053bf8070722c0e16422 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Thu, 5 Sep 2024 13:40:55 -0600 Subject: [PATCH] Use GPU capable bamg_relax_type. --- reg_tests/hypre_settings/hypre_blade_resolved.yaml | 4 ++-- .../fsiTurbineSurrogate/fsiTurbineSurrogate.yaml | 8 ++++---- .../test_files/multiElemCylinder/multiElemCylinder.yaml | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/reg_tests/hypre_settings/hypre_blade_resolved.yaml b/reg_tests/hypre_settings/hypre_blade_resolved.yaml index 538e62946..a12be0882 100644 --- a/reg_tests/hypre_settings/hypre_blade_resolved.yaml +++ b/reg_tests/hypre_settings/hypre_blade_resolved.yaml @@ -1,6 +1,6 @@ hypre_simple_precon: bamg_max_levels: 1 - bamg_relax_type: 12 # Use 11 for Hypre master or v2.21 and later, 8 for earlier + bamg_relax_type: 18 # Use 11 for Hypre master or v2.21 and later, 8 for earlier, 18 for SyCL bamg_num_sweeps: 2 bamg_relax_order: 0 @@ -8,7 +8,7 @@ hypre_elliptic: bamg_max_levels: 7 bamg_coarsen_type: 8 # 10 for CPUs (HMIS). For GPUs, use 8 (PMIS) bamg_interp_type: 6 - bamg_relax_type: 11 # Use 11 for Hypre master or v2.21 and later, 8 for earlier + bamg_relax_type: 18 # Use 11 for Hypre master or v2.21 and later, 8 for earlier, 18 for SyCL #bamg_num_sweeps: 2 bamg_num_up_sweeps: 1 bamg_num_down_sweeps: 2 diff --git a/reg_tests/test_files/fsiTurbineSurrogate/fsiTurbineSurrogate.yaml b/reg_tests/test_files/fsiTurbineSurrogate/fsiTurbineSurrogate.yaml index 17aa20e7f..e2806020a 100644 --- a/reg_tests/test_files/fsiTurbineSurrogate/fsiTurbineSurrogate.yaml +++ b/reg_tests/test_files/fsiTurbineSurrogate/fsiTurbineSurrogate.yaml @@ -20,7 +20,7 @@ linear_solvers: dump_hypre_matrix_stats: no bamg_max_levels: 1 - bamg_relax_type: 12 + bamg_relax_type: 18 bamg_num_sweeps: 2 bamg_cycle_type: 1 bamg_relax_order: 0 @@ -44,7 +44,7 @@ linear_solvers: dump_hypre_matrix_stats: no bamg_max_levels: 1 - bamg_relax_type: 12 + bamg_relax_type: 18 bamg_num_sweeps: 2 bamg_cycle_type: 1 bamg_relax_order: 0 @@ -71,7 +71,7 @@ linear_solvers: #bamg_max_levels: 7 bamg_coarsen_type: 8 bamg_interp_type: 6 - bamg_relax_type: 11 + bamg_relax_type: 18 bamg_cycle_type: 1 bamg_relax_order: 0 bamg_keep_transpose: 1 @@ -107,7 +107,7 @@ linear_solvers: bamg_max_levels: 7 bamg_coarsen_type: 8 bamg_interp_type: 6 - bamg_relax_type: 11 + bamg_relax_type: 18 bamg_num_sweeps: 2 bamg_cycle_type: 1 bamg_relax_order: 0 diff --git a/reg_tests/test_files/multiElemCylinder/multiElemCylinder.yaml b/reg_tests/test_files/multiElemCylinder/multiElemCylinder.yaml index 4e78f6b52..d44fb3a82 100644 --- a/reg_tests/test_files/multiElemCylinder/multiElemCylinder.yaml +++ b/reg_tests/test_files/multiElemCylinder/multiElemCylinder.yaml @@ -27,7 +27,7 @@ linear_solvers: dump_hypre_matrix_stats: no bamg_max_levels: 1 - bamg_relax_type: 12 + bamg_relax_type: 18 bamg_num_sweeps: 2 bamg_cycle_type: 1 bamg_relax_order: 0 @@ -52,7 +52,7 @@ linear_solvers: dump_hypre_matrix_stats: no bamg_max_levels: 1 - bamg_relax_type: 12 + bamg_relax_type: 18 bamg_num_sweeps: 2 bamg_cycle_type: 1 bamg_relax_order: 0 @@ -79,7 +79,7 @@ linear_solvers: #bamg_max_levels: 7 bamg_coarsen_type: 8 bamg_interp_type: 6 - bamg_relax_type: 11 + bamg_relax_type: 18 bamg_cycle_type: 1 bamg_relax_order: 0 bamg_keep_transpose: 1 @@ -119,7 +119,7 @@ linear_solvers: bamg_max_levels: 7 bamg_coarsen_type: 8 bamg_interp_type: 6 - bamg_relax_type: 11 + bamg_relax_type: 18 bamg_num_sweeps: 2 bamg_cycle_type: 1 bamg_relax_order: 0