Subversion Repositories slepc-dev

Compare Revisions

Ignore whitespace Rev 2701 → Rev 2702

branches/slepc-3_2-branch/src/eps/impls/external/trlan/trlan.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/trlan/trlan.c:r2701
branches/slepc-3_2-branch/src/eps/impls/external/trlan/trlanp.h Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/trlan/trlanp.h:r2701
branches/slepc-3_2-branch/src/eps/impls/external/trlan/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/trlan/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/external/arpack/arpack.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/arpack/arpack.c:r2701
branches/slepc-3_2-branch/src/eps/impls/external/arpack/arpackp.h Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/arpack/arpackp.h:r2701
branches/slepc-3_2-branch/src/eps/impls/external/arpack/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/arpack/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/external/blzpack/blzpack.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/blzpack/blzpack.c:r2701
branches/slepc-3_2-branch/src/eps/impls/external/blzpack/blzpackp.h Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/blzpack/blzpackp.h:r2701
branches/slepc-3_2-branch/src/eps/impls/external/blzpack/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/blzpack/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/external/blopex/slepc-interface.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/blopex/slepc-interface.c:r2701
branches/slepc-3_2-branch/src/eps/impls/external/blopex/blopex.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/blopex/blopex.c:r2701
branches/slepc-3_2-branch/src/eps/impls/external/blopex/slepc-interface.h Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/blopex/slepc-interface.h:r2701
branches/slepc-3_2-branch/src/eps/impls/external/blopex/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/blopex/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/external/primme/ftn-custom/zprimmef.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/primme/ftn-custom/zprimmef.c:r2701
branches/slepc-3_2-branch/src/eps/impls/external/primme/ftn-custom/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/primme/ftn-custom/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/external/primme/primme.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/primme/primme.c:r2701
branches/slepc-3_2-branch/src/eps/impls/external/primme/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/primme/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/external/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/external/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/krylov/krylov.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/krylov.c:r2701
branches/slepc-3_2-branch/src/eps/impls/krylov/arnoldi/arnoldi.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/arnoldi/arnoldi.c:r2701
branches/slepc-3_2-branch/src/eps/impls/krylov/arnoldi/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/arnoldi/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/krylov/lanczos/lanczos.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/lanczos/lanczos.c:r2701
branches/slepc-3_2-branch/src/eps/impls/krylov/lanczos/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/lanczos/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/krylov/krylovschur/ks-symm.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/krylovschur/ks-symm.c:r2701
branches/slepc-3_2-branch/src/eps/impls/krylov/krylovschur/ks-harm.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/krylovschur/ks-harm.c:r2701
/branches/slepc-3_2-branch/src/eps/impls/krylov/krylovschur/ks-slice.c
332,6 → 332,8
}
sPres->comp[0] = (count0 >= sPres->nsch[0])?PETSC_TRUE:PETSC_FALSE;
sPres->comp[1] = (count1 >= sPres->nsch[1])?PETSC_TRUE:PETSC_FALSE;
if(count0 > sPres->nsch[0] || count1 > sPres->nsch[1])SETERRQ(((PetscObject)eps)->comm,1,"Unexpected error in Spectrum Slicing!\nMismatch between number of values found and information from inertia");
 
ierr = PetscFree(Q);CHKERRQ(ierr);
ierr = PetscFree(a);CHKERRQ(ierr);
ierr = PetscFree(b);CHKERRQ(ierr);
/branches/slepc-3_2-branch/src/eps/impls/krylov/krylovschur/krylovschur.c
87,7 → 87,10
}
if (!eps->mpd) eps->mpd = eps->ncv;
if (eps->ncv>eps->nev+eps->mpd) SETERRQ(((PetscObject)eps)->comm,1,"The value of ncv must not be larger than nev+mpd");
if (!eps->max_it) eps->max_it = PetscMax(100,2*eps->n/eps->ncv);
if (!eps->max_it) {
if (eps->which==EPS_ALL) eps->max_it = 100; /* special case for spectrum slicing */
else eps->max_it = PetscMax(100,2*eps->n/eps->ncv);
}
if (!eps->which) { ierr = EPSDefaultSetWhich(eps);CHKERRQ(ierr); }
if (eps->ishermitian && (eps->which==EPS_LARGEST_IMAGINARY || eps->which==EPS_SMALLEST_IMAGINARY))
SETERRQ(((PetscObject)eps)->comm,1,"Wrong value of eps->which");
branches/slepc-3_2-branch/src/eps/impls/krylov/krylovschur/krylovschur.c Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/krylovschur/krylovschur.c:r2701
branches/slepc-3_2-branch/src/eps/impls/krylov/krylovschur/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/krylovschur/makefile:r2701
branches/slepc-3_2-branch/src/eps/impls/krylov/makefile Property changes : Modified: svn:mergeinfo
Merged /trunk/src/eps/impls/krylov/makefile:r2701
branches/slepc-3_2-branch Property changes : Modified: svn:mergeinfo
Merged /trunk:r2701