Merge pull request #26365 from lindsayad/respect-options-left-10396

Respect options_left set in petsc_options
idaholab · Dec 19, 2023 · 7d1e620 · 7d1e620
2 parents eebfa9f + 5f591ea
commit 7d1e620
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/framework/src/utils/PetscSupport.C b/framework/src/utils/PetscSupport.C
@@ -820,7 +820,7 @@ processPetscPairs(const std::vector<std::pair<MooseEnumItem, std::string>> & pet
   // Turn off default options_left warnings added in 3.19.3 pre-release for all PETSc builds
   // (PETSc commit: 59f199a7), unless the user has set a preference.
 #if !PETSC_VERSION_LESS_THAN(3, 19, 2)
-  if (!options_left_set)
+  if (!options_left_set && !po.flags.contains("-options_left"))
     po.pairs.emplace_back("-options_left", "0");
 #endif
 }

diff --git a/test/tests/misc/petsc_option_left/tests b/test/tests/misc/petsc_option_left/tests
@@ -5,6 +5,7 @@
   [test_options_not_left]
     type = RunApp
     input = '2d_diffusion_petsc_option.i'
+    expect_out = 'PETSc Option Table'
     absent_out = "Option left.*value.*hypre"
     requirement = "The system shall use the default PETSc option database in the parent app to handle system-level PETSc parameters"
   []