Merge pull request #5 from firedrakeproject/connorjward/merge-upstream

Merge upstream

docs/manual/intro.tex

@@ -352,7 +352,6 @@ \subsection{Simple SLEPc Example}
         MatCreate(MPI_Comm comm,Mat *A);
         MatSetSizes(Mat A,PetscInt m,PetscInt n,PetscInt M,PetscInt N);
         MatSetFromOptions(Mat A);
-        MatSetUp(Mat A);
         \end{Verbatim}
 where the matrix format can be specified at runtime. The example creates a matrix, sets the nonzero values with \rutina{MatSetValues} and then assembles it.
 

gmakefile

@@ -50,6 +50,7 @@ libslepcall := $(if $(filter-out no,$(BUILDSHAREDLIB)),$(libslepcall_shared),$(l
 generated      := $(PETSC_ARCH)/lib/slepc/conf/files
 
 slepc_libs : $(libslepcall)
+
 .PHONY: slepc_libs
 
 .SECONDEXPANSION:               # to expand $$(@D)/.DIR
@@ -61,7 +62,7 @@ $(generated) : $(slepcconf) $(slepcvariables) $(PETSCCONFIGDIR)/gmakegen.py
 	$(PYTHON) $(PETSCCONFIGDIR)/gmakegen.py --petsc-arch=$(PETSC_ARCH_DIR) --pkg-dir=$(SLEPC_DIR) --pkg-name=slepc --pkg-pkgs=$(spkgs) --pkg-arch=$(PETSC_ARCH)
 
 # Skip including generated files (which triggers rebuilding them) when we're just going to clean anyway.
-ifneq ($(filter-out alletags deletefortranstubs allfortranstubs allfortranstubsinplace help clean check info gmakeinfo,$(MAKECMDGOALS:clean%=clean)),)
+ifneq ($(filter-out help clean distclean check info gmakeinfo checkbadSource deletefortranstubs allfortranstubs allfortranstubsinplace alletags lint_slepc get%,$(MAKECMDGOALS:clean%=clean)),)
 include $(generated)
 endif
 
@@ -144,7 +145,7 @@ define ARCHIVE_RECIPE_DEFAULT
 endef
 
 %.$(AR_LIB_SUFFIX) : $$(obj) | $$(@D)/.DIR
-	$(if $(findstring win_lib,$(AR)),$(ARCHIVE_RECIPE_WIN32FE_LIB),$(if $(findstring yes,$(AR_ARGFILE)),$(if $(GMAKE4),$(ARCHIVE_RECIPE_ARGFILE),$(ARCHIVE_RECIPE_DEFAULT)),$(ARCHIVE_RECIPE_DEFAULT)))
+	$(if $(findstring win32fe_lib,$(AR)),$(ARCHIVE_RECIPE_WIN32FE_LIB),$(if $(findstring yes,$(AR_ARGFILE)),$(if $(GMAKE4),$(ARCHIVE_RECIPE_ARGFILE),$(ARCHIVE_RECIPE_DEFAULT)),$(ARCHIVE_RECIPE_DEFAULT)))
 
 # with-single-library=0
 libpkg = $(foreach pkg, $1, $(LIBDIR)/libslepc$(pkg).$(SL_LINKER_SUFFIX))
@@ -231,7 +232,7 @@ $(OBJDIR)/src/mfn/f90-mod/slepcmfnmod.o   : $(OBJDIR)/src/sys/classes/bv/f90-mod
 $(OBJDIR)/src/lme/f90-mod/slepclmemod.o   : $(OBJDIR)/src/sys/classes/bv/f90-mod/slepcbvmod.o
 $(OBJDIR)/src/eps/f90-mod/slepcepsmod.o   : $(OBJDIR)/src/sys/classes/bv/f90-mod/slepcbvmod.o $(OBJDIR)/src/sys/classes/fn/f90-mod/slepcfnmod.o $(OBJDIR)/src/sys/classes/ds/f90-mod/slepcdsmod.o $(OBJDIR)/src/sys/classes/rg/f90-mod/slepcrgmod.o $(OBJDIR)/src/sys/classes/st/f90-mod/slepcstmod.o $(OBJDIR)/src/lme/f90-mod/slepclmemod.o
 $(OBJDIR)/src/pep/f90-mod/slepcpepmod.o   : $(OBJDIR)/src/eps/f90-mod/slepcepsmod.o
-$(OBJDIR)/src/nep/f90-mod/slepcnepmod.o   : $(OBJDIR)/src/pep/f90-mod/slepcpepmod.o
+$(OBJDIR)/src/nep/f90-mod/slepcnepmod.o   : $(OBJDIR)/src/pep/f90-mod/slepcpepmod.o $(OBJDIR)/src/mfn/f90-mod/slepcmfnmod.o
 $(OBJDIR)/src/svd/f90-mod/slepcsvdmod.o   : $(OBJDIR)/src/eps/f90-mod/slepcepsmod.o
 
 # all sources should get recompiled when slepcvariables changes (i.e when configure is rerun or when slepcvariables is manually edited.)
@@ -283,22 +284,37 @@ gmakeinfo:
 	-@echo "-----------------------------------------"
 	-@echo "Using C/C++ include paths: ${SLEPC_CC_INCLUDES}"
 	-@echo "Using C compile: ${PETSC_CCOMPILE_SINGLE}"
-	-@if [ "${CXX}" != "" ]; then \
-           echo "Using C++ compile: ${PETSC_CXXCOMPILE_SINGLE}";\
-         fi
+	-@if [  "${MPICC_SHOW}" != "" ]; then \
+             printf  "mpicc -show: %b\n" "${MPICC_SHOW}";\
+          fi; \
+        printf  "C compiler version: %b\n" "${C_VERSION}"; \
+        if [ "${CXX}" != "" ]; then \
+        echo "Using C++ compile: ${PETSC_CXXCOMPILE_SINGLE}";\
+        if [ "${MPICXX_SHOW}" != "" ]; then \
+               printf "mpicxx -show: %b\n" "${MPICXX_SHOW}"; \
+            fi;\
+            printf  "C++ compiler version: %b\n" "${Cxx_VERSION}"; \
+          fi
 	-@if [ "${FC}" != "" ]; then \
 	   echo "Using Fortran include/module paths: ${SLEPC_FC_INCLUDES}";\
 	   echo "Using Fortran compile: ${PETSC_FCOMPILE_SINGLE}";\
+           if [ "${MPIFC_SHOW}" != "" ]; then \
+             printf "mpif90 -show: %b\n" "${MPIFC_SHOW}"; \
+           fi; \
+             printf  "Fortran compiler version: %b\n" "${FC_VERSION}"; \
          fi
 	-@if [ "${CUDAC}" != "" ]; then \
-           echo "Using CUDA compile: ${PETSC_CUCOMPILE_SINGLE}";\
+	   echo "Using CUDA compile: ${PETSC_CUCOMPILE_SINGLE}";\
          fi
+	-@if [ "${CLANGUAGE}" = "CXX" ]; then \
+           echo "Using C++ compiler to compile PETSc";\
+        fi
 	-@echo "-----------------------------------------"
 	-@echo "Using C/C++ linker: ${PCC_LINKER}"
 	-@echo "Using C/C++ flags: ${PCC_LINKER_FLAGS}"
 	-@if [ "${FC}" != "" ]; then \
-           echo "Using Fortran linker: ${FC_LINKER}";\
-           echo "Using Fortran flags: ${FC_LINKER_FLAGS}";\
+	   echo "Using Fortran linker: ${FC_LINKER}";\
+	   echo "Using Fortran flags: ${FC_LINKER_FLAGS}";\
          fi
 	-@echo "-----------------------------------------"
 	-@echo "Using libraries: ${SLEPC_LIB}"

gmakefile.test

@@ -7,7 +7,7 @@ CONFIGDIR := $(SLEPC_DIR)/config
 # TESTSRCDIR is always relative to gmakefile.test
 #  This must be before includes
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
-TESTSRCDIR := $(dir $(mkfile_path))src
+TESTSRCDIR ?= $(dir $(mkfile_path))src
 
 -include $(SLEPC_DIR)/$(PETSC_ARCH)/lib/slepc/conf/slepcvariables
 -include $(SLEPC_DIR)/lib/slepc/conf/slepc_variables
@@ -116,7 +116,7 @@ endif
 $(generatedtest) : $(slepcconf) $(slepcvariables) $(PETSCCONFIGDIR)/gmakegentest.py $(TESTDIR)/.DIR | $$(@D)/.DIR
 	$(PYTHON) $(PETSCCONFIGDIR)/gmakegentest.py --petsc-dir=$(PETSC_DIR) --petsc-arch=$(PETSC_ARCH_DIR) --testdir=$(TESTDIR) --srcdir=$(TESTSRCDIR) --pkg-name=slepc --pkg-pkgs=$(spkgs) --pkg-arch=$(PETSC_ARCH) --pkg-dir=$(SLEPC_DIR)
 
-ifneq ($(filter-out help clean check info gmakeinfo slepc_libs all install install-lib checkbadSource checkbadFileChange deletefortranstubs allfortranstubs allfortranstubsinplace alletags get%,$(MAKECMDGOALS:clean%=clean)),)
+ifneq ($(filter-out help clean distclean check info gmakeinfo slepc_libs all install install-lib checkbadSource deletefortranstubs allfortranstubs allfortranstubsinplace alletags lint_slepc get%,$(MAKECMDGOALS:clean%=clean)),)
 include $(generatedtest)
 endif
 
@@ -159,6 +159,7 @@ endif
 # The solution is not ideal in the sense we have to duplicate the same workaround to any external libraries
 # using C++17 inline static variables. We have to wait for GNU to clarify this issue.
 PETSC_COMPILE.kokkos.cxx = $(filter-out -fvisibility=hidden,$(subst -Xcompiler -fvisibility=hidden ,,$(strip $(KOKKOS_COMPILE))))
+KOKKOS_LINKER = $(filter-out -fvisibility=hidden,$(subst -Xcompiler -fvisibility=hidden ,,$(strip $(CLINKER))))
 
 ifneq ($(RAJA_USE_CUDA_COMPILER),)
   PETSC_COMPILE.raja.cxx  = ${CUDAC} $(MPICXX_INCLUDES) ${CUDAC_FLAGS} -x cu -Xcudafe "--display_error_number" -c --compiler-options="${PETSC_CXXCPPFLAGS} ${PETSC_CC_INCLUDES} ${CUDA_CXXFLAGS}" --expt-extended-lambda --expt-relaxed-constexpr
@@ -271,7 +272,7 @@ $(testexe.hip.cpp) : $(TESTDIR)/% : $(TESTDIR)/%.o $$^ $(libpetscall)
 	-$(call macos-firewall-register,$@)
 
 $(testexe.kokkos.cxx) : $(TESTDIR)/% : $(TESTDIR)/%.o $$^ $(libslepcall)
-	$(call quiet,CLINKER) $(EXEFLAGS) -o $@ $^ $(SLEPC_TEST_LIB)
+	$(call quiet,KOKKOS_LINKER) $(EXEFLAGS) -o $@ $^ $(SLEPC_TEST_LIB)
 	-$(call macos-firewall-register,$@)
 
 $(testexe.raja.cxx) : $(TESTDIR)/% : $(TESTDIR)/%.o $$^ $(libpetscall)
@@ -433,7 +434,7 @@ help: help-make ${helpdeps}
 help-make:
 	-@echo
 	-@echo "SLEPc makefile basic usage:"
-	-@echo "   make  rule <V=1 for verbose output> <other options>"
+	-@echo "  ${OMAKE} rule <V=1 for verbose output> <other options>"
 	-@echo
 
 help-nontest:
@@ -453,13 +454,17 @@ help-nontest:
 	-@echo "   test - use \"make -f gmakefile.test help\" for help on running the extensive tests"
 	-@echo
 	-@echo "Developer rules:"
-	-@echo "   clean - delete libraries and Fortran module files"
+	-@echo "   clean - delete libraries and Fortran module files (used in $SLEPC_DIR)"
 	-@echo "   lint_slepc - run lint on the source code, including its embedded documentation"
+	-@echo "           delete compiled examples, .o and related files (used in tutorials or test directories)"
 	-@echo "   allfortranstubs - regenerate Fortran stubs/interface definitions, needed after git pulls or source code changes"
 	-@echo "   deletefortranstubs - delete the generated Fortran stubs/interface definitions"
 	-@echo "   checkbadSource - check the source code for violations of coding standards"
 	-@echo "   abitest - Compare ABI/API of two versions of SLEPc library with the old one defined by SLEPC_DIR_ABI_OLD and PETSC_{DIR,ARCH}_ABI_OLD"
 	-@echo "   reconfigure - delete libraries and Fortran module files and run the previously run configure again"
+	-@echo "   lint_slepc - run lint on the source code, including its embedded documentation"
+	-@echo "     Run \"${OMAKE} help-lint\" for lint options"
+	-@echo "   "
 	-@echo "   "
 
 help-test:

include/slepc/private/bvimpl.h

@@ -212,7 +212,6 @@ static inline PetscErrorCode BV_SetMatrixDiagonal(BV bv,Vec vomega,Mat M)
   PetscCall(MatCreate(PetscObjectComm((PetscObject)bv),&Omega));
   PetscCall(MatSetSizes(Omega,bv->n,bv->n,bv->N,bv->N));
   PetscCall(MatSetType(Omega,Mtype));
-  PetscCall(MatSetUp(Omega));
   PetscCall(MatDiagonalSet(Omega,vomega,INSERT_VALUES));
   PetscCall(BVSetMatrix(bv,Omega,PETSC_TRUE));
   PetscCall(MatDestroy(&Omega));

include/slepcds.h

@@ -195,6 +195,7 @@ SLEPC_EXTERN PetscErrorCode DSSynchronize(DS,PetscScalar*,PetscScalar*);
 PETSC_DEPRECATED_FUNCTION(3, 18, 0, "DSGetMat()+MatDenseGetSubMatrix()+MatCopy()", ) static inline PetscErrorCode DSCopyMat(DS ds,DSMatType m,PetscInt mr,PetscInt mc,Mat A,PetscInt Ar,PetscInt Ac,PetscInt rows,PetscInt cols,PetscBool out)
 {
   Mat M,M0,A0;
+
   PetscFunctionBegin;
   PetscCall(DSGetMat(ds,m,&M));
   PetscCall(MatDenseGetSubMatrix(M,mr,mr+rows,mc,mc+cols,&M0));

include/slepcmat.h

@@ -25,6 +25,7 @@ SLEPC_EXTERN PetscErrorCode MatNormEstimate(Mat,Vec,Vec,PetscReal*);
 PETSC_DEPRECATED_FUNCTION(3, 6, 0, "MatCreateRedundantMatrix() followed by MatConvert()", ) static inline PetscErrorCode SlepcMatConvertSeqDense(Mat mat,Mat *newmat)
 {
   Mat Ar;
+
   PetscFunctionBegin;
   PetscCall(MatCreateRedundantMatrix(mat,0,PETSC_COMM_SELF,MAT_INITIAL_MATRIX,&Ar));
   PetscCall(MatConvert(Ar,MATSEQDENSE,MAT_INITIAL_MATRIX,newmat));

include/slepcst.h

@@ -72,6 +72,7 @@ PETSC_DEPRECATED_FUNCTION(3, 15, 0, "STGetMatrixTransformed()", ) static inline
 PETSC_DEPRECATED_FUNCTION(3, 15, 0, "STGetOperator() followed by MatComputeOperator()", ) static inline PetscErrorCode STComputeExplicitOperator(ST st,Mat *A)
 {
   Mat Op;
+
   PetscFunctionBegin;
   PetscCall(STGetOperator(st,&Op));
   PetscCall(MatComputeOperator(Op,MATAIJ,A));

include/slepcversion.h

@@ -14,7 +14,7 @@
 #define SLEPC_VERSION_RELEASE    0
 #define SLEPC_VERSION_MAJOR      3
 #define SLEPC_VERSION_MINOR      20
-#define SLEPC_VERSION_SUBMINOR   1
+#define SLEPC_VERSION_SUBMINOR   2
 #define SLEPC_RELEASE_DATE       "September 29, 2023"
 #define SLEPC_VERSION_DATE       "unknown"
 

lib/slepc/bin/maint/fixinclude.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Used by the makefile lib/petsc/conf/rules html to replace #includes in the source files with links when possible
 

lib/slepc/bin/maint/generateetags.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-#!/bin/env python3
 #
 #    Generates etag and ctag (use -noctags to skip generation of ctags) files for SLEPc
 #    Adds file names to list of tags in a TAGS file
@@ -147,7 +146,7 @@ def main(ctags):
     ctagfile = None
   flist = []
   if os.path.isdir('.git'):
-    output = subprocess.check_output('git ls-files | grep -E -v \(^\(docs/\|share/slepc/datafiles/\)\|/output/\|\.\(png\|pdf\|ps\|ppt\|jpg\|tex\)$\)', shell=True)
+    output = subprocess.check_output(f'git ls-files | grep -E -v \(^\(docs/\|share/slepc/datafiles/\)\|/output/\|\.\(png\|pdf\|ps\|ppt\|jpg\|tex\)$\)', shell=True)
     flist = output.decode(sys.getfilesystemencoding()).splitlines()
   else:
     for dirpath, dirnames, filenames in os.walk(os.getcwd()):

lib/slepc/bin/maint/generatefortranstubs.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-#!/bin/env python3
 #
 #    Generates fortran stubs for PETSc using the Sowing bfort program
 #

lib/slepc/bin/maint/wwwindex.py

@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-#!/bin/env python
+#!/usr/bin/env python3
 
 """ Reads in all the generated manual pages, and creates the index
 for the manualpages, ordering the indices into sections based

makefile

@@ -44,7 +44,7 @@ all:
 	@ln -sf ${PETSC_ARCH}/lib/slepc/conf/make.log make.log
 	+@${OMAKE_SELF_PRINTDIR} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} SLEPC_DIR=${SLEPC_DIR} all-local 2>&1 | tee -a ${PETSC_ARCH}/lib/slepc/conf/make.log;
 	@grep -E '(out of memory allocating.*after a total of|gfortran: fatal error: Killed signal terminated program f951|f95: fatal error: Killed signal terminated program f951)' ${PETSC_ARCH}/lib/slepc/conf/make.log | tee ${PETSC_ARCH}/lib/slepc/conf/memoryerror.log > /dev/null
-	@grep -E -i "( error | error: |no such file or directory)" ${PETSC_ARCH}/lib/slepc/conf/make.log | tee ./${PETSC_ARCH}/lib/slepc/conf/error.log > /dev/null
+	@grep -v "using error" ${PETSC_ARCH}/lib/slepc/conf/make.log > /dev/null | grep -E -i "( error | error: |no such file or directory)" | tee ./${PETSC_ARCH}/lib/slepc/conf/error.log
 	+@if test -s ${PETSC_ARCH}/lib/slepc/conf/memoryerror.log; then \
            printf ${PETSC_TEXT_HILIGHT}"**************************ERROR*************************************\n" 2>&1 | tee -a ${PETSC_ARCH}/lib/slepc/conf/make.log; \
            echo "  Error during compile, you need to increase the memory allocated to the VM and rerun " 2>&1 | tee -a ${PETSC_ARCH}/lib/slepc/conf/make.log; \

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 SLEPc: Scalable Library for Eigenvalue Problem Computations

share/slepc/Makefile.user

@@ -8,23 +8,23 @@ petsc.pc := $(PETSC_DIR)/$(PETSC_ARCH)/lib/pkgconfig/petsc.pc
 slepc.pc := $(SLEPC_DIR)/$(PETSC_ARCH)/lib/pkgconfig/slepc.pc
 
 # Additional libraries that support pkg-config can be added to the list of PACKAGES below.
-PACKAGES := $(petsc.pc) $(slepc.pc)
+PACKAGES := $(slepc.pc)
 
-CC := $(shell pkg-config --variable=ccompiler $(PACKAGES))
-CXX := $(shell pkg-config --variable=cxxcompiler $(PACKAGES))
-FC := $(shell pkg-config --variable=fcompiler $(PACKAGES))
-CFLAGS_OTHER := $(shell pkg-config --cflags-only-other $(PACKAGES))
-CFLAGS := $(shell pkg-config --variable=cflags_extra $(PACKAGES)) $(CFLAGS_OTHER)
-CXXFLAGS := $(shell pkg-config --variable=cxxflags_extra $(PACKAGES)) $(CFLAGS_OTHER)
-FFLAGS := $(shell pkg-config --variable=fflags_extra $(PACKAGES))
+CC := $(shell pkg-config --variable=ccompiler $(petsc.pc))
+CXX := $(shell pkg-config --variable=cxxcompiler $(petsc.pc))
+FC := $(shell pkg-config --variable=fcompiler $(petsc.pc))
+CFLAGS_OTHER := $(shell pkg-config --cflags-only-other $(petsc.pc))
+CFLAGS := $(shell pkg-config --variable=cflags_extra $(petsc.pc)) $(CFLAGS_OTHER)
+CXXFLAGS := $(shell pkg-config --variable=cxxflags_extra $(petsc.pc)) $(CFLAGS_OTHER)
+FFLAGS := $(shell pkg-config --variable=fflags_extra $(petsc.pc))
 CPPFLAGS := $(shell pkg-config --cflags-only-I $(PACKAGES))
 LDFLAGS := $(shell pkg-config --libs-only-L --libs-only-other $(PACKAGES))
 LDFLAGS += $(patsubst -L%, $(shell pkg-config --variable=ldflag_rpath $(petsc.pc))%,$(shell pkg-config --libs-only-L $(PACKAGES)))
 LDLIBS := $(shell pkg-config --libs-only-l $(PACKAGES)) -lm
-CUDAC := $(shell pkg-config --variable=cudacompiler $(PACKAGES))
-CUDAC_FLAGS := $(shell pkg-config --variable=cudaflags_extra $(PACKAGES))
-CUDA_LIB := $(shell pkg-config --variable=cudalib $(PACKAGES))
-CUDA_INCLUDE := $(shell pkg-config --variable=cudainclude $(PACKAGES))
+CUDAC := $(shell pkg-config --variable=cudacompiler $(petsc.pc))
+CUDAC_FLAGS := $(shell pkg-config --variable=cudaflags_extra $(petsc.pc))
+CUDA_LIB := $(shell pkg-config --variable=cudalib $(petsc.pc))
+CUDA_INCLUDE := $(shell pkg-config --variable=cudainclude $(petsc.pc))
 
 print:
 	@echo CC=$(CC)

src/binding/slepc4py/CHANGES.rst

@@ -6,6 +6,12 @@ CHANGES: SLEPc for Python
 :Contact: [email protected]
 
 
+Release 3.20.2
+==============
+
+- Update to SLEPc 3.20.2.
+
+
 Release 3.20.1
 ==============
 

src/binding/slepc4py/conf/cythonize.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Run Cython with custom options."""
 import os
 import sys

src/binding/slepc4py/conf/epydoc.cfg

@@ -66,7 +66,7 @@ imports: no
 # the output (HTML only).
 sourcecode: no
 
-# Whether or not to include a a page with Epydoc log, containing
+# Whether or not to include a page with Epydoc log, containing
 # effective option at the time of generation and the reported logs.
 include-log: no
 

src/binding/slepc4py/setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Author:  Lisandro Dalcin
 # Contact: [email protected]
 

src/binding/slepc4py/src/slepc4py/__init__.py

@@ -21,7 +21,7 @@
 """
 
 __author__  = 'Lisandro Dalcin'
-__version__ = '3.20.1'
+__version__ = '3.20.2'
 __credits__ = 'SLEPc Team <[email protected]>'
 
 # -----------------------------------------------------------------------------

src/eps/impls/davidson/davidson.h

@@ -203,7 +203,7 @@ static inline PetscErrorCode EPSDavidsonFLCall(dvdFunctionList *fl,dvdDashboard
   dvdFunctionList *l;
 
   PetscFunctionBegin;
-  for (l=fl;l;l=l->next) PetscCall((l->f)(d));
+  for (l=fl;l;l=l->next) PetscCall(l->f(d));
   PetscFunctionReturn(PETSC_SUCCESS);
 }
 

src/eps/impls/davidson/dvdcalcpairs.c

@@ -348,7 +348,7 @@ static PetscErrorCode dvd_calcpairs_apply_arbitrary(dvdDashboard *d,PetscInt r_s
     xi = NULL;
     if (d->nX[i] != 1.0) PetscCall(VecScale(xr,1.0/d->nX[i]));
 #endif
-    PetscCall((d->eps->arbitrary)(rr[i-r_s],ri[i-r_s],xr,xi,&rr[i-r_s],&ri[i-r_s],d->eps->arbitraryctx));
+    PetscCall(d->eps->arbitrary(rr[i-r_s],ri[i-r_s],xr,xi,&rr[i-r_s],&ri[i-r_s],d->eps->arbitraryctx));
 #if !defined(PETSC_USE_COMPLEX)
     if (i != k) {
       rr[i+1-r_s] = rr[i-r_s];
@@ -496,7 +496,7 @@ static PetscErrorCode dvd_calcpairs_proj_res(dvdDashboard *d,PetscInt r_s,PetscI
     PetscCall(BVSetActiveColumns(cX,0,l));
     for (i=0;i<r_e-r_s;i++) PetscCall(BVOrthogonalizeVec(cX,R[i],NULL,&d->nR[r_s+i],&lindep));
     PetscCall(BVSetActiveColumns(cX,l,k));
-    if (lindep || (PetscAbs(d->nR[r_s+i]) < PETSC_MACHINE_EPSILON)) PetscCall(PetscInfo(d->eps,"The computed eigenvector residual %" PetscInt_FMT " is too low, %g!\n",r_s+i,(double)(d->nR[r_s+i])));
+    if (lindep || (PetscAbs(d->nR[r_s+i]) < PETSC_MACHINE_EPSILON)) PetscCall(PetscInfo(d->eps,"The computed eigenvector residual %" PetscInt_FMT " is too low, %g!\n",r_s+i,(double)d->nR[r_s+i]));
   } else {
     for (i=0;i<r_e-r_s;i++) PetscCall(VecNormBegin(R[i],NORM_2,&d->nR[r_s+i]));
     for (i=0;i<r_e-r_s;i++) PetscCall(VecNormEnd(R[i],NORM_2,&d->nR[r_s+i]));

src/eps/impls/external/arpack/arpack.c

@@ -178,7 +178,7 @@ static PetscErrorCode EPSSolve_ARPACK(EPS eps)
       PetscCall(VecPlaceArray(y,&ar->workd[ipntr[1]-1]));
 
       if (ido == -1) {
-        /* Y = OP * X for for the initialization phase to
+        /* Y = OP * X for the initialization phase to
            force the starting vector into the range of OP */
         PetscCall(STApply(eps->st,x,y));
       } else if (ido == 2) {
@@ -213,7 +213,7 @@ static PetscErrorCode EPSSolve_ARPACK(EPS eps)
   eps->nconv = iparam[4];
   eps->its = iparam[2];
 
-  PetscCheck(info!=3,PetscObjectComm((PetscObject)eps),PETSC_ERR_LIB,"No shift could be applied in xxAUPD.\nTry increasing the size of NCV relative to NEV");
+  PetscCheck(info!=3,PetscObjectComm((PetscObject)eps),PETSC_ERR_LIB,"No shift could be applied in xxAUPD. Try increasing the size of NCV relative to NEV");
   PetscCheck(info==0 || info==1,PetscObjectComm((PetscObject)eps),PETSC_ERR_LIB,"Error reported by ARPACK subroutine xxAUPD (%" PetscInt_FMT ")",info);
 
   rvec = PETSC_TRUE;