Hook up the GMRES restart option (and make setting it optional).

Author: jrper

femtools/Solvers.F90

@@ -1578,7 +1578,7 @@ recursive subroutine setup_ksp_from_options(ksp, mat, pmat, solver_option_path,
     KSPType ksptype
     PC pc
     PetscReal rtol, atol, dtol
-    PetscInt max_its
+    PetscInt max_its, lrestart
     PetscErrorCode ierr
     PetscObject vf
 
@@ -1611,6 +1611,15 @@ recursive subroutine setup_ksp_from_options(ksp, mat, pmat, solver_option_path,
     call KSPSetType(ksp, ksptype, ierr)
     ewrite(2, *) 'ksp_type:', trim(ksptype)
 
+    if(trim(ksptype) == 'gmres') then
+       call get_option(trim(solver_option_path)//&
+            '/iterative_method::gmres/restart', lrestart, default=-1)
+       if (lrestart >= 0) then
+          call KSPGMRESSetRestart(ksp, lrestart, ierr)
+          ewrite(2, *) 'restart:', lrestart
+       end if
+    end if
+
     ! set max. iterations and tolerances:
     ! =======================================
     call get_option(trim(solver_option_path)//'/relative_error', rtol)

schemas/solvers.rnc

@@ -113,10 +113,10 @@ kspgmres_options =
          attribute name { "gmres" },
          ## Restart value for gmres iteration
          ## Higher values give better convergence but require more memory.
-         ## Suggested value: 30
+         ## Default value: 30
          element restart {
             integer
-         }
+         }?
       }
    )
 

schemas/solvers.rng

@@ -110,12 +110,14 @@ Your safest bet for non-symmetric systems.</a:documentation>
       <attribute name="name">
         <value>gmres</value>
       </attribute>
-      <element name="restart">
-        <a:documentation>Restart value for gmres iteration
+      <optional>
+        <element name="restart">
+          <a:documentation>Restart value for gmres iteration
 Higher values give better convergence but require more memory.
-Suggested value: 30</a:documentation>
-        <ref name="integer"/>
-      </element>
+Default value: 30</a:documentation>
+          <ref name="integer"/>
+        </element>
+      </optional>
     </element>
   </define>
   <define name="kspcg_options">