Commits

Satish Balay committed a5d5ffe Merge

Merge branch 'master' into next

Comments (0)

Files changed (2)

include/finclude/petscksp.h

 !
 !   Possible arguments to KSPMonitorSet()
 !
-      external KSPDEFAULTCONVERGED
+      external KSPCONVERGEDDEFAULT
       external KSPMONITORDEFAULT
       external KSPMONITORTRUERESIDUALNORM
       external KSPMONITORLGRESIDUALNORM

include/finclude/petscsnes.h

       external SNESMONITORSOLUTIONUPDATE
 
       external SNESCONVERGEDDEFAULT
-      external SNESSKIPCONVERGED
+      external SNESCONVERGEDSKIP
 
 !
 ! SNESNGMRESRestartType